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

Timestamp:

04/01/12 20:33:03 (12 years ago)

Author:

gaba

Message:

workspace actions - new version

File:

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

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

@@ -26 +26 @@
 import eu.clarin.cmdi.mdservice.model.Diagnostic;
 import eu.clarin.cmdi.mdservice.model.Diagnostics;
+import eu.clarin.cmdi.mdservice.model.Repositories;
 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;
 import eu.clarin.cmdi.mdservice.proxy.ProxyInterface;
@@ -50 +51 @@
         private String actionkey = "generic";
         private String q;
-        private String format = "xml";
+        protected String format = "xml";
         
         private String actionContentType;
@@ -127 +128 @@
         }
         
+        public String getUserName(){
+                
+                return null;
+        }
         /**
          * Sets the variable format. Used by Struts in case the format is part of the request path.
@@ -380 +385 @@
                         if (params.get("repository") == null){
                                 if (params.get("x-context") == null){
-                                        addParam("repository",WorkspaceProfile.getRepositoryByIndex(0));
+                                        addParam("repository",Repositories.getRepositories().getRepositoryByIndex(0));
                                 } else {
                                         // search in fcs-mapping
-                                        addParam("repository",WorkspaceProfile.getFCSMapping(params.get("x-context")[0]));
+                                        //addParam("repository",WorkspaceProfile.getFCSMapping(params.get("x-context")[0]));
                                         //addParam("repository",params.get("x-context")[0]);
                                 }
@@ -528 +533 @@
 
         public boolean checkTargetProxy(){
-                if ( getTargetProxy() == null) return false;
                 return true;
         }
@@ -566 +570 @@
                         
                         setTargetProxy();
-                        if (!checkTargetProxy()) return;
+                        if (checkTargetProxy()) {
+                                if (getTargetProxy() == null)   
+                                        return;
+                        }
                         checkParams();
                         
@@ -576 +583 @@
                         log.debug("request_key: " +  req_key); 
                         log.debug("params.size: " +  params.size());
-                        log.debug(getActionkey() + ".targetURL: " + getTargetRequest() + " .format:" + getFullFormat());
+                        if (getTargetRequest() != null){
+                                log.debug(getActionkey() + ".targetURL: " + getTargetRequest() + " .format:" + getFullFormat());
+                        }
                         
                         //Caching
@@ -617 +626 @@
                                 // set URL as srcFile (for MDTransformer to pass to xsl-scripts)
                                 // TODO: WHY??
-                                transformer.setSrcFile(getTargetProxy().getTargetRequest());
+                                transformer.setSrcFile(getTargetRequest());
                                 transformer.setParams(getParams());
                                 // here the transformation is invoked