Changeset 3862 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGRetrieve.java

Timestamp:

2003-03-12T15:04:12+13:00 (21 years ago)

Author:

kjdon

Message:

new xml format - removed content from request and response, document has been renamed documentNode

File:

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

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

@@ -102 +102 @@
     result.setAttribute(GSXML.FROM_ATT, from);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-    Element result_content = doc_.createElement(GSXML.CONTENT_ELEM);
-    result.appendChild(result_content);
+    //Element result_content = doc_.createElement(GSXML.CONTENT_ELEM);
+    //result.appendChild(result_content);
 
-    // Get the parameters of the request
-    Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    if (param_list == null) {
-        System.err.println("GS2Retrieve, DocumentContentRetrieve Error: missing paramList.\n");
-        return result;  // Return the empty result
-    }
-
-    String index = default_index_;
-
-    // Process the request parameters
-    Element param = (Element) param_list.getFirstChild();
-    while (param != null) {
-        if (!param.getNodeName().equals(GSXML.PARAM_ELEM)) {
-        System.err.println("Warning: Non-param in paramList (ignored).");
-        }
-        else {
-        //
-        if (param.getAttribute(GSXML.NAME_ATT) == INDEX_PARAM) {
-            index = GSXML.getValue(param);
-            System.out.println("Index: " + index);
-        }
-        }
-
-        param = (Element) param.getNextSibling();
-    }
+    // Get the parameters of the request - no parameters at this stage
+    //Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
 
     // Get the request content
-    Element content = (Element) GSXML.getChildByTagName(request, GSXML.CONTENT_ELEM);
-    if (content == null) {
-        System.err.println("Error: DocumentContentRetrieve request had no content.\n");
+    
+    Element query_doc_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    if (query_doc_list == null) {
+        System.err.println("Error: DocumentContentRetrieve request specified no doc nodes.\n");
         return result;
     }
-
-    Element doc_list = doc_.createElement(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
-    result_content.appendChild(doc_list);
-
+    
+    Element doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    result.appendChild(doc_list);
+    
     // The location of the MG index and text files
     String basedir = GSFile.collectionBaseDir(site_home_, cluster_name_)
-                     + File.separatorChar;  // Needed by MG
+                          + File.separatorChar;  // Needed by MG
     String textdir = GSFile.collectionTextPath(cluster_name_);
-    String indexpath = GSFile.collectionIndexPath(cluster_name_, index);
-
+    // index is only needed to start up MG, not used so just use the default index
+    String indexpath = GSFile.collectionIndexPath(cluster_name_, default_index_);
     mg_src_.setIndex(indexpath);
-
+    
     // Get the documents
-    String[] doc_ids = GSXML.getDocumentNameList(content);
+    //String[] doc_ids = GSXML.getDocumentNameList(query_doc_list);
+    String[] doc_ids = GSXML.getAttributeValuesFromList(query_doc_list, 
+                                GSXML.DOC_NODE_ID_ATT);
     for (int i = 0; i < doc_ids.length; i++) {
         String doc_id = doc_ids[i];
         long doc_num = gdbm_src_.oid2Docnum(doc_id);
         String doc_content = mg_src_.getDocument(basedir, textdir, doc_num);
-
-        // For now, stick it in a text node - eventually should be parsed as xml??
-        Element doc = GSXML.createDocumentElement(doc_, doc_id);
+        // Stick it in a text node 
+        Element doc = doc_.createElement(GSXML.DOC_NODE_ELEM);
+        doc.setAttribute(GSXML.DOC_NODE_ID_ATT, doc_id);
         GSXML.addDocText(doc_, doc, doc_content);
         doc_list.appendChild(doc);