Changeset 3995

Timestamp:

2003-03-26T12:10:12+12:00 (21 years ago)

Author:

kjdon

Message:

path for resolving images now based of site_http_address_

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java (modified) (1 diff)

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

@@ -628 +628 @@
     protected abstract Element processDocumentContentRetrieve(Element request);
 
-
+    /** needs to get info from gdbm database - if the calling code gets it already it may pay to pass it in instead */
     protected String resolveImages(String doc_content, String doc_id)
     {
-    // System.out.println("(Resolving images): Document content:\n" + doc_content);
-    File siteConfigFile = new File(GSFile.siteConfigFile(site_home_));
-    Element siteConfig = converter_.getDOM(siteConfigFile).getDocumentElement();
-    Element httpAddress = (Element) GSXML.getChildByTagName(siteConfig, "httpAddress");
-    String httpAddressString = httpAddress.getAttribute(GSXML.VALUE_ATT);
-    System.out.println("HTTP address string: " + httpAddressString);
-    System.out.println("Collection name: " + cluster_name_);
-
-    String image_dir = httpAddressString + "/sites/localsite" +
-        "/collect/" + cluster_name_ + "/index/assoc/" + doc_id.substring(0, 8) + ".dir";
-    System.out.println("Image dir: " + image_dir);
+    String top_doc_id = OID.getTop(doc_id);
+    DBInfo info = gdbm_src_.getInfo(top_doc_id);
+    String assocfilepath = info.getInfo("assocfilepath");
+    String image_dir  = site_http_address_ + "/collect/"+cluster_name_+"/index/assoc/"+assocfilepath;
 
     // Resolve all "_httpdocimg_"s