Changeset 745 for MDService2/trunk/MDService2/src/eu/clarin/cmdi

Timestamp:

10/04/10 11:31:33 (14 years ago)

Author:

gaba

Message:

simple-querystring handling, collections treeview correction

Location:

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

Files:

• action/Cache.java (modified) (5 diffs)
• action/GenericProxyAction.java (modified) (3 diffs)
• action/MDRepoProxyAction.java (modified) (2 diffs)
• action/MDTransformer.java (modified) (1 diff)
• model/Query.java (modified) (11 diffs)

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

@@ -128 +128 @@
                         e.setAttribute("collection", "");
                 }
-
                 if (key_array.length > 3){
-                        e.setAttribute("startRecord", key_array[3]);
+                        e.setAttribute("squery", key_array[3]);
+                }else{
+                        e.setAttribute("squery", "");
+                }
+                if (key_array.length > 4){
+                        e.setAttribute("startRecord", key_array[4]);
                 }else{
                         e.setAttribute("startRecord", "");
                 }
-                if (key_array.length > 4){
-                        e.setAttribute("maximumRecords", key_array[4]);
+                if (key_array.length > 5){
+                        e.setAttribute("maximumRecords", key_array[5]);
                 }else{
                         e.setAttribute("maximumRecords", "");
@@ -186 +190 @@
                 Query query;
                 
-                query = new Query(str,"recordset","");
+                if (str == null) return "";
+                if (str.trim().length() == 0) return "";
+                
+                query = new Query("", str,"recordset","");
                 if (query.isStatus(Query.PARSEERROR)) {
                         Admin.notifyUser("Cache.transformQuery.PARSEERROR:" + query.getMsg());
@@ -207 +214 @@
                 
                 String[] key_array = key_info.split("//-");
-                String query_str;
-                
-                Admin.notifyUser("formPATH:" + key_info);
-                
+                String query_str;               
                 
                 if(key_array.length > 1){
                         //Admin.notifyUser("formPATH- querystring:" + key_array[1]);
                         if (key_array[0].equals("recordset")){
-                                query_str = transformQuery(key_array[1]);       
+                                query_str = this.transformQuery(key_array[1]);  
                                 Admin.notifyUser("formPATH- querystring-transformed:" + query_str);
                         }
@@ -233 +237 @@
                 }
                 if (key_array.length > 3){
-                        xpath_expr = xpath_expr + "and @startRecord='"+key_array[3]+"'";
+                        xpath_expr = xpath_expr + "and @squery='"+key_array[3]+"'";
+                }else{
+                        xpath_expr = xpath_expr + " and @squery=''";
+                }
+                if (key_array.length > 4){
+                        xpath_expr = xpath_expr + "and @startRecord='"+key_array[4]+"'";
                 }else{
                         xpath_expr = xpath_expr + " and @startRecord=''";
                 }
-                if (key_array.length > 4){
-                        xpath_expr = xpath_expr + "and @maximumRecords='"+key_array[4]+"']";
+                if (key_array.length > 5){
+                        xpath_expr = xpath_expr + "and @maximumRecords='"+key_array[5]+"']";
                 }else{
                         xpath_expr = xpath_expr + " and @maximumRecords='']";
@@ -259 +268 @@
                         path = cachepath + PREFIX + key_array[0] + "_"+id + ".xml";
                 }  else if (list.getLength() > 1){
-                        //Admin.notifyUser("formPath:!!!:multiple paths:"+key_info);
+                        Admin.notifyUser("formPath ERROR:!!!:multiple paths:"+key_info);
                         
                 }

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

@@ -30 +30 @@
         private String actionkey;
         private String q;
+        private String squery;
         private String cache = Cache.USE;
         private String collection;
@@ -49 +50 @@
         }
 
+        public String getSquery() {
+                return squery;
+        }
+
+        public void setSquery(String squery) {
+                this.squery = squery;
+        }
+        
         public String getCache() {
                 return cache;
@@ -119 +128 @@
         }
         
+
         public String getFullFormat() {         
                 return actionkey + "2" + format;

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

@@ -52 +52 @@
                         if (getQ()!=null) {
                                 key += getQ() + "//-" ;
+                        } else {
+                                key +="//-" ;
                         }
                         if (getCollection()!=null) {
                                 key += getCollection() + "//-";
+                        } else {
+                                key +="//-" ;
+                        }
+                        if (getSquery()!=null) {
+                                key += getSquery() + "//-" ;
+                        } else {
+                                key +="//-" ;
                         }
                         if (getStartRecord()!=null) {
@@ -73 +82 @@
         // URL targetURL =new URL( base_url, compname + ".xml");
                 
-                Admin.notifyUser("MDRPA.getQ:" + getQ());
+                Admin.notifyUser("MDRPA.getQ:" + getSquery() + " and (" +  getQ() + ")");
                 Admin.notifyUser("MDRPA.getActionkey:" + getActionkey());
                 Admin.notifyUser("MDRPA.getMaxdepth:" + getMaxdepth());
                 
-                Query query = new Query(getQ(),getActionkey());
+                Query query = new Query(getSquery(), getQ(),getActionkey());
                 if (query.isStatus(Query.PARSEERROR)) {
                         Admin.notifyUser("MDRPA.query.PARSEERROR:" + query.getMsg());

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

@@ -209 +209 @@
                 }
                 // 
-                
                 StreamSource src =new StreamSource();                   
                 src.setInputStream(in);

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

@@ -29 +29 @@
         public static String COLLECTIONS = "collections";
         public static String COLUMNS = "columns";
-        public static String startRecord = null;
-        public static String maximumRecords = null;
         public static String MODEL = "model";
         public static String RECORDSET = "recordset";
@@ -47 +45 @@
         private URL targetRequest;
         private String syntax = "cql";  /* cql, cmdIndex, xpath */
+        private String squery_string;
         private String query_string;
         private CQLNode query_cql;
@@ -55 +54 @@
         private String collection="olac";
         private String columns="Id,name";
+        private String startRecord = null;
+        private String maximumRecords = null;
+        private String squery = null;
         private int maxdepth=1;
         
@@ -63 +65 @@
 
         
-        public Query(String queryString) {              
-                this(queryString, MODEL);
+        public Query(String squeryString, String queryString) {         
+                this(squeryString, queryString, MODEL);
         }
 
@@ -74 +76 @@
          */
 
-        public Query(String queryString, String type, String collection, String columns) {
+        public Query(String squeryString,String queryString, String type, String collection, String columns) {
                 this.type =type;
-                setQueryString(queryString);
+                setQueryString(squeryString, queryString);
                 setCollection(collection);
                 setColumns(columns);
@@ -88 +90 @@
          */
 
-        public Query(String queryString, String type, String collection) {
+        public Query(String squeryString, String queryString, String type, String collection) {
                 this.type =type;
-                setQueryString(queryString);
+                setQueryString(squeryString, queryString);
                 setCollection(collection);
         }
@@ -101 +103 @@
          */
 
-        public Query(String queryString, String type) {
-        
+        public Query(String squeryString, String queryString, String type) {
                 this.type =type;
-                setQueryString(queryString);
+                setQueryString(squeryString, queryString);
         }
 
@@ -132 +133 @@
         }
 
-        public void setQueryString(String queryString) {
-                query_string = queryString;
-                if (type.equals(RECORDSET)) {
-                        
-                        
+        public void setQueryString(String squeryString, String queryString) {
+                if (squeryString.trim().length() == 0){
+                        squeryString = null;
+                }
+                if (queryString.trim().length() == 0){
+                        queryString = null;
+                }
+                String squery = createsqueryString(squeryString);
+                if (squery != null && queryString != null){
+                        query_string = "(" + squery + " ) and (" + queryString + ")";
+                } else if (squery != null) {
+                        query_string = squery;
+                } else {
+                        query_string = queryString;
+                }
+                Admin.notifyUser("QUERY.QUERYSTRING:" + query_string);
+                if (type.equals(RECORDSET)) {   
                         parse();
                         //preprocess();
@@ -163 +176 @@
         }
 
+        public String getSQuery() {
+                return this.squery;
+        }
+        
+        public void setSQuery(String squery) {
+                if (squery!=null) {
+                        this.squery = squery;
+                }
+        }
+        
         public String getStartRecord() {
                 return startRecord;
@@ -209 +232 @@
         }
 
+        // apply rules form squery
+        public String createsqueryString (String _squery){
+                String sq = null;
+                
+                if (_squery !=null){
+                        sq = "* any " + _squery;
+                }
+
+                return sq;
+        }
         public String getSimpleQueryString() {
                 String[] arr_and = query_string.split(" and ");
@@ -236 +269 @@
                                 simple_form = simple_form + rel + arr_or[j];
                         }
-                        Admin.notifyUser(simple_form);
+                        //Admin.notifyUser(simple_form);
                         if (arr_or.length > 1){
                                 simple_form = "(" + simple_form + ") ";