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

Timestamp:

09/19/11 10:39:55 (13 years ago)

Author:

gaba

Message:

Utils.java in place of Helpers and Admin
Diagnostics changes in GenericAction?
code arrangement, comments

File:

• MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java (modified) (14 diffs)

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

@@ -3 +3 @@
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -21 +20 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
@@ -49 +46 @@
 import org.xml.sax.SAXException;
 
-import eu.clarin.cmdi.mdservice.internal.Admin;
-import eu.clarin.cmdi.mdservice.internal.Helpers;
+import eu.clarin.cmdi.mdservice.internal.Utils;
 import eu.clarin.cmdi.mdservice.internal.MDTransformer;
 import eu.clarin.cmdi.mdservice.model.Diagnostic;
@@ -164 +160 @@
         public WorkspaceAction () {     
                 this.elementtype = WorkspaceAction.SE_WORKSPACE;
-                workspacefilename = Admin.getConfig().getProperty("workspaceprofile.path") + Admin.getConfig().getProperty("workspace.file");
+                workspacefilename = Utils.getConfig().getProperty("workspaceprofile.path") + Utils.getConfig().getProperty("workspace.file");
                 if (workspace_doc == null){
-                        //workspacefilename = Admin.getConfig().getProperty("workspace.path") + Admin.getConfig().getProperty("workspace.file");
+                        //workspacefilename = Utils.getConfig().getProperty("workspace.path") + Utils.getConfig().getProperty("workspace.file");
                         initDocument();
                 }
@@ -228 +224 @@
         public String getBasePath() {           
                 if (base_path == null) {
-                        base_path = Admin.getConfig().getProperty(getProxyKey() + ".path");
+                        base_path = Utils.getConfig().getProperty(getProxyKey() + ".path");
                 }
                 return base_path;
@@ -248 +244 @@
                         File f = new File(getBasePath() + profilename);
                         if (! f.exists()){
-                                //Admin.notifyUser(" not exists");
+                                //log.debug(" not exists");
                                 profilename = "WorkspaceProfile_default.xml";
                         }
@@ -260 +256 @@
                 if (profilename == null){
                         profilename = PROFILENAME_DEFAULT;
-                        Admin.notifyUser("WorkspaceProfilePath not specified (USER, SERVER)!");
-                }
-                
-                Admin.notifyUser("WorkspaceProfilename : " + profilename);
+                        log.debug("WorkspaceProfilePath not specified (USER, SERVER)!");
+                }
+                
+                log.debug("WorkspaceProfilename : " + profilename);
                 return profilename;
         }
@@ -277 +273 @@
             try{
                     url=file.toURI().toURL(); 
-                    //Admin.notifyUser("url "  + url);
+                    //log.debug("url "  + url);
             } catch (MalformedURLException e){
-                //Admin.notifyUser("" + e);
+                //log.debug("" + e);
             }
                 return url;
@@ -308 +304 @@
         }
         
