Changeset 1496 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/SRUProxyAction.java

Timestamp:

08/26/11 20:40:35 (13 years ago)

Author:

gaba

Message:

repoaction created ,
options + repositories moved to workspaceprofile

File:

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

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

@@ -51 +51 @@
 import eu.clarin.cmdi.mdservice.model.Diagnostic;
 import eu.clarin.cmdi.mdservice.model.Diagnostics;
+import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;
 
 
@@ -79 +80 @@
         private String x_cmd_repository;
         private String x_cmd_collections;
+        private Set paramSet;
 
         private MDRepoProxyAction mdrepoproxyaction;
@@ -88 +90 @@
         private static int OP_EXPLAIN = 2;
         private static int OP_SCAN = 3;
+        
         
         //TODO cache after analysis
@@ -120 +123 @@
                  this.startRecord = 1;
                  this.maximumRecords = 50;
+                 
+                 if (getServletRequest() != null){
+                         this.setX_cmd_repository(getServletRequest().getParameter("x-cmd-repository"));
+                         this.setRepository(this.getX_cmd_repository());
+                         paramSet = getServletRequest().getParameterMap().entrySet();                    
+                 }
+                 
+                //TODO xsl usage according particular repositories ?
+                 this.setActionkey("sru");
          }
          
@@ -285 +297 @@
         @Override
         public String getBaseURI() {            
-                Admin.notifyUser("SRU-repositorypath:" + getRepositoryPath());
-                String uri = getRepositoryPath();//Admin.getConfig().getProperty(getProxyKey() + ".uri");               
+                Admin.notifyUser("SRU-repositorypath:" + WorkspaceProfile.getRepositoryPath(getRepository()));
+                String uri = WorkspaceProfile.getRepositoryPath(getRepository());//Admin.getConfig().getProperty(getProxyKey() + ".uri");               
                 return uri;
         }
@@ -358 +370 @@
                                                         if (this.scanClause.equals("cmd.Repository")){
                                                                 XMLSerializer xmlserializer = new XMLSerializer();
-                                                                String xml = xmlserializer.write( mdrepoproxyaction.getRepositories() );  
+                                                                String xml = xmlserializer.write( WorkspaceProfile.getRepositories());//mdrepoproxyaction.getRepositories() );  
                                                                 this.setResultStream(new ByteArrayInputStream(xml.getBytes("UTF-8"))); 
 
@@ -498 +510 @@
         }
         
+        //TODO create query + query.toURLParams ?
+        public String createURLParams(){
+                String params = "";
+                
+                //TODO params
+                if (paramSet == null){
+                        if (!(operation == null)){
+                                params = params + "operation=" + operation;
+                        }
+                        if (!(version == null)){
+                                params = params + "&version=" + version;
+                        }
+                        if (!(query == null)){
+                                params = params + "&query=" + query;
+                        }
+                        if (getStartRecord() > 0){
+                                params = params + "&startRecord=" + String.valueOf(getStartRecord());
+                        }
+                        if (getMaximumRecords()> 0){
+                                params = params + "&numRecords=" + String.valueOf(getMaximumRecords());
+                        }
+                } else {
+                        Iterator i = paramSet.iterator();
+                        params = "";
+                    while(i.hasNext()){
+                              Map.Entry me = (Map.Entry)i.next();
+                              if (!(me.getKey().equals("x-cmd-repository") || me.getKey().equals("x-cmd-collections"))){
+                                      params = params + "&" + me.getKey() + "=" + ((String[])me.getValue())[0];  
+                              }
+                        }
+                    params = params.substring(1);
+
+                }
+
+                return params;
+        }
         @Override
         public URL getTargetRequest() throws IOException {
@@ -508 +556 @@
                         requestURI = this.getBaseURI();
                 }
-                //TODO params
-                Set set = getServletRequest().getParameterMap().entrySet();
-                Iterator i = set.iterator();
-                String params = "";
-            while(i.hasNext()){
-                      Map.Entry me = (Map.Entry)i.next();
-                      if (!(me.getKey().equals("x-cmd-repository") || me.getKey().equals("x-cmd-collections"))){
-                              params = params + "&" + me.getKey() + "=" + ((String[])me.getValue())[0];  
-                      }
-                }
-            params = params.substring(1);
-            targetURL = new URL(requestURI + "?" + params);
+            
+            targetURL = new URL(requestURI + "?" + createURLParams());
                 return targetURL;
         }
@@ -525 +563 @@
         @Override 
         public void prepare() throws Exception{
-                this.setX_cmd_repository(getServletRequest().getParameter("x-cmd-repository"));
-                this.setRepository(this.getX_cmd_repository());
+                //this.setX_cmd_repository(getServletRequest().getParameter("x-cmd-repository"));
+                //this.setRepository(this.getX_cmd_repository());
                 //TODO xsl usage according particular repositories ?
-                this.setActionkey("sru");
+                //this.setActionkey("sru");
                 //this.setFormat("xml");
                 
                 //extern SRU repository
-                if (this.isSRURepository() || this.getBaseURI() == null){
+                if (WorkspaceProfile.isSRURepository(getRepository()) || this.getBaseURI() == null){
                         super.prepare();
                 }