Changeset 3952

Timestamp:

27/05/08 16:34:13 (12 years ago)

Author:

cbyrom

Message:

Promote methods from DBClient into new Interface class + rename DBClient
to PostgresDBClient to allow future changes to the DB types used +
refactoring of searchagent code - to remove unecessary workflow +
simplify.

Location:

TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/services/discovery

Files:

• DiscoveryDBException.java (added)
• InterfaceDBClient.java (added)
• PostgresDBClient.java (moved) (moved from TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/services/discovery/DBClient.java) (5 diffs)
• SearchAgent.java (modified) (5 diffs)
• ServiceProperties.java (modified) (1 diff)

TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/services/discovery/PostgresDBClient.java

@@ -10 +10 @@
  *
  */
-public class DBClient 
+public class PostgresDBClient implements InterfaceDBClient 
 {
         // Obtain a suitable logger.
-    private static Logger logger = Logger.getLogger(DBClient.class.getName());
+    private static Logger logger = Logger.getLogger(PostgresDBClient.class.getName());
 
     Connection       db;        // A connection to the database
@@ -30 +30 @@
          * @param userName
          * @param pw
-         * @throws SQLException
-         * @throws DiscoveryWSException
+         * @throws DiscoveryDBException
          */
-        public DBClient(String connectionString, String userName, String pw) throws SQLException, DiscoveryWSException
+        public PostgresDBClient(String connectionString, String userName, String pw) throws DiscoveryDBException
         {
                 this.userName = userName;
                 this.pw = pw;
-                init(connectionString);
+                setupConnection(connectionString);
         }
 
@@ -50 +49 @@
          * @param portNo
          * @throws SQLException
-         * @throws DiscoveryWSException
+         * @throws DiscoveryDBException
          */
-        public DBClient(String db, String userName, String pw, String host, int portNo) 
-                throws SQLException, DiscoveryWSException
+        public PostgresDBClient(String db, String userName, String pw, String host, int portNo) 
+                throws DiscoveryDBException
         {
                 this.userName = userName;
                 this.pw = pw;
                 String connectionString = "jdbc:postgresql://" + host + ":" + portNo + "/" + db;
-                init(connectionString);
+                setupConnection(connectionString);
         }
 
-        /**
-         * Initialise db connection - including loading the driver library
-         * 
-         * @param connectionString - connection string to connect to the DB with
-         *  
+        /* (non-Javadoc)
+         * @see ndg.services.discovery.InterfaceDBClient#setupConnection(java.lang.String)
          */
-        private void init(String connectionString) throws DiscoveryWSException, SQLException
+        public void setupConnection(String connectionString) throws DiscoveryDBException
         {
                 logger.info("Initialising DB client set up");
@@ -81 +77 @@
                         "postgresql-...jdbc4.jar is available on the classpath.";
                 logger.severe(errorMessage);
-                throw new DiscoveryWSException(errorMessage);
+                throw new DiscoveryDBException(errorMessage);
                 } 
             
-            logger.info("Setting up connection to DB");
-            db = DriverManager.getConnection(connectionString, this.userName, this.pw);
-            dbmd = db.getMetaData(); //get MetaData to confirm connection
-            logger.info("Connection to "+dbmd.getDatabaseProductName()+" "+
-                               dbmd.getDatabaseProductVersion()+" successful.\n");
-            
-            
-            //create a statement that we can use later
-            logger.info("Creating sql statement to use for running queries with later");
-            sql = db.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY); 
+            try 
+            {
+                    logger.info("Setting up connection to DB");
+                    db = DriverManager.getConnection(connectionString, this.userName, this.pw);
+                    dbmd = db.getMetaData(); //get MetaData to confirm connection
+                    logger.info("Connection to "+dbmd.getDatabaseProductName()+" "+
+                                       dbmd.getDatabaseProductVersion()+" successful.\n");
+                    
+                    
+                    //create a statement that we can use later
+                    logger.info("Creating sql statement to use for running queries with later");
+                    sql = db.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY); 
+                        
+                } 
+            catch (SQLException e) 
+            {
+                handleSQLException(e);
+                }
             logger.info("Initialising complete");
         }
         
