Changeset 21775 for other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraConnection.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/FedoraConnection.java (modified) (3 diffs)

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