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

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

Location:

main/trunk/greenstone2/perllib/cgiactions

Files:

• explodeaction.pm (modified) (2 diffs)
• metadataaction.pm (modified) (6 diffs)

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

@@ -135 +135 @@
     
     if (defined $src_files) {
-        foreach my $if (@$src_files) {
-        $all_import_file_keys{$if} = 1;
+        foreach my $ifile (@$src_files) {
+        $ifile = &util::placeholders_to_abspath($ifile);
+        $all_import_file_keys{$ifile} = 1;
         }
     }
 
     if (defined $assoc_files) {
-        foreach my $if (@$assoc_files) {
-        $all_import_file_keys{$if} = 1;
+        foreach my $ifile (@$assoc_files) {
+        $ifile = &util::placeholders_to_abspath($ifile);
+        $all_import_file_keys{$ifile} = 1;
         }
     }
@@ -175 +177 @@
     my %all_oid_keys = ();
 
-    foreach my $if (@$import_filenames) {
-        $if = &util::upgrade_if_dos_filename($if);
-
-    print STDERR "*** looking import filename key \"$if\"\n";
-
+    foreach my $ifile (@$import_filenames) {
+    $ifile = &util::upgrade_if_dos_filename($ifile);
+    $ifile = &util::abspath_to_placeholders($ifile);
+
+    print STDERR "*** looking up import filename key \"$ifile\"\n";
+    
     my $src_rec
         = &dbutil::read_infodb_entry($infodb_type, $arcinfo_src_filename, 
-                     $if);
+                     $ifile);
+
     my $oids = $src_rec->{'oid'};
 

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 [?]