Changeset 15437 for other-projects/trunk/gs3-webservices-democlient/src/GS3Fedora/org/greenstone/fedora/services/GSearchConnection.java

Timestamp:

2008-05-14T13:27:08+12:00 (16 years ago)

Author:

ak19

Message:

Introduced GSearchConnection member indexName set in its constructor by FedoraGS3Connection

File:

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

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

@@ -60 +60 @@
     protected static String NAMESPACE_URI = "http://server.fedoragsearch.defxws.dk";
     protected static String SERVICE_NAME = "OperationsService"; 
-    protected static final String INDEX_NAME = "FedoraIndex"; 
 
     /** The names of the methods we use of Fedora Generic Search's web services
@@ -78 +77 @@
     /** separator used internally to separate values of a search field */ 
     protected static final String SPACE = " ";
+
+        /** The name of the Index wherein FedoraGSearch has indexed all the GS3 docs.
+     * This final member is public here so that others may read the indexName  
+     * that this GSearchConnection works with. */
+    public final String indexName; 
     
     /** The Service object used to connect to the FedoraGSearch web services */
@@ -89 +93 @@
     protected final DocumentBuilder builder;
     
+
+    
     /** Constructor that takes a String representing the url of the WSDL
      * file for FedoraGSearch's web services, and tries to establish a 
      * connection to those web services. 
      * @param wsdlFileLocation is a String representing the url of the WSDL file
+     * @param indexName is the name of the index that Fedora Generic Search
+     * should work with (the index wherein the indexed GS3 documents have been
+     * placed). 
     */
-    public GSearchConnection(String wsdlFileLocation) 
+    public GSearchConnection(String wsdlFileLocation, String indexName) 
         throws MalformedURLException, ServiceException, 
             ParserConfigurationException
     { 
+        this.indexName = indexName;
+        
         URL wsdlURL = new URL(wsdlFileLocation);
         service = new Service(wsdlURL, new QName(NAMESPACE_URI, SERVICE_NAME));
@@ -218 +229 @@
         return gFindObjects(fullSearchTerm, sort, 
             hitPageStart, hitPageSize, snippetsMax, 
-            fieldMaxLength, INDEX_NAME, resultPageXslt);
+            fieldMaxLength, indexName, resultPageXslt);
     }
     
@@ -364 +375 @@
         return gFindObjects(fieldedSearchTerms, sort, 
                 hitPageStart, hitPageSize, snippetsMax, 
-                fieldMaxLength, INDEX_NAME, resultPageXslt);
+                fieldMaxLength, indexName, resultPageXslt);
     }
     
@@ -460 +471 @@
         try { 
             GSearchConnection searcher = new GSearchConnection(
-                "http://localhost:8080/fedoragsearch/services/FgsOperations?wsdl");
+                "http://localhost:8080/fedoragsearch/services/FgsOperations?wsdl", "FedoraIndex");