Changeset 860 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action

Timestamp:

11/08/10 21:30:02 (14 years ago)

Author:

gaba

Message:

 

Location:

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

Files:

• CollectionProxyAction.java (modified) (1 diff)
• GenericProxyAction.java (modified) (9 diffs)
• MDRepoProxyAction.java (modified) (1 diff)
• TermsProxyAction.java (modified) (1 diff)
• WorkspaceAction.java (modified) (12 diffs)

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

@@ -44 +44 @@
                 if (base_url == null) {
                         //base_url = new URL(Admin.getConfig().getProperty(getProxyKey() + ".uri"));
-                        base_url = new URL(getRepository());
+                        base_url = new URL(getRepositoryPath());
                                                 //Admin.notifyUser("TEST-URLnew:" + base_url.toString());
                         

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

@@ -1 +1 @@
 package eu.clarin.cmdi.mdservice.action;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
@@ -8 +13 @@
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.xml.transform.TransformerException;
+
+import net.sf.json.JSON;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import net.sf.json.JSONSerializer;
+
+
 import org.apache.struts2.interceptor.ServletRequestAware;
 
@@ -26 +40 @@
         private static final long serialVersionUID = 1L;
         
+        private static JSONArray repositories = null;
         /** 
          * Properties to be filled by Struts with according request-parameters
@@ -41 +56 @@
         private String format;
         private String userMsg;
-        private String repository;
+        private int repository;
         //private Map<String,Object> session;
          private HttpServletRequest request; 
@@ -116 +131 @@
         }
         
-        public void setRepository(String repository) {
+        public void setRepository(int repository) {
                 this.repository = repository;
         }
         
-        public String getRepository() {
+        public int getRepository() {
                 return repository;
         }
@@ -211 +226 @@
 */
         
+        public JSONArray getRepositories(){
+                return repositories;
+        }
+        
+        public void setRepositories(JSONArray rep){
+                this.repositories = rep;
+        }
+        
         protected URL base_url ;
         
@@ -284 +307 @@
                                 key +="//-" ;
                         }
-                        if (getRepository()!=null) {
-                                key += getRepository()  + "//-";
-                        }else{
-                                key +="//-" ;
-                        }
-                        
+                        
+                        key += getRepository()  + "//-";
                         key += getMaxdepth()  + "//-";
                         
@@ -303 +322 @@
         }
         
+        public  static String convertStreamToString(InputStream is) {  
+                
+                BufferedReader reader = new BufferedReader(new InputStreamReader(is));  
+                StringBuilder sb = new StringBuilder();  
+                String line = null;  
+                
+                try {
+                        while ((line = reader.readLine()) != null) {  
+                                         sb.append(line + "\n");  
+                        }
+                } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }  finally {
+                        try {
+                                is.close();
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                        try {
+                                is.reset();
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+                  
+                
+                return sb.toString();  
+        }
+
+        
+        public static JSONArray createRepositories() throws IOException, InterruptedException, TransformerException{
+                String path = Admin.getConfig().getProperty("workspaceprofile.path") + WorkspaceAction.PROFILENAME_SERVER;
+                File file=new File(path);
+                InputStream in  = new BufferedInputStream( new FileInputStream(path));;
+                
+                MDTransformer.getMDTransformer().setSrcFile(file.toURL());
+                InputStream jsonstream = MDTransformer.getMDTransformer().transformXML(in, "xml2json");
+                
+                JSONObject json = JSONObject.fromObject(convertStreamToString(jsonstream));
+                JSONArray array = json.getJSONObject("WorkspaceProfile").getJSONArray("Repositories");  
+                
+                // repository as static variable
+                return array;
+        
+                // repository as session attribute
+                /*
+                HttpSession session = getServletRequest().getSession();
+                //JSONArray param = (JSONArray) session.getAttribute("repositories");
+                JSONArray param = new JSONArray();
+        param.add(array);
+        session.setAttribute("repositories", param);
+                 */
+        }
+        
+        
+        public String getRepositoryPath(){
+                String repository_path = null;
+                
+                
+                if (repositories == null ) {
+                        try {
+                                setRepositories(GenericProxyAction.createRepositories());
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        } catch (InterruptedException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        } catch (TransformerException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+                // static repositories
+                net.sf.json.JSONArray json = getRepositories(); 
+                for(int i=0;i<json.size();i++){
+                        if (json.getJSONObject(i).getInt("id") == getRepository()){
+                                repository_path =  json.getJSONObject(i).getString("uri");
+                        }
+                }
+                //Admin.notifyUser("REPOSITORY_PATH:" + repository_path);
+                
+                //session repositories
+                /*
+                HttpSession session = getServletRequest().getSession();
+                json = (net.sf.json.JSONArray) session.getAttribute("repositories");
+                for(int i=0;i<json.size();i++){
+                        if (json.getJSONObject(i).getInt("id") == getRepository()){
+                                repository_path =  json.getJSONObject(i).getString("uri");
+                        }
+                }
+                Admin.notifyUser("REPOSITORY_PATH-SESSIONATTR:" + repository_path);
+                */
+                return repository_path;
+                
+        }
         
         public void prepare() throws Exception {                
@@ -339 +457 @@
                         // set URL as srcFile (for MDTransformer to pass to xsl-scripts) 
                         MDTransformer.getMDTransformer().setSrcFile(getTargetRequest());
-                        // getColumns
-                        resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),getRepository());
+                        resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),getRepositoryPath());
                 }
                         

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

