Changeset 15658

Timestamp:

2008-05-22T19:10:12+12:00 (16 years ago)

Author:

ak19

Message:

Browsing docs (by title) in a Fedora repository of Greenstone docs skips the collection itself, as it is not a document

File:

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

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

@@ -1398 +1398 @@
             // just *contain* the letter, but actually start with it:
             String resultTitle = results[i].getTitle(0);
-            if(resultTitle.toLowerCase().startsWith(letter.toLowerCase())) {
+            if(resultTitle.equalsIgnoreCase(GREENSTONE_+collName+_COLLECTION)) {
+                continue; // try next one
+            } else if(resultTitle.toLowerCase().startsWith(letter.toLowerCase())) {
+                // skip the collection itself
                 v.add(results[i].getPid());
                 //LOG.debug(resultTitle);
@@ -1469 +1472 @@
             boolean accepted = false; // accept the resultTitle found
             
+            // skip the collection object itself, since it's not a document
+            if(resultTitle.equalsIgnoreCase(GREENSTONE_+collName+_COLLECTION)) {
+                accepted = false;
+            }
             // if titleContents is a single word and we are checking 
-            // whether resultTitle contains titleContents: 
-            if(indexOfFirstSpace == -1) { // titleContents is a single word
+            // whether resultTitle contains titleContents:
+            else if(indexOfFirstSpace == -1) { // titleContents is a single word
+                    
                 if(!startsWith) // titles that *contain* the word titleContents
                     accepted = true; //accept all titles found
@@ -1479 +1487 @@
                     accepted = true;
                 
-            } else { // otherwise, titleContents is a phrase of >1 word, need 
+            }
+            else { // otherwise, titleContents is a phrase of >1 word, need 
                 // to check that the result title contains the entire phrase
                 if(startsWith && resultTitle.toLowerCase().startsWith(
@@ -1488 +1497 @@
                     accepted = true;
             }
+            
             // if the resultTitle fit the criteria, store its pid
             if(accepted) {
@@ -1558 +1568 @@
         // (i.e. all collections).
         FieldSearchResult objects = null;
+        final String[] retrieveFields = {"pid", "title"};
         try {
             objects = AutoFinder.findObjects(
-                    APIA, new String[]{"pid", "title"}, maxresults, query);
+                    APIA, retrieveFields, maxresults, query);
             // collection = APIA.findObjects(new String[]{"pid", "title"}, 
                 // new NonNegativeInteger(Integer.toString(maxresults)), query);