Changeset 1530 for MDService2

Timestamp:

09/12/11 10:58:13 (13 years ago)

Author:

gaba

Message:

repository action

Location:

MDService2/branches/MDService_simple3/src

Files:

• eu/clarin/cmdi/mdservice/action/GenericAction.java (modified) (1 diff)
• eu/clarin/cmdi/mdservice/action/VirtualCollectionProxyAction.java (modified) (2 diffs)
• eu/clarin/cmdi/mdservice/action/WorkspaceAction.java (modified) (9 diffs)
• eu/clarin/cmdi/mdservice/action/WorkspaceRepositoryAction.java (added)
• eu/clarin/cmdi/mdservice/internal/Helpers.java (modified) (4 diffs)
• struts.xml (modified) (1 diff)

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/GenericAction.java

@@ -111 +111 @@
                 }
                 
+         public String getScanClause() {
+                 return getParam("scanClause");
+         }
          public String getRecordPacking() {
                  return getParam("recordPacking");

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/VirtualCollectionProxyAction.java

@@ -14 +14 @@
 import eu.clarin.cmdi.mdservice.internal.Admin;
 import eu.clarin.cmdi.mdservice.internal.Cache;
+import eu.clarin.cmdi.mdservice.internal.Helpers;
 import eu.clarin.cmdi.mdservice.internal.MDTransformer;
 
@@ -77 +78 @@
                 
                 // find the workspace data
-                NodeList list = (NodeList) getWorkspace(); 
-        InputStream is = this.DocumentToStream(list.item(0));
+                NodeList list = (NodeList) getWorkspaceData(); 
+        InputStream is = Helpers.DocumentToStream(list.item(0));
                 //xslt transform to request data
                 MDTransformer transformer = new MDTransformer();

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java

@@ -50 +50 @@
 
 import eu.clarin.cmdi.mdservice.internal.Admin;
+import eu.clarin.cmdi.mdservice.internal.Helpers;
 import eu.clarin.cmdi.mdservice.internal.MDTransformer;
 import eu.clarin.cmdi.mdservice.model.Diagnostic;
@@ -479 +480 @@
                 String newid = "";
                 if (this.elementtype.equals(WorkspaceAction.SE_WORKSPACE)){
-                        NodeList wsnodelist = (NodeList) getWorkspace();
+                        NodeList wsnodelist = (NodeList) getWorkspaceData();
                 // remove 
                 //childeNode
@@ -581 +582 @@
                                                 node2 = workspace_doc.renameNode(node2, "", "item");
                                            // apend to specific querysets
-                                                NodeList wsnodelist = (NodeList) this.getWorkspace();
+                                                NodeList wsnodelist = (NodeList) this.getWorkspaceData();
                                                 Element welem = (Element)wsnodelist.item(0);
                                                         Node anode = welem.getElementsByTagName("Querysets").item(0);
@@ -620 +621 @@
                                                 node2 = workspace_doc.renameNode(node2, "", "item");
                                            // apend to specific querysets
-                                                NodeList wsnodelist = (NodeList) this.getWorkspace();
+                                                NodeList wsnodelist = (NodeList) this.getWorkspaceData();
                                                 Element welem = (Element)wsnodelist.item(0);
                                                 Node anode = welem.getElementsByTagName("Bookmarksets").item(0);
@@ -715 +716 @@
                 
         }
-        public InputStream DocumentToStream(Node node) throws TransformerConfigurationException, TransformerException, TransformerFactoryConfigurationError{
-                
-                InputStream is = null;
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); 
-                Source xmlSource;
-                
-                if (node == null) {
-                        xmlSource = new DOMSource(workspace_doc); 
-                } else {
-                        xmlSource = new DOMSource(node);
-                }
-                Result outputTarget = new StreamResult(outputStream); 
-                TransformerFactory.newInstance().newTransformer().transform(xmlSource, outputTarget); 
-                is = new ByteArrayInputStream(outputStream.toByteArray()); 
-                return is;
-        }
 
         public String DocumentToXMLString(){
@@ -813 +798 @@
                 return userstring;
         }
-        public String getWorkspaceXPathExpression(){
+        public String getWorkspaceDataXPathExpression(){
                 String xpath_expr = "";
 
@@ -821 +806 @@
         }
         
-        public Object getWorkspace() throws XPathExpressionException{
+        public Object getWorkspaceData() throws XPathExpressionException{
                 InputStream is = null;
                 XPathFactory factory = XPathFactory.newInstance(); 
             XPath xpath = factory.newXPath(); 
             XPathExpression expr;
-                        expr = xpath.compile(getWorkspaceXPathExpression());
+                        expr = xpath.compile(getWorkspaceDataXPathExpression());
                         //expression is evaluated with respect to a certain context node which is doc.
                         Object result = null;
@@ -975 +960 @@
                 loadParams();
                 
-                NodeList list = (NodeList) getWorkspace();//result;
+                NodeList list = (NodeList) getWorkspaceData();//result;
                 if (list.getLength() < 1) {
                         addWorkspaceToDocument();
-                        list = (NodeList) getWorkspace();
+                        list = (NodeList) getWorkspaceData();
                 }
                 if (list.getLength() > 1){
@@ -984 +969 @@
                 }
                 // nodelistto stream
-                InputStream is = this.DocumentToStream(list.item(0));
+                InputStream is = Helpers.DocumentToStream(list.item(0));
                 this.setSourceStream(is);     
                 

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/internal/Helpers.java

@@ -2 +2 @@
 
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -12 +14 @@
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
@@ -20 +30 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -164 +175 @@
 
 
+        public static InputStream DocumentToStream(Node node) throws TransformerConfigurationException, TransformerException, TransformerFactoryConfigurationError{
+                
+                InputStream is = null;
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); 
+                Source xmlSource;
+                
+                //if (node == null) {
+                //      xmlSource = new DOMSource(workspace_doc); 
+                //} else {
+                        xmlSource = new DOMSource(node);
+                //}
+                Result outputTarget = new StreamResult(outputStream); 
+                TransformerFactory.newInstance().newTransformer().transform(xmlSource, outputTarget); 
+                is = new ByteArrayInputStream(outputStream.toByteArray()); 
+                return is;
+        }
 }

MDService2/branches/MDService_simple3/src/struts.xml

@@ -205 +205 @@
                 </action>
                 
+                <action name="repository" class="eu.clarin.cmdi.mdservice.action.WorkspaceRepositoryAction" method="execute">
+                           <param name="type">server</param> 
+                    <result type="stream">                         
+                                <!-- <param name="contentType">application/json</param> -->
+                                <param name="contentType">${getActionContentType()}</param>
+                                <param name="inputName">resultStream</param>                            
+                            </result>
+                </action>
+                
                 <action name="virtualcollection/*/*" class="eu.clarin.cmdi.mdservice.action.VirtualCollectionProxyAction" method="publish">              
                            <param name="type">{1}</param>