Changeset 20935

Timestamp:

2009-11-13T10:02:48+13:00 (14 years ago)

Author:

davidb

Message:

import_file now comes back as full pathname (not just local name within collection). Code revised to take account of that.

File:

• gsdl/trunk/perllib/cgiactions/metadataaction.pm (modified) (2 diffs)

gsdl/trunk/perllib/cgiactions/metadataaction.pm

@@ -686 +686 @@
     my $metadata_xml_file;
 
+    my $import_filename = undef;
+
     if (defined $docid) {
 
@@ -693 +695 @@
     my $doc_rec = GDBMUtils::gdbmRecordToHash($arcinfo_doc_filename,$docid);
 
-    $import_file = $doc_rec->{'src-file'}->[0];
-    }
-    
-
-    my $import_filename = &util::filename_cat($collect_dir,$collect,$import_file);
-
+    # This now stores the full pathname
+    $import_filename = $doc_rec->{'src-file'}->[0];
+    }
+    else {
+    $import_filename = &util::filename_cat($collect_dir,$collect,$import_file);
+    }
     
     # figure out correct metadata.xml file