diff options
| author | levinse <levinse> | 2010-11-20 04:50:49 +0000 |
|---|---|---|
| committer | levinse <levinse> | 2010-11-20 04:50:49 +0000 |
| commit | e6e50b882540c84743c97e5a671f108d9c5d5941 (patch) | |
| tree | 3487b60ab471008379b6e62f119fc0f14a7ceccf | |
| parent | 14ddc73d2c72c357bc80e40aae0c3a7538110450 (diff) | |
bug fixes vitelity.pm, RT4868
| -rw-r--r-- | FS/FS/part_export/vitelity.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/FS/FS/part_export/vitelity.pm b/FS/FS/part_export/vitelity.pm index 044387a68..7803b3fab 100644 --- a/FS/FS/part_export/vitelity.pm +++ b/FS/FS/part_export/vitelity.pm @@ -51,7 +51,6 @@ sub get_dids { 'table' => 'phone_avail', 'hashref' => { 'exportnum' => $self->exportnum, 'countrycode' => '1', # vitelity is US/CA only now - 'state' => $opt{'state'}, 'npa' => $opt{'areacode'}, 'nxx' => $opt{'exchange'}, }, @@ -61,14 +60,16 @@ sub get_dids { } elsif ( $opt{'areacode'} ) { #return exchanges in format NPA-NXX- literal 'XXXX' + # you can't call $->name .... that returns "(unlinked)" + # and in any case this is still major abuse of encapsulation, it just happens to work for the other fields return [ - map { $_->name. ' ('. $_->npa. '-'. $_->nxx. '-XXXX)' } + map { $_->{'Hash'}->{name}.' ('. $_->npa. '-'. $_->nxx. '-XXXX)' } qsearch({ - 'select' => 'DISTINCT ON ( name, npa, nxx ) *', + # i know this doesn't do the same thing as before, but now the sort works + 'select' => 'DISTINCT npa,nxx,name', 'table' => 'phone_avail', 'hashref' => { 'exportnum' => $self->exportnum, 'countrycode' => '1', # vitelity is US/CA only now - 'state' => $opt{'state'}, 'npa' => $opt{'areacode'}, }, 'order_by' => 'ORDER BY nxx', @@ -133,7 +134,7 @@ sub get_dids { } foreach my $did ( @dids ) { - $did =~ /^(\d{3})(\d{3})(\d{4})$/ or die "unparsable did $did\n"; + $did =~ /^(\d{3})(\d{3})(\d{4}),/ or die "unparsable did $did\n"; my($npa, $nxx, $station) = ($1, $2, $3); $npa{$npa}++; |