Changeset 21835 for other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone

Timestamp:

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

Author:

ak19

Message:

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

Location:

other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client

Files:

• GS3JavaClient.java (modified) (2 diffs)
• dlservices/DigitalLibraryServicesAPIA.java (modified) (1 diff)
• dlservices/FedoraServicesAPIA.java (modified) (6 diffs)
• dlservices/GS3ServicesAPIA.java (modified) (1 diff)

other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/GS3JavaClient.java

@@ -736 +736 @@
             JEditorPane information = new JEditorPane();
             information.setEditable(false);
-            information.setContentType("text/html");
+            information.setContentType("text/html");
             information.setText(collDataEl.info());
             
@@ -929 +929 @@
      * to be retrieved. */
     public void doBrowse(ClassifierData classifier) {
+        String[] classifierNames = { classifier.name };
         String response = dlAPIA.retrieveBrowseStructure(
-                this.colName, this.serviceName, classifier.name);
+                this.colName, this.serviceName, classifierNames);
         
         browseResponseObject.clear();

other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/dlservices/DigitalLibraryServicesAPIA.java

@@ -201 +201 @@
      * classifierID (including the structures of document descendents of 
      * the classifier). 
-     * @param classifierID is of the form CL# where the number (#) marks
-     * out structured sections like CL1.1.3 or CL2 
+     * @param classifierIDs - each ID is of the form CL# where the number (#)
+     * marks out structured sections like CL1.1.3 or CL2 
      * @param collection is the name of the collection 
      * @param service is the name of the browse service (=ClassifierBrowse usually) 
     */
     public String retrieveBrowseStructure(
-            String collection, String service, String classifierID);
+            String collection, String service, String[] classifierIDs);
 
     /** @return a String representing Greenstone3 

other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/dlservices/FedoraServicesAPIA.java

@@ -121 +121 @@
     }
 
-    /** @return a String representing Greenstone3 DocumentMetadataRetrieve XML
+    /** @return a String representing Greenstone3 DocumentStructureRetrieve XML
      * containing the document structure of the documents indicated by docIDs: 
      * this means all their descendents 
@@ -131 +131 @@
     }
     
-    /** @return a String representing Greenstone3 DocumentMetadataRetrieve XML 
+    /** @return a String representing Greenstone3 DocumentStructureRetrieve XML 
      * containing the document structure of the document indicated by docID: 
      * this means all its descendents 
@@ -142 +142 @@
 
     // UNUSED by the client, but still a very useful method:
-    /** @return a String representing Greenstone3 DocumentMetadataRetrieve XML 
+    /** @return a String representing Greenstone3 DocumentStructureRetrieve XML 
      * containing a view of the document structure of the documents denoted by 
      * docs where only the requested documents and their direct children are  
@@ -153 +153 @@
     }
     
-    /** @return a String representing Greenstone3 DocumentMetadataRetrieve XML 
+    /** @return a String representing Greenstone3 DocumentStructureRetrieve XML 
      * containing a view of the document structure of the document denoted by 
      * docID where only the document and its direct children are returned. 
@@ -167 +167 @@
      * classifierID (including the structures of document descendents of 
      * the classifier). 
-     * @param classifierID is of the form CL# where the number (#) marks
-     * out structured sections like CL1.1.3 or CL2 
+     * @param classifierIDs - each ID is of the form CL# where the number (#)
+     * marks out structured sections like CL1.1.3 or CL2 
      * @param collection is the name of the collection 
      * @param service is the name of the browse service (=ClassifierBrowse usually)
     */
     public String retrieveBrowseStructure(
-            String collection, String service, String classifierID) 
+            String collection, String service, String[] classifierIDs) 
     {
-        return this.browse(collection, classifierID);
+        return this.browse(collection, classifierIDs);
     }
 
@@ -194 +194 @@
     }
     
-    /** @return a String representing Greenstone3 XML for a query process
-     * response returning the results for the query denoted by parameter
-     * nameValParamsMap.
-     * @param nameValParamsMap is a Map of name and value pairs for all the
-     * query field data values. The names match the field names that
-     * describeCollectionService() would have returned for the query service. 
-     * @param collection is the name of the collection 
-     * @param service is the name of the query service
-     * This method is only ever called when any of the services in the digital 
-     * library described themselves as type=query. Therefore any digital
-     * libraries that have no query services, can just return emtpy message 
-     * strings (or even "") since this method will never be called on them 
-     * anyway. */
-    public String query(String collection, String service, 
-            Map nameValParamsMap) 
-    {   
-        return super.query(collection, service, nameValParamsMap);
-    }
 }

other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3client/dlservices/GS3ServicesAPIA.java

@@ -356 +356 @@
      * classifierID (including the structures of document descendants of 
      * the classifier). 
-     * @param classifierID is of the form CL# where the number (#) marks
-     * out structured sections like CL1.1.3 or CL2 
+     * @param classifierIDs - each ID is of the form CL# where the number (#)
+     * marks out structured sections like CL1.1.3 or CL2 
      * @param collection is the name of the collection 
      * @param service is the name of the browse service (=ClassifierBrowse usually)
     */
     public String retrieveBrowseStructure(
-            String collection, String service, String classifierID) 
+            String collection, String service, String[] classifierIDs) 
     {
-        String[] classifierIDs = { classifierID }; 
         return this.browseDescendants(collection, service, 
                 language, classifierIDs );