Changeset 8962

Timestamp:

2005-02-04T11:51:21+13:00 (19 years ago)

Author:

kjdon

Message:

made a base class which GS2MAcroREsolver inherits

Location:

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

Files:

• GS2MacroResolver.java (modified) (5 diffs)
• MacroResolver.java (added)

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

@@ +1 @@
+/*
+ *    GS2MacroResolver.java
+ *    Copyright (C) 2005 New Zealand Digital Library, http://www.nzdl.org
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 package org.greenstone.gsdl3.util;
 
@@ -5 +23 @@
 import org.greenstone.gdbm.DBInfo;
 
-public class GS2MacroResolver {
+public class GS2MacroResolver 
+    extends MacroResolver 
+{
 
-    public static final String SCOPE_TEXT = "text";
-    public static final String SCOPE_META = "metadata";
-    public static final String SCOPE_ALL = "all";
-
-    public static final int TYPE_TEXT = 0;
-    public static final int TYPE_META = 1;
-    public static final int TYPE_DICT = 2;
-    
-    protected ArrayList text_macros = null;
-    protected ArrayList metadata_macros = null;
     protected GDBMWrapper gdbm_src = null;
     
-    String lang = null;
     // need to make it not add macros if they are already present
-    public GS2MacroResolver(GDBMWrapper wrapper) {
-    this.text_macros = new ArrayList();
-    this.metadata_macros = new ArrayList();
-    this.gdbm_src = wrapper;
-    }
-    
-    public void addMacro(int type, String macro, String text_or_metadata, String scope) {
-    Macro m = new Macro();
-    m.type = type;
-    m.macro = macro;
-    m.text = text_or_metadata;
-    addMacro(m, scope);
+    public GS2MacroResolver(GDBMWrapper gdbm) {
+    gdbm_src = gdbm;
     }
 
-    public void addMacro(int type, String macro, String bundle, String key, String scope) {
-    Macro m = new Macro();
-    m.type = type;
-    m.macro = macro;
-    m.bundle = bundle;
-    m.key = key;
-    addMacro(m, scope);
-    }
-
-    protected void addMacro(Macro m, String scope) {
-
-    if (scope.equals(SCOPE_TEXT)) {
-        this.text_macros.add(m);
-    }
-    else if (scope.equals(SCOPE_META)) {
-        this.metadata_macros.add(m);
-    }
-    else if (scope.equals(SCOPE_ALL)) {
-        this.text_macros.add(m);
-        this.metadata_macros.add(m);
-        
-    }
-
-    }
     
-    public String resolve(String text, String lang, String scope, String doc_oid, DBInfo info) {
+     public String resolve(String text, String lang, String scope, 
+              String doc_oid) {
     //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 node_info = null;
     DBInfo root_info = null;
     boolean new_lang = false;
@@ -93 +70 @@
         case TYPE_META:
         if (text.indexOf(m.macro) != -1) {
-            if (info == null) {
-            info = gdbm_src.getInfo(doc_oid);
-            if (info == null) {
+            if (node_info == null) {
+            node_info = gdbm_src.getInfo(doc_oid);
+            if (node_info == null) {
                 break;
             }
             }
-            String value = info.getInfo(m.text);
+            
+            String value = node_info.getInfo(m.text);
             if (value != null) {
             text = text.replaceAll(m.macro, value);
@@ -105 +83 @@
             // 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));
             }
@@ -125 +102 @@
     }
 
-
-
-
-    private class Macro {
-
-    public int type;
-    public String macro = null;
-    public String text = null;
-    public String key = null;
-    public String bundle = null;
-    
-
-    
-    }
-
-
 }