Changeset 24225

Timestamp:

2011-07-04T19:43:43+12:00 (12 years ago)

Author:

ak19

Message:

Still on ticket 449. Now srclink_file metadata (contains an underscore that makes things difficult for GS3) is renamed to srclinkFile. Related commits are in GS2's runtime-src formattools.cpp and dublincore.cpp and GS3's default/transform/config_format.xsl and Action.java.

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• BasePlugin.pm (modified) (1 diff)
• ConvertBinaryFile.pm (modified) (1 diff)
• ConvertToRogPlugin.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

@@ -1366 +1366 @@
     
     $doc_obj->associate_file($filename, $assocfilename, undef, $cursection);
+    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
     $doc_obj->add_utf8_metadata ($cursection, "srclink_file", $doc_obj->get_sourcefile());
+    $doc_obj->add_utf8_metadata ($cursection, "srclinkFile", $doc_obj->get_sourcefile());
 }
 

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

@@ -476 +476 @@
     $srclink_filename = $doc_obj->get_sourcefile();
     }
+    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
     $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_"); 
     $doc_obj->add_utf8_metadata ($cursection, "srclink_file", $srclink_filename);
+    $doc_obj->add_utf8_metadata ($cursection, "srclinkFile", $srclink_filename);
     return 1;
 }

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

@@ -447 +447 @@
     $doc_obj->associate_file($filename, "doc.$doc_ext", undef, $cursection);
 
+    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
     $doc_obj->add_metadata ($cursection, "srclink_file", "doc.$doc_ext"); 
+    $doc_obj->add_metadata ($cursection, "srclinkFile", "doc.$doc_ext"); 
     $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_"); 
 

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

@@ -258 +258 @@
     }
 
+    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
     $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]\">");
+    $doc_obj->add_metadata ($section, "srclinkFile", $url_to_filename_no_path);
+    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[srclinkFile]\" width=\"[ImageWidth]\" height=\"[ImageHeight]\">");
 
     # Add the image as an associated file

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

@@ -138 +138 @@
         $doc_obj->associate_file($filename_full_path, $assoc_file, "", $section);
         
+        # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
         $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile()); 
+        $doc_obj->add_metadata ($section, "srclinkFile", $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]\">");
+        $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclinkFile]\">");
         
         # Add a fake thumbnail icon with the full-sized image scaled down by the browser
-        $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\" width=\"" . $self->{'thumbnailsize'} . "\">");
+        $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclinkFile]\" width=\"" . $self->{'thumbnailsize'} . "\">");
     }
     #we have no text - adds dummy text and NoText metadata

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

@@ -267 +267 @@
     
     $doc_obj->add_metadata ($section, "srcicon", "_iconmp3_");
+    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
     $doc_obj->add_metadata ($section, "srclink_file", $assoc_url);
+    $doc_obj->add_metadata ($section, "srclinkFile", $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
 
+    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
     $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile());
+    $doc_obj->add_metadata ($section, "srclinkFile", $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");
+    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
     $doc_obj->add_metadata ($top_section, "srclink_file", $doc_obj->get_sourcefile());
+    $doc_obj->add_metadata ($top_section, "srclinkFile", $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
+    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
     $doc_obj->add_metadata ("", "srclink_file", $doc_obj->get_sourcefile());
+    $doc_obj->add_metadata ("", "srclinkFile", $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\">"); 
 

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

@@ -108 +108 @@
     $doc_obj->add_metadata($top_section, "FileFormat", "RealMedia");
 
+    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
     $doc_obj->add_metadata ($top_section, "srclink_file", $doc_obj->get_sourcefile());
+    $doc_obj->add_metadata ($top_section, "srclinkFile", $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 
+    # srclink_file is now deprecated because of the "_" in the metadataname. Use srclinkFile
     $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile());
+    $doc_obj->add_metadata ($section, "srclinkFile", $doc_obj->get_sourcefile());
     $doc_obj->add_metadata ($section, "srcicon", "_".$self->{'srcicon'}."_");