Changeset 28211 for main/trunk/greenstone2/perllib/plugouts

Timestamp:

2013-09-04T21:46:07+12:00 (11 years ago)

Author:

ak19

Message:

No more absolute paths in archiveinf-doc.gdb and archiveinf-src.gdb

File:

• main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -878 +878 @@
         $reverse_lookups->{$real_filename} = 1;
         }
-###     push(@{$oid_files->{$field}},$full_file);
+
+        if($field =~ m@assoc-file|src-file|meta-file@) {
+        $raw_filename = &util::abspath_to_placeholders($raw_filename);
+        }
+
+###     push(@{$oid_files->{$field}},$full_file);       
         push(@{$oid_files->{$field}},$raw_filename);
     }
@@ -935 +940 @@
 
     my $doc_db = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $output_dir);
-    my $src_db = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-src", $output_dir);
+    #my $src_db = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-src", $output_dir); # var unused in this function or file
 
     ##print STDERR "*** To set in db: \n\t$doc_db\n\t$oid\n\t$doc_db_text\n";
@@ -982 +987 @@
     $oid_files->{'doc-file'} = [ $oid_files->{'doc-file'} ];
     $oid_files->{'index-status'} = [ $oid_files->{'index-status'} ];
+    $oid_files->{'src-file'} = &util::abspath_to_placeholders($oid_files->{'src-file'});
     $oid_files->{'src-file'} = [ $oid_files->{'src-file'} ];
     $oid_files->{'sort-meta'} = [ $oid_files->{'sort-meta'} ];