Changeset 19754 for gsdl/trunk/bin/script/explode_metadata_database.pl

Timestamp:

2009-06-08T13:34:05+12:00 (15 years ago)

Author:

ak19

Message:

The document_prefix field of exploding-metadata now has the file-separator appended to the end if it refers to a directory (but not a URL). If it refers to a shared filename prefix then no file-sep will be appended.

File:

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

gsdl/trunk/bin/script/explode_metadata_database.pl

@@ -402 +402 @@
 
         $value =~ s/\\\\/\\/g;
+        my $document_file_full;
 
         # Does this metadata element specify a document to obtain?
         if ($field eq $document_field) {
-        # 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;
+        if(-d $document_prefix && $document_prefix !~ m@^(http|ftp|https)://@ ) {
+            # if the document-prefix refers to a directory but not URL, ensure it has a file-separator at the end
+            # by first of all stripping any trailing slash and then always ensuring one is used through filename_cat
+            $document_prefix =~ s/(\/|\\)$//;
+            $document_file_full = &util::filename_cat($document_prefix, "$value$document_suffix");
+        } else { # the doc prefix may also contain the prefix of the actual *filename* following the directory
+            $document_file_full = $document_prefix . $value . $document_suffix;
+        }
 
         # this either downloads/copies the document, or creates a nul file for it.