Changeset 34250 for main/trunk/greenstone2/perllib/plugins/CSVPlugin.pm

Timestamp:

2020-07-09T09:50:29+12:00 (4 years ago)

Author:

ak19

Message:

Having tested the incorporation of Kathy's bugfix to CSVPlugin from commit revision 33389, tested on the WMTB VM's gs3-svn install, am now committing her bugfix again on top of Dr Bainbridge's updated (Metadata)CSVPlugin work as that didn't already have her bugfix.

File:

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

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

@@ -133 +133 @@
     }
 
-    $self->{'csv_file_fields'} = \@csv_file_fields;
-    
-    # print STDERR "**** CSV file fields joined = ", join(" ||| ", @{$self->{'csv_file_fields'}}), "\n";
+    #$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";
+
 }
 
@@ -147 +148 @@
     my $section = $doc_obj->get_top_section();
     my $csv_line = $$textref;
-    my @csv_file_fields = @{$self->{'csv_file_fields'}};    
-    
+    #my @csv_file_fields = @{$self->{'csv_file_fields'}};
+    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);