Changeset 8827

Timestamp:

2004-12-16T15:25:39+13:00 (19 years ago)

Author:

kjdon

Message:

small change, testing for null things

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java (modified) (1 diff)

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

@@ -92 +92 @@
         break;
         case TYPE_META:
-        // for some reason, this matches() never matches
-        //if (text.matches(".*"+m.macro+".*")) {
-        if (info == null) {
-            info = gdbm_src.getInfo(doc_oid);
+        if (text.indexOf(m.macro) != -1) {
             if (info == null) {
-            break;
+            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);
+            } 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);
+            }
             }
         }
-        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