Changeset 764 for MDService2/trunk/MDService2/src/eu

Timestamp:

10/10/10 12:27:11 (14 years ago)

Author:

vronk

Message:

still trying to handle query-null

Location:

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Files:

• action/Cache.java (modified) (1 diff)
• action/GenericProxyAction.java (modified) (3 diffs)
• action/WorkspaceAction.java (modified) (1 diff)
• model/Query.java (modified) (11 diffs)

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

@@ -193 +193 @@
                 if (str.trim().length() == 0) return "";
                 
-                query = new Query(null, str,"recordset","");
+                // provisional hack, setting simple string to ""
+                query = new Query("", str,"recordset","");
                 if (query.isStatus(Query.PARSEERROR)) {
                         Admin.notifyUser("Cache.transformQuery.PARSEERROR:" + query.getMsg());

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

@@ -46 +46 @@
         }
 
-        public void setQ(String q) {
+        public void setQ(String pq) {
+                if (pq == null) pq="";
+                /*
                 if (q != null){
                         if (q.trim().length() == 0){
@@ -52 +54 @@
                         }
                 }
-                this.q = q;
+                */
+                this.q = pq;
         }
 
@@ -59 +62 @@
         }
 
-        public void setSquery(String squery) {
-                this.squery = squery;
+        public void setSquery(String psquery) {
+                if (psquery==null) psquery="";
+                this.squery = psquery;
         }
         

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

@@ -40 +40 @@
 import java.security.PrivilegedExceptionAction;
 //import javax.servlet.ServletInputStream;
-import org.apache.catalina.connector.CoyoteInputStream;
-import org.apache.catalina.security.SecurityUtil;
-
 
 

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

@@ -47 +47 @@
         private String squery_string;
         private String query_string;
+        private String full_query_string;
         private CQLNode query_cql;
         private String msg;
@@ -52 +53 @@
          * temporary default;
          */
-        private String collection="olac";
+        private String collection="";
         private String columns="Id,name";
-        private String startRecord = null;
-        private String maximumRecords = null;
+        private String startRecord = "1";
+        private String maximumRecords = "50";
         private String squery = null;
         private int maxdepth=1;
@@ -78 +79 @@
         public Query(String squeryString,String queryString, String type, String collection, String columns) {
                 this.type =type;
-                setQueryString(squeryString, queryString);
+                setFullQueryString(squeryString, queryString);
                 setCollection(collection);
                 setColumns(columns);
@@ -92 +93 @@
         public Query(String squeryString, String queryString, String type, String collection) {
                 this.type =type;
-                setQueryString(squeryString, queryString);
+                setFullQueryString(squeryString, queryString);
                 setCollection(collection);
         }
@@ -105 +106 @@
         public Query(String squeryString, String queryString, String type) {
                 this.type =type;
-                setQueryString(squeryString, queryString);
+                if (squeryString == null)squeryString =""; 
+                setFullQueryString(squeryString, queryString);
         }
 
@@ -113 +115 @@
         
         public String getStatus() {
-                if (type.equals(Query.RECORDSET) && query_cql== null && (query_string != "")) {
+                if (type.equals(Query.RECORDSET) && query_cql== null && (full_query_string != "")) {
                         return Query.PARSEERROR;
                 } else {
@@ -133 +135 @@
         }
 
-        public void setQueryString(String squeryString, String queryString) {
-                /*
+        public void setFullQueryString(String squeryString, String queryString) {
+                
+                query_string=queryString;
+                
                 if (squeryString.trim().length() == 0){
                         squeryString = null;
@@ -141 +145 @@
                         queryString = null;
                 }
-                */
+                
                 String squery = createsqueryString(squeryString);
                 if (squery != null && queryString != null){
-                        query_string = "(" + squery + " ) and (" + queryString + ")";
+                        full_query_string = "(" + squery + " ) and (" + queryString + ")";
                 } else if (squery != null) {
-                        query_string = squery;
+                        full_query_string = squery;
                 } else if (queryString != null){
-                        query_string = queryString;
+                        full_query_string = queryString;
                 } else {
-                        query_string = "";
-                }
-                Admin.notifyUser("QUERY.QUERYSTRING:" + query_string);
-                if (type.equals(RECORDSET) && (query_string.length() > 0)) {    
+                        full_query_string = "";
+                }
+                Admin.notifyUser("QUERY.FULLQUERYSTRING:" + full_query_string);
+                if (type.equals(RECORDSET) && (full_query_string.length() > 0)) {       
                         parse();
                         //preprocess();
@@ -159 +163 @@
                         
         }
+        
+        public String getFullQueryString() {
+                return full_query_string;
+        }
+
         
         public void setCollection(String collection) {
@@ -321 +330 @@
         
         /**
-         * tries to parse the query_string according the CQL-syntax
+         * tries to parse the full_query_string according the CQL-syntax
          * if successful returns the root-node of the parse-tree
          */
@@ -328 +337 @@
           try {
                 CQLParser parser = new CQLParser();             
-                query_cql = parser.parse(query_string);
+                query_cql = parser.parse(full_query_string);
           }
                 catch (CQLParseException e) {