-        /*
-        @Override
-        public void prepare() throws Exception {                
-                
-                //Admin.notifyUser("execute:");
-                InputStream in = getSourceStream();
-                this.setSourceStream(in); 
-                if (getFormat().equals("xml")) {                        
-                        setResultStream(in);    
-                }else { //JSON
-                        // set srcFile (for MDTransformer to pass to xsl-scripts) 
-                        MDTransformer transformer = new MDTransformer();
-                        transformer.setSrcFile(getURL());
-                        transformer.setParams(MDTransformer.createParamsMap(getFullFormat()));
-                        setResultStream(transformer.transformXML(in));//, getFullFormat()));
-                        //setSessionData(getResultStream());
-                }
-                        
-                Admin.notifyUser(getProxyKey() + " success:" + (getResultStream()!=null));
-        }
-
-        public void changeNodeName(Document doc, Node node, String new_name){
-                // Create an element with the new name 
-                Node node2 = (Node ) doc.createElement(new_name); 
-                // Copy the attributes to the new element NamedNodeMap attrs = element.getAttributes(); for (int i=0; i<attrs.getLength(); i++) { Attr attr2 = (Attr)doc.importNode(attrs.item(i), true); element2.getAttributes().setNamedItem(attr2); } 
-                // Move all the children 
-                while (node.hasChildNodes()) { node2.appendChild(node.getFirstChild()); } 
-                // Replace the old node with the new node
-                Admin.notifyUser("replace:" + node2.getNodeName() + "," + node.getNodeName());
-                node.getParentNode().replaceChild(node2, node); 
-        }
-
-        public void administrateQid() throws IOException, SAXException, ParserConfigurationException, TransformerException{
-                WorkspaceAction wa = new WorkspaceAction();
-                wa.setType("Admin");
-                
-                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder builder;
-
-                builder = factory.newDocumentBuilder();
-                Document  document = builder.parse(wa.getSourceStream());
-                // find user-filename-id or create one
-                //add qid
-                //NodeList list = document.getElementsByTagName("e");
-                //Admin.notifyUser("list:" + list.getLength());
-
-                // save the changes
-                Transformer transformer;
-                transformer = TransformerFactory.newInstance().newTransformer();
-                transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-                StreamResult result = new StreamResult(new StringWriter());
-                DOMSource source = new DOMSource(document);
-                transformer.transform(source, result);
-                String xmlString = result.getWriter().toString();
-                InputStream is_xml = new ByteArrayInputStream( xmlString.getBytes( ) );
-                Admin.writeToFile(wa.getPath(), is_xml);
-                //wa.save();
-        }
-        
-        public String save() throws IOException, SAXException, ParserConfigurationException, TransformerException {
-                
-        String jsonData = getData();
-              
-        Admin.notifyUser("JSON data:"+jsonData);
-        if ((!this.getType().equals(ADMIN)) && this.getQid() != null) {
-                        administrateQid();
-                } 
-        
-        XMLSerializer serializer = new XMLSerializer();
-                JSON json = JSONSerializer.toJSON( jsonData );
-                if (this.getType().equals(ADMIN)){
-                        serializer.setRootName("Admin");
-                } else {
-                        serializer.setRootName("WorkspaceProfile");     
-                }
-                serializer.setElementName("item");
-        serializer.setTypeHintsEnabled(false); 
-        String xml = serializer.write( json );
-        Admin.notifyUser("XML:" + xml);
-        
-        InputStream is_xml = new ByteArrayInputStream( xml.getBytes( ) );
-        
-        Admin.writeToFile(getPath(), is_xml);
-   
-        String ret = "1";
-                this.setResultStream( new ByteArrayInputStream(ret.getBytes()));
-                                
-
-                return SUCCESS;
-        }
-*/
+        
         public void changeQueryId(Document doc, String from_id, String to_id) throws XPathExpressionException{
                 InputStream is = null;
@@ -692 +598 @@
         serializer.setTypeHintsEnabled(false); 
         String xml = serializer.write( json );
-        //Admin.notifyUser("XML:" + xml);
+        //log.debug("XML:" + xml);
         InputStream is_xml = new ByteArrayInputStream( xml.getBytes( ) );
         // add to document
-        //Admin.writeToFile(getPath(), is_xml);
+        //Utils.writeToFile(getPath(), is_xml);
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder = factory.newDocumentBuilder();
@@ -970 +876 @@
                 }
                 // nodelistto stream
-                InputStream is = Helpers.DocumentToStream(list.item(0));
+                InputStream is = Utils.document2Stream(list.item(0));
                 this.setSourceStream(is);     
                 
@@ -1022 +928 @@
                                         this.saveDocument();
                                         
-                                        //Admin.notifyUser("new document");
+                                        //log.debug("new document");
                                 } catch (ParserConfigurationException e) {
                                         // TODO Auto-generated catch block
@@ -1051 +957 @@
                          init = true;
                     }  catch (IOException ex){
-                        //Admin.notifyUser("initCacheCounter:" + ex.toString());
+                        //log.debug("initCacheCounter:" + ex.toString());
                         ex.printStackTrace();
                     }
@@ -1070 +976 @@
                 //workspace_doc.getFirstChild().getAttributes().getNamedItem("idcounter").setNodeValue(i.toString());
                 
-                //Admin.notifyUser("writeCacheCounter:" + i.toString());
+                //log.debug("writeCacheCounter:" + i.toString());
                 // write xml
                 Transformer transformer;