[freeside-commits] freeside/FS/FS pay_batch.pm,1.15.2.3,1.15.2.4

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv14579/FS/FS

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	pay_batch.pm 
Log Message:
RT#7274: accept CR/LF in RBC batch import

Index: pay_batch.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/pay_batch.pm,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -d -r1.15.2.3 -r1.15.2.4
--- pay_batch.pm	7 Jan 2010 09:49:11 -0000	1.15.2.3
+++ pay_batch.pm	10 Feb 2010 02:13:01 -0000	1.15.2.4
@@ -272,11 +272,12 @@
         };
         push @all_values, [ $csv->fields(), $line ];
       }elsif ($filetype eq 'fixed'){
-        my @values = ( $line =~ /$formatre/, $line );
+        my @values = ( $line =~ /$formatre/ );
         unless (@values) {
           $dbh->rollback if $oldAutoCommit;
           return "can't parse: ". $line;
         };
+        push @values, $line;
         push @all_values, \@values;
       }else{
         $dbh->rollback if $oldAutoCommit;