Changeset 16922 for gsdl/trunk/perllib

Timestamp:

2008-08-20T17:45:33+12:00 (16 years ago)

Author:

ak19

Message:

1. The doclink uses the new SourceFile metadata, which is the url-encoded reference to the associated file's name on the filesystem (which may itself be url-encoded originally). 2. The assocfilename calls the doc_obj's new method assocfile_from_sourcefile() to determine the name of the associate file from the SourceFile metadata (the SourceFile metadata being the url ref to the filename).

File:

• gsdl/trunk/perllib/plugins/ConvertBinaryFile.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/ConvertBinaryFile.pm

@@ -481 +481 @@
     my $assocfilename = "doc.$doc_ext";
     if ($self->{'keep_original_filename'} == 1) {
-    # this should be the same filename that was used for the Source metadata, as we will use [Source] in the srclink
-    ($assocfilename) = $file =~ /([^\\\/]+)$/;
+    # this should be the same filename that was used for the Source and SourceFile metadata, 
+    # as we will use [SourceFile] in the srclink
+    $assocfilename = $doc_obj->assocfile_from_sourcefile(); #($assocfilename) = $file =~ /([^\\\/]+)$/;
     }
     $doc_obj->associate_file($filename, $assocfilename, undef, $cursection);
@@ -490 +491 @@
     my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/doc.$doc_ext\">";
     if ($self->{'keep_original_filename'} == 1) {
-    $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/[Source]\">";
+    $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/[SourceFile]\">";
     }
     $doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink);