Changeset 1515

Timestamp:

09/04/11 20:14:15 (13 years ago)

Author:

vronk

Message:

troubles commiting - trying once again (after update):
only package proxy

Location:

MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/proxy

Files:

• BasicProxy.java (added)
• LocalProxy.java (added)
• MDRepoProxy.java (modified) (3 diffs)
• ProxyInterface.java (added)
• RepoProxy.java (modified) (3 diffs)

MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/proxy/MDRepoProxy.java

@@ -70 +70 @@
                  urls.put("model", "?operation=queryModel&q=");
                  urls.put("values", "?operation=scanIndex&q=");
-                 urls.put("recordset", "?operation=searchRetrieve&query=");
+                 urls.put("search", "?operation=searchRetrieve&query=");
                  urls.put("record", "?operation=searchRetrieve&query=");
          } 
  
-          
         /**
          * uses base_url + url_pattern (parametrized by actionkey) to form a url
@@ -82 +81 @@
          @Override
         public URL getTargetRequest() throws IOException {
-        // URL targetURL =new URL( base_url, compname + ".xml");
-                 return getBaseURL();
+        
+                 Query query = new Query(getParam("squery"), getParam("q"),getSourceAction().getActionkey());
+                 
+                 URL targetURL =new URL( getBaseURL(), urls.get(getSourceAction().getActionkey()) + query.toURLParam());
+                 
+                 return targetURL;
                 /*
                 log.debug("MDRPx.getQ:" + getSquery() + " and (" +  getQ() + ")");
                 log.debug("MDRPA.getActionkey:" + getActionkey());              
                 
-                Query query = new Query(getSquery(), getQ(),getActionkey());
+                
 
         // check if the query could get parsed
@@ -114 +117 @@
                  
         }
-
-        @Override
-        public InputStream getSourceStream() throws IOException, NoStylesheetException {
-                
-                /*if (getCommand() == null){
-                        try {
-                                return getSourcePz2();
-                        } catch (Exception e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
-                        }
-                } 
-                        */
-                return super.getSourceStream();
-        }
         
 }

MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/proxy/RepoProxy.java

@@ -45 +45 @@
  *
  */
-public class RepoProxy implements GenericProxy{
+public class RepoProxy extends BasicProxy{
 
         private static final long serialVersionUID = 1L;
         private static Logger log = Logger.getLogger("RepoProxy");
  
-        private String proxy_key = "generic";
+        private String proxy_key = "repo";
                 
         // should perhaps be RepoAction, but it gets complicated with the types
@@ -71 +71 @@
         
         /**
+         * Convenience function to access the request-parameters in the Action  
+         * @param key
+         * @return
+         */
+        public String getParam(String key) {
+                return getSourceAction().getParam(key);
+        }
+        
+        public void checkParams() {
+                // required Params
+                if (getParam("repository")=="") {
+                        getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "repository");
+                }
+        }
+        
+        
+        /**
          * identification of the target-proxy (type)
          * base for finding the right base_url in the props
@@ -81 +98 @@
 
         /**
-         * Override of the basic method provided by the super-class
-         * Reading the repository-uri from the WorkspaceProfile based on the repository-parameter 
+         * Override of the basic method provided by the super-class:
+         * Read the repository-uri from the WorkspaceProfile based on the repository-parameter 
          */