Changeset 21760 for main/trunk

Timestamp:

2010-03-03T11:09:07+13:00 (14 years ago)

Author:

kjdon

Message:

srclink now generated dynamically at runtime. instead of storing srclink metadata, we store srclink_file metadata, which can be a value (doc.doc) or a metadata format element (eg [SourceFile]).

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• 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)
• 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/ConvertBinaryFile.pm

@@ -498 +498 @@
     # We use set instead of add here because we only want one value
     $doc_obj->set_utf8_metadata_element($cursection, "FileFormat", $file_type);
-    my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/doc.$doc_ext\">";
+    my $srclink_filename = "doc.$doc_ext";
+    #my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/doc.$doc_ext\">";
     if ($self->{'keep_original_filename'} == 1) {
-    $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">";
-    }
-    $doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink); 
+    $srclink_filename = "[SourceFile]";
+    #$doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">";
+    }
+    #$doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink); 
     $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_"); 
-    $doc_obj->add_utf8_metadata ($cursection, "/srclink", "</a>"); 
-
+    #$doc_obj->add_utf8_metadata ($cursection, "/srclink", "</a>"); 
+    $doc_obj->add_utf8_metadata ($cursection, "srclink_file", $srclink_filename);
     return 1;
 }

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

@@ -444 +444 @@
     $doc_obj->associate_file($filename, "doc.$doc_ext", undef, $cursection);
 
-    my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/doc.$doc_ext\">";
-    $doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink); 
+    #my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/doc.$doc_ext\">";
+    #$doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink); 
+    $doc_obj->add_metadata ($section, "srclink_file", "doc.$doc_ext"); 
     $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_"); 
-    $doc_obj->add_utf8_metadata ($cursection, "/srclink", "</a>"); 
+    #$doc_obj->add_utf8_metadata ($cursection, "/srclink", "</a>"); 
     return $ret_val;
 }

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

@@ -244 +244 @@
 
 
-    $doc_obj->add_metadata ($section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[Image]\">");
-    $doc_obj->add_metadata ($section, "/srclink", "</a>");
+    #$doc_obj->add_metadata ($section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[Image]\">");
+    #$doc_obj->add_metadata ($section, "/srclink", "</a>");
+    $doc_obj->add_metadata ($section, "srclink_file", "[Image]"); 
     $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[Image]\" 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", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
-    $doc_obj->add_metadata ($section, "/srclink", "</a>");
+    #$doc_obj->add_metadata ($section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
+    #$doc_obj->add_metadata ($section, "/srclink", "</a>");
+    $doc_obj->add_metadata ($section, "srclink_file", "[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]/[SourceFile]\">");

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

@@ -266 +266 @@
     $doc_obj->add_metadata ($section, "FileFormat", "MP3");
     
-    $doc_obj->add_metadata ($section, "srclink", 
-                "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srcurl]\">");
+    #$doc_obj->add_metadata ($section, "srclink", 
+#               "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srcurl]\">");
     $doc_obj->add_metadata ($section, "srcicon", "_iconmp3_");
-    $doc_obj->add_metadata ($section, "/srclink", "</a>");
-
+    #$doc_obj->add_metadata ($section, "/srclink", "</a>");
+    $doc_obj->add_metadata ($section, "srclink_file", "[srcurl]"); 
     my $applet_metadata = $self->{'applet_metadata'};
     if (defined $applet_metadata && $applet_metadata ) {

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

@@ -137 +137 @@
 
     $doc_obj->add_metadata ($top_section, "FileFormat", "OggVorbis");
-    $doc_obj->add_metadata ($top_section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
-    $doc_obj->add_metadata ($top_section, "/srclink", "</a>");
+    #$doc_obj->add_metadata ($top_section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
+    #$doc_obj->add_metadata ($top_section, "/srclink", "</a>");
+    $doc_obj->add_metadata ($section, "srclink_file", "[SourceFile]"); 
     $doc_obj->add_metadata ($top_section, "srcicon", "_iconogg_");
 

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

@@ -262 +262 @@
 
     #setup to doclink thingi
-    my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/$file_only\">";
-    $doc_obj->add_utf8_metadata ("", "srclink",  $doclink); 
+    #my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/$file_only\">";
+    #$doc_obj->add_utf8_metadata ("", "srclink",  $doclink); 
+    $doc_obj->add_metadata ($section, "srclink_file", "[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\">"); 
-    $doc_obj->add_utf8_metadata ("", "/srclink", "</a>"); 
+    #$doc_obj->add_utf8_metadata ("", "/srclink", "</a>"); 
     $self->set_Source_metadata($doc_obj, $file_only);
      $doc_obj->set_utf8_metadata_element("", "FileSize", (-s $filename));

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

@@ -108 +108 @@
     $doc_obj->add_metadata($top_section, "FileFormat", "RealMedia");
 
-    $doc_obj->add_metadata($top_section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
-    $doc_obj->add_metadata($top_section, "/srclink", "</a>");
+    #$doc_obj->add_metadata($top_section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
+    #$doc_obj->add_metadata($top_section, "/srclink", "</a>");
+    $doc_obj->add_metadata ($top_section, "srclink_file", "[SourceFile]"); 
     $doc_obj->add_metadata($top_section, "srcicon", "_iconrmvideo_");
 

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

@@ -146 +146 @@
     $doc_obj->add_utf8_metadata ($section, $assoc_field, $doc_obj->get_source()); # Source metadata is already in utf8 
 
-    $doc_obj->add_metadata ($section, "srclink", 
-                "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
+    #$doc_obj->add_metadata ($section, "srclink", 
+#               "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">");
+    $doc_obj->add_metadata ($section, "srclink_file", "[SourceFile]"); 
     $doc_obj->add_metadata ($section, "srcicon", "_".$self->{'srcicon'}."_");
-    $doc_obj->add_metadata ($section, "/srclink", "</a>");
+    #$doc_obj->add_metadata ($section, "/srclink", "</a>");
     
     # we have no text - add dummy text and NoText metadata