Changeset 26038 for main/trunk/greenstone3

Timestamp:

2012-07-30T20:57:25+12:00 (12 years ago)

Author:

ak19

Message:

Updated addLinkMetaNames to deal with weblinks (for the Pointing To Docs On The Web tutorial) and equivdoc links (for the Associated Files tutorial), so that these can be referenced as other gsf:link types rather than as gsf:metadata for starting tag, anchor and closing tag. The last three were tested against the tutorials and they worked, but would like the format statements to be in a more GS3 way. For now the gsf:link type=equivdoc works with the changes in config_format, but still have issues with weblink because of the webicon. Once that's fixed, will commit config_format.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java

@@ -145 +145 @@
         // makes use of 'assocfilepath' so need to make sure it's asked for
 
+        boolean getEquivLinkMeta = false;
+
         NodeList link_nodes = format.getElementsByTagName("gsf:link");
         for (int i = 0; i < link_nodes.getLength(); i++)
@@ -155 +157 @@
                 meta_names.add("srclinkFile");
             }
+            else if (type.equals("web")) {
+                    meta_names.add("weblink");
+                meta_names.add("webicon");
+                meta_names.add("/weblink");
+            }
+            else if (type.equals("equivdoc")) {
+                getEquivLinkMeta = true;
+            }
         }
 
@@ -160 +170 @@
         // so that we can build up the equivlink from the metadata components it needs
         link_nodes = format.getElementsByTagName("gsf:equivlinkgs3");
-        if (link_nodes.getLength() > 0)
+        if (getEquivLinkMeta || link_nodes.getLength() > 0)
         {
             String[] equivlink_metanames = { "equivDocIcon", "equivDocLink", "/equivDocLink" };