Changeset 3866

Timestamp:

2003-03-12T16:29:43+13:00 (21 years ago)

Author:

kjdon

Message:

new xml format - document replaced with documentNode, content removed from requests and responses

Location:

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

Files:

• GS2Browse.java (modified) (3 diffs)
• GS2Retrieve.java (modified) (7 diffs)

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

@@ -94 +94 @@
     result.setAttribute(GSXML.FROM_ATT, from);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
-    Element result_content = doc_.createElement(GSXML.CONTENT_ELEM);
-    result.appendChild(result_content);
 
     // get the classifier name out of request content - assume only one for now
-    String path = GSXML.CONTENT_ELEM;
-    path = GSPath.appendLink(path, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
-    path = GSPath.appendLink(path, GSXML.DOCUMENT_ELEM);
+    //String path = GSXML.CONTENT_ELEM;
+    String path = GSPath.appendLink(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER, GSXML.CLASS_NODE_ELEM);
+    //path = GSPath.appendLink(path, GSXML.DOCUMENT_ELEM);
 
     Element elem = (Element)GSXML.getNodeByPath(request, path);
-    String elem_name = elem.getAttribute(GSXML.NAME_ATT);
+    String elem_name = elem.getAttribute(GSXML.CLASS_NODE_ID_ATT);
 
     if (OID.needsTranslating(elem_name)) {
@@ -116 +114 @@
     String classifier_name = OID.getTop(elem_name);
     classifier.setAttribute(GSXML.NAME_ATT, classifier_name);
-    result_content.appendChild(classifier);
+    result.appendChild(classifier);
 
     // see if there is a stylesheet associated with this classifier
@@ -130 +128 @@
         // add it to the result if the result isnt null
         if (cl_format!=null) {
-        System.out.println("adding format info to browse result!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
         result.appendChild(doc_.importNode(cl_format, true));
         }

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

@@ -63 +63 @@
     System.out.println("Configuring GS2Retrieve...");
 
-    // these entries should reflect the build config file
-    // some services may not be available depending on how the colleciton was built.
     // set up short_service_info_ - for now just has name and type
     Element dsr_service = doc_.createElement(GSXML.SERVICE_ELEM);
@@ -170 +168 @@
     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
@@ -224 +222 @@
         wantChildren = false;
 
-    // Get the request content
-    Element content = (Element) GSXML.getChildByTagName(request, GSXML.CONTENT_ELEM);
-    if (content == null) {
-        System.err.println("Error: DocumentStructureRetrieve request had no content.");
+//      // Get the request content
+//      Element content = (Element) GSXML.getChildByTagName(request, GSXML.CONTENT_ELEM);
+//      if (content == null) {
+//          System.err.println("Error: DocumentStructureRetrieve request had no content.");
+//          return result;
+//      }
+    
+    Element query_doc_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    if (query_doc_list == null) {
+        System.err.println("Error: DocumentStructureRetrieve 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);
 
     // Get the documents
-    String[] doc_ids = GSXML.getDocumentNameList(content);
+    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];
-
+        
         // Add the document to the list
-        // !! TO DO: This should probably be a documentNode rather than a document !!
-        Element doc = doc_.createElement(GSXML.DOCUMENT_ELEM);
+        Element doc = doc_.createElement(GSXML.DOC_NODE_ELEM);
         doc_list.appendChild(doc);
-        doc.setAttribute(GSXML.NAME_ATT, doc_id);
-
+        doc.setAttribute(GSXML.DOC_NODE_ID_ATT, doc_id);
+        // all structure info goes into a docNodestructure elem
+        Element structure_elem = doc_.createElement(GSXML.DOC_NODE_STRUCTURE_ELEM);
+        doc.appendChild(structure_elem);
         // Add the requested structure information
         Element current = doc_.createElement(GSXML.DOC_NODE_ELEM);
@@ -297 +303 @@
         root = (Element) root.getParentNode();
         }
-        doc.appendChild(root);
+        structure_elem.appendChild(root);
     }
 
@@ -312 +318 @@
     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
@@ -344 +350 @@
 
     // Get the request content
-    Element content = (Element) GSXML.getChildByTagName(request, GSXML.CONTENT_ELEM);
-    if (content == null) {
-        System.err.println("Error: DocumentMetadataRetrieve request had no content.\n");
-        return result;
-    }
-
-    Element doc_list = doc_.createElement(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
-    result_content.appendChild(doc_list);
+//      Element content = (Element) GSXML.getChildByTagName(request, GSXML.CONTENT_ELEM);
+//      if (content == null) {
+//          System.err.println("Error: DocumentMetadataRetrieve request had no content.\n");
+//          return result;
+//      }
+
+    Element doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    //result_content.appendChild(doc_list);
+    result.appendChild(doc_list);
 
     // Get the documents
-    Element request_doc_list = (Element) GSXML.getChildByTagName(content, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
+    //Element request_doc_list = (Element) GSXML.getChildByTagName(content, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
+    Element request_doc_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    if (request_doc_list == null) {
+        System.err.println("Error: DocumentMetadataRetrieve request had no documentList.\n");
+        return result;
+    }
     NodeList request_docs = request_doc_list.getChildNodes();
     for (int i = 0; i < request_docs.getLength(); i++) {
@@ -369 +381 @@
 
         // Add the requested metadata information
-        Element doc_meta_list = GSXML.addMetaList(doc_, doc_node);
+        Element doc_meta_list = doc_.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+        doc_node.appendChild(doc_meta_list);
         DBInfo info = gdbm_src_.getInfo(doc_id);
         for (int m = 0; m < metadata_list.size(); m++) {