Changeset 1565

Timestamp:

09/10/06 16:45:10 (13 years ago)

Author:

mpritcha

Message:

doFullTextSearch now returns full document-uri. Set defaults for start, howMany.

Location:

TI01-discovery/trunk/ws-Discovery2/src/ndg/services/discovery

Files:

• DiscoveryServiceSkeleton.java (modified) (2 diffs)
• FullTextSearchAgent.java (modified) (6 diffs)
• SearchAgent.java (modified) (3 diffs)

TI01-discovery/trunk/ws-Discovery2/src/ndg/services/discovery/DiscoveryServiceSkeleton.java

@@ -34 +34 @@
                         agent.setStart( requestContent.getStart() );
                 }
-                else 
-                {
-                        agent.setStart( 1 );
-                }
                 
                 if ( requestContent.isSetHowMany() )
@@ -43 +39 @@
                         agent.setHowMany( requestContent.getHowMany() );
                 }
-                else
-                {
-                        agent.setHowMany( 30 );
-                }
+
                 if ( requestContent.isSetOrderBy() )
                 {
                         agent.setOrderBy( requestContent.getOrderBy().toString() );
-                }
-                else
-                {
-                        agent.setOrderBy( "date" );
                 }
 

TI01-discovery/trunk/ws-Discovery2/src/ndg/services/discovery/FullTextSearchAgent.java

@@ -8 +8 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+
+import javax.xml.xpath.*;
+import javax.xml.*;
+import javax.xml.namespace.*;
+import org.xml.sax.InputSource;
+import org.w3c.dom.*;
 
 import org.apache.xmlrpc.XmlRpc;
@@ -57 +64 @@
         public SearchSummary doSearch() {
 
-                SearchSummary result = null;
+                SearchSummary result = new SearchSummary();
                 XmlRpc.setEncoding("UTF-8");
                 Vector myResultDocuments = new Vector();
@@ -78 +85 @@
 
 
-                        Hashtable options = new Hashtable();
-                        options.put("indent", "yes");
-                        options.put("encoding", "UTF-8");
-                        options.put("process-xsl-pi", "no");
-
                         //1. Execute the search
-                        Vector executeQueryParams = new Vector();
+                        Vector queryParams = new Vector();
 
                         // Load fullText XQuery from a file
@@ -104 +106 @@
                                 else
                                 {
-                                        xqueryStr += line;
+                                        xqueryStr += line + "\n";
                                 }
                         }
@@ -111 +113 @@
                         // Substitute __term__ in the xquery for value from request message
                         xqueryStr = xqueryStr.replaceAll("__term__", term);
-                        executeQueryParams.addElement( xqueryStr ); 
-                        executeQueryParams.addElement( options );
-                        resultId = ((Integer)xmlrpc.execute( "executeQuery", executeQueryParams )).intValue();
+                        //xqueryStr = xqueryStr.replaceAll("__orderBy__", orderBy);
 
-                        //2. Fetch the querySummary
-                        Vector querySummaryParams = new Vector();
-                        querySummaryParams.addElement( resultId ); //resultId from last query
-                        Hashtable querySummaryHashtable = (Hashtable)xmlrpc.execute( "querySummary", querySummaryParams );
-                        result = new SearchSummary( querySummaryHashtable, resultId );
+                        queryParams.addElement( xqueryStr.getBytes("UTF-8") ); 
 
-                        //3. Do a releaseQueryResult
-                        Vector releaseQueryResultParams = new Vector();
-                        releaseQueryResultParams.addElement( resultId ); //resultId from last query
-                        xmlrpc.execute( "releaseQueryResult", releaseQueryResultParams );
+                        queryParams.addElement( this.howMany );
+                        queryParams.addElement( this.start ); 
+
+                        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() );
+
+                        result.setHits( (new Integer( xpath.evaluate(hitsExpr, resultSource) )).intValue() );
+                        
+                        resultStream.reset();
+                        NodeList nodeList = (NodeList)xpath.evaluate( documentExpr, resultSource, XPathConstants.NODESET ); 
+                        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.setDocuments( documents );       
+                        result.setStatus( true );
+
                 }
                 catch (org.apache.xmlrpc.XmlRpcException e)
@@ -144 +172 @@
         }
 
+        public class existNamespaceContextImpl implements NamespaceContext
+    {
+        public String getNamespaceURI(String prefix)
+        {
+                        return "http://exist.sourceforge.net/NS/exist";
+        }
+     
+                // Doesn't matter what the prefix in the source doc is, override it
+                // Important thing is that the namespace URI matches, and that
+                // whatever prefix is set here, is used in the xpath query
+        public String getPrefix(String namespace)
+        {
+                        return "exist";
+        }
+
+        public Iterator getPrefixes(String namespace)
+        {
+            return null;
+        }
+    } 
+
         // setter methods for start, howMany, OrderBy already defined in superclass SearchAgent
 

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

@@ -28 +28 @@
         String orderBy;
 
+        public static final int startDefault = 1;
+        public static final int howManyDefault = 30;
+
         // Output parameters
         boolean status;
@@ -40 +43 @@
 
         /**
-         * Sets the start position of result set
+         * Sets the start position of result set.
+         * <p>Value should be integer > 0, else defaults to howManyDefault.
          * @param i position of first result to fetch
          */
         public void setStart(int i)
         {
-                this.start = i;
+                if ( i > 0)
+                {
+                        this.start = i;
+                }
+                else
+                {
+                        this.start = this.startDefault;
+                }
         }
 
         /**
-         * Sets how many results to fetch
+         * Sets how many results to fetch.
+         * <p>Value should be integer > 0, else defaults to howManyDefault.
          * @param i position of first result to fetch
          */
         public void setHowMany(int i)
         {
-                this.howMany = i;
+                if ( i > 0)
+                {
+                        this.howMany = i;
+                }
+                else
+                {
+                        this.howMany = this.howManyDefault;
+                }
         }
 
@@ -63 +82 @@
         public void setOrderBy(String s)
         {
-                this.orderBy = s;
+                if ( s.equals("date") )
+                {
+                        this.orderBy = " order by $i//DIF_Creation_Date";
+                }
+                else if ( s.equals("dataCentre") )
+                {
+                        this.orderBy = "order by $i//Data_Center/Data_Center_Name/Short_Name";
+                }
+                else
+                {
+                        this.orderBy = "order by document-uri($i)";
+                }
         }
 }