Changeset 11264

Timestamp:

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

Author:

kjdon

Message:

recursively resolve the replacement values if resolve is set to true

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java (modified) (6 diffs)

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

@@ -29 +29 @@
     // need to make it not add macros if they are already present
     public GS2MacroResolver(GDBMWrapper gdbm) {
+    super();
     gdbm_src = gdbm;
     }
 
     
-     public String resolve(String text, String lang, String scope, 
+    public String resolve(String text, String lang, String scope, 
               String doc_oid) {
-    //System.err.println("resolving macros for "+text);
+    if (text == null || text.equals("")) return text;
     if (scope.equals(SCOPE_TEXT) && text_macros.size()==0) return text;
     if (scope.equals(SCOPE_META) && metadata_macros.size() ==0) return text;
-
     DBInfo node_info = null;
     DBInfo root_info = null;
@@ -53 +53 @@
         macros = metadata_macros;
     }
-    
     for (int i=0; i<macros.size(); i++) {
+        String new_text = null;
         Macro m = (Macro)macros.get(i);
         switch (m.type) {
@@ -62 +62 @@
             m.text = dict.get(m.key, null);
         }
-        // now drop through to text case
-        case TYPE_TEXT:
+        // we assume that dictionary entries will contain no macros
+        // otherwise we can't cache the answer because it might be 
+        // document specific
         text = text.replaceAll(m.macro, m.text);
         break;
+        case TYPE_TEXT:
+        // make sure we resolve any macros in the text
+        // the (?s) treats the string as a single line, cos . 
+        // doesn't necessarily match line breaks
+        if (text.matches("(?s).*"+m.macro+".*")) {
+            if (m.resolve) {
+            new_text = this.resolve(m.text, lang, scope, doc_oid);
+            } else {
+            new_text = m.text;
+            }
+            text = text.replaceAll(m.macro, new_text);
+        }
+        break;
         case TYPE_META:
-        if (text.indexOf(m.macro) != -1) {
+        if (text.matches(".*"+m.macro+".*")) {
             if (node_info == null) {
             node_info = gdbm_src.getInfo(doc_oid);
@@ -74 +88 @@
             }
             }
-            
-            String value = node_info.getInfo(m.text);
-            if (value != null) {
-            text = text.replaceAll(m.macro, value);
-            } else {
+            new_text = node_info.getInfo(m.text);
+            if (new_text == null || new_text.equals("")) {
             // try the root node
             if (root_info == null && !OID.isTop(doc_oid)) {
@@ -84 +95 @@
             }
             if (root_info == null) break;
-            value = root_info.getInfo(m.text);
-            if (value != null) {
-                text = text.replaceAll(m.macro, value);
+            new_text = root_info.getInfo(m.text);
+            }
+            if (new_text != null) {
+            if (m.resolve) {
+                new_text = this.resolve(new_text, lang, scope, doc_oid);
             }
+            text = text.replaceAll(m.macro, new_text);
             }
+            
         }
         
@@ -95 +110 @@
        
     }
-    
     return text;