Changeset 11834

Timestamp:

2006-05-18T15:10:38+12:00 (18 years ago)

Author:

mdewsnip

Message:

Replaced all "_httpcollection_" in metadata (especially srclink) with "_httpprefix_/collect/[collection]" (this works correctly when using cross-collection searching).

Location:

trunk/gsdl/perllib/plugins

Files:

• BasPlug.pm (modified) (1 diff)
• ConvertToPlug.pm (modified) (1 diff)
• ConvertToRogPlug.pm (modified) (1 diff)
• ImagePlug.pm (modified) (3 diffs)
• MP3Plug.pm (modified) (3 diffs)
• OggVorbisPlug.pm (modified) (1 diff)
• OpenDocumentPlug.pm (modified) (1 diff)
• PagedImgPlug.pm (modified) (3 diffs)
• RealMediaPlug.pm (modified) (1 diff)
• StructuredHTMLPlug.pm (modified) (1 diff)
• UnknownPlug.pm (modified) (1 diff)
• W3ImgPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -1252 +1252 @@
 
         my ($doc_ext) = ($tail_filename =~ m/^.*\.(.*)$/);
-        my $start_doclink = "<a href=\"_httpcollection_/index/assoc/{Or}{[parent(Top):archivedir],[archivedir]}/$tail_filename\">";
+        my $start_doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):archivedir],[archivedir]}/$tail_filename\">";
         my $srcicon = "_icon".$doc_ext."_";
         my $end_doclink = "</a>";

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -476 +476 @@
     $doc_obj->set_utf8_metadata_element($cursection, "FileFormat", $file_format);
 
-    my $doclink = "<a href=\"_httpcollection_/index/assoc/[archivedir]/doc.$doc_ext\">";
+    my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/doc.$doc_ext\">";
     $doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink); 
     $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_"); 

trunk/gsdl/perllib/plugins/ConvertToRogPlug.pm

@@ -445 +445 @@
     $doc_obj->associate_file($filename, "doc.$doc_ext", undef, $cursection);
 
-    my $doclink = "<a href=\"_httpcollection_/index/assoc/[archivedir]/doc.$doc_ext\">";
+    my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/doc.$doc_ext\">";
     $doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink); 
     $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_"); 

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -200 +200 @@
 
     $doc_obj->add_metadata ($section, "srclink", 
-                "<a href=\"_httpcollection_/index/assoc/[assocfilepath]/[Image]\">");
+                "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Image]\">");
     $doc_obj->add_metadata ($section, "/srclink", "</a>");
 
-    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpcollection_/index/assoc/[assocfilepath]/[Image]\" width=100>");
+    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Image]\" width=100>");
 
     
@@ -232 +232 @@
     $doc_obj->add_metadata ($section, "Thumb", "thumbnail.$thumbnailtype");
 
-    $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpcollection_/index/assoc/[assocfilepath]/[Thumb]\" width=[ThumbWidth] height=[ThumbHeight]>");
+    $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Thumb]\" width=[ThumbWidth] height=[ThumbHeight]>");
     }
 
@@ -277 +277 @@
         $doc_obj->add_metadata ($section, "Screen", "screenview.$screenviewtype");
 
-        $doc_obj->add_metadata ($section, "screenicon", "<img src=\"_httpcollection_/index/assoc/[assocfilepath]/[Screen]\" width=[ScreenWidth] height=[ScreenHeight]>");
+        $doc_obj->add_metadata ($section, "screenicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Screen]\" width=[ScreenWidth] height=[ScreenHeight]>");
     } else {
         print $outhandle "ImagePlug: couldn't find \"$screenviewfilename\"\n";

trunk/gsdl/perllib/plugins/MP3Plug.pm

@@ -222 +222 @@
     
     $doc_obj->add_metadata ($section, "srclink", 
-                "<a href=\"_httpcollection_/index/assoc/[assocfilepath]/[srcurl]\">");
+                "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srcurl]\">");
     $doc_obj->add_metadata ($section, "srcicon", "_iconmp3_");
     $doc_obj->add_metadata ($section, "/srclink", "</a>");
@@ -229 +229 @@
     if (defined $applet_metadata && $applet_metadata ) {
     my $applet_html 
-        = gen_mp3applet("_httpcollection_/index/assoc/[assocfilepath]/[srcurl]");
+        = gen_mp3applet("_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srcurl]");
     $doc_obj->add_metadata ($section, "mp3applet", $applet_html);
     }
@@ -272 +272 @@
         $doc_obj->associate_file($img_filename, $dst_file, "image/jpeg", $section);
 
