Changeset 1751

Timestamp:

23/11/06 17:13:23 (14 years ago)

Author:

mpritcha

Message:

Updated to handle present of multiple documents, but DiscoveryServiceSkeleton? yet updated to match.

Location:

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

Files:

• PresentAgent.java (modified) (5 diffs)
• PresentSummary.java (modified) (4 diffs)

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

@@ -30 +30 @@
 
         // Input parameters
-        String documentName;
-        String format = "payload"; //default
+        Vector documentNames;
+        String format = "original"; //default
+
+        // Output holder
+        Vector returnDocs;
 
         /**
@@ -42 +45 @@
          * @param documentName String containing name (eg. /db/dif/badc/somedoc.xml)
          */
-        public PresentAgent(String documentName)
+        public PresentAgent(Vector documentNames)
         {
-                this.documentName = documentName;
+                this.documentNames = documentNames;
         }
 
@@ -51 +54 @@
          * @param s String containing name (eg. /db/dif/badc/somedoc.xml)
          */
-        public void setDocumentName(String s)
+        public void setDocumentNames(Vector documentNames)
         {
-                this.documentName = s;
+                this.documentNames = documentNames;
         }
 
@@ -99 +102 @@
                         options.put("process-xsl-pi", "no");
 
-                        //1. Execute the remote getDocumentAsString() 
-                        Vector getDocumentAsStringParams = new Vector();
-                        getDocumentAsStringParams.addElement( this.documentName );
-                        getDocumentAsStringParams.addElement( options );
-                        returnDoc = (byte[])xmlrpc.execute( "getDocument", getDocumentAsStringParams );
+                        //0. For each document requested, do an XMLRPC call to fetch it
+                        Iterator it = this.documentNames.iterator();
+                        returnDocs = new Vector();
 
-                        if (returnDoc != null)
+                        while ( it.hasNext() )
                         {
-                                result.setStatus( true );
-                                result.setStatusMessage( "Success" );
+                                //1. Execute the remote getDocumentAsString() 
+                                Vector getDocumentAsStringParams = new Vector();
+                                getDocumentAsStringParams.addElement( (String)it.next() );
+                                getDocumentAsStringParams.addElement( options );
+                                returnDoc = (byte[])xmlrpc.execute( "getDocument", getDocumentAsStringParams );
 
-                                if ( this.format.equals("payload") )
+                                if (returnDoc != null)
                                 {
-                                        // Return the payload, i.e. the contents of the first "doc" element
-                                        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-                                        DocumentBuilder builder = factory.newDocumentBuilder();
-                                        Document root = builder.parse( 
-                                                new InputSource (
-                                                        new ByteArrayInputStream(
-                                                                returnDoc
-                                                        )
-                                                )
-                                        );
+                                        result.setStatus( true );
+                                        result.setStatusMessage( "Success" );
 
-                                        NodeList docNodes = root.getElementsByTagName("doc");
-                                        // Assuming payload is contained within 1st doc element...
-                                        Element docElem = (Element)docNodes.item(0);
-                                        NodeList payloadNodes = docElem.getChildNodes();
-                                        // Could be text nodes too, so need to test for type = Element
-                                        for (int i=0; i<payloadNodes.getLength(); i++)
+                                        if ( this.format.equals("ndgDoc") )
                                         {
-                                                Node thisNode = payloadNodes.item(i);
-                                                if ( thisNode.getNodeType() == Node.ELEMENT_NODE )
-                                                {
-                                                        // Serialize it
-                                                        OutputFormat format = new OutputFormat( root );
-                                                        format.setOmitXMLDeclaration( true );
-                                                        StringWriter writer = new StringWriter();
-                                                        XMLSerializer output = new XMLSerializer(writer, format);
-                                                        output.serialize( (Element)thisNode );
-                                                        result.setDocument( writer.toString() );
-                                                }
+                                                returnDocs.add( new String( returnDoc ) );
+                                        }
+                                        else
+                                        {
+                                                throw new Exception("Format " + this.format + " not implemented.");
                                         }
                                 }
-                                else if ( this.format.equals("ndgDoc") )
-                                {
-                                        result.setDocument( new String( returnDoc ) );
-                                }
-                                else
-                                {
-                                        throw new Exception("Format " + this.format + " not implemented.");
+                                else {
+                                        throw new Exception("Got null response from getDocumentAsString()");
                                 }
                         }
-                        else {
-                                throw new Exception("Got null response from getDocumentAsString()");
-                        }
-
+                        result.setDocuments( returnDocs );
                 }
                 catch (Exception e)
@@ -162 +139 @@
                         result.setStatusMessage( "Error retrieving document : " + e.toString() );
                 }
+
+
                 return result;
         }

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

@@ -1 +1 @@
 package ndg.services.discovery;
+
+import java.util.Vector;
 
 /**
@@ -10 +12 @@
         private boolean status;
         private String statusMessage;
-        private String document;
+        private Vector documents;
         
         /** Default no-arg constructor */
@@ -22 +24 @@
          * @param  documents  String containing XML document
          */
-        public PresentSummary( boolean status, String statusMessage, String document ) {
+        public PresentSummary( boolean status, String statusMessage, Vector docs ) {
                 this.status = status;
                 this.statusMessage = statusMessage;
-                this.document = document;
+                this.documents = docs;
         }
 
@@ -78 +80 @@
 
         /**
-         * Sets the String containing the XML document retrieved by the present.
-         * @param  s  String containing XML document
+         * Sets the Vector containing the documents.
+         * Each element should contain a string, which in turn should contain 
+         * the XML document payload.
+         * @param  v  Vector containing 1 element for each document
          */
-        public void setDocument(String s)
+        public void setDocuments(Vector v)
         {
-                this.document = s;
+                this.documents = v;
         }
 
         /**
-         * Returns the String containing XML document retrieved by present.
-         * @return String containing XML document
+         * Returns the Vector containing Hashtable of info for each matched document.
+         * @return Vector one element per matched document
          */
-        public String getDocument()
+        public Vector getDocuments()
         {
-                 return this.document;
+                 return this.documents;
         }