Changeset 28211 for main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

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/cgiactions/metadataaction.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

@@ -318 +318 @@
         # This now stores the full pathname
         my $import_filename = $doc_rec->{'src-file'}->[0];
+        $import_filename = &util::placeholders_to_abspath($import_filename);
 
         # figure out correct metadata.xml file [?]
@@ -424 +425 @@
         my $doc_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $docid);
         # This now stores the full pathname
-        my $doc_filename = $doc_rec->{'doc-file'}->[0]; 
+        my $doc_filename = $doc_rec->{'doc-file'}->[0];
         $doc_filename = &util::filename_cat($archive_dir, $doc_filename);
 
@@ -793 +794 @@
     # This now stores the full pathname
     $import_filename = $doc_rec->{'src-file'}->[0];
+    $import_filename = &util::placeholders_to_abspath($import_filename);
 
     # figure out correct metadata.xml file [?]
@@ -2874 +2876 @@
     # This now stores the full pathname
     $import_filename = $doc_rec->{'src-file'}->[0]; 
+    $import_filename = &util::placeholders_to_abspath($import_filename);
+
     } else { # only for set_import_meta, not the case when calling method is set_import_metadata_array
          # as the array version of the method doesn't support the -f parameter yet
@@ -2962 +2966 @@
         # This now stores the full pathname
         $import_filename = $doc_rec->{'src-file'}->[0]; 
+        $import_filename = &util::placeholders_to_abspath($import_filename);
     }
 
@@ -3393 +3398 @@
     # This now stores the full pathname
     my $import_filename = $archive_doc_rec->{'src-file'}->[0];
+    $import_filename = &util::placeholders_to_abspath($import_filename);
     
     # figure out correct metadata.xml file [?]