Changeset 25345

Timestamp:

2012-04-05T14:49:08+12:00 (12 years ago)

Author:

kjdon

Message:

working on equiv link stuff. Have changed xxx.assoclink and equivlink back to having parent(Top):assocfilepath in it as this is needed for gs2. Have left equivDocLink as it was as I think that is used for gs3. I'll change this later.

File:

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

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

@@ -1316 +1316 @@
         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/[assocfilepath]/$url_tail_filename\'>";
+        # the greenstone 2 stuff
+        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\'>";
 
@@ -1325 +1326 @@
         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 "") {
@@ -1338 +1336 @@
 
         $equiv_form .= " $assoc_form";  
+
+        # following are used for greenstone 3, 
+        $doc_obj->add_utf8_metadata ($cursection, "equivDocLink", $start_doclink_gs3);
+        $doc_obj->add_utf8_metadata ($cursection, "equivDocIcon", $srcicon);
+        $doc_obj->add_utf8_metadata ($cursection, "/equivDocLink", $end_doclink);
+
         }
         $doc_obj->add_utf8_metadata ($cursection, "equivlink", $equiv_form);