Changeset 26309

Timestamp:

2012-10-11T19:10:46+13:00 (12 years ago)

Author:

ak19

Message:

1. Corrections to XML returned by FedoraGS3 to get the VList display for classifierBrowse to work correctly in Greenstone: classifierStyle attribute needs to be set on documents returned. Also added in further missing attributes for query and browse, in case these turn out to be important. 2. Replaced 3-line setAttributeNode() calls with 1-line setAttribute() calls.

Location:

other-projects/gs3-webservices-java-client/trunk

Files:

• lib/fedoraGS3.jar (modified) ( previous)
• src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java (modified) (14 diffs)
• src/GS3Fedora/org/greenstone/fedora/services/GSearchConnection.java (modified) (1 diff)

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java

@@ -493 +493 @@
             ex = this.getEX(id);
         }
-        else { // docID refers to a document 
+        else { // docID refers to a document
+
+            docNode.setAttribute(GSXML.DOC_TYPE_ATT, "hierarchy");          
+            docNode.setAttribute(GSXML.NODE_RANK_ATT, "NaN");
+
             // work out the document's fedora PID and section ID, and then 
             // obtain the EX (extracted metadata) and DC datastreams for the doc
@@ -509 +513 @@
                 dc = this.getDC(docPID);
                 dls = this.getDLS(docPID);
+                docNode.setAttribute(GSXML.NODE_TYPE_ATT, "root");
             }
             else {
                 ex = getSectionEXMetadata(docPID, sectionID);
                 dc = getSectionDCMetadata(docPID, sectionID);
+                docNode.setAttribute(GSXML.NODE_TYPE_ATT, "leaf");
             }
         }
@@ -1796 +1802 @@
 
         Element responseMsg = createResponseMessage(doc, classifierNodeList, ex,
-                    GSXML.REQUEST_TYPE_DESCRIBE, /*collectionName+/ */"ClassifierBrowse");
+                    GSXML.REQUEST_TYPE_PROCESS, /*collectionName+/ */"ClassifierBrowse");
         try {
         return FedoraCommons.elementToString(responseMsg);
@@ -1840 +1846 @@
     attribute.setValue(classifierID);
     classNode.setAttributeNode(attribute);
-    Attr typeAttribute = doc.createAttribute(GSXML.CHILD_TYPE_ATT);
-    typeAttribute.setValue(GSXML.VLIST);
-    classNode.setAttributeNode(typeAttribute);
 
     if(firstLevel == -1) { // CL1 - toplevel node      
@@ -1849 +1852 @@
         classifierNodeList.appendChild(classNode);
         classNode.appendChild(nodeStructure);
-        
         nodeStructure.appendChild(root);
+        root.setAttribute(GSXML.CHILD_TYPE_ATT, GSXML.VLIST);
+
         if(structure.indexOf("descendants") != -1) {
         getTitlesByLetterStructure(collectionName, root, classifierID, true, null);
@@ -1868 +1872 @@
         attribute.setValue(toplevelID);
         toplevelNode.setAttributeNode(attribute);
-        typeAttribute = doc.createAttribute(GSXML.CHILD_TYPE_ATT);
-        typeAttribute.setValue(GSXML.VLIST);
-        toplevelNode.setAttributeNode(typeAttribute);
         Element node = (Element)toplevelNode.cloneNode(true); // clone nodes before appending children
 
@@ -1876 +1877 @@
         toplevelNode.appendChild(nodeStructure);        
         nodeStructure.appendChild(node);
+        node.setAttribute(GSXML.CHILD_TYPE_ATT, GSXML.VLIST);
 
         if(structure.indexOf("siblings") != -1) { // get the children of the parents too
@@ -1884 +1886 @@
         } else {
             node.appendChild(classNode);
+            classNode.setAttribute(GSXML.CHILD_TYPE_ATT, GSXML.VLIST);
         }
         } else {
@@ -1889 +1892 @@
         classifierNodeList.appendChild(node);
         node.appendChild(nodeStructure);
-        nodeStructure.appendChild(classNode);
+        nodeStructure.appendChild(classNode);   
+        classNode.setAttribute(GSXML.CHILD_TYPE_ATT, GSXML.VLIST);
         }
         
@@ -2001 +2005 @@
             // <classifierNode childType="VList" nodeID="CL1.x">
             subClassifier = doc.createElement(GSXML.CLASS_NODE_ELEM);
-            Attr typeAttribute = doc.createAttribute(GSXML.CHILD_TYPE_ATT);
-            typeAttribute.setValue(GSXML.VLIST);
-            subClassifier.setAttributeNode(typeAttribute);
-            Attr attribute = doc.createAttribute(GSXML.NODE_ID_ATT);
-            attribute.setValue(classifierID+"."+count);
-            subClassifier.setAttributeNode(attribute);
+            subClassifier.setAttribute(GSXML.CHILD_TYPE_ATT, GSXML.VLIST);
+            subClassifier.setAttribute(GSXML.NODE_ID_ATT, classifierID+"."+count);
+            subClassifier.setAttribute(GSXML.CLASSIFIER_STYLE_ATT, GSXML.VLIST);
         }
         classifierNode.appendChild(subClassifier); // either way, append the subClassifier node
@@ -2337 +2338 @@
         }
         
