Changeset 25672

Timestamp:

2012-05-24T14:04:43+12:00 (12 years ago)

Author:

sjm84

Message:

Adding in two useful runtime macros that specify the current document ID

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java (modified) (3 diffs)

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

@@ -75 +75 @@
         {
             macros.addAll(text_macros);
+
+            //Two helpful runtime macros
+            Macro docIDMacro = new Macro();
+            docIDMacro.macro = "[DocOID]";
+            docIDMacro.text = doc_oid;
+            docIDMacro.type = TYPE_TEXT;
+
+            Macro docTopIDMacro = new Macro();
+            docTopIDMacro.macro = "[DocTopOID]";
+            docTopIDMacro.text = OID.getTop(doc_oid);
+            docTopIDMacro.type = TYPE_TEXT;
+
+            macros.add(docIDMacro);
+            macros.add(docTopIDMacro);
         }
         else
@@ -80 +94 @@
             macros.addAll(metadata_macros);
         }
+
         //for (int i=0; i<macros.size(); i++) {
         while (!macros.empty())
@@ -180 +195 @@
                         text = StringUtils.replace(text, m.macro, new_text);
                     }
-
                 }
 
                 break;
             } // switch
-
         }
         return text;