Changeset 19747

Timestamp:

2009-06-05T17:14:11+12:00 (15 years ago)

Author:

ak19

Message:

Undoing yesterday's commit: Katherine explains that the document-prefix is not simply the path shared by documents, but may also end on the shared filename prefix, in which case we should not be forcing a slash at the end after all (where the user did not provide one).

File:

• gsdl/trunk/bin/script/explode_metadata_database.pl (modified) (1 diff)

gsdl/trunk/bin/script/explode_metadata_database.pl

@@ -405 +405 @@
         # Does this metadata element specify a document to obtain?
         if ($field eq $document_field) {
-        # if the document prefix provided didn't have the requisite slash at the end, we make sure it does now
-        # by first of all stripping any trailing slash and then always ensuring one is used through filename_cat
-        $document_prefix =~ s/(\/|\\)$//;
-        my $document_file_full = &util::filename_cat($document_prefix, "$value$document_suffix");
+        # shouldn't force a slash at the end after all, since the doc prefix may already
+        # contain the prefix of the actual filename itself (that's shared over several docs) 
+        my $document_file_full = $document_prefix . $value . $document_suffix;
 
         # this either downloads/copies the document, or creates a nul file for it.