-        // Build Greenstone XML Query response message for from 
+        // Build Greenstone XML Query response message from 
         // the pids (which should be document identifiers)
         Document doc = builder.newDocument();
@@ -2345 +2346 @@
                 GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
         Element metadata = doc.createElement(GSXML.METADATA_ELEM);
-        
-        Attr attribute = doc.createAttribute(GSXML.NAME_ATT);
-        attribute.setValue(NUM_DOCS_MATCHED);
-        metadata.setAttributeNode(attribute);
-        
-        attribute = doc.createAttribute(GSXML.VALUE_ATT);
-        attribute.setValue(Integer.toString(pids.length));
-        metadata.setAttributeNode(attribute);
-        
+        metadata.setAttribute(GSXML.NAME_ATT, NUM_DOCS_MATCHED);
+        metadata.setAttribute(GSXML.VALUE_ATT, Integer.toString(pids.length));      
+        metadataList.appendChild(metadata);
+
+        metadata = doc.createElement(GSXML.METADATA_ELEM);
+        metadata.setAttribute(GSXML.NAME_ATT, "numDocsReturned");
+        metadata.setAttribute(GSXML.VALUE_ATT, Integer.toString(pids.length));      
         metadataList.appendChild(metadata);
         
@@ -2367 +2366 @@
         for(int i = 0; i < pids.length; i++) {
             Element docNode = doc.createElement(GSXML.DOC_NODE_ELEM);
-            attribute = doc.createAttribute(GSXML.NODE_ID_ATT);
-            attribute.setValue(pids[i]);
-            docNode.setAttributeNode(attribute);
-            
-            attribute = doc.createAttribute(GSXML.DOC_TYPE_ATT);
-            attribute.setValue("hierarchy");
-            docNode.setAttributeNode(attribute);
-            
-            attribute = doc.createAttribute(GSXML.NODE_TYPE_ATT);
-            attribute.setValue("root");
-            docNode.setAttributeNode(attribute);
+            docNode.setAttribute(GSXML.NODE_ID_ATT, pids[i]);
+            docNode.setAttribute(GSXML.DOC_TYPE_ATT, "hierarchy");
+            docNode.setAttribute(GSXML.NODE_TYPE_ATT, "root");
+            docNode.setAttribute(GSXML.NODE_RANK_ATT, "NaN");
+
             docNodeList.appendChild(docNode);
         }
@@ -2383 +2376 @@
         Element responseMsg = createResponseMessage(doc, docNodeList, ex,
                 GSXML.REQUEST_TYPE_PROCESS, service);
+        
+        //docNodeList.getParentNode().appendChild(metadataList); // need to add term info
+
         try{
             return FedoraCommons.elementToString(responseMsg);

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/GSearchConnection.java

@@ -208 +208 @@
         // for debugging
         //javax.swing.JOptionPane.showMessageDialog(null, "GSearchConnection.gFindObjects:" + valueFound);
-        
+        //LOG.error("gfindObjects result: " + valueFound);
+
         return valueFound;
     }