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

Timestamp:

09/27/10 11:27:07 (14 years ago)

Author:

gaba

Message:

 

File:

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

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

@@ -12 +12 @@
 import java.io.StringReader;
 import java.io.StringWriter;
+
+import javax.servlet.http.HttpServletRequest;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -29 +31 @@
 import net.sf.json.xml.XMLSerializer;
 
+import org.apache.struts2.interceptor.ServletRequestAware;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -43 +46 @@
  *
  */
-public class WorkspaceAction extends ActionSupport 
+public class WorkspaceAction extends GenericProxyAction 
+//implements ServletRequestAware 
 {
 
         private static final long serialVersionUID = 1L;
+        
+        public static String USER = "user";
+        public static String SERVER = "server";
         
         /** 
          * Properties to be filled by Struts with according request-parameters
          */     
-        private String actionkey;
+        //private String actionkey;
         private String data;
-        private String id;
-        private String format;
-        private String userMsg;
-        
+        private String type;
+        //private String format;
+        //private String userMsg;
         private String base_path;
         
+        //private HttpServletRequest request; 
+         
         public String getData() {
                 return data;
@@ -67 +75 @@
         }
 
-        public String getID() {
-                return id;
-        }
-
-        public void setID(String _id) {
-                this.id = _id;
-        }
-        
+        public String getType() {
+                return type;
+        }
+
+        public void setType(String type) {
+                this.type = type;
+        }
+        /*
         public String getFormat() {
                 return format;
@@ -90 +98 @@
                 actionkey = actionKey;
         }
-
+*/
         /**
          * primitive identification of the target-proxy
@@ -100 +108 @@
                 return "workspaceprofile";
         }
-        
+        /*
         public String getUserMsg() {
                 return userMsg;
@@ -109 +117 @@
         }
 
+        @Override
+        public void setServletRequest(HttpServletRequest arg0) {
+                request = arg0;
+                
+        }
 
         private InputStream resultStream;
         private InputStream sourceStream;
-
+*/
         /**
          * The stream holding the resulting data to be sent back to the user as response
          * @return
          */
+        /*
         public InputStream getResultStream() {
                 return resultStream;
@@ -126 +140 @@
                 sourceStream = _sourceStream;
         }
-        
-        
+        */
+        @Override
         public URL getBaseURL() {
                 File file=new File(getPath());
@@ -147 +161 @@
                 return base_path;
         }
-        //TODO identification of WOrkspaceProfile (user, name, id)
+        
+        
         public String getWorkspaceProfile() {
-                return "WorkspaceProfile.xml";
-        }
-        
+                String profilename = null;
+                
+                Admin.notifyUser("QQQremoteUSER:" + type.toLowerCase());
+                Admin.notifyUser("QQQremoteUSER:" + USER);
+                Admin.notifyUser("QQQremoteUSER:" + getServletRequest().getRemoteUser());
+                if (type.toLowerCase().equals(USER)) {
+                        Admin.notifyUser("WWWaaaremoteUSER:" + getServletRequest().getRemoteUser());
+                        if (getServletRequest().getRemoteUser() != null) {
+                                Admin.notifyUser("WWWremoteUSER:" + getServletRequest().getRemoteUser());
+                                profilename =  "WorkspaceProfile_" + getServletRequest().getRemoteUser() + ".xml";
+                        } else {
+                                profilename = "WorkspaceProfile_default.xml";
+                        }
+                } else if (type.toLowerCase().equals(SERVER)) {
+                        profilename =  "WorkspaceProfileServer.xml";
+                        File f = new File(profilename);
+                        if (! f.exists()){
+                                profilename = "WorkspaceProfile_default.xml";
+                        }
+                }
+                
+                if (profilename == null){
+                        profilename = "WorkspaceProfile_default.xml";
+                        Admin.notifyUser("WorkspaceProfilePath not specified (USER, SERVER)!");
+                }
+                
+                Admin.notifyUser("WorkspaceProfilename : " + profilename);
+                return profilename;
+        }
+        
+        @Override
         public String getFullFormat() {
                 return "xml2json";
@@ -171 +214 @@
         public String getPath() {
                 String targetPath = getBasePath() + getWorkspaceProfile();         
-        Admin.notifyUser(targetPath);              
+        Admin.notifyUser("WorkspaceAction TARGETPATH: " + targetPath);              
         return targetPath;
         }
 
+        @Override
         public InputStream getSourceStream() throws IOException {       
                 InputStream stream = new BufferedInputStream( new FileInputStream(getPath()));
@@ -182 +226 @@
         }
         
+        @Override
         public void prepare() throws Exception {                
                 
                 //Admin.notifyUser("execute:");
-                sourceStream = getSourceStream(); 
-                if (format.equals("xml")) {                     
-                        resultStream = sourceStream;    
+                InputStream in = getSourceStream();
+                this.setSourceStream(in); 
+                if (getFormat().equals("xml")) {                        
+                        setResultStream(in);    
                 }else { //JSON
                         // set srcFile (for MDTransformer to pass to xsl-scripts) 
                         MDTransformer.getMDTransformer().setSrcFile(getURL());
-                        resultStream =  MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat());
+                        setResultStream(MDTransformer.getMDTransformer().transformXML(in, getFullFormat()));
                 }
                         
-                Admin.notifyUser(getProxyKey() + " success:" + (resultStream!=null));
+                Admin.notifyUser(getProxyKey() + " success:" + (getResultStream()!=null));
         }
 
@@ -318 +364 @@
         
         InputStream is_xml = new ByteArrayInputStream( xml.getBytes( ) );
+        
         Admin.writeToFile(getPath(), is_xml);
    
         String ret = "1";
-                resultStream = new ByteArrayInputStream(ret.getBytes());
+                this.setResultStream( new ByteArrayInputStream(ret.getBytes()));
                                 
 
@@ -330 +377 @@
          * default Action method
          */
+        /*
         public String execute() throws Exception {
                 
@@ -339 +387 @@
                 }               
         }
-        
+        */