Changeset 34250

Show
Ignore:
Timestamp:
09.07.2020 09:50:29 (4 weeks 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/CSVPlugin.pm

    r34249 r34250  
    133133    } 
    134134 
    135     $self->{'csv_file_fields'} = \@csv_file_fields; 
    136      
    137     # print STDERR "**** CSV file fields joined = ", join(" ||| ", @{$self->{'csv_file_fields'}}), "\n"; 
     135    #$self->{'csv_file_fields'} = \@csv_file_fields; 
     136    $self->{'csv_file_fields'}->{$filename} = \@csv_file_fields; 
     137    ###print STDERR "**** CSV file fields joined ($filename) = ", join(" ||| ", @{$self->{'csv_file_fields'}->{$filename}}), "\n"; 
     138 
    138139} 
    139140 
     
    147148    my $section = $doc_obj->get_top_section(); 
    148149    my $csv_line = $$textref; 
    149     my @csv_file_fields = @{$self->{'csv_file_fields'}};     
    150      
     150    #my @csv_file_fields = @{$self->{'csv_file_fields'}}; 
     151    my $filename_full_path = &FileUtils::filenameConcatenate($base_dir,$file); 
     152    my @csv_file_fields = @{$self->{'csv_file_fields'}->{$filename_full_path}}; 
     153     
     154    ###print STDERR "**** CSV file fields joined = ", join(" ||| ", @csv_file_fields), "\n"; 
     155     
    151156    # Add the raw line as the document text 
    152157    $doc_obj->add_utf8_text($section, $csv_line);