Changeset 32818 for main/trunk

Timestamp:

2019-02-25T23:01:49+13:00 (5 years ago)

Author:

davidb

Message:

New option added to allow metadata values within CSV to be split into separate values

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) (2 diffs)

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

@@ -43 +43 @@
     'type' => "string",
     'deft' => "auto",
+    'reqd' => "no" },
+      { 'name' => "metadata_value_separator",
+    'desc' => "{CSVFieldSeparator.metadata_value_separator}",
+    'type' => "string",
+    'deft' => "",
     'reqd' => "no" }
     ];

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

@@ -130 +130 @@
     }
     else {
-        print STDERR "Error: Badly formatted CSV field line: $csv_file_field_line.\n";
+    print STDERR "Error: Badly formatted CSV field line: $csv_file_field_line.\n";
     }
 
@@ -154 +154 @@
     my $separate_char = $self->{'separate_char'};
 
+    my $md_val_sep = $self->{'metadata_value_separator'};
+    undef $md_val_sep if ($md_val_sep eq "");
+
     my $csv = Text::CSV->new();
     $csv->sep_char($separate_char);
@@ -166 +169 @@
         # Only bother with non-empty values
         if ($md_val ne "" && defined($csv_file_fields[$i])) {
-        $doc_obj->add_utf8_metadata($section, $csv_file_fields[$i], $md_val);
+        if (defined $md_val_sep) {
+            my $md_name = $csv_file_fields[$i];
+
+            my @within_md_vals = split(/${md_val_sep}/,$md_val);
+            foreach my $within_md_val (@within_md_vals) {
+            $doc_obj->add_utf8_metadata($section, $md_name, $within_md_val);
+            }
+        }
+        else {
+            $doc_obj->add_utf8_metadata($section, $csv_file_fields[$i], $md_val);
+        }
         }
     }

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

@@ -146 +146 @@
     my $separate_char = $self->{'csv_field_separator'};
 
+    my $md_val_sep = $self->{'metadata_value_separator'};
+    undef $md_val_sep if ($md_val_sep eq "");
+
     my @csv_file_lines = split(/\n/, $csv_file_content);
     my $csv_file_field_line = shift(@csv_file_lines);
@@ -198 +201 @@
         # Only bother with non-empty values
         if ($md_val ne "" && defined($csv_file_fields[$i])) {
-            if (!defined $csv_line_metadata{$csv_file_fields[$i]}) {
-            $csv_line_metadata{$csv_file_fields[$i]} = [];
+
+            my $md_name = $csv_file_fields[$i];
+
+            if (!defined $md_name) {
+            $csv_line_metadata{$md_name} = [];
             }
-            push (@{$csv_line_metadata{$csv_file_fields[$i]}}, $md_val);
+
+            if (defined $md_val_sep) {          
+            
+            my @within_md_vals = split(/${md_val_sep}/,$md_val);
+            push (@{$csv_line_metadata{$md_name}}, @within_md_vals);
+
+#           foreach my $within_md_val (@within_md_vals) {
+#               push (@{$csv_line_metadata{$md_name}}, $within_md_val);
+#           }
+            }
+            else {
+            push (@{$csv_line_metadata{$md_name}}, $md_val);
+            }
         }
         }