Changeset 11263 for trunk/gsdl3

Timestamp:

2006-02-16T13:31:14+13:00 (18 years ago)

Author:

kjdon

Message:

added a new field to macros: resolve. if true, will try to resolve macros (recursively) in the replacement value. also added setSAiteDetails() method, which sets up two default macros, _httpsite_ and _clustername_

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/MacroResolver.java (modified) (4 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/MacroResolver.java

@@ -44 +44 @@
     this.metadata_macros = new ArrayList();
     }
+
     
-    public void addMacro(int type, String macro, String text_or_metadata, String scope) {
+    public void setSiteDetails(String site_address, String cluster_name) {
+    if (site_address != null) {
+        addMacro(TYPE_TEXT, "_httpsite_", site_address, SCOPE_ALL, false);
+    }
+    if (cluster_name != null) {
+        addMacro(TYPE_TEXT, "_clustername_", cluster_name, SCOPE_ALL, false);
+    }
+    }
+
+    public void addMacro(int type, String macro, String text_or_metadata, String scope, boolean resolve) {
     Macro m = new Macro();
     m.type = type;
     m.macro = macro;
     m.text = text_or_metadata;
+    m.resolve = resolve;
     addMacro(m, scope);
     }
 
-    public void addMacro(int type, String macro, String bundle, String key, String scope) {
+    public void addMacro(int type, String macro, String bundle, String key, String scope, boolean resolve) {
     Macro m = new Macro();
     m.type = type;
@@ -59 +70 @@
     m.bundle = bundle;
     m.key = key;
+    m.resolve = resolve;
     addMacro(m, scope);
     }
@@ -70 +82 @@
         scope = SCOPE_ALL;
         }
+        boolean resolve = true;
+        String resolve_str = e.getAttribute("resolve");
+        if (resolve_str.equals("false")) {
+        resolve = false;
+        }
         String from = e.getAttribute("macro");
         String to = e.getAttribute("text");
         if (!to.equals("")) {
-        addMacro(TYPE_TEXT, from, to, scope);
+        addMacro(TYPE_TEXT, from, to, scope, resolve);
         } else {
         String meta = e.getAttribute("metadata");
         if (!meta.equals("")) {
-            addMacro(TYPE_META, from, meta, scope);
+            addMacro(TYPE_META, from, meta, scope, resolve);
         } else {
             String key = e.getAttribute("key");
             String bundle = e.getAttribute("bundle");
-            addMacro(TYPE_DICT, from, bundle, key, scope);
+            addMacro(TYPE_DICT, from, bundle, key, scope, resolve);
         }
-        } 
+                                                                                                                    } 
     }
     
@@ -109 +126 @@
     protected class Macro {
     
+    /** type of replacement: TEXT, METADATA, DICTIONARY */
     public int type;
+    /** the macro to replace */
     public String macro = null;
-    public String text = null;
+    /** If text type, holds the text to replace with. If metadata type, holds the metadata name */
+    public String text = null; 
+    /** If dictionary type, holds the key to look up in the dictionary */
     public String key = null;
+    /** If dictionary type, holds the resource bundle name */
     public String bundle = null;
+    /** If true, will try to resolve macros in the replacement text */
+    public boolean resolve = true;
     
     }