Changeset 1630 for MDService2

Timestamp:

11/25/11 22:47:10 (12 years ago)

Author:

gaba

Message:

search for sru-repository

Location:

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

Files:

• action/RepoAction.java (modified) (1 diff)
• model/Query.java (modified) (3 diffs)
• proxy/SRUProxy.java (modified) (1 diff)

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

@@ -141 +141 @@
                                 return;
                             case SRU:
-                                setTargetProxy(new SRUProxy(new Query(getActionkey(), this.getParams())));
+                                setTargetProxy(new SRUProxy(new Query(Query.SRURECORDSET, this.getParams())));
                                 return;
                             case MD:

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/Query.java

@@ -43 +43 @@
         public static String RECORD = "record";
         public static String SRUEXTERN = "sruextern";
+        public static String SRURECORDSET = "srurecordset";
         
         public static String PARSED = "parsed";
@@ -241 +242 @@
                 
                 log.debug("QUERY.FULLQUERYSTRING:" + query_string);
-                if (type.equals(RECORDSET) && (query_string.length() > 0)) {    
+                if ((type.equals(RECORDSET) || (type.equals(SRURECORDSET))) && (query_string.length() > 0)) {   
                         parse();
                         //preprocess();
@@ -450 +451 @@
                         log.debug("Query.toURLParam.corrid=" + corrid);
                         targetRequest = "//MdSelfLink[ft:query(.,'" + corrid + "')]";                    
+                } else if (type.equals(SRURECORDSET)) {
+                        targetRequest = "?query="+ getParam("query") + "&operation=" + getParam("operation");   
+                        
+                        if (!getParam("startItem").equals("")) {
+                                targetRequest = targetRequest +  "&startItem=" + getParam("startItem");
+                        }
+                        if (!getParam("maximumItems").equals("")) {
+                                targetRequest = targetRequest +  "&maxItems=" + getParam("maximumItems");
+                        }
+                        if ((!getParam("version").equals(""))) {
+                                targetRequest = targetRequest +  "&version" + getParam("version");
+                        }                
                 } else {
                                 if (query_cql == null){

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

@@ -35 +35 @@
                 // check and set defaults
                 if (getParam("operation").equals("")) {
+                        //getSourceAction().setParam("operation","searchRetrieve");
                         getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "operation");
                 }
                 if (getParam("version").equals("")) {
+                        //getSourceAction().setParam("version","1.2");
                         getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "version");
                 }