Changeset 12627

Timestamp:

2006-08-31T13:46:50+12:00 (18 years ago)

Author:

mdewsnip

Message:

Extended to allow quoted names in the first line.

File:

• trunk/gsdl/perllib/plugins/CSVPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/CSVPlug.pm

@@ -108 +108 @@
     # The first line contains the metadata element names
     $$textref =~ s/^(.*?)\r?\n//;
-    my $csv_file_field_line = $1;
-    my @csv_file_fields = split(/\,/, $csv_file_field_line);
-    for (my $i = 0; $i < scalar(@csv_file_fields); $i++) {
-    # Remove any spaces from the field names
-    $csv_file_fields[$i] =~ s/ //g;
+    my @csv_file_fields = ();
+    my $csv_file_field_line = $1 . ",";  # To make the regular expressions simpler
+    while ($csv_file_field_line ne "") {
+    # Handle quoted values
+    if ($csv_file_field_line =~ s/^\"(.*?)\"\,//) {
+        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/^(.*?)\,//) {
+        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;