Changeset 15670

Timestamp:

2008-05-23T13:31:52+12:00 (16 years ago)

Author:

ak19

Message:

Changed the browse() method so that the titles-by-letter classifier returns only letter classifiers that contain document titles

File:

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

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

@@ -1378 +1378 @@
             // for each letter of the alphabet:
             Element classifier = createClassifierElement(doc, "TitleByLetter", 
-                classifierNum++, "titles (by letter)", "Browse titles by letter");
+                classifierNum++, "titles by letter", "Browse titles by letter");
             // now add this <classifier> to the <classifierList>
             classifierList.appendChild(classifier);
@@ -1722 +1722 @@
                 int num = 1;
                 for(char ch = 'A'; ch <= 'Z'; ch++, num++) {
+                    // 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{
+                    String[] docPIDs = this.browseTitlesByLetter(
+                             collectionName, letter);
+                    if(docPIDs.length == 0) {
+                        continue; // skip letters that don't have any kids
+                    }
+                    
                     // <classifierNode nodeID="CL3.1">
                     Element subClassifier = doc.createElement(
-                            GSXML.CLASS_NODE_ELEM);
+                          GSXML.CLASS_NODE_ELEM);
                     attribute = doc.createAttribute(GSXML.NODE_ID_ATT);
                     attribute.setValue(classifierID+"."+num);
                     subClassifier.setAttributeNode(attribute);
                     classifierNode.appendChild(subClassifier);
-                    // now we are going to retrieve the document structure for
-                    // this subClassifierID: all the documents that begin with
-                    // its letter.
-                    // remove the starting CL
-                    String letter = String.valueOf(ch);
-                    try{
-                        String[] docPIDs = this.browseTitlesByLetter(
-                                collectionName, letter);
-                        // append the <docNodes> for the docPIDs found as children 
-                        // of subclassifier 
-                        getStructureElement(subClassifier, docPIDs, DESCENDANTS);
-                                        //CHILDREN); // for testing
-                    } catch(Exception e) { 
-                        ex = new FedoraGS3RunException(e);
-                        ex.setSpecifics("requested portion of TOC file or "
-                                + "trouble with fielded search ");
-                    }
+                    
+                    // append the <docNodes> for the docPIDs found as children 
+                    // of subclassifier 
+                    getStructureElement(subClassifier, docPIDs, DESCENDANTS);
+                        //CHILDREN); // for testing
+                    } catch(Exception e) { 
+                    ex = new FedoraGS3RunException(e);
+                    ex.setSpecifics("requested portion of TOC file or "
+                            + "trouble with fielded search ");
+                    }
                 }
                 break;