Changeset 24219 for main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

Timestamp:

2011-07-01T21:05:19+12:00 (13 years ago)

Author:

ak19

Message:

Thanks to Sam, Veronica and Dr Bainbridge, can finally commit the changes necessary for ticket 449.

File:

• main/trunk/greenstone2/perllib/plugins/BasePlugin.pm (modified) (2 diffs)

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

@@ -1300 +1300 @@
         my ($pre_doc_ext) = ($file_extended_ext =~ m/^(.*)\..*$/);
         my ($doc_ext) = ($tail_filename =~ m/^.*\.(.*)$/);
-        my $start_doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):assocfilepath],[assocfilepath]}/$url_tail_filename\">";
+
+##      my $start_doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):assocfilepath],[assocfilepath]}/$url_tail_filename\">";
+        my $start_doclink = "<a href=\'_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/$url_tail_filename\'>";
+        my $start_doclink_gs3 = "<a href=\'_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/$url_tail_filename\'>";
+
         my $srcicon = "_icon".$doc_ext."_";
         my $end_doclink = "</a>";
-
+        
         my $assoc_form = "$start_doclink\{If\}{$srcicon,$srcicon,$doc_ext\}$end_doclink";
+
+        $doc_obj->add_utf8_metadata ($cursection, "equivDocLink", $start_doclink);
+        $doc_obj->add_utf8_metadata ($cursection, "equivDocIcon", $srcicon);
+        $doc_obj->add_utf8_metadata ($cursection, "/equivDocLink", $end_doclink);
 
         if (defined $pre_doc_ext && $pre_doc_ext ne "") {
@@ -1313 +1321 @@
         # for multiple metadata such as [mp3.assoclink]
         $doc_obj->add_utf8_metadata ($cursection, "$doc_ext.assoclink", $assoc_form); 
-        
+
         $equiv_form .= " $assoc_form";  
         }