Changeset 1991

Timestamp:

04/27/17 00:47:33 (7 years ago)

Author:

nanardon

Message:

Use hash for loadCSV options to allow more parameters

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Tools/CSV.pm (modified) (2 diffs)
• LATMOS-Accounts/bin/la-load-csv (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Utils.pm (modified) (3 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Tools/CSV.pm

@@ -42 +42 @@
     loadCSV(
         $upload->fh,
-        sub {
+        cb => sub {
             my ($res, $count) = @_;
 
@@ -75 +75 @@
             return 1;
         },
-        sub {
+        initcb => sub {
             my ($csv) = @_;
             @{ $c->stash->{attrs} } = $csv->column_names;

trunk/LATMOS-Accounts/bin/la-load-csv

@@ -68 +68 @@
 loadCSV(
     $fh,
-    sub {
+    cb => sub {
         my ($res, $linecount) = @_;
 
@@ -82 +82 @@
         $ochelper->Automate($info) or
             die "Cannot create object line $linecount (not enough information ?)\n";
-    }
+    },
 );
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Utils.pm

@@ -180 +180 @@
 Parse CVS files and return an array for each parsed line.
 
-If defined call C<$callback> for parsed line.
-
-C<$initcallback>, if defined, is called just after the first line.
+C<%options> may contains
+
+=over 4
+
+=item C<initcb> An function call after parsing first line
+
+=item C<cb> A function call for each line
+
+=back
 
 =cut
 
 sub loadCSV {
-    my ($fh, $cb, $initcb) = @_;
+    my ($fh, %opt) = @_;
 
     my $csv = Text::CSV->new({
@@ -201 +207 @@
     $csv->column_names($columns);
 
-    if ($initcb) {
-        $initcb->($csv);
+    if ($opt{initcb}) {
+        $opt{initcb}->($csv);
     }
 
@@ -209 +215 @@
     while ( my $row = $csv->getline_hr( $fh ) ) {
         $linecount++;
-        if ($cb) {
-            if (! $cb->($row, $linecount)) {
+        if ($opt{cb}) {
+            if (! $opt{cb}->($row, $linecount)) {
                 return;
             }