Changeset 1623 for MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/SRUProxy.java

Timestamp:

11/22/11 10:57:22 (13 years ago)

Author:

gaba

Message:

query params

File:

• MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/SRUProxy.java (modified) (12 diffs)

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

@@ -21 +21 @@
 
 import eu.clarin.cmdi.mdservice.model.Diagnostics;
+import eu.clarin.cmdi.mdservice.model.Query;
 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;
 
@@ -39 +40 @@
          * Properties to be filled by Struts with according request-parameters
          */     
+        /*
         private String q;
         private String version;
@@ -54 +56 @@
         private String x_cmd_repository;
         private String x_cmd_collections;
+        */
         private Set paramSet;
 
@@ -59 +62 @@
         private static int OP_EXPLAIN = 2;
         private static int OP_SCAN = 3;
+        
+        
         
         
@@ -82 +87 @@
          }
          
+         public SRUProxy(Query q){
+                        setQuery(q);
+                }
+         
          protected void  initialize(){
-                                
+                /*              
                  // TODO set SRU params
                         // missing collections, columns...
@@ -94 +103 @@
                         setX_cmd_repository(getSourceAction().getRepository());
                         setQuery(this.fullQueryString());
-                        
+                */      
         /*       
                  if (getServletRequest() != null){
@@ -126 +135 @@
                 }
         
-                
+        /*      
          public String getQ() {
                         return q;
@@ -134 +143 @@
                         this.q = q;
                 }
+                */
          /*
          public InputStream getResultStream() {
@@ -142 +152 @@
          }
         */
-
+/*
         public String getVersion() {
                 return version;
@@ -254 +264 @@
                 this.x_cmd_collections = x_cmd_collections;
         }
-        
+        */
         
         @Override
@@ -483 +493 @@
                 //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());
+                        if (!(getParam("operation") == null)){
+                                params = params + "operation=" + getParam("operation");
+                        }
+                        if (!(getParam("version") == null)){
+                                params = params + "&version=" + getParam("version");
+                        }
+                        if (!(getParam("query") == null)){
+                                params = params + "&query=" + getParam("query");
+                        }
+                        if (Integer.parseInt(getParam("startRecord")) > 0){
+                                params = params + "&startRecord=" + String.valueOf(getParam("startRecord"));
+                        }
+                        if (Integer.parseInt(getParam("maximumRecords"))> 0){
+                                params = params + "&numRecords=" + String.valueOf(getParam("maximumRecords"));
                         }
                 } else {
@@ -519 +529 @@
                 
                 if (this.getBaseURI() == null){
-                        requestURI = this.getX_cmd_repository();
+                        requestURI = getParam("x_cmd_repository");//this.getX_cmd_repository();
                 } else {
                         requestURI = this.getBaseURI();