-        /**
-         * Run a specified SQL query against the client DB connection
-         * @param sqlQuery
-         * @return
-         * @throws SQLException
+        /* (non-Javadoc)
+         * @see ndg.services.discovery.InterfaceDBClient#runQuery(java.lang.String)
          */
-        public String[][] runQuery(String sqlQuery) throws SQLException
+        public String[][] runQuery(String sqlQuery) throws DiscoveryDBException
         {
             logger.info("Executing the command: " + sqlQuery);
-            ResultSet results = sql.executeQuery(sqlQuery);
             String[][] returnData = null;
-            if (results != null)
+
+            try 
             {
-                logger.info("Retrieving results data...");
-                int colCount = results.getMetaData().getColumnCount();
-                logger.fine("Returning " + colCount + " columns of data");
-                
-                // finding the row count is less easy
-                // - firstly point to the last row in resultset.
-                results.last();      
+                    ResultSet results = sql.executeQuery(sqlQuery);
+                    if (results != null)
+                    {
+                        logger.info("Retrieving results data...");
+                        int colCount = results.getMetaData().getColumnCount();
+                        logger.fine("Returning " + colCount + " columns of data");
+                        
+                        // finding the row count is less easy
+                        // - firstly point to the last row in resultset.
+                        results.last();      
 
-                // Now get the row position which is also the number of rows in the resultset.
-                int rowcount = results.getRow();
+                        // Now get the row position which is also the number of rows in the resultset.
+                        int rowcount = results.getRow();
 
-                // Now reposition back at the beginning of the ResultSet
-                results.beforeFirst();
-                
-                returnData = new String[rowcount][colCount];
-                int i = 0;
-                    while (results.next())
-                    {
-                        for (int j = 0; j < colCount; j++)
-                        {
-                                returnData[i][j] = results.getString(j+1);
-                                System.out.println(returnData[i][j]);
-                        }
-                        
+                        // Now reposition back at the beginning of the ResultSet
+                        results.beforeFirst();
+                        
+                        returnData = new String[rowcount][colCount];
+                        int i = 0;
+                            while (results.next())
+                            {
+                                for (int j = 0; j < colCount; j++)
+                                {
+                                        returnData[i][j] = results.getString(j+1);
+                                        System.out.println(returnData[i][j]);
+                                }
+                                
+                            }
                     }
-            }
-            results.close();
+                    results.close();
+                }
+            catch (SQLException e) 
+            {
+                handleSQLException(e);
+                }
             return returnData;
-                
+        }
+        
+        
+        /**
+         * Handle any SQLExceptions thrown by the JDBC library in a uniform way
+         * - logging and wrappering detail in Discovery framework code
+         * 
+         * @param e - exception thrown
+         * @throws DiscoveryDBException
+         */
+        private void handleSQLException(SQLException e) throws DiscoveryDBException 
+        {
+        String errorMessage = 
+                "SQLException thrown whilst interacting with postgres DB - detail: " + 
+                e.getLocalizedMessage();
+        logger.severe(errorMessage);
+        throw new DiscoveryDBException(errorMessage);
+        }
+
+        /* (non-Javadoc)
+         * @see ndg.services.discovery.InterfaceDBClient#closeConnection()
+         */
+        public void closeConnection() throws DiscoveryDBException
+        {
+                logger.info("Closing DB connection...");
+                try
+                {
+                        db.close();
+                }
+            catch (SQLException e) 
+            {
+                handleSQLException(e);
+                }
+                logger.info("DB connection closed");
         }
 
@@ -145 +187 @@
             try
             {
-              DBClient demo = new DBClient("jdbc:postgresql://glue:51000/calum", "calum", "boybear");
+              InterfaceDBClient demo = new PostgresDBClient("jdbc:postgresql://glue:51000/calum", "calum", "boybear");
               demo.runQuery("SELECT * FROM ORIGINAL_DOCUMENT");
             }

TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/services/discovery/SearchAgent.java