@@ -55 +55 @@
         public String getBaseURI() {            
                 Admin.notifyUser("MDREPO-property:" + Admin.getConfig().getProperty(getProxyKey() + ".uri"));
-                Admin.notifyUser("MDREPO-profile:" + getRepository());
-                String uri = getRepository();//Admin.getConfig().getProperty(getProxyKey() + ".uri");           
+                Admin.notifyUser("MDREPO-profile:" + getRepositoryPath());
+                String uri = getRepositoryPath();//Admin.getConfig().getProperty(getProxyKey() + ".uri");               
                 return uri;
         }

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

@@ -125 +125 @@
                         InputStream resultStream=null;
                         try {
-                                resultStream = MDTransformer.getMDTransformer().transformXML(stream_matrix_all, "terms2extract", getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(), getRepository());
+                                resultStream = MDTransformer.getMDTransformer().transformXML(stream_matrix_all, "terms2extract", getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(), getRepositoryPath());
                         } catch (InterruptedException e) {                              
                                 Admin.notifyUser("TPA.getSourceStream(): "+ e.getMessage());

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

@@ -7 +7 @@
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.Writer;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -19 +22 @@
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -33 +37 @@
 
 import net.sf.json.JSON;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 import net.sf.json.JSONSerializer;
 import net.sf.json.xml.XMLSerializer;
@@ -58 +64 @@
  */
 public class WorkspaceAction extends GenericProxyAction 
-implements ServletRequestAware 
+//implements ServletRequestAware 
 {
 
@@ -66 +72 @@
         public static String SERVER = "server";
         
+        public static String PROFILENAME_BASE = "WorkspaceProfile_";
+        public static String PROFILENAME_SERVER = "WorkspaceProfileServer.xml";
+        public static String PROFILENAME_DEFAULT = PROFILENAME_BASE + "default.xml";
         /** 
          * Properties to be filled by Struts with according request-parameters
@@ -76 +85 @@
         private String base_path;
         
-        private HttpServletRequest request; 
+        //private HttpServletRequest request; 
         
         public String getData(){
@@ -120 +129 @@
         }
 
+        /*
         @Override
         public void setServletRequest(HttpServletRequest arg0) {
@@ -130 +140 @@
                 return request;         
         }
-
+*/
         /*
         public String getUserMsg() {
@@ -186 +196 @@
                 if (type.toLowerCase().equals(USER)) {
                         if (getServletRequest().getRemoteUser() != null) {
-                                profilename =  "WorkspaceProfile_" + getServletRequest().getRemoteUser() + ".xml";
+                                profilename =  PROFILENAME_BASE + getServletRequest().getRemoteUser() + ".xml";
                         } else {
-                                profilename = "WorkspaceProfile_default.xml";
+                                profilename = PROFILENAME_DEFAULT;
                         }
                 } else if (type.toLowerCase().equals(SERVER)) {
-                        profilename =  "WorkspaceProfileServer.xml";
+                        profilename =  PROFILENAME_SERVER;
+                        /*
                         File f = new File(getBasePath() + profilename);
                         if (! f.exists()){
@@ -197 +208 @@
                                 profilename = "WorkspaceProfile_default.xml";
                         }
+                        */
                 }
                 
                 if (profilename == null){
-                        profilename = "WorkspaceProfile_default.xml";
+                        profilename = PROFILENAME_DEFAULT;
                         Admin.notifyUser("WorkspaceProfilePath not specified (USER, SERVER)!");
                 }
@@ -240 +252 @@
         }
         
+        // set the server - session data =  repositories, termsets
+        public void setSessionData(InputStream source) throws IOException {
+                if (source == null) return;
+                if (this.getWorkspaceProfile() != PROFILENAME_SERVER) return;
+                
+                
+                        
+        }
+        
+        
         @Override
         public void prepare() throws Exception {                
@@ -252 +274 @@
                         MDTransformer.getMDTransformer().setSrcFile(getURL());
                         setResultStream(MDTransformer.getMDTransformer().transformXML(in, getFullFormat()));
+                        //setSessionData(getResultStream());
                 }