Changeset 33389 for main/trunk

Timestamp:

2019-08-06T13:19:16+12:00 (5 years ago)

Author:

kjdon

Message:

store csv field array associated with filename, because you might have 2 csv files with different field lists. The field list is created in metadata_read pass, and used in read pass.

File:

• main/trunk/greenstone2/perllib/plugins/CSVPlugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/CSVPlugin.pm

@@ -130 +130 @@
     }
     }
-    $self->{'csv_file_fields'} = \@csv_file_fields;
+
+    $self->{'csv_file_fields'}->{$filename} = \@csv_file_fields;
+    ###print STDERR "**** CSV file fields joined ($filename) = ", join(" ||| ", @{$self->{'csv_file_fields'}->{$filename}}), "\n";
 }
 
@@ -142 +144 @@
     my $section = $doc_obj->get_top_section();
     my $csv_line = $$textref;
-    my @csv_file_fields = @{$self->{'csv_file_fields'}};
 
-    # Add the raw line as the document text
+    my $filename_full_path = &FileUtils::filenameConcatenate($base_dir,$file);
+    my @csv_file_fields = @{$self->{'csv_file_fields'}->{$filename_full_path}};
+
+    ###print STDERR "**** CSV file fields joined = ", join(" ||| ", @csv_file_fields), "\n";
+
+     # Add the raw line as the document text
     $doc_obj->add_utf8_text($section, $csv_line);