Changeset 748 for MDService2/trunk/MDService2/src/eu

Timestamp:

10/05/10 10:38:17 (14 years ago)

Author:

gaba

Message:

submiting collections only (withouth any query)

File:

• MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java (modified) (4 diffs)

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java

@@ -113 +113 @@
         
         public String getStatus() {
-                if (type.equals(Query.RECORDSET) && query_cql== null) {
+                if (type.equals(Query.RECORDSET) && query_cql== null && (query_string != "")) {
                         return Query.PARSEERROR;
                 } else {
@@ -145 +145 @@
                 } else if (squery != null) {
                         query_string = squery;
+                } else if (queryString != null){
+                        query_string = queryString;
                 } else {
-                        query_string = queryString;
+                        query_string = "";
                 }
                 Admin.notifyUser("QUERY.QUERYSTRING:" + query_string);
-                if (type.equals(RECORDSET)) {   
+                if (type.equals(RECORDSET) && (query_string.length() > 0)) {    
                         parse();
                         //preprocess();
@@ -302 +304 @@
                         targetRequest = "//MdSelfLink[.='" + corrid + "']";                      
                 } else { 
-                        targetRequest = toXPath() + "&collection=" + getCollection();
+                        if (query_cql == null){
+                                targetRequest =  "//*" + "&collection=" + getCollection();
+                        } else {
+                                targetRequest = toXPath() + "&collection=" + getCollection();   
+                        }
                         if ((startRecord != null) && (maximumRecords != null)) {
                                 targetRequest = targetRequest +  "&startRecord=" + getStartRecord() + "&iend=" + getMaximumRecords();
@@ -376 +382 @@
          */
         public String toXPath() {       
-                 return MDTransformer.getMDTransformer().transformXML(toXCQL(), "XCQL2XPATH");
+                return MDTransformer.getMDTransformer().transformXML(toXCQL(), "XCQL2XPATH");
         }