Changeset 29989 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java

Timestamp:

2015-06-24T14:17:24+12:00 (9 years ago)

Author:

kjdon

Message:

add in the replaceListRef macros to the macro resolver

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java

@@ -93 +93 @@
         if (macro_resolver != null)
         {
-            macro_resolver.setSiteDetails(this.site_http_address, this.cluster_name, this.library_name);
-            // set up the macro resolver
-            Element replacement_elem = (Element) GSXML.getChildByTagName(extra_info, GSXML.REPLACE_ELEM + GSXML.LIST_MODIFIER);
-            if (replacement_elem != null)
-            {
-                macro_resolver.addMacros(replacement_elem);
-            }
-        }
+          macro_resolver.setSiteDetails(this.site_http_address, this.cluster_name, this.getLibraryName());
+          // set up the macro resolver
+          Element replacement_elem = (Element) GSXML.getChildByTagName(extra_info, GSXML.REPLACE_ELEM + GSXML.LIST_MODIFIER);
+          if (replacement_elem != null)
+            {
+              macro_resolver.addMacros(replacement_elem);
+            }
+          
+          // look for any refs to global replace lists
+          NodeList replace_refs_elems = extra_info.getElementsByTagName(GSXML.REPLACE_ELEM + GSXML.LIST_MODIFIER + GSXML.REF_MODIFIER);
+          for (int i = 0; i < replace_refs_elems.getLength(); i++)
+            {
+              String id = ((Element) replace_refs_elems.item(i)).getAttribute("id");
+              if (!id.equals(""))
+            {
+              Element replace_list = GSXML.getNamedElement(this.router.config_info, GSXML.REPLACE_ELEM + GSXML.LIST_MODIFIER, "id", id);
+              if (replace_list != null)
+                {
+                  macro_resolver.addMacros(replace_list);
+                }
+            }
+            }
+        }
+
+        
 
         // check that there are classifiers specified