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

Timestamp:

2010-03-26T18:37:14+13:00 (14 years ago)

Author:

ak19

Message:

Browse takes a list of classifierIDs, not a single one.

File:

• other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java (modified) (12 diffs)

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

@@ -161 +161 @@
      * administrative password and username of the fedora server showing 
      * the values in the properties file as default. If the necessary 
-     * initialisation are not present in the file, they corresponding fields
+     * initialisation are not present in the file, the corresponding fields
      * in the dialog will be blank. 
      * If no password was set on the fedora repository when installing it, 
@@ -1301 +1301 @@
      * serviceNames: DocumentContent/Metadata/StructureRetrieve, ClassifierBrowse,
      * ClassifierBrowseMetadataRetrieve.   
-     * All collections in this Digital Library (Fedora Repository) share 
-     * the same services, so this method returns the same as 
-     * describeService(serviceName).
+     * All collections in this Digital Library (Fedora Repository) share the
+     * same services, so this method returns the same services as getServiceList();
      * @param collectionName - the name of the collection whose services are to
      * be described. It will be converted to a fedora collection pid, which is of 
@@ -1679 +1678 @@
      * user to browse the titles of documents in the given collection by letter
      * and returning the results.
-     * @param classifierID is the id of the classifier on which to browse. In
+     * @param classifierIDs are the ids of the classifiers on which to browse. In
      * this case, the classifier indicates whether we browse titles by letter, or
      * browse (documents) by collection; and it is of the form <CL(letter)>.
@@ -1687 +1686 @@
      * the documents that start with the letter indicated by parameter classifier.
     */
-    public String browse(String collectionName, String classifierID)
+    public String browse(String collectionName, String[] classifierIDs)
     {
         Document doc = builder.newDocument();
@@ -1696 +1695 @@
                 GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
         
+    for(int i = 0; i < classifierIDs.length; i++) {
         // <classifierNode nodeID="classifierNum">
         Element requestedClassifierNode = doc.createElement(
                 GSXML.CLASS_NODE_ELEM);
         Attr attribute = doc.createAttribute(GSXML.NODE_ID_ATT);
-        attribute.setValue(classifierID);
+        attribute.setValue(classifierIDs[i]);
         requestedClassifierNode.setAttributeNode(attribute);
         classifierNodeList.appendChild(requestedClassifierNode);
@@ -1711 +1711 @@
         Element classifierNode = doc.createElement(GSXML.CLASS_NODE_ELEM);
         attribute = doc.createAttribute(GSXML.NODE_ID_ATT);
-        attribute.setValue(classifierID);
+        attribute.setValue(classifierIDs[i]);
         classifierNode.setAttributeNode(attribute);
         nodeStructure.appendChild(classifierNode);
@@ -1719 +1719 @@
         // classifier CL2 = browse by collection;
         //remove the CL prefix and obtain the number from the id:
-        int classifierNum = Integer.parseInt(classifierID.replace("CL", ""));
+        int classifierNum = Integer.parseInt(classifierIDs[i].replace("CL", ""));
         switch(classifierNum) {
             case 1:
@@ -1727 +1727 @@
                     // Retrieve the document structure for each subClassifierID: 
                     // all the documents that begin with its letter.
-                    // remove the starting CL
                     String letter = String.valueOf(ch);
-                    try{
+                    try {
                     String[] docPIDs = this.browseTitlesByLetter(
                              collectionName, letter);
@@ -1740 +1739 @@
                           GSXML.CLASS_NODE_ELEM);
                     attribute = doc.createAttribute(GSXML.NODE_ID_ATT);
-                    attribute.setValue(classifierID+"."+num);
+                    attribute.setValue(classifierIDs[i]+"."+num);
                     subClassifier.setAttributeNode(attribute);
                     classifierNode.appendChild(subClassifier);
@@ -1760 +1759 @@
                             GSXML.CLASS_NODE_ELEM);
                     attribute = doc.createAttribute(GSXML.NODE_ID_ATT);
-                    attribute.setValue(classifierID+"."+0); //
+                    attribute.setValue(classifierIDs[i]+"."+0); //
                     subClassifier.setAttributeNode(attribute);
                     classifierNode.appendChild(subClassifier);
@@ -1769 +1768 @@
             default:
                 ex = new FedoraGS3RunException( // cause is regular exception
-                    new Exception("Unknown classifier ID: " + classifierID));
-        }
+                    new Exception("Unknown classifier ID: " + classifierIDs[i]));
+        }
+    }
         Element responseMsg = createResponseMessage(doc, classifierNodeList, ex,
                 GSXML.REQUEST_TYPE_DESCRIBE, collectionName+"/ClassifierBrowse");
@@ -2209 +2209 @@
             System.out.println("\nCLASSIFIER BROWSE");
             System.out.println(con.browse("gs2mgdemo", //"ClassifierBrowse", 
-                    "CL1"));
+                              new String[]{"CL1"}));
             
             System.out.println("\nCLASSIFIER BROWSE METADATA RETRIEVE");