Changeset 8643

Timestamp:

2004-11-23T16:51:01+13:00 (19 years ago)

Author:

nzdl

Message:

metadata macros now work, hopefully

File:

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

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

@@ -61 +61 @@
     
     public String resolve(String text, String lang, String scope, String doc_oid, DBInfo info) {
-    System.err.println("resolving macros for "+text);
+    //System.err.println("resolving macros for "+text);
     if (scope.equals(SCOPE_TEXT) && text_macros.size()==0) return text;
     if (scope.equals(SCOPE_META) && metadata_macros.size() ==0) return text;
-    
+
+    DBInfo root_info = null;
     boolean new_lang = false;
     if (this.lang == null || !this.lang.equals(lang) ) {
@@ -91 +92 @@
         break;
         case TYPE_META:
-        if (text.matches(m.macro)) {
+        // for some reason, this matches() never matches
+        //if (text.matches(".*"+m.macro+".*")) {
+        if (info == null) {
+            info = gdbm_src.getInfo(doc_oid);
             if (info == null) {
-            info = gdbm_src.getInfo(doc_oid);
-            if (info == null) {
-                break;
-            }
-            String value = info.getInfo(m.text);
-            if (value != null) {
-                text = text.replaceAll(m.macro, value);
-            }
+            break;
             }
         }
-        
+        String value = info.getInfo(m.text);
+        if (value != null) {
+            text = text.replaceAll(m.macro, value);
+        } else {
+            // try the root node
+            if (root_info == null && !OID.isTop(doc_oid)) {
+            System.err.println("top="+OID.getTop(doc_oid));
+            root_info = gdbm_src.getInfo(OID.getTop(doc_oid));
+            }
+            if (root_info == null) break;
+            value = root_info.getInfo(m.text);
+            if (value != null) {
+            text = text.replaceAll(m.macro, value);
+            }
+        }
+        //} // if
         break;
-        }
+        } // switch
+       
     }