Changeset 3990

Timestamp:

2003-03-25T17:07:19+12:00 (21 years ago)

Author:

mdewsnip

Message:

Initial document image support.

Location:

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

Files:

• GS2MGPPRetrieve.java (modified) (1 diff)
• GS2MGRetrieve.java (modified) (3 diffs)
• GS2Retrieve.java (modified) (1 diff)

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

@@ -121 +121 @@
         long doc_num = gdbm_src_.oid2Docnum(doc_id);
         String doc_content = mgpp_src_.getDocument(basedir, textdir, default_level_, doc_num);
+        doc_content = resolveImages(doc_content, doc_id);
 
         // For now, stick it in a text node - eventually should be parsed as xml??

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

@@ -63 +63 @@
     // Do specific configuration
     System.out.println("Configuring GS2MGRetrieve...");
+    // System.out.println("info:\n" + converter_.getString(info));
+    // System.out.println("extra_info:\n" + converter_.getString(extra_info));
 
     // Get the default index out of <defaultIndex> (buildConfig.xml)
@@ -120 +122 @@
         long doc_num = gdbm_src_.oid2Docnum(doc_id);
         String doc_content = mg_src_.getDocument(basedir, textdir, doc_num);
-        // Stick it in a text node 
+        doc_content = resolveImages(doc_content, doc_id);
+        // Stick it in a text node
         Element doc = doc_.createElement(GSXML.DOC_NODE_ELEM);
         doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
@@ -129 +132 @@
     return result;
     }
-}   
+}

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

@@ -627 +627 @@
     /** Retrieve the content of a document - implemented by concrete subclasses */
     protected abstract Element processDocumentContentRetrieve(Element request);
+
+
+    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);
+
+    // Resolve all "_httpdocimg_"s
+    doc_content = doc_content.replaceAll("_httpdocimg_", image_dir);
+    return doc_content;
+    }
 }