Changeset 30597

Show
Ignore:
Timestamp:
01.07.2016 20:31:42 (4 years ago)
Author:
ak19
Message:

1. Reindexing files with a user-generated manifest file did not work because modifications for generating nightly binaries broke this. Absolute file paths were replaced with filepaths containing placeholders in a pass by reference value and therefore affected other parts of the code. In this case, the code used for reindexing files mentioned in the manifest file. Some files ended up containing placeholders and couldn't be located and reindexed. 2. Use FileUtils? method instead of going through deprecated util method.

Location:
main/trunk/greenstone2/perllib
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/manifest.pm

    r28211 r30597  
    213213        $filename = &util::placeholders_to_abspath($filename); 
    214214 
    215         if (!&util::filename_is_absolute($filename)) { 
     215        if (!&FileUtils::isFilenameAbsolute($filename)) { 
    216216            $filename = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},$filename); 
    217217        } 
  • main/trunk/greenstone2/perllib/plugin.pm

    r28211 r30597  
    255255    # that this file is used in (note in most cases, it's just one OID) 
    256256     
    257     $file = &util::abspath_to_placeholders($file); 
    258     my $src_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_src_filename, $file); 
     257    my $file_with_placeholders = &util::abspath_to_placeholders($file); 
     258    my $src_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_src_filename, $file_with_placeholders); 
    259259    my $oids = $src_rec->{'oid'}; 
    260260    my $rv;