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

Timestamp:

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

Author:

gaba

Message:

simple-querystring handling, collections treeview correction

File:

• MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Cache.java (modified) (5 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);
                         
                 }