Changeset 1310 for MDService2/trunk/MDService2/src/eu/clarin

Timestamp:

05/16/11 10:42:30 (13 years ago)

Author:

gaba

Message:

virtualcollection publish

Location:

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action

Files:

• VirtualCollectionProxyAction.java (modified) (4 diffs)
• WorkspaceAction.java (modified) (7 diffs)

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/VirtualCollectionProxyAction.java

@@ -4 +4 @@
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -16 +20 @@
 import java.util.Date;
 import java.util.HashMap;
+
+import org.w3c.dom.NodeList;
 
 import net.sf.json.JSONObject;
@@ -71 +77 @@
             }
             if (getQid() != null){
-                        hm.put("queryid", getFullFormat());
+                        hm.put("queryid", getQid());
             }
         
@@ -78 +84 @@
         }
         public String publish() throws Exception {
-                // find the filename
-                //WorkspaceAction wadmin = new WorkspaceAction();
-                //wadmin.setType(WorkspaceAction.ADMIN);
-                //String workspace_filename = "";
                 
-                // find the querydata
-                //WorkspaceAction wa = new WorkspaceAction();
-                //wa.setType(WorkspaceAction.FILENAME);
-                //wa.setWorkspace_filename(workspace_filename);
-                InputStream is = new BufferedInputStream( new FileInputStream(getPath()));
+                // find the workspace data
+                NodeList list = (NodeList) getWorkspace(); 
+        InputStream is = this.DocumentToStream(list.item(0));
                 //xslt transform to request data
                 MDTransformer transformer = new MDTransformer();
                 transformer.setSrcFile(getTargetRequest());
                 transformer.setParams(createTransformerParams());
-                InputStream resultStream = transformer.transformXML(is);
+                InputStream requestStream = transformer.transformXML(is);
                 
-                //post to wcr
-                // Send the request
-        URL url = new URL("http://clarin.ids-mannheim.de/vcr");
-        URLConnection conn = url.openConnection();
+                java.io.Writer writer = new java.io.StringWriter(); 
+                char[] buffer = new char[1024];             
+                
+                java.io.Reader reader = new BufferedReader(                         
+                new InputStreamReader(requestStream, "UTF-8"));                 
+                int n;                 
+                while ((n = reader.read(buffer)) != -1) {                     
+                        writer.write(buffer, 0, n); 
+                } 
+        
+                //create connection and post request data
+                
+        URL url = new URL("http://clarin.ids-mannheim.de/vcr/service/virtualcollection");
+        String charset = "UTF-8"; 
+        URLConnection urlconn = url.openConnection();
+        HttpURLConnection conn = (HttpURLConnection) urlconn;
+        conn.setDoOutput(true);
+        conn.setDoInput(true); 
+        conn.setRequestMethod("POST");
         String encoding = new sun.misc.BASE64Encoder().encode("test1@ids-mannheim.de:test1234".getBytes());
-        conn.setRequestProperty ("Authorization", "Basic " + encoding);
-        System.setProperty("http.agent", ""); 
-        conn.setDoOutput(true);
-        OutputStreamWriter writer = new OutputStreamWriter(conn.getOutputStream());
+        conn.setRequestProperty("Authorization", "Basic " + encoding);
+        conn.setRequestProperty("Content-Type", "text/xml;charset=" + charset);//; charset=utf-8");
+        conn.setRequestProperty("Accept-Charset", charset); 
+        //System.setProperty("http.keepAlive", "false");
+        //conn.setRequestMethod("GET");
+        //conn("Expect", "100-continue"); 
+        //System.setProperty("http.agent", "");
         
-                //write parameters
-        writer.write(resultStream.toString());
-        writer.flush();
+        OutputStreamWriter out = new OutputStreamWriter(
+                                  conn.getOutputStream());
+        out.write(writer.toString());
+        out.flush();
+        out.close();
+        
+        InputStream responseStream; 
+                
+        Integer respCode = conn.getResponseCode();
+        if (respCode == 200 || respCode == 201) {  
+                    responseStream = conn.getInputStream(); 
+                    //conn.getContent();
+        } else {    
+                        responseStream = conn.getErrorStream(); 
+        } 
+                  
+        setResultStream(responseStream);
         
-        // Get the response
-        //StringBuffer answer = new StringBuffer();
-        //BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-        //String line;
-        //while ((line = reader.readLine()) != null) {
-        //    answer.append(line);
-        //}
-        writer.close();
-        //reader.close();
-
-                //answer.toString();
-                
                 return SUCCESS;
         }

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java

@@ -111 +111 @@
         
         private static WorkspaceAction singleton;
-        private String workspacefile; 
+        private static String workspacefilename;
+        private static Document workspace_doc;
+        
         //private String workspaceindex_path;
         //private static Integer querycounter;
         private static final Integer start_query = 1;
         
-        private static Document workspace_doc;
+        
         
         //private HttpServletRequest request; 
@@ -152 +154 @@
         }
 
-        
-        
         public WorkspaceAction () {             
-                workspacefile = Admin.getConfig().getProperty("workspace.path") + Admin.getConfig().getProperty("workspace.file");
-                //querycounter =
-                if (singleton == null){
+                workspacefilename = Admin.getConfig().getProperty("workspaceprofile.path") + Admin.getConfig().getProperty("workspace.file");
+                if (workspace_doc == null){
+                        //workspacefilename = Admin.getConfig().getProperty("workspace.path") + Admin.getConfig().getProperty("workspace.file");
                         initDocument();
-                        singleton = this;
-                }
-
-                
+                }
         }
         
@@ -638 +635 @@
                         expr = xpath.compile(getWorkspaceXPathExpression());
                         //expression is evaluated with respect to a certain context node which is doc.
-                Object result = expr.evaluate(workspace_doc, XPathConstants.NODESET);
+                        Object result = null;
+                        try{
+                        result = expr.evaluate(workspace_doc, XPathConstants.NODESET);
+                        } catch(Exception e){
+                                
+                        }
+
              return result;
         }
@@ -672 +675 @@
         }
 
+        
+        
 public void initDocument() {
-                
-                Integer counter = start_query;
-                boolean init=false;
-                String fname = getPath();//workspacefile;
-                File f = new File (fname);
-                
-                if (!f.exists()) {
+        
+        boolean init=false;
+        Integer counter = start_query;
+        //String fname = getPath();//workspacefile;
+        File f = new File (workspacefilename);
+                
+        if (!f.exists()) {
                                 // create new  counter document
                                 DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
@@ -693 +698 @@
                                         root.appendChild(e);
                                         e = workspace_doc.createElement("maxqid");
-                                        e.setNodeValue(counter.toString());//setAttribute("id", c.toString());
+                                        e.setNodeValue(counter.toString());
+                                        e = workspace_doc.createElement("WorkspaceProfiles");
+                                        root.appendChild(e);
+
                                         //updateQuerycounter();
                                         this.saveDocument();
@@ -711 +719 @@
                                         docBuilder = docFactory.newDocumentBuilder();               
                                         try {
-                                                        workspace_doc = docBuilder.parse(fname);
+                                                        workspace_doc = docBuilder.parse(workspacefilename);
                                         } catch (SAXException e) {
                                                         // TODO Auto-generated catch block
@@ -764 +772 @@
                         String xmlString = result.getWriter().toString();
 
-                        File f = new File (getPath());//workspacefile);
+                        File f = new File (workspacefilename);
                         FileWriter fw;
                         try {