Changeset 8616 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPRetrieve.java

Timestamp:

2004-11-22T15:05:37+13:00 (20 years ago)

Author:

kjdon

Message:

modified the macro resolution - now replace items can be metadata as well, and have a scope - text or metadata. and this is used for text as well as metadata now. _httpdocimg_ is the only macro to remain in the code

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPRetrieve.java (modified) (2 diffs)

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

@@ -98 +98 @@
         return result;
     }
-
+    String lang = request.getAttribute(GSXML.LANG_ATT);
     Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(doc_list);
@@ -118 +118 @@
         long doc_num = this.gdbm_src.oid2Docnum(doc_id);
         String doc_content = this.mgpp_src.getDocument(textdir, this.default_level, doc_num);
-        doc_content = resolveImages(doc_content, doc_id);
+        doc_content = resolveTextMacros(doc_content, doc_id, lang);
 
         // For now, stick it in a text node - eventually should be parsed as xml??