Changeset 8574

Timestamp:

2004-11-16T16:15:38+13:00 (19 years ago)

Author:

kjdon

Message:

now uses the macro resolver instead of the replacements arraylist

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java (modified) (14 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java

@@ -79 +79 @@
     protected Element config_info = null; // the xml from the config file
 
-    protected ArrayList replacements = null;
+    protected GS2MacroResolver macro_resolver = null;
+
     /** constructor */
     protected GS2Retrieve()
     {
     this.gdbm_src = new GDBMWrapper();
+    this.macro_resolver = new GS2MacroResolver();
     }
 
@@ -114 +116 @@
         System.err.println("GS2Retrieve Error: Could not open GDBM database!");
         return false;
+    }
+
+    // look for document display format
+    String path = GSPath.appendLink(GSXML.DISPLAY_ELEM, GSXML.FORMAT_ELEM);
+    Element display_format = (Element)GSXML.getNodeByPath(extra_info, path);
+    if (display_format != null) {
+        this.format_info_map.put(DOCUMENT_CONTENT_RETRIEVE_SERVICE, this.doc.importNode(display_format, true));
+        // shoudl we make a copy?
+    }
+
+    // set up the macro resolver
+    Element replacement_elem = (Element)GSXML.getChildByTagName(extra_info, "replaceList");
+    if (replacement_elem != null) {
+        NodeList replaces = replacement_elem.getElementsByTagName("replace");
+        for (int i=0; i<replaces.getLength(); i++) {
+        Element e = (Element)replaces.item(i);
+        String from = e.getAttribute("macro");
+        String to = e.getAttribute("text");
+        if (to.equals("")) {
+            String key = e.getAttribute("key");
+            String bundle = e.getAttribute("bundle");
+            macro_resolver.addMacro(from, bundle, key);
+        } else {
+            macro_resolver.addMacro(from, to);
+        }
+        }
     }
 
@@ -181 +209 @@
     }
 
-    // look for document display format
-    String path = GSPath.appendLink(GSXML.DISPLAY_ELEM, GSXML.FORMAT_ELEM);
-    Element display_format = (Element)GSXML.getNodeByPath(extra_info, path);
-    if (display_format != null) {
-        this.format_info_map.put(DOCUMENT_CONTENT_RETRIEVE_SERVICE, this.doc.importNode(display_format, true));
-        // shoudl we make a copy?
-    }
-
-    // set up the replacement list
-    Element replacement_elem = (Element)GSXML.getChildByTagName(extra_info, "replaceList");
-    if (replacement_elem != null) {
-        this.replacements = new ArrayList();
-        NodeList replaces = replacement_elem.getElementsByTagName("replace");
-        for (int i=0; i<replaces.getLength(); i++) {
-        Element e = (Element)replaces.item(i);
-        String from = e.getAttribute("from");
-        String to = e.getAttribute("to");
-        System.out.println("replace "+from+" with "+to);
-        this.replacements.add(from);
-        this.replacements.add(to);
-        }
-    }
     return true;
     }
@@ -510 +516 @@
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
 
-
+    String lang = request.getAttribute(GSXML.LANG_ATT);
     Element query_doc_list = (Element) GSXML.getChildByTagName(request, node_name+GSXML.LIST_MODIFIER);
     if (query_doc_list == null) {
@@ -689 +695 @@
 
     String node_name;
-    
+    String lang = request.getAttribute(GSXML.LANG_ATT);
     String service_name;
     if (type==DOCUMENT) {
@@ -763 +769 @@
             String key = (String)it.next();
             String value = info.getInfo(key);
-            GSXML.addMetadata(this.doc, node_meta_list, key, replaceMacros(value));
+            GSXML.addMetadata(this.doc, node_meta_list, key, this.macro_resolver.resolveMacros(value, lang));
         }
         } else { // just get the selected ones
@@ -769 +775 @@
         for (int m = 0; m < metadata_list.size(); m++) {
             String metadata = (String) metadata_list.get(m);
-            String value = getMetadata(node_id, info, metadata);
+            String value = getMetadata(node_id, info, metadata, lang);
             if (!value.equals("")) {
             GSXML.addMetadata(this.doc, node_meta_list, metadata, value);
@@ -781 +787 @@
 
     protected String getMetadata(String node_id, DBInfo info, 
-                 String metadata) {
+                 String metadata, String lang) {
     boolean multiple = false;
     String relation = "";
@@ -788 +794 @@
     if (pos ==-1) {
         // just a plain meta entry eg dc.Title
-        return replaceMacros((String)info.getInfo(metadata));
+        return macro_resolver.resolveMacros((String)info.getInfo(metadata), lang);
     }
     
@@ -848 +854 @@
 
     if (!multiple) {
-        result.append(replaceMacros(relation_info.getInfo(metadata)));
+        result.append(this.macro_resolver.resolveMacros(relation_info.getInfo(metadata), lang));
     } else {
         // we have multiple meta
@@ -860 +866 @@
             result.append(separator);
             }
-            result.append(replaceMacros((String)values.elementAt(i)));
+            result.append(this.macro_resolver.resolveMacros((String)values.elementAt(i), lang));
         }
         }
@@ -877 +883 @@
         if (!multiple) {
         result.insert(0, separator);
-        result.insert(0, replaceMacros(relation_info.getInfo(metadata)));
+        result.insert(0, this.macro_resolver.resolveMacros(relation_info.getInfo(metadata), lang));
         } else {
         Vector values = relation_info.getMultiInfo(metadata);
@@ -883 +889 @@
             for (int i=values.size()-1; i>=0; i--) {
             result.insert(0, separator);
-            result.insert(0, replaceMacros((String)values.elementAt(i)));
+            result.insert(0, this.macro_resolver.resolveMacros((String)values.elementAt(i), lang));
             }
         }
@@ -894 +900 @@
     }
     
-
-    protected String replaceMacros(String text) {
-    if (this.replacements == null) {
-        return text;
-    }
-    for (int i=0; i<this.replacements.size()-1; i+=2) {
-        String from  = (String)this.replacements.get(i);
-        String to = (String)this.replacements.get(i+1);
-        text = text.replaceAll(from, to);
-    }
-    return text;
-    }
     /** Retrieve the content of a document - implemented by concrete subclasses */
     protected abstract Element processDocumentContentRetrieve(Element request);