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

Timestamp:

04/25/11 21:01:01 (13 years ago)

Author:

vronk

Message:

adding jsdocs
added sru_explain.xsl in mdservice.properties
added termsproxyaction in SRUProxyAction for explain()-operation (based on terms)

File:

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

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

@@ -78 +78 @@
 
         private MDRepoProxyAction mdrepoproxyaction;
+        private TermsProxyAction termsproxyaction;
         private InputStream resultStream;
         private HttpServletRequest request; 
@@ -89 +90 @@
          {       
                  hash_operations.put("searchRetrieve", "recordset");
+                 hash_operations.put("explain", "model"); /* could be terms*/ 
+                 hash_operations.put("scan", "values");
          }
          
@@ -95 +98 @@
          {       
                  operation_code.put("searchRetrieve", OP_SEARCHRETRIEVE);
-                 operation_code.put("searchRetrieve", OP_EXPLAIN);
-                 operation_code.put("searchRetrieve", OP_SCAN);
+                 operation_code.put("explain", OP_EXPLAIN);
+                 operation_code.put("scan", OP_SCAN);
          }
          
@@ -304 +307 @@
                         if ((this.maximumRecords < 0 ) ||((getServletRequest().getParameter("maximumRecords") != null) && (getServletRequest().getParameter("maximumRecords").equals("0")))){
                                    this.Diagnostics().Add(new Diagnostic(Diagnostic.UNSUPPORTED_PARAMETERVALUE, 
-                                                   "maximumRecords must by grater than 0."));
+                                                   "maximumRecords must by greater than 0."));
                         } else {
                                 mdrepoproxyaction.setMaximumItems(Integer.toString(this.getMaximumRecords()));  
@@ -319 +322 @@
 
                 } else {
-                        if (operation.equals("explain")){
-                                
+                        if (operation.equals("explain") || operation == null){
+                                Admin.notifyUser("explaining", "debug");
                         }else {
                                 if (operation.equals("scan")){
@@ -345 +348 @@
                 }
         }
+        
         public void prepare() throws UnsupportedEncodingException{
                 // special handling of parameter setting, x-cmd-... not alowed in java
                 this.setX_cmd_repository(getServletRequest().getParameter("x-cmd-repository"));
                 this.setX_cmd_collections(getServletRequest().getParameter("x-cmd-collections"));
-
-                
-                //version
-                if (this.version == null) {
-                        this.Diagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "version");
+                
+                // root call
+                //operation
+                if (operation.equals("explain") || operation == null){
+                        // TODO: version param is mandatory for explain as well, but for root-request not!
+                        //explain
+                        termsproxyaction = new TermsProxyAction();
+                        termsproxyaction.setDiagnostics(diagnostics);
+                        termsproxyaction.setActionkey("terms");
+                        
+                        termsproxyaction.setQ("all");                   
+                        termsproxyaction.setFormat("sru-explain");                      
+                        
                         //return -1;
-                } else {
-                        if (!version.equals("1.2")) {
-                                this.Diagnostics().Add(Diagnostic.UNSUPPORTED_VERSION, "Version 1.2 supported.");
+                } else {                                
+                        //version               
+                        if (this.version == null) {
+                                this.Diagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "version");
                                 //return -1;
-                        }
-                }
-                //operation
-                if (this.operation == null) {
-                        this.Diagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "operation");
-                        //return -1;
-                } else {
+                        } else {
+                                if (!version.equals("1.2")) {
+                                        this.Diagnostics().Add(Diagnostic.UNSUPPORTED_VERSION, "Version 1.2 supported.");
+                                        //return -1;
+                                }
+                        }
+                        
                         prepareOperation();
                 }
@@ -444 +457 @@
                 prepare();
                 if (Diagnostics().Accepted()){
-                        //TODO diagnostic
-                        if (this.mdrepoproxyaction.getTargetRequest() == null) {
-                                Diagnostics().Add(Diagnostic.QUERYSYNTAXERROR);
-                                return ERROR;
-                        }
-                        if (this.mdrepoproxyaction.execute() == SUCCESS){
-                                resultStream = this.mdrepoproxyaction.getResultStream();
-                                postprocess();
-                                return SUCCESS;
+                        // root-explain
+                        if (this.termsproxyaction != null) {                    
+                                if (this.termsproxyaction.execute() == SUCCESS){
+                                        resultStream = this.termsproxyaction.getResultStream();
+                                        return SUCCESS;
+                                }
+                        } else {
+                                //TODO diagnostic                        
+                                if (this.mdrepoproxyaction.getTargetRequest() == null) {
+                                        Diagnostics().Add(Diagnostic.QUERYSYNTAXERROR);
+                                        return ERROR;
+                                }
+                                if (this.mdrepoproxyaction.execute() == SUCCESS){
+                                        resultStream = this.mdrepoproxyaction.getResultStream();
+                                        postprocess();
+                                        return SUCCESS;
+                                }
                         }
                 }