@@ -8 +8 @@
 import java.math.BigDecimal; // needed because xmlbeans uses this for xsd:decimal
 import java.util.Calendar;  // needed because xmlbeans uses this for xsd:date
+import java.util.logging.Logger;
 import java.io.ByteArrayInputStream;
 import java.text.DecimalFormat;
@@ -23 +24 @@
  *  @author     Matt Pritchard <m.j.pritchard@rl.ac.uk>
  */
-public abstract class SearchAgent {
+public abstract class SearchAgent 
+{
+
+    private static Logger logger = Logger.getLogger(SearchAgent.class.getName());
 
         static Properties properties = new ServiceProperties().getProperties();
@@ -55 +59 @@
         Calendar dateRangeEnd;
 
-        // Output parameters
-        boolean status;
-        String statusMessage;
         int hits;
         Hashtable result = new Hashtable();
@@ -294 +295 @@
          * @return SearchSummary object containing result of search
          */
-        public SearchSummary doSearch() {
+        public SearchSummary doSearch() 
+        {
 
                 SearchSummary result = new SearchSummary();
@@ -300 +302 @@
                 try
                 {
-                        // Set xmlDbURI as class variable so can reuse it in error messages
-                        String uri = properties.getProperty("xmlrpc.uri");
-
-                        // Create xmlrpc client & set username, password
-                        XmlRpcClient xmlrpc = new XmlRpcClient( uri );
-                        xmlrpc.setBasicAuthentication(properties.getProperty("xmlrpc.username"),properties.getProperty("xmlrpc.password"));
-
-
-                        //1. Prepare & execute the search
-                        Vector queryParams = new Vector();
+                        // firstly prepare the search query string
+                        String sqlQuery = constructSearchQuery();
                         
-                        StringBuffer sqlCmd = new StringBuffer("SELECT original_document_id FROM ORIGINAL DOCUMENT WHERE ");
-
-                        // Substitute values in template xquery string
+                        // now run the query using the db client configured appropriately
+                        InterfaceDBClient client = setupDBClient();
+                        client.runQuery(sqlQuery);
+                        
+
+//                      ByteArrayInputStream resultStream = new ByteArrayInputStream( resultByteArray );
+//
+//                      // Mark the beginning of the Stream, so can reset before each xpath evaluation (!)
+//                      resultStream.mark( resultStream.available() );
+//                      InputSource resultSource = new InputSource( resultStream );
+//                      
+//                      XPath xpath = XPathFactory.newInstance().newXPath();
+//                      String hitsExpr = "/exist:result/@hits"; 
+//                      String documentExpr = "//exist:result/document";
+//                      xpath.setNamespaceContext( new existNamespaceContextImpl() );
+//
+//                      // If there is a successful search but with no hits, exist sets hitCount=0 rather than hits=0 !!
+//                      // Need to check that the thing returned by xpath will convert to an int
+//                      try
+//                      {
+//                              int xpathHits = (new Integer( xpath.evaluate(hitsExpr, resultSource) )).intValue();
+//                              result.setHits( xpathHits );
+//                      }
+//                      catch (NumberFormatException e)
+//                      {
+//                              result.setHits( 0 );
+//                      }
+//                      
+//                      resultStream.reset();
+//                      NodeList nodeList = (NodeList)xpath.evaluate( documentExpr, resultSource, XPathConstants.NODESET ); 
+//                      
+//                      if ( result.getHits() > 0)
+//                      {
+//                              Vector documents = new Vector();
+//                              for (int i=0; i<nodeList.getLength(); i++)
+//                              {
+//                                      Hashtable thisDoc = new Hashtable();
+//                                      thisDoc.put("name", nodeList.item(i).getFirstChild().getNodeValue() );
+//                                      thisDoc.put("matches", 1);
+//                                      thisDoc.put("position", i);
+//                                      documents.add( thisDoc );
+//                              }
+//                              result.setStatus( true );
+//                              result.setStatusMessage( "Success" );
+//                              result.setDocuments( documents );       
+//                      }
+//                      else
+//                      {
+//                              result.setStatus( false );
+//                              result.setStatusMessage("Search was successful but generated no results.");
+//                      }
+//                      
+                        
+                }
+                catch (Exception e)
+                {
+                        result.setStatus(false);
+                        result.setStatusMessage("An error ocurred - details : " + e.toString());
+                }
+
+                return result;
+        }
+
+        /**
+         * Set up a DBClient object to use with running the search - getting the config details
+         * from the properties file
+         * 
+         * @return DBClient ready to accept SQL queries to run
+         * @throws DiscoveryDBException 
+         */
+        private InterfaceDBClient setupDBClient() throws DiscoveryDBException 
+        {
+                logger.info("Setting up DBClient using config info from properties file...");
+                String connectionString = properties.getProperty("jdbc.uri");
+                String userName = properties.getProperty("jdbc.username");
+                String pw = properties.getProperty("jdbc.password");
+                
+                InterfaceDBClient client = new PostgresDBClient(connectionString, userName, pw);
+                logger.info("DBClient set up for use with Discovery service.");
+                return client;
+        }
+
+        private String constructSearchQuery() 
+        {
+                //1. Prepare & execute the search
+                Vector queryParams = new Vector();
+                
+                StringBuffer sqlCmd = new StringBuffer("SELECT original_document_id FROM ORIGINAL DOCUMENT WHERE ");
+
+                // Substitute values in template xquery string
 /*                      xqueryStr = xqueryStr.replaceFirst("__subst_term__", this.term);
-                        xqueryStr = xqueryStr.replaceFirst("__subst_scope__", this.getScopesAsString() );
-
-                        // orderByField contains $ chars etc so needs special treatment to avoid "java.lang.IllegalArgumentException: Illegal group reference" when replacing
-                        String orderByFieldReplace = Matcher.quoteReplacement(this.orderByField);
-                        xqueryStr = xqueryStr.replaceAll("__subst_orderByField__", orderByFieldReplace); //NB replaceAll cos more than 1!
-                        xqueryStr = xqueryStr.replaceFirst("__subst_orderByDirection__", this.orderByDirection);
-                        
+                xqueryStr = xqueryStr.replaceFirst("__subst_scope__", this.getScopesAsString() );
+
+                // orderByField contains $ chars etc so needs special treatment to avoid "java.lang.IllegalArgumentException: Illegal group reference" when replacing
+                String orderByFieldReplace = Matcher.quoteReplacement(this.orderByField);
+                xqueryStr = xqueryStr.replaceAll("__subst_orderByField__", orderByFieldReplace); //NB replaceAll cos more than 1!
+                xqueryStr = xqueryStr.replaceFirst("__subst_orderByDirection__", this.orderByDirection);
+                
 */                      // Construct the search clause for spatio temporal search, if necessary
-                        String spatialClause = "";
-                        try
+                String spatialClause = "";
+                try
+                {
+                        SPATIO:
+                        if ( 
+                                doSpatio && 
+                                limitWest != null &&
+                                limitSouth != null &&
+                                limitNorth != null &&
+                                limitEast != null
+                        )
                         {
-                                SPATIO:
-                                if ( 
-                                        doSpatio && 
-                                        limitWest != null &&
-                                        limitSouth != null &&
-                                        limitNorth != null &&
-                                        limitEast != null
+                                if (    // Ignore spatial search if search area is global
+                                        limitWest.intValue() == -180 &&
+                                        limitEast.intValue() == 180 &&
+                                        limitNorth.intValue() == 90 &&
+                                        limitSouth.intValue() == -90
                                 )
                                 {
-                                        if (    // Ignore spatial search if search area is global
-                                                limitWest.intValue() == -180 &&
-                                                limitEast.intValue() == 180 &&
-                                                limitNorth.intValue() == 90 &&
-                                                limitSouth.intValue() == -90
-                                        )
-                                        {
-                                                doSpatio = false;
-                                                System.out.println("Global extent selected : spatial search ignored");
-                                                break SPATIO;
-                                        }
-
-                                        String latFormatPattern = "#0.00";
-                                        String lonFormatPattern = "##0.00";
-                                        DecimalFormat latFormat = new DecimalFormat( latFormatPattern );
-                                        DecimalFormat lonFormat = new DecimalFormat( lonFormatPattern );
-
-                                        if ( spatialOperator.equals("within") )
-                                        {
-                                                spatialClause += " sbox_contains_box(";
-                                        } 
-                                        else if ( spatialOperator.equals("overlaps") )
-                                        {
-                                                spatialClause += " sbox_overlap_box(";
-                                        }
-                                        else if ( spatialOperator.equals("doesNotOverlap") )
-                                        {
-                                                spatialClause += " NOT sbox_overlap_box(";
-                                        } 
-                                        else
-                                        {
-                                                doSpatio = false;
-                                                throw new Exception("Unrecognised spatial operator: " + spatialOperator + " (see spatialOperatorList for supported values)");
-                                        }                                       
-                                        spatialClause += " sbox'("+
-                                        lonFormat.format( limitWest.floatValue() )+"d,"+
-                                        latFormat.format( limitSouth.floatValue() )+"d),("+
-                                        lonFormat.format( limitEast.floatValue() )+"d,"+
-                                        latFormat.format( limitNorth.floatValue() )+"d)' ";
-                                        spatialClause += ", coordinates ) ";
-
+                                        doSpatio = false;
+                                        System.out.println("Global extent selected : spatial search ignored");
+                                        break SPATIO;
                                 }
-                                else {
-                                        doSpatio = false; //just in case any components of coordinates were null
+
+                                String latFormatPattern = "#0.00";
+                                String lonFormatPattern = "##0.00";
+                                DecimalFormat latFormat = new DecimalFormat( latFormatPattern );
+                                DecimalFormat lonFormat = new DecimalFormat( lonFormatPattern );
+
+                                if ( spatialOperator.equals("within") )
+                                {
+                                        spatialClause += " sbox_contains_box(";
+                                } 
+                                else if ( spatialOperator.equals("overlaps") )
+                                {
+                                        spatialClause += " sbox_overlap_box(";
                                 }
-                        }
-                        catch (Exception e)
-                        {
-                                System.out.println("Error converting coordinates to SQL: " + e.toString() );
-                                doSpatio = false;
-                        }
-
-                        String temporalClause = "";
-                        try
-                        {
-                                if (
-                                        doTemporal &&
-                                        dateRangeStart != null &&
-                                        dateRangeEnd != null &&
-                                        dateRangeEnd.getTimeInMillis() > dateRangeStart.getTimeInMillis()
-                                )
+                                else if ( spatialOperator.equals("doesNotOverlap") )
                                 {
-                                        String format = "yyyy-MM-dd";
-                                        SimpleDateFormat sdf = new SimpleDateFormat(format);
-
-                                        temporalClause = " (startdate, enddate) OVERLAPS (DATE '"+sdf.format( dateRangeStart.getTime() )+"', DATE '"+ sdf.format( dateRangeEnd.getTime() ) +"') ";
-                                }
+                                        spatialClause += " NOT sbox_overlap_box(";
+                                } 
                                 else
                                 {
-                                        doTemporal = false; // just in case any components of date range were null
-                                }
+                                        doSpatio = false;
+                                        throw new Exception("Unrecognised spatial operator: " + spatialOperator + " (see spatialOperatorList for supported values)");
+                                }                                       
+                                spatialClause += " sbox'("+
+                                lonFormat.format( limitWest.floatValue() )+"d,"+
+                                latFormat.format( limitSouth.floatValue() )+"d),("+
+                                lonFormat.format( limitEast.floatValue() )+"d,"+
+                                latFormat.format( limitNorth.floatValue() )+"d)' ";
+                                spatialClause += ", coordinates ) ";
+
                         }
-                        catch (Exception e)
+                        else {
+                                doSpatio = false; //just in case any components of coordinates were null
+                        }
+                }
+                catch (Exception e)
+                {
+                        System.out.println("Error converting coordinates to SQL: " + e.toString() );
+                        doSpatio = false;
+                }
+
+                String temporalClause = "";
+                try
+                {
+                        if (
+                                doTemporal &&
+                                dateRangeStart != null &&
+                                dateRangeEnd != null &&
+                                dateRangeEnd.getTimeInMillis() > dateRangeStart.getTimeInMillis()
+                        )
                         {
-                                System.out.println("Error converting date to SQL: " + e.toString() );
-                                temporalClause = "";
-                                doTemporal = false;
-                        }                       
-
-                        String whereClause = "";
-                        if ( doSpatio && doTemporal )
-                        {
-                                whereClause = " WHERE " + spatialClause + " AND " + temporalClause + " ";
-                        }
-                        else if ( doSpatio && !doTemporal )
-                        {
-                                whereClause = " WHERE " + spatialClause + " ";
-                        }
-                        else if ( doTemporal && !doSpatio )
-                        {
-                                whereClause = " WHERE " + temporalClause + " ";
+                                String format = "yyyy-MM-dd";
+                                SimpleDateFormat sdf = new SimpleDateFormat(format);
+
+                                temporalClause = " (startdate, enddate) OVERLAPS (DATE '"+sdf.format( dateRangeStart.getTime() )+"', DATE '"+ sdf.format( dateRangeEnd.getTime() ) +"') ";
                         }
                         else
                         {
-                                whereClause = "";
+                                doTemporal = false; // just in case any components of date range were null
                         }
+                }
+                catch (Exception e)
+                {
+                        System.out.println("Error converting date to SQL: " + e.toString() );
+                        temporalClause = "";
+                        doTemporal = false;
+                }                       
+
+                String whereClause = "";
+                if ( doSpatio && doTemporal )
+                {
+                        whereClause = " WHERE " + spatialClause + " AND " + temporalClause + " ";
+                }
+                else if ( doSpatio && !doTemporal )
+                {
+                        whereClause = " WHERE " + spatialClause + " ";
+                }
+                else if ( doTemporal && !doSpatio )
+                {
+                        whereClause = " WHERE " + temporalClause + " ";
+                }
+                else
+                {
+                        whereClause = "";
+                }
 /*
-                        xqueryStr = xqueryStr.replaceFirst("__subst_spatioTempWhereClause__", whereClause );
-
-                        xqueryStr = xqueryStr.replaceFirst("__subst_doTerm__", this.doTerm ? "fn:true()" : "fn:false()");
-                        xqueryStr = xqueryStr.replaceFirst("__subst_doSpatioTemp__", (this.doSpatio | this.doTemporal) ? "fn:true()" : "fn:false()");
-                        xqueryStr = xqueryStr.replaceFirst("__subst_doOrderBy__", this.doOrderBy ? "fn:true()" : "fn:false()"); //NB replaceAll cos more than 1! 
-                        xqueryStr = xqueryStr.replaceFirst("__subst_doScope__", this.doScope ? "fn:true()" : "fn:false()");
-                        
-                        //System.out.println("Xquery was \n" + xqueryStr);
-                        
-                        queryParams.addElement( xqueryStr.getBytes("UTF-8") ); 
+                xqueryStr = xqueryStr.replaceFirst("__subst_spatioTempWhereClause__", whereClause );
+
+                xqueryStr = xqueryStr.replaceFirst("__subst_doTerm__", this.doTerm ? "fn:true()" : "fn:false()");
+                xqueryStr = xqueryStr.replaceFirst("__subst_doSpatioTemp__", (this.doSpatio | this.doTemporal) ? "fn:true()" : "fn:false()");
+                xqueryStr = xqueryStr.replaceFirst("__subst_doOrderBy__", this.doOrderBy ? "fn:true()" : "fn:false()"); //NB replaceAll cos more than 1! 
+                xqueryStr = xqueryStr.replaceFirst("__subst_doScope__", this.doScope ? "fn:true()" : "fn:false()");
+                
+                //System.out.println("Xquery was \n" + xqueryStr);
+                
+                queryParams.addElement( xqueryStr.getBytes("UTF-8") ); 
 */
-                        queryParams.addElement( this.howMany.intValue() );
-                        queryParams.addElement( this.start.intValue() ); 
-                        //System.out.println("start \n" + this.start.intValue());
-                        //System.out.println("howMany \n" + this.howMany.intValue());
-
-                        Hashtable options = new Hashtable();
-                        options.put("indent", "yes");
-                        options.put("encoding", "UTF-8");
-                        options.put("process-xsl-pi", "no");
-                        queryParams.addElement( options );
-                        byte[] resultByteArray = (byte[])xmlrpc.execute( "query", queryParams );
-                        ByteArrayInputStream resultStream = new ByteArrayInputStream( resultByteArray );
-
-                        // Mark the beginning of the Stream, so can reset before each xpath evaluation (!)
-                        resultStream.mark( resultStream.available() );
-                        InputSource resultSource = new InputSource( resultStream );
-                        
-                        XPath xpath = XPathFactory.newInstance().newXPath();
-                        String hitsExpr = "/exist:result/@hits"; 
-                        String documentExpr = "//exist:result/document";
-                        xpath.setNamespaceContext( new existNamespaceContextImpl() );
-
-                        // If there is a successful search but with no hits, exist sets hitCount=0 rather than hits=0 !!
-                        // Need to check that the thing returned by xpath will convert to an int
-                        try
-                        {
-                                int xpathHits = (new Integer( xpath.evaluate(hitsExpr, resultSource) )).intValue();
-                                result.setHits( xpathHits );
-                        }
-                        catch (NumberFormatException e)
-                        {
-                                result.setHits( 0 );
-                        }
-                        
-                        resultStream.reset();
-                        NodeList nodeList = (NodeList)xpath.evaluate( documentExpr, resultSource, XPathConstants.NODESET ); 
-                        
-                        if ( result.getHits() > 0)
-                        {
-                                Vector documents = new Vector();
-                                for (int i=0; i<nodeList.getLength(); i++)
-                                {
-                                        Hashtable thisDoc = new Hashtable();
-                                        thisDoc.put("name", nodeList.item(i).getFirstChild().getNodeValue() );
-                                        thisDoc.put("matches", 1);
-                                        thisDoc.put("position", i);
-                                        documents.add( thisDoc );
-                                }
-                                result.setStatus( true );
-                                result.setStatusMessage( "Success" );
-                                result.setDocuments( documents );       
-                        }
-                        else
-                        {
-                                result.setStatus( false );
-                                result.setStatusMessage("Search was successful but generated no results.");
-                        }
-                        
-                        
-
-                }
-                catch (org.apache.xmlrpc.XmlRpcException e)
-                {
-                        status = false;
-                        statusMessage = "Search failed - reason : " + e.toString();
-                        result.setStatus(false);
-                        result.setStatusMessage( statusMessage );
-                }
-                catch (Exception e)
-                {
-                        status = false;
-                        statusMessage = "An error ocurred - details : " + e.toString();
-                        result.setStatus( status );
-                        result.setStatusMessage( statusMessage );
-                }
-
-                return result;
+                queryParams.addElement( this.howMany.intValue() );
+                queryParams.addElement( this.start.intValue() ); 
+                //System.out.println("start \n" + this.start.intValue());
+                //System.out.println("howMany \n" + this.howMany.intValue());
+                return null;
         }
 

TI01-discovery/branches/ws-Discovery2-upgrade/src/ndg/services/discovery/ServiceProperties.java

@@ -12 +12 @@
         public ServiceProperties()
         {
-                properties.setProperty("jdbc.uri","jdbc:postgresql://glue.badc.rl.ac.uk/ndg_spatial");
-                properties.setProperty("jdbc.username","postgres");
-                properties.setProperty("jdbc.password","postgresDB");
+                properties.setProperty("jdbc.uri","jdbc:postgresql://glue.badc.rl.ac.uk/calum:51000");
+                properties.setProperty("jdbc.username","calum");
+                properties.setProperty("jdbc.password","boybear");
+//              properties.setProperty("jdbc.uri","jdbc:postgresql://glue.badc.rl.ac.uk/ndg_spatial");
+//              properties.setProperty("jdbc.username","postgres");
+//              properties.setProperty("jdbc.password","postgresDB");
 
                 properties.setProperty("namespace.DIF", "http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/");