Changeset 16921 for gsdl/trunk/perllib

Timestamp:

2008-08-20T17:39:48+12:00 (16 years ago)

Author:

ak19

Message:

src_link 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)

Location:

gsdl/trunk/perllib/plugins

Files:

• OggVorbisPlugin.pm (modified) (1 diff)
• RealMediaPlugin.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/OggVorbisPlugin.pm

@@ -125 +125 @@
 
     $doc_obj->add_metadata ($top_section, "FileFormat", "OggVorbis");
-    $doc_obj->add_metadata ($top_section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Source]\">");
+    $doc_obj->add_metadata ($top_section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
     $doc_obj->add_metadata ($top_section, "/srclink", "</a>");
     # srcicon (need to include "iogg.gif" in the greenstone images directory

gsdl/trunk/perllib/plugins/RealMediaPlugin.pm

@@ -101 +101 @@
     $doc_obj->add_metadata($top_section, "FileFormat", "RealMedia");
 
-    $doc_obj->add_metadata($top_section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Source]\">");
+    $doc_obj->add_metadata($top_section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
     $doc_obj->add_metadata($top_section, "/srclink", "</a>");
     # srcicon (need to include "irmvideo.gif" in the greenstone images directory
     $doc_obj->add_metadata($top_section, "srcicon", "<img src=\"_httpprefix_/images/irmvideo.gif\" title=\"Download\" border=0>");
 
-    # Add the actual file as an associated file
+    # Add the actual filename as it exists on the file system as an associated file
+    # by making sure we undo any URL-encoding escaping there may be
+    $filename_no_path =~ s/%25/%/g;
     $doc_obj->associate_file($filename_full_path, $filename_no_path, "RealMedia", $top_section);