Changeset 22663

Timestamp:

2010-08-18T10:50:18+12:00 (14 years ago)

Author:

mdewsnip

Message:

Changed "srclink_file" metadata to always contain the filename, instead of referencing another metadata element. This is so the C++ code can escape underscores in the filename values correctly.

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• BasePlugin.pm (modified) (1 diff)
• ConvertBinaryFile.pm (modified) (1 diff)
• ImageConverter.pm (modified) (1 diff)
• ImagePlugin.pm (modified) (1 diff)
• MP3Plugin.pm (modified) (1 diff)
• MediainfoOGVPlugin.pm (modified) (1 diff)
• OggVorbisPlugin.pm (modified) (1 diff)
• OpenDocumentPlugin.pm (modified) (1 diff)
• RealMediaPlugin.pm (modified) (1 diff)
• UnknownPlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

@@ -1140 +1140 @@
     
     $doc_obj->associate_file($filename, $assocfilename, undef, $cursection);
-    $doc_obj->add_utf8_metadata ($cursection, "srclink_file", "[SourceFile]");
+    $doc_obj->add_utf8_metadata ($cursection, "srclink_file", $doc_obj->get_sourcefile());
 }
 

main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm

@@ -486 +486 @@
     my $srclink_filename = "doc.$doc_ext";
     if ($self->{'keep_original_filename'} == 1) {
-    $srclink_filename = "[SourceFile]";
+    $srclink_filename = $doc_obj->get_sourcefile();
     }
     $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_"); 

main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

@@ -243 +243 @@
     }
 
-    $doc_obj->add_metadata ($section, "srclink_file", "[Image]"); 
+    $doc_obj->add_metadata ($section, "srclink_file", $url_to_filename_no_path);
     $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[srclink_file]\" width=\"[ImageWidth]\" height=\"[ImageHeight]\">");
 

main/trunk/greenstone2/perllib/plugins/ImagePlugin.pm

@@ -131 +131 @@
     $doc_obj->associate_file($filename_full_path, $assoc_file, "", $section);
 
-    $doc_obj->add_metadata ($section, "srclink_file", "[SourceFile]"); 
+    $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile()); 
     # We don't know the size of the image, but the browser should display it at full size
     $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\">");

main/trunk/greenstone2/perllib/plugins/MP3Plugin.pm

@@ -267 +267 @@
     
     $doc_obj->add_metadata ($section, "srcicon", "_iconmp3_");
-    $doc_obj->add_metadata ($section, "srclink_file", "[srcurl]"); 
+    $doc_obj->add_metadata ($section, "srclink_file", $assoc_url);
     my $applet_metadata = $self->{'applet_metadata'};
     if (defined $applet_metadata && $applet_metadata ) {

main/trunk/greenstone2/perllib/plugins/MediainfoOGVPlugin.pm

@@ -145 +145 @@
     $doc_obj->add_utf8_metadata ($section, $assoc_field, $doc_obj->get_source()); # Source metadata is already in utf8
 
-    $doc_obj->add_metadata ($section, "srclink_file", "[SourceFile]"); 
+    $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile());
     $doc_obj->add_metadata ($section, "srcicon", "_iconogg_");
 

main/trunk/greenstone2/perllib/plugins/OggVorbisPlugin.pm

@@ -137 +137 @@
 
     $doc_obj->add_metadata ($top_section, "FileFormat", "OggVorbis");
-    $doc_obj->add_metadata ($top_section, "srclink_file", "[SourceFile]"); 
+    $doc_obj->add_metadata ($top_section, "srclink_file", $doc_obj->get_sourcefile());
     $doc_obj->add_metadata ($top_section, "srcicon", "_iconogg_");
 

main/trunk/greenstone2/perllib/plugins/OpenDocumentPlugin.pm

@@ -262 +262 @@
 
     #setup to doclink thingi
-    $doc_obj->add_metadata ("", "srclink_file", "[SourceFile]"); 
+    $doc_obj->add_metadata ("", "srclink_file", $doc_obj->get_sourcefile());
     $doc_obj->add_utf8_metadata ("", "srcicon",  "<img border=\"0\" align=\"absmiddle\" src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/thumbnail.png\" alt=\"View the Open document\" title=\"View the Open document\">"); 
     $self->set_Source_metadata($doc_obj, $file_only);

main/trunk/greenstone2/perllib/plugins/RealMediaPlugin.pm

@@ -108 +108 @@
     $doc_obj->add_metadata($top_section, "FileFormat", "RealMedia");
 
-    $doc_obj->add_metadata ($top_section, "srclink_file", "[SourceFile]"); 
+    $doc_obj->add_metadata ($top_section, "srclink_file", $doc_obj->get_sourcefile());
     $doc_obj->add_metadata($top_section, "srcicon", "_iconrmvideo_");
 

main/trunk/greenstone2/perllib/plugins/UnknownPlugin.pm

@@ -145 +145 @@
     $doc_obj->add_metadata ($section, "MimeType", $mime_type);
     $doc_obj->add_utf8_metadata ($section, $assoc_field, $doc_obj->get_source()); # Source metadata is already in utf8 
-    $doc_obj->add_metadata ($section, "srclink_file", "[SourceFile]"); 
+    $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile());
     $doc_obj->add_metadata ($section, "srcicon", "_".$self->{'srcicon'}."_");