Changeset 3449

Timestamp:

18/02/08 15:22:24 (12 years ago)

Author:

mpritcha

Message:

Updated to demonstrate use of helper classes & added timings.

File:

• TI01-discovery/trunk/ws-Discovery2/src/ndg/services/discovery/DiscoveryServiceClient.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package ndg.services.discovery;
+
+import discoveryserviceapi.*;
+import java.util.Date;
 
 /**
@@ -38 +41 @@
                         DiscoveryServiceClient client = new DiscoveryServiceClient("http://glue.badc.rl.ac.uk/axis2/services/DiscoveryService");
 
-                        System.out.println( "Trying a doSearch..." );
-                        String doSearchResult = client.doSearch(
-                                "<m:doSearch xmlns:m=\"urn:DiscoveryServiceAPI\"><m:term>*neodc*</m:term><m:termType>fullText</m:termType></m:doSearch>"
-                        );
-                        System.out.println( doSearchResult );
-
-                        System.out.println( "Trying a doPresent..." );
-                        String doPresentResult = client.doPresent(
-                                "<m:doPresent xmlns:m=\"urn:DiscoveryServiceAPI\"><m:documents><m:document>neodc.nerc.ac.uk__DIF__dataent_11924879127625221.xml</m:document></m:documents><m:presentFormat>original</m:presentFormat></m:doPresent>"
-                        );
-                        System.out.println( doPresentResult );
+                        // Method 1: request documents passed as strings
+                        if ( args[0].equals("string") )
+                        {
+                                System.out.println( "Trying a doSearch..." );
+                                String doSearchResult = client.doSearch(
+                                        "<m:doSearch xmlns:m=\"urn:DiscoveryServiceAPI\"><m:term>*neodc*</m:term><m:termType>fullText</m:termType></m:doSearch>"
+                                );
+                                System.out.println( doSearchResult );
+
+                                System.out.println( "Trying a doPresent..." );
+                                String doPresentResult = client.doPresent(
+                                        "<m:doPresent xmlns:m=\"urn:DiscoveryServiceAPI\"><m:documents><m:document>neodc.nerc.ac.uk__DIF__dataent_11924879127625221.xml</m:document></m:documents><m:presentFormat>original</m:presentFormat></m:doPresent>"
+                                );
+                                System.out.println( doPresentResult );
+                        }
+                        else if ( args[0].equals("helpers") )
+                        {
+                                // Method 2: request documents construced using helper classes
+                                System.out.println( "Trying a doSearch using helper classes" );
+                                DoSearchDocument reqDoc = DoSearchDocument.Factory.newInstance();
+                                SearchType doSearch = reqDoc.addNewDoSearch();
+                                doSearch.setTermType("fullText");
+                                doSearch.setTerm( args[1] );
+                                //if ( args.length == 2 )
+                                //{
+                                        doSearch.setScopeArray( new String[]{ args[2] } );
+                                //}
+                                System.out.println("doSearch request:\n" + reqDoc.toString() );
+
+                                Date dateBeforeSearch = new Date();
+                                DoSearchReturnDocument doSearchReturnDocument = client.getDoSearchReturnDocument( reqDoc );
+                                Date dateAfterSearch = new Date();
+
+                                System.out.println("doSearch result:\n" + doSearchReturnDocument.toString() );
+
+                                if ( doSearchReturnDocument != null)
+                                {
+                                        System.out.println( doSearchReturnDocument.toString() );
+                                        System.out.println( "Trying a doPresent using helper classes" );
+
+                                        DoPresentDocument presReqDoc = DoPresentDocument.Factory.newInstance();
+                                        PresentType doPresent = presReqDoc.addNewDoPresent();
+
+                                        // Use document array in result of search as document array in request to doPresent
+                                        // (does not retrieve hits greater than default value of howMany, but works for this example)
+                                        SearchReturnType searchReturn = doSearchReturnDocument.getDoSearchReturn();
+                                        if ( searchReturn.getHits() > 0 )
+                                        {
+                                                doPresent.setDocuments( searchReturn.getDocuments() );
+                                                doPresent.setFormat("DIF");
+                                                System.out.println("doPresent request:\n" + presReqDoc.toString() );
+
+                                                Date dateBeforePresent = new Date();
+                                                DoPresentReturnDocument doPresentReturnDocument = client.getDoPresentReturnDocument( presReqDoc );
+                                                Date dateAfterPresent = new Date();
+
+                                                //System.out.println( doPresentReturnDocument.toString() );
+
+                                                System.out.println("Before search\t" + dateBeforeSearch.getTime() );
+                                                System.out.println("After search\t" + dateAfterSearch.getTime());
+
+                                                System.out.println("Search duration\t" + (dateAfterSearch.getTime()-dateBeforeSearch.getTime() ) );
+
+                                                System.out.println("Before present\t" + dateBeforePresent.getTime());
+                                                System.out.println("After present\t" + dateAfterPresent.getTime());
+                                                System.out.println("Present duration\t" + (dateAfterPresent.getTime()-dateBeforePresent.getTime()) );
+
+                                        }
+                                        
+                                }                       
+                        }
+                        else
+                        {
+                                System.out.println("Usage : DiscoveryServiceClient string|helpers <term>");
+                        }
+
+                        
+                        
+
 
                 }
@@ -96 +167 @@
                 return resDoc.toString();
         }
+
+        /**
+         * Acts as proxy method for doSearch operation
+         * @param reqDocAsString String containing XML request doc (see WSDL for structure)
+         * @return DoSearchReturnDocument containing SearchReturn (see WSDL for structure)
+         */
+        public DoSearchReturnDocument getDoSearchReturnDocument(
+                String reqDocAsString
+        ) throws java.rmi.RemoteException, org.apache.xmlbeans.XmlException
+        {
+                discoveryserviceapi.DoSearchDocument reqDoc= discoveryserviceapi.DoSearchDocument.Factory.parse( reqDocAsString );
+                discoveryserviceapi.DoSearchReturnDocument resDoc= _service.doSearch( reqDoc );
+                return resDoc;
+        }
+
+        /**
+         * Acts as proxy method for doPresent operation
+         * @param reqDocAsString String containing XML request doc (see WSDL for structure)
+         * @return DoPresentReturnDocument containing PresentReturn (see WSDL for structure)
+         */
+        public DoPresentReturnDocument getDoPresentReturnDocument(
+                String reqDocAsString
+        ) throws java.rmi.RemoteException, org.apache.xmlbeans.XmlException
+        {
+                discoveryserviceapi.DoPresentDocument reqDoc= discoveryserviceapi.DoPresentDocument.Factory.parse( reqDocAsString );
+                discoveryserviceapi.DoPresentReturnDocument resDoc= _service.doPresent( reqDoc );
+                return resDoc;
+        }
+
+        /**
+         * Acts as proxy method for doSearch operation
+         * @param reqDoc DoSearchDocument containing request doc (see WSDL for structure)
+         * @return DoSearchReturnDocument containing SearchReturn (see WSDL for structure)
+         */
+        public DoSearchReturnDocument getDoSearchReturnDocument(
+                DoSearchDocument reqDoc
+        ) throws java.rmi.RemoteException, org.apache.xmlbeans.XmlException
+        {
+                discoveryserviceapi.DoSearchReturnDocument resDoc= _service.doSearch( reqDoc );
+                return resDoc;
+        }
+
+        /**
+         * Acts as proxy method for doPresent operation
+         * @param reqDoc DoPresentDocument containing request doc (see WSDL for structure)
+         * @return DoPresentReturnDocument containing PresentReturn (see WSDL for structure)
+         */
+        public DoPresentReturnDocument getDoPresentReturnDocument(
+                DoPresentDocument reqDoc
+        ) throws java.rmi.RemoteException, org.apache.xmlbeans.XmlException
+        {
+                discoveryserviceapi.DoPresentReturnDocument resDoc= _service.doPresent( reqDoc );
+                return resDoc;
+        }
+
 };