[freeside-commits] freeside/FS/FS Record.pm, 1.214.2.6, 1.214.2.7 cdr.pm, 1.66.2.7, 1.66.2.8

[Erik Levinson]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Record.pm cdr.pm 
Log Message:
SMSC CDRs (Kannel) and cdrtypenum option on cdr sftp import script, RT10991

Index: cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cdr.pm,v
retrieving revision 1.66.2.7
retrieving revision 1.66.2.8
diff -u -w -d -r1.66.2.7 -r1.66.2.8
--- cdr.pm	2 Jun 2011 20:43:16 -0000	1.66.2.7
+++ cdr.pm	9 Jun 2011 22:09:08 -0000	1.66.2.8
@@ -948,6 +948,14 @@
   my $iopt = _import_options;
   $opt->{$_} = $iopt->{$_} foreach keys %$iopt;
 
+  if ( defined $opt->{'cdrtypenum'} ) {
+        $opt->{'preinsert_callback'} = sub {
+                my($record,$param) = (shift,shift);
+                $record->cdrtypenum($opt->{'cdrtypenum'});
+                '';
+        };
+  }
+
   FS::Record::batch_import( $opt );
 
 }

Index: Record.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Record.pm,v
retrieving revision 1.214.2.6
retrieving revision 1.214.2.7
diff -u -w -d -r1.214.2.6 -r1.214.2.7
--- Record.pm	1 May 2011 19:51:08 -0000	1.214.2.6
+++ Record.pm	9 Jun 2011 22:09:08 -0000	1.214.2.7
@@ -1851,9 +1851,11 @@
 
       $line = &{$row_callback}($line) if $row_callback;
 
+      next if $line =~ /^\s*$/; #skip empty lines
+
       $parser->parse($line) or do {
         $dbh->rollback if $oldAutoCommit;
-        return "can't parse: ". $parser->error_input();
+        return "can't parse: ". $parser->error_input() . " " . $parser->error_diag;
       };
       @columns = $parser->fields();