Changeset 1628

Timestamp:

11/25/11 11:53:28 (12 years ago)

Author:

gaba

Message:

 

Location:

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice

Files:

• action/GenericAction.java (modified) (1 diff)
• action/RepoAction.java (modified) (2 diffs)
• action/SRUAction.java (modified) (2 diffs)
• proxy/BasicProxy.java (modified) (3 diffs)
• proxy/LocalProxy.java (modified) (1 diff)
• proxy/MDRepoProxy.java (modified) (3 diffs)
• proxy/RepoProxy.java (modified) (1 diff)

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

@@ -339 +339 @@
         
         protected void setDefaultParams(){
-                
+                //q=query       
+                
+        
+                if (getQ() != null) {
+                        addParam("q",getQ());
+                        addParam("query",getQ());
+                } else {
+                        addParam("q",this.getParam("query"));
+                }
+                
+                if (this.format != null) {
+                        addParam("format",this.format);
+                } 
+        
+                if (getParams().get("repository") == null){
+                        addParam("repository",WorkspaceProfile.getRepositoryByIndex(0));
+                } 
         }
         /**

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

@@ -40 +40 @@
         }
 
+        /*
         @Override
         protected void setDefaultParams() {     
-                //q=query                       
-                if (getQ() != null) {
-                        addParam("q",getQ());
-                        addParam("query",getQ());
-                } else {
-                        addParam("q",this.getParam("query"));
-                }
+                
                 
                 // set defaults
@@ -120 +115 @@
 
                 addParam("fullformat",getFullFormat());
-                */
+                
         }
+*/
         /**
          * Based on the repository type - we create a typed Proxy, that will do the work.

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

@@ -106 +106 @@
                 return "";
         }
-
+/*
         @Override
         protected void setDefaultParams() {             
@@ -178 +178 @@
 
                 addParam("fullformat",getFullFormat());
-                */
-        }
+                
+        }
+*/
         /* 
         public void prepareOperation() throws UnsupportedEncodingException{

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/BasicProxy.java

@@ -13 +13 @@
 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;
 import eu.clarin.cmdi.mdservice.internal.Utils;
+import eu.clarin.cmdi.mdservice.model.Diagnostic;
+import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;
 
 
@@ -46 +48 @@
         }
         
+        public void addParam (String key, String value){
+                 getSourceAction().addParam(key, value);
+         }
+        
         public Map<String,String[]> getParams() {
                 return getSourceAction().getParams();
@@ -60 +66 @@
         
         public void checkParams() {
-                // required Params      
+                // required Params
+
+                if (getParam("q").equals("")) {
+                        getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "q");
+                }
+                if (getParams().get("format") == null){
+                        if (getSourceAction().getFormat() == null) {
+                                addParam("format","xml");
+                        } else if (getSourceAction().getFormat().equals("")){
+                                addParam("format","xml");
+                        } else {
+                                addParam("format",getSourceAction().getFormat());
+                        }
+                } 
+                // moved into action - needed for creation  proxy 
+                /*if (getParams().get("repository") == null){
+                        addParam("repository",WorkspaceProfile.getRepositoryByIndex(0));
+                } 
+                */
+                addParam("fullformat",getSourceAction().getFullFormat());
         }
         

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/LocalProxy.java

@@ -26 +26 @@
         private String proxy_key = "local";
 
-        public void checkParams() {
-                // required Params
-                if (getParam("q")=="") {
-                        getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "q");
-                }
-        }
         
         /**

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

@@ -75 +75 @@
  
          
-         public void addParam (String key, String value){
-                 getSourceAction().addParam(key, value);
-         }
+         // check and set defaults
          @Override
          public void checkParams() {
                 // set defaults
+                        super.checkParams();
                         
                 if ( getParams().get("startRecord") == null){
@@ -122 +121 @@
                         
                 if ( getParams().get("x-cmd-format") == null){
+                        // TODO moved into BasicAction 
+                        /*
                                 if (getParams().get("format") == null){
                                         if (getSourceAction().getFormat() == null) {
@@ -130 +131 @@
                                                 addParam("format",getSourceAction().getFormat());
                                         }
-                                } 
+                                }
+                                */ 
                 } else {
                                 addParam("format",getParams().get("x-cmd-format")[0]);
                 }
-
+                 
+                //todo
                 addParam("fullformat",getSourceAction().getFullFormat());
-                 
-                super.checkParams();
+                //super.checkParams();
                 
                 // TODO ?????

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

@@ -84 +84 @@
         public void checkParams() {
                 // required Params
+                super.checkParams();
                 // check and set defaults
                 if (WorkspaceProfile.getRepositoryPath(getParam("repository")) == null) {