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

Timestamp:

2010-03-11T16:45:58+13:00 (14 years ago)

Author:

ak19

Message:

FedoraConnection.java changed to work with files that have no TOC (Table of Contents) because they have only 1 section. Other source files only have cosmetic changes.

File:

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

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

@@ -1035 +1035 @@
                 // set the text content to what was retrieved
                 Element nodeContent = doc.createElement(GSXML.NODE_CONTENT_ELEM);
-                Text textNode = doc.createTextNode(sectionContent);
+                Text textNode = doc.createTextNode(sectionContent.trim());
                 
                 nodeContent.appendChild(textNode);
@@ -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).
      * @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 
@@ -1333 +1336 @@
      * return nothing special except their names; browse (and any query)
      * return more complex XML responses.
-     * All collections in this Digital Library (Fedora Repository) share 
-     * the same services, so this method returns the same as 
-     * describeService(serviceName). 
      * @param serviceName - the name of the service in the collection which is to 
      * be described.*/
@@ -1355 +1355 @@
         attribute = doc.createAttribute(GSXML.TYPE_ATT);
         
-        if(serviceName.toLowerCase().endsWith("retrieve"))
+        if(serviceName.toLowerCase().endsWith("retrieve")) {
             attribute.setValue(GSXML.SERVICE_TYPE_RETRIEVE);
-        
+        } 
         else if(serviceName.toLowerCase().contains("browse")) {
             attribute.setValue(GSXML.SERVICE_TYPE_BROWSE);
@@ -1390 +1390 @@
         else if(serviceName.toLowerCase().contains("query")) {
             attribute.setValue(GSXML.SERVICE_TYPE_QUERY);
-            if(serviceName.equals("TextQuery"))
+            if(serviceName.equals("TextQuery")) {
                 describeTextQueryService(service);
-            else if(serviceName.equals("FieldQuery"))
+            } else if(serviceName.equals("FieldQuery")) {
                 describeFieldQueryService(service);
+            }
         }
         
@@ -2045 +2046 @@
                 // there may be fewer searchTerms than fieldNames (since some
                 // fieldNames may have been left empty), so loop on searchTerms
-                if(map.containsKey(fieldNames[i])) { //fieldName is already 
+                if(map.containsKey(fieldNames[i])) { // fieldName is already 
                     // in the list, so append comma with new value
                     String termsList = (String)map.get(fieldNames[i]);