Changeset 13174

Timestamp:

2006-10-27T14:33:59+13:00 (18 years ago)

Author:

kjdon

Message:

now checks for Filename field when reading through the first line. Also, puts values into an array, so that multiple values can be set for a single metadata field

File:

• trunk/gsdl/perllib/plugins/MetadataCSVPlug.pm (modified) (4 diffs)

trunk/gsdl/perllib/plugins/MetadataCSVPlug.pm

@@ -108 +108 @@
     my $csv_file_field_line = shift(@csv_file_lines);
     my @csv_file_fields = split(/\,/, $csv_file_field_line);
+    my $found_filename_field = 0;
     for (my $i = 0; $i < scalar(@csv_file_fields); $i++) {
     # Remove any spaces from the field names
     $csv_file_fields[$i] =~ s/ //g;
+    if ($csv_file_fields[$i] eq "Filename") {
+        $found_filename_field = 1;
+    }
     }
 
+    if (!$found_filename_field) {
+    print STDERR "MetadataCSVPlug Error: No Filename field in CSV file: $filename\n";
+    return -1; # error
+    }
     # Read each line of the file and assign the metadata appropriately
     foreach my $csv_line (@csv_file_lines) {
     # Ignore lines containing only whitespace
     next if ($csv_line =~ /^\s*$/);
-
+    my $orig_csv_line = $csv_line;
     # Build a hash of metadata name to metadata value for this line
     my %csv_line_metadata;
@@ -127 +135 @@
         # Only bother with non-empty values
         if ($1 ne "" && defined($csv_file_fields[$i])) {
-            $csv_line_metadata{$csv_file_fields[$i]} = $1;
+            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);
         }
         }
@@ -134 +145 @@
         # Only bother with non-empty values
         if ($1 ne "" && defined($csv_file_fields[$i])) {
-            $csv_line_metadata{$csv_file_fields[$i]} = $1;
+            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);
         }
         }
         # The line must be formatted incorrectly
         else {
-        print STDERR "Error: Badly formatted CSV line: $csv_line.\n";
+        print STDERR "MetadataCSVPlug Error: Badly formatted CSV line: $csv_line.\n";
         last;
         }
@@ -147 +161 @@
 
     # We can't associate any metadata without knowing the file to associate it with
-    my $csv_line_filename = $csv_line_metadata{"Filename"};
-    if (!defined($csv_line_filename)) {
-        print STDERR "Error: No Filename metadata in CSV line: $csv_line\n";
+    my $csv_line_filename_array = $csv_line_metadata{"Filename"};
+    if (!defined $csv_line_filename_array) {
+        print STDERR "MetadataCSVPlug Error: No Filename metadata in CSV line: $orig_csv_line\n";
         next;
     }
+    my $csv_line_filename = shift(@$csv_line_filename_array);
     delete $csv_line_metadata{"Filename"};