Changeset 30597

Timestamp:

2016-07-01T20:31:42+12:00 (7 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:

• manifest.pm (modified) (1 diff)
• plugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/manifest.pm

@@ -213 +213 @@
         $filename = &util::placeholders_to_abspath($filename);
 
-        if (!&util::filename_is_absolute($filename)) {
+        if (!&FileUtils::isFilenameAbsolute($filename)) {
             $filename = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},$filename);
         }

main/trunk/greenstone2/perllib/plugin.pm

@@ -255 +255 @@
     # that this file is used in (note in most cases, it's just one OID)
     
-    $file = &util::abspath_to_placeholders($file);
-    my $src_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_src_filename, $file);
+    my $file_with_placeholders = &util::abspath_to_placeholders($file);
+    my $src_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_src_filename, $file_with_placeholders);
     my $oids = $src_rec->{'oid'};
     my $rv;