Changeset 1600

Timestamp:

18/10/06 21:36:49 (14 years ago)

Author:

mpritcha

Message:

Updated to reflect new storage structure ndgdoc/doc/payload.

Location:

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

Files:

• DiscoveryServiceSkeleton.java (modified) (2 diffs)
• PresentAgent.java (modified) (6 diffs)

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

@@ -111 +111 @@
                 discoveryserviceapi.PresentType requestContent = request.getDoPresent();
                 PresentAgent agent = new PresentAgent( requestContent.getDocument() );
+                if ( requestContent.isSetFormat() )
+                {
+                        agent.setFormat( requestContent.getFormat().toString() );
+                }
 
                 try
@@ -131 +135 @@
         }
 
-        
-}
+        /**
+         * Auto generated method signature
+         
+          * @param param2
+         
+         */
+        public  discoveryserviceapi.DoAuthorSearchReturnDocument doAuthorSearch
+                  (discoveryserviceapi.DoAuthorSearchDocument param2 )
+         
+           {
+                //Todo fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException();
+        }
+     
+                 
+        /**
+         * Auto generated method signature
+         
+          * @param param4
+         
+         */
+        public  discoveryserviceapi.DoParameterSearchReturnDocument doParameterSearch
+                  (discoveryserviceapi.DoParameterSearchDocument param4 )
+         
+           {
+                //Todo fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException();
+        }
+     
+                 
+        /**
+         * Auto generated method signature
+         
+          * @param param6
+         
+         */
+        public  discoveryserviceapi.DoSpatioTemporalSearchReturnDocument doSpatioTemporalSearch
+                  (discoveryserviceapi.DoSpatioTemporalSearchDocument param6 )
+         
+           {
+                //Todo fill this with the necessary business logic
+                throw new  java.lang.UnsupportedOperationException();
+        }
+        }
     

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

@@ -6 +6 @@
 import java.util.Properties;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
+import java.io.*;
 
 import org.apache.xmlrpc.XmlRpc;
 import org.apache.xmlrpc.XmlRpcClient;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import org.xml.sax.InputSource;
+import org.w3c.dom.*;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
+
+
 
 /**
@@ -24 +31 @@
         // Input parameters
         String documentName;
+        String format = "payload"; //default
 
         /**
@@ -49 +57 @@
 
         /**
+         * Sets the format in which to present the document
+         * @param s String containing format (eg. payload, ndgdoc, dc)
+         */
+        public void setFormat(String s)
+        {
+                this.format = s;
+        }
+
+        /**
          * Executes the remote getDocumentAsString method and returns document as a String
          * @return String containing XML document
@@ -57 +74 @@
                 PresentSummary result = new PresentSummary();
 
-                String returnDoc = null;
+                byte[] returnDoc = null;
                 XmlRpc.setEncoding("UTF-8");
 
@@ -83 +100 @@
 
                         //1. Execute the remote getDocumentAsString() 
-                        System.out.println( "before : returnDoc is " + returnDoc );
                         Vector getDocumentAsStringParams = new Vector();
                         getDocumentAsStringParams.addElement( this.documentName );
                         getDocumentAsStringParams.addElement( options );
-                        returnDoc = (String)xmlrpc.execute( "getDocumentAsString", getDocumentAsStringParams );
+                        returnDoc = (byte[])xmlrpc.execute( "getDocument", getDocumentAsStringParams );
 
                         if (returnDoc != null)
@@ -93 +109 @@
                                 result.setStatus( true );
                                 result.setStatusMessage( "Success" );
-                                result.setDocument( returnDoc );
+
+                                if ( this.format.equals("payload") )
+                                {
+                                        // 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
+                                                        )
+                                                )
+                                        );
+
+                                        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++)
+                                        {
+                                                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() );
+                                                }
+                                        }
+                                }
+                                else if ( this.format.equals("ndgdoc") )
+                                {
+                                        result.setDocument( new String( returnDoc ) );
+                                }
+                                else
+                                {
+                                        throw new Exception("Format " + this.format + " not implemented.");
+                                }
                         }
                         else {