Changeset 32817 for main/trunk

Timestamp:

2019-02-25T22:21:24+13:00 (5 years ago)

Author:

davidb

Message:

Change of option name

Location:

main/trunk/model-sites-dev/heritage-nz/collect/reports-2019/perllib/plugins

Files:

• CSVFieldSeparator.pm (modified) (1 diff)
• CSVPlugin.pm (modified) (3 diffs)
• MetadataCSVPlugin.pm (modified) (3 diffs)

main/trunk/model-sites-dev/heritage-nz/collect/reports-2019/perllib/plugins/CSVFieldSeparator.pm

@@ -39 +39 @@
 my $arguments = 
     [ 
-      { 'name' => "separate_char",
-    'desc' => "{CSVFieldSeparator.separate_char}",
+      { 'name' => "csv_field_separator",
+    'desc' => "{CSVFieldSeparator.csv_field_separator}",
     'type' => "string",
     'deft' => "auto",

main/trunk/model-sites-dev/heritage-nz/collect/reports-2019/perllib/plugins/CSVPlugin.pm

@@ -116 +116 @@
     my $csv_file_field_line = $1;
 
-    my $separate_char = $self->{'separate_char'};
+    my $separate_char = $self->{'csv_field_separator'};
     if ($separate_char =~ m/^auto$/i) {
     $separate_char = $self->resolve_auto($csv_file_field_line,$self->{'plugin_type'},$self->{'outhandle'},$self->{'verbosity'});
@@ -133 +133 @@
     }
 
-    # $csv_file_field_line .= $separate_char;  # To make the regular expressions simpler # ****
-
-    # while ($csv_file_field_line ne "") {
-    #   # Handle quoted values
-    #   if ($csv_file_field_line =~ s/^\"(.*?)\"${separate_char}//) { # ****
-    #       my $csv_file_field = $1;
-    #       $csv_file_field =~ s/ //g;  # Remove any spaces from the field names
-    #       push(@csv_file_fields, $csv_file_field);
-    #   }
-    #   # Normal comma-separated case
-    #   elsif ($csv_file_field_line =~ s/^(.*?)${separate_char}//) { # ****
-    #       my $csv_file_field = $1;
-    #       $csv_file_field =~ s/ //g;  # Remove any spaces from the field names
-    #       push(@csv_file_fields, $csv_file_field);
-    #   }
-    #   # The line must be formatted incorrectly
-    #   else {
-    #       print STDERR "Error: Badly formatted CSV field line: $csv_file_field_line.\n";
-    #       last;
-    #   }
-    # }
-
     $self->{'csv_file_fields'} = \@csv_file_fields;
 
-    print STDERR "****** csv file fields joined = ", join(" ||| ", @{$self->{'csv_file_fields'}}), "\n";
+    # print STDERR "**** CSV file fields joined = ", join(" ||| ", @{$self->{'csv_file_fields'}}), "\n";
 }
 
@@ -196 +174 @@
     }
 
-
-
-    # # Build a hash of metadata name to metadata value for this line
-    # my $i = 0;
-    # $csv_line .= $separate_char;  # To make the regular expressions simpler # ****
-    # while ($csv_line ne "") {
-    #   # Metadata values containing commas are quoted
-    #   if ($csv_line =~ s/^\"(.*?)\"${separate_char}//) { # ****
-    #       # Only bother with non-empty values
-    #       my $match = $1;
-    #       if ($match ne "" && defined($csv_file_fields[$i])) {
-    #       $doc_obj->add_utf8_metadata($section, $csv_file_fields[$i], $match);
-    #       }
-    #   }
-    #   # Normal comma-separated case
-    #   elsif ($csv_line =~ s/^(.*?)${separate_char}//) { # ****
-    #       # Only bother with non-empty values
-    #       my $match = $1;
-    #       if ($match ne "" && defined($csv_file_fields[$i])) {
-    #       $doc_obj->add_utf8_metadata($section, $csv_file_fields[$i], $match);
-    #       }
-    #   }
-    #   # The line must be formatted incorrectly
-    #   else {
-    #       print STDERR "Error: Badly formatted CSV line: $csv_line.\n";
-    #       last;
-    #   }
-
-    #   $i++;
-    # }
-
     # Record was processed successfully
     return 1;

main/trunk/model-sites-dev/heritage-nz/collect/reports-2019/perllib/plugins/MetadataCSVPlugin.pm

@@ -144 +144 @@
     $csv_file_content =~ s/\n+/\n/g;
 
-    my $separate_char = $self->{'separate_char'};
+    my $separate_char = $self->{'csv_field_separator'};
 
     my @csv_file_lines = split(/\n/, $csv_file_content);
@@ -165 +165 @@
     }
 
-##    my @csv_file_fields = split(/${separate_char}/, $csv_file_field_line); # ****
     my $found_filename_field = 0;
     for (my $i = 0; $i < scalar(@csv_file_fields); $i++) {
@@ -210 +209 @@
         last;
     }
-
-    # my $i = 0;
-    # $csv_line .= "$separate_char";  # To make the regular expressions simpler
-    # while ($csv_line ne "") {
-    #     # Metadata values containing commas are quoted
-    #     if ($csv_line =~ s/^\"(.*?)\"${separate_char}//) { # ****
-    #   # Only bother with non-empty values
-    #   if ($1 ne "" && defined($csv_file_fields[$i])) {
-    #       if (!defined $csv_line_metadata{$csv_file_fields[$i]}) {
-    #       $csv_line_metadata{$csv_file_fields[$i]} = [];
-    #       }
-    #       push (@{$csv_line_metadata{$csv_file_fields[$i]}}, $1);
-    #   }
-    #     }
-    #     # Normal comma-separated case
-    #     elsif ($csv_line =~ s/^(.*?)${separate_char}//) { # ****
-    #   # Only bother with non-empty values
-    #   if ($1 ne "" && defined($csv_file_fields[$i])) {
-    #       if (!defined $csv_line_metadata{$csv_file_fields[$i]}) {
-    #       $csv_line_metadata{$csv_file_fields[$i]} = [];
-    #       }
-    #       # remove any surrounding quotes. (When exporting to CSV, some spreadsheet
-    #       # programs add quotes even around field values that don't contain commas.)
-    #       my $value = $1;
-    #       $value =~ s/^"//;
-    #       $value =~ s/"$//;
-    #       push (@{$csv_line_metadata{$csv_file_fields[$i]}}, $value);
-    #   }
-    #     }
-    #     # The line must be formatted incorrectly
-    #     else {
-    #   $self->print_error($outhandle, $failhandle, $gli, $filename_full_path, "Badly formatted CSV line: $csv_line");
-    #   last;
-    #     }
-
-    #     $i++;
-    # }
 
     # We can't associate any metadata without knowing the file to associate it with