Changeset 1629

Timestamp:

11/25/11 21:09:47 (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) (1 diff)
• proxy/BasicProxy.java (modified) (2 diffs)
• proxy/MDRepoProxy.java (modified) (4 diffs)
• proxy/RepoProxy.java (modified) (1 diff)

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

@@ -335 +335 @@
                 params = new HashMap(getServletRequest().getParameterMap());    
 
-                setDefaultParams();             
+                //setDefaultParams();
+
+                // set defaults
+                if ( params.get("version") == null){
+                        addParam("version","1.2");
+                }
+                if ( params.get("operation") == null){
+                        addParam("operation","searchRetrieve");
+                }
+                //q=query                       
+                if (getQ() != null) {
+                        addParam("q",getQ());
+                        addParam("query",getQ());
+                } else {
+                        addParam("q",this.getParam("query"));
+                }
+                
+                if ( params.get("startRecord") == null){
+                        addParam("startRecord","1");
+                }
+                if ( params.get("maximumRecords") == null){
+                        addParam("maximumRecords","50");
+                }
+                
+                if ( params.get("x-cmd-maxdepth") == null){
+                        if (params.get("maxdepth") == null){
+                                addParam("maxdepth","2");
+                        } 
+                } else {
+                        addParam("maxdepth",params.get("x-cmd-maxdepth")[0]);
+                }
+                
+                if ( params.get("x-cmd-repository") == null){
+                        if (params.get("repository") == null){
+                                addParam("repository",WorkspaceProfile.getRepositoryByIndex(0));
+                        } 
+                } else {
+                        addParam("repository",params.get("x-cmd-repository")[0]);
+                }
+                
+                if ( params.get("x-cmd-cache") == null){
+                        if (params.get("cache") == null){
+                                addParam("cache",Cache.SKIP);
+                        } 
+                } else {
+                        addParam("cache",params.get("x-cmd-cache")[0]);
+                }
+                
+                if ( params.get("x-cmd-lang") == null){
+                        if (params.get("lang") == null){
+                                addParam("lang","en");
+                        } 
+                } else {
+                        addParam("lang",params.get("x-cmd-lang")[0]);
+                }
+                
+                if ( params.get("x-cmd-format") == null){
+                        if (params.get("format") == null){
+                                if (this.format == null) {
+                                        addParam("format","xml");
+                                } else if (this.format.equals("")){
+                                        addParam("format","xml");
+                                } else {
+                                        addParam("format",this.format);
+                                }
+                        } 
+                } else {
+                        addParam("format",params.get("x-cmd-format")[0]);
+                }
+
+                addParam("fullformat",getFullFormat());
         }
         

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

@@ -133 +133 @@
                                 return;
                         }
+
                         //Query query = new Query();
                         switch (WorkspaceProfile.RepositoryType.toRepositoryType(WorkspaceProfile.getRepositoryType(getRepository())))

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

@@ -67 +67 @@
         public void checkParams() {
                 // required Params
-
-                if (getParam("q").equals("")) {
-                        getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "q");
-                }
+/*
+                //if (getParam("q").equals("")) {
+                //      getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "q");
+                //}
                 if (getParams().get("format") == null){
                         if (getSourceAction().getFormat() == null) {
@@ -80 +80 @@
                         }
                 } 
-                // moved into action - needed for creation  proxy 
-                /*if (getParams().get("repository") == null){
-                        addParam("repository",WorkspaceProfile.getRepositoryByIndex(0));
-                } 
+                
+                addParam("fullformat",getSourceAction().getFullFormat());
                 */
-                addParam("fullformat",getSourceAction().getFullFormat());
         }
         

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

@@ -79 +79 @@
          public void checkParams() {
                 // set defaults
-                        super.checkParams();
-                        
+                //      super.checkParams();
+                        /*
                 if ( getParams().get("startRecord") == null){
                                 addParam("startRecord","1");
@@ -122 +122 @@
                 if ( getParams().get("x-cmd-format") == null){
                         // TODO moved into BasicAction 
-                        /*
+                        
                                 if (getParams().get("format") == null){
                                         if (getSourceAction().getFormat() == null) {
@@ -132 +132 @@
                                         }
                                 }
-                                */ 
+                                
                 } else {
                                 addParam("format",getParams().get("x-cmd-format")[0]);
@@ -140 +140 @@
                 addParam("fullformat",getSourceAction().getFullFormat());
                 //super.checkParams();
-                
+                */
                 // TODO ?????
                  if (getSourceAction().getActionkey().equals("sru")){

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

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