Changeset 11268

Timestamp:

2006-02-16T13:41:08+13:00 (18 years ago)

Author:

kjdon

Message:

set site details for the macro resolver, also look for replaceListRefs, and retrieve the lists from teh messsagerouters config_info

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java

@@ -134 +134 @@
 
     if (macro_resolver != null) {
+        macro_resolver.setSiteDetails(this.site_http_address, this.cluster_name);
         // set up the macro resolver
         Element replacement_elem = (Element)GSXML.getChildByTagName(extra_info, "replaceList");
@@ -139 +140 @@
         macro_resolver.addMacros(replacement_elem);
         }
-    }
-
+        // look for any refs to global replace lists
+        NodeList replace_refs_elems = extra_info.getElementsByTagName("replaceListRef");
+        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, "replaceList", "id", id);
+            if (replace_list != null) {
+            macro_resolver.addMacros(replace_list);
+            }
+        }
+        }
+    }
+    
     return true;
     }