Changeset 11265

Timestamp:

2006-02-16T13:36:30+13:00 (18 years ago)

Author:

kjdon

Message:

resolving macro _httpdocimg_ is now done by replaceList, rather than hard coded

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java (modified) (3 diffs)

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

@@ -62 +62 @@
     {
     this.gdbm_src = new GDBMWrapper();
-    this.macro_resolver = new GS2MacroResolver(gdbm_src);
+    this.macro_resolver = new GS2MacroResolver(this.gdbm_src);
     }
 
@@ -75 +75 @@
         return false;
     }
-
+    
     System.out.println("Configuring AbstractGS2DocumentRetrieve...");
     //this.config_info = info;
@@ -408 +408 @@
     protected String resolveTextMacros(String doc_content, String doc_id, String lang)
     {
-    DBInfo info = null;
-    if (doc_content.indexOf("_httpdocimg_")!=-1) {
-        String top_doc_id = OID.getTop(doc_id);
-        info = this.gdbm_src.getInfo(top_doc_id);
-        if (info == null) {
-        // perhaps we had per.iods in the ids - just try the current id
-        top_doc_id = doc_id;
-        info = this.gdbm_src.getInfo(top_doc_id);
-        }
-        if (info != null) {
-        String archivedir = info.getInfo("archivedir");
-        String image_dir  = this.site_http_address + "/collect/"+this.cluster_name+"/index/assoc/"+archivedir;
-        
-        // Resolve all "_httpdocimg_"s
-        doc_content = doc_content.replaceAll("_httpdocimg_", image_dir);
-        }
-    }
     // resolve any collection specific macros
     doc_content = macro_resolver.resolve(doc_content, lang, MacroResolver.SCOPE_TEXT, doc_id);