Changeset 23798 for main

Timestamp:

2011-03-18T10:59:53+13:00 (13 years ago)

Author:

sjm84

Message:

Fixes to Greenstone 3 after Steven's changes

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java (modified) (1 diff)
• web/WEB-INF/lib/org (added)
• web/WEB-INF/lib/org/apache (moved) (moved from main/trunk/greenstone3/web/WEB-INF/lib/apache )

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

@@ -65 +65 @@
     } 
 
-    Stack macros;//ArrayList macros;
+    Stack macros = new Stack();//ArrayList macros;
     if (scope.equals(SCOPE_TEXT)) {
-        macros = text_macros;
+        macros.addAll(text_macros);
     } else {
-        macros = metadata_macros;
+        macros.addAll(metadata_macros);
     }
     //for (int i=0; i<macros.size(); i++) {