Changeset 15659

Timestamp:

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

Author:

ak19

Message:

Corrected previous. 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.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);
+            if(resultTitle.toLowerCase().startsWith(letter.toLowerCase())) {
+                String pid = results[i].getPid();
+                // skip the collection object itself
+                if(!pid.equalsIgnoreCase(GREENSTONE_+collName+_COLLECTION)) {
+                    v.add(pid);
+                    //LOG.debug(resultTitle);
+                }
             }
         }
@@ -1472 +1473 @@
             boolean accepted = false; // accept the resultTitle found
             
-            // skip the collection object itself, since it's not a document
-            if(resultTitle.equalsIgnoreCase(GREENSTONE_+collName+_COLLECTION)) {
+            String resultPID = results[i].getPid();
+            // skip the collection object itself, since it's not a document
+            if(resultPID.equalsIgnoreCase(GREENSTONE_+collName+_COLLECTION)) {
                 accepted = false;
             }
@@ -1479 +1481 @@
             // 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
@@ -1487 +1488 @@
                     accepted = true;
                 
-            }
+            } 
             else { // otherwise, titleContents is a phrase of >1 word, need 
                 // to check that the result title contains the entire phrase
@@ -1500 +1501 @@
             // if the resultTitle fit the criteria, store its pid
             if(accepted) {
-                v.add(results[i].getPid());
+                v.add(resultPID);
                 //System.out.println(resultTitle);
             }