Changeset 1802 for MDService2

Timestamp:

03/19/12 10:46:36 (12 years ago)

Author:

gaba

Message:

corrections

Location:

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

Files:

• action/FCSAction.java (modified) (2 diffs)
• proxy/FCSProxy.java (modified) (1 diff)

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

@@ -78 +78 @@
         @Override
         public String getRepository() {
-                return getParam("x-content");
+                //return getParam("x-content");
+                if (WorkspaceProfile.getFCSMapping(params.get("x-context")[0]) == null){
+                                        return getParam("x-context");
+                                } else {
+                                        return WorkspaceProfile.getFCSMapping(params.get("x-context")[0]);
+                                }
         }
-        */
+*/
          
         /**
@@ -128 +133 @@
                 // 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("repository") == null){
+                        if (params.get("x-context") == null){
+                                addParam("repository",WorkspaceProfile.getRepositoryByIndex(0));
+                        } else {
+                                // search in fcs-mapping
+                                if (WorkspaceProfile.getFCSMapping(params.get("x-context")[0]) == null){
+                                        addParam("repository",params.get("x-context")[0]);
+                                } else {
+                                        addParam("repository",WorkspaceProfile.getFCSMapping(params.get("x-context")[0]));
+                                }
+                        }       
+                }       
                 
-                if ( params.get("startRecord") == null){
-                        addParam("startRecord","1");
-                }
-                if ( params.get("maximumRecords") == null){
-                        addParam("maximumRecords","10");
-                }
-                
-                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){
-                                if (params.get("x-context") == null){
-                                        addParam("repository",WorkspaceProfile.getRepositoryByIndex(0));
-                                } else {
-                                        // search in fcs-mapping
-                                        if (WorkspaceProfile.getFCSMapping(params.get("x-context")[0]) == null){
-                                                addParam("repository",params.get("x-context")[0]);
-                                        } else {
-                                                addParam("repository",WorkspaceProfile.getFCSMapping(params.get("x-context")[0]));
-                                        }
-                                        //addParam("repository",params.get("x-context")[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.getParam("format") == null) {
-                                        addParam("format","xml");
-                                } else if (this.getParam("format").equals("")){
-                                        addParam("format","xml");
-                                } else {
-                                        addParam("format",this.getParam("format"));
-                                }
-                        } 
-                } else {
-                        addParam("format",params.get("x-cmd-format")[0]);
-                }
-
-                addParam("fullformat",getFullFormat());
         }
         @Override

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

@@ -30 +30 @@
         }
         
+        @Override
+        public void checkParams() {
+                // required Params
+                // check and set defaults
+                if (getParam("operation").equals("")) {
+                        //getSourceAction().setParam("operation","searchRetrieve");
+                        getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "operation");
+                }
+                
+                if (getParam("query").equals("") && getParam("operation").equals("searchRetrieve")) {
+                        getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "query");
+                }
+                if (getParam("scanClause").equals("") && getParam("operation").equals("scan")) {
+                        getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "scan");
+                }
+
+
+        }
         
 }