Changeset 21775 for other-projects

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.

Location:

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

Files:

• GS3DemoClient/org/greenstone/gs3client/SearchResultsDisplay.java (modified) (1 diff)
• GS3Fedora/org/greenstone/fedora/services/FedoraConnection.java (modified) (3 diffs)
• GS3Fedora/org/greenstone/fedora/services/FedoraGS3Connection.java (modified) (6 diffs)

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

@@ -323 +323 @@
             String docContent = docNode.getContent();
             if(docContent != null) {
-                docContent = docContent.replaceAll(
-                        "ALIGN=\"JUSTIFY\"", "ALIGN=\"LEFT\"");
+                docContent = docContent.replaceAll(
+                    "ALIGN=\"JUSTIFY\"", "ALIGN=\"LEFT\"");
             }
-            this.docContentEditPane.setText(docContent);
+
+        this.docContentEditPane.setText(docContent);
             this.docContentEditPane.setCaretPosition(0); // set 'cursor' at top
         }

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

@@ -766 +766 @@
     
     /** All "greenstone:*" objects in fedora (be they collections or documents) 
-     * have a TOC datastream. This method returns the content (XML) of the TOC  
-     * datastream as is. (Calls default fedora-system 3 dissemination <pid>/TOC.)
+     * have a TOC datastream, unless they have only 1 section (SECTION1). 
+     * This method returns the content (XML) of the TOC datastream as is.
+     * (Calls default fedora-system 3 dissemination <pid>/TOC.)
      * @return a String version of the XML in the TOC datastream for the fedora
      * object denoted by pid.
@@ -780 +781 @@
         throws RemoteException, UnsupportedEncodingException 
     {
+        try {
         MIMETypedStream tocStream = APIA.getDatastreamDissemination(pid, TOC, null);
             //asOfDateTime = null to get the current version of the dataStream
-        
         // need to set the charset encoding to UTF8
         return new String(tocStream.getStream(), UTF8);
+        } catch(RemoteException re) {
+        // if TOC does not exist, then it means there is only 1 section, dsID: SECTION1
+        return new String("<Section id=\"1\"></Section>".getBytes(), UTF8); //set charset
+        }       
     }
     
@@ -1317 +1322 @@
         // If sectionNumber=1, then the top-level element/document element
         // of the TOC XML is requested, so return the TOC as is.
-        if(sectionNumber.equals("1"))
+        if(sectionNumber.equals("1")) {
             return docEl;
+        }
         
         // Get all <Section> elements and find the

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]);