-        my $srcurl = "src=\"_httpcollection_/index/assoc/[assocfilepath]/$dst_file\"";
+        my $srcurl = "src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/$dst_file\"";
 
         $doc_obj->add_metadata ($section, "img$i", 

trunk/gsdl/perllib/plugins/OggVorbisPlug.pm

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

trunk/gsdl/perllib/plugins/OpenDocumentPlug.pm

@@ -236 +236 @@
 
     #setup to doclink thingi
-    my $doclink = "<a href=\"_httpcollection_/index/assoc/[archivedir]/$file_only\">";
+    my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/$file_only\">";
     $doc_obj->add_utf8_metadata ("", "srclink",  $doclink); 
-    $doc_obj->add_utf8_metadata ("", "srcicon",  "<img border=\"0\" align=\"absmiddle\" src=\"_httpcollection_/index/assoc/[archivedir]/thumbnail.png\" alt=\"View the Open document\" title=\"View the Open document\">"); 
+    $doc_obj->add_utf8_metadata ("", "srcicon",  "<img border=\"0\" align=\"absmiddle\" src=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/thumbnail.png\" alt=\"View the Open document\" title=\"View the Open document\">"); 
     $doc_obj->add_utf8_metadata ("", "/srclink", "</a>"); 
     $doc_obj->add_utf8_metadata ("", "Source", &ghtml::dmsafe($file_only));

trunk/gsdl/perllib/plugins/PagedImgPlug.pm

@@ -369 +369 @@
     if ($top) {
     $doc_obj->add_metadata ($section, "srclink", 
-                "<a href=\"_httpcollection_/index/assoc/[assocfilepath]/[Image]\">");
-    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpcollection_/index/assoc/[assocfilepath]/[Image]\">");
+                "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Image]\">");
+    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Image]\">");
 
     } else {
     $doc_obj->add_metadata ($section, "srclink", 
-                "<a href=\"_httpcollection_/index/assoc/[parent(Top):assocfilepath]/[Image]\">");
-    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpcollection_/index/assoc/[parent(Top):assocfilepath]/[Image]\">");
+                "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Image]\">");
+    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Image]\">");
 
     }
@@ -414 +414 @@
         $doc_obj->add_metadata ($section, "Thumb", $id."thumb.$thumbnailtype");
         if ($top) {
-        $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpcollection_/index/assoc/[assocfilepath]/[Thumb]\" width=[ThumbWidth] height=[ThumbHeight]>");
+        $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Thumb]\" width=[ThumbWidth] height=[ThumbHeight]>");
         } else {
-        $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpcollection_/index/assoc/[parent(Top):assocfilepath]/[Thumb]\" width=[ThumbWidth] height=[ThumbHeight]>");
+        $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Thumb]\" width=[ThumbWidth] height=[ThumbHeight]>");
         }
     }
@@ -471 +471 @@
 
         if ($top) {
-        $doc_obj->add_metadata ($section, "screenicon", "<img src=\"_httpcollection_/index/assoc/[assocfilepath]/[Screen]\" width=[ScreenWidth] height=[ScreenHeight]>");
+        $doc_obj->add_metadata ($section, "screenicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[Screen]\" width=[ScreenWidth] height=[ScreenHeight]>");
         } else {
-        $doc_obj->add_metadata ($section, "screenicon", "<img src=\"_httpcollection_/index/assoc/[parent(Top):assocfilepath]/[Screen]\" width=[ScreenWidth] height=[ScreenHeight]>");
+        $doc_obj->add_metadata ($section, "screenicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[parent(Top):assocfilepath]/[Screen]\" width=[ScreenWidth] height=[ScreenHeight]>");
 
         }

trunk/gsdl/perllib/plugins/RealMediaPlug.pm

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

trunk/gsdl/perllib/plugins/StructuredHTMLPlug.pm

@@ -277 +277 @@
     $doc_obj->associate_file($filename, "doc.doc", undef, $cursection);
     
-    my $doclink = "<a href=_httpcollection_/index/assoc/[archivedir]/doc.doc>";
+    my $doclink = "<a href=_httpprefix_/collect/[collection]/index/assoc/[archivedir]/doc.doc>";
     $doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink);
     $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icondoc_");

trunk/gsdl/perllib/plugins/UnknownPlug.pm

@@ -152 +152 @@
     
     $doc_obj->add_metadata ($section, "srclink", 
-                "<a href=\"_httpcollection_/index/assoc/[assocfilepath]/[$assoc_field]\">");
+                "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[$assoc_field]\">");
     #$doc_obj->add_metadata ($section, "srcicon", "_iconunknown_");
     $doc_obj->add_metadata ($section, "srcicon", "_".$self->{'srcicon'}."_");

trunk/gsdl/perllib/plugins/W3ImgPlug.pm

@@ -532 +532 @@
     $doc_obj->add_metadata($section, "PageTitle", $pagetitle);
     $doc_obj->add_metadata($section, "ThumbURL", 
-               "_httpcollection_/index/assoc/[archivedir]/$fn.thumb.jpg");
+               "_httpprefix_/collect/[collection]/index/assoc/[archivedir]/$fn.thumb.jpg");
     $doc_obj->add_metadata($section, "FileFormat", "W3Img");
 
@@ -554 +554 @@
     $doc_obj->associate_file($filepath, $onlyfn, undef, $section);
     $doc_obj->add_utf8_metadata($section, "CacheURL", 
-                   "_httpcollection_/index/assoc/[archivedir]/$onlyfn");
+                   "_httpprefix_/collect/[collection]/index/assoc/[archivedir]/$onlyfn");
     }
     return 1;