Changeset 704 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Timestamp:

09/19/10 09:37:51 (14 years ago)

Author:

gaba

Message:

 

Location:

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

Files:

• action/Cache.java (modified) (4 diffs)
• action/CompRegistryProxyAction.java (modified) (1 diff)
• action/GenericProxyAction.java (modified) (1 diff)
• model/Query.java (modified) (1 diff)

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

@@ -29 +29 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.InputSource;
+import org.apache.commons.lang.StringEscapeUtils; 
 
 
@@ -108 +109 @@
                 //e.setNamedItem(attr);
                 e.setAttribute("id", c.toString());
-                String[] key_array = key_info.split("-");
+                String[] key_array = key_info.split("//-");
                 
                 e.setAttribute("type", key_array[0]);
@@ -182 +183 @@
                         transformed = "";
                 } else {
-                        try {
-                                transformed =  query.toURLParam();
-                                transformed = transformed.replace("'", "__qqqqq__");
-                                //Admin.notifyUser("CACHE.transformQuery:"+transformed);
-                        } catch (MalformedURLException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
-                                transformed = "";
-                        }
+                        transformed =  query.getSimpleQueryString();
+                        transformed = StringEscapeUtils.escapeXml(transformed);
+                        //Admin.notifyUser("CACHE.transformQuery:"+transformed);
                 }
                 return transformed;
@@ -201 +196 @@
                 String xpath_expr="";
                 
-                String[] key_array = key_info.split("-");
+                String[] key_array = key_info.split("//-");
                 String query_str;
                 
+                Admin.notifyUser("formPATH:" + key_info);
+                
+                
                 if(key_array.length > 1){
+                        //Admin.notifyUser("formPATH- querystring:" + key_array[1]);
                         if (key_array[0].equals("recordset")){
                                 query_str = transformQuery(key_array[1]);       
+                                Admin.notifyUser("formPATH- querystring-transformed:" + query_str);
                         }
                         else {

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

@@ -51 +51 @@
                 String key="";
                 if (getActionkey()!=null) {
-                        key += getActionkey() + "-" ;
+                        key += getActionkey() + "//-" ;
                 }
                 if (getCompid()!=null) {
-                        key += getCompid() + "-" ;
+                        key += getCompid() + "//-" ;
                 }
                  

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

@@ -176 +176 @@
                 String key="";
                 if (getActionkey()!=null) {
-                        key += getActionkey() + "-" ;
+                        key += getActionkey() + "//-" ;
                 }
                 if (getQ()!=null) {
-                        key += getQ() + "-" ;
+                        key += getQ() + "//-" ;
                 }
                 if (getCollection()!=null) {

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

@@ -188 +188 @@
         }
 
+        public String getSimpleQueryString() {
+                String[] arr_and = query_string.split(" and ");
+                String simple_form = "";
+                String simple_form_all = "";
+                String rel = "";
+                
+                for( int i=0;i<arr_and.length;i++){
+                        arr_and[i] = arr_and[i].trim();
+                        String[] arr_or = arr_and[i].split(" or ");
+                        simple_form = "";
+                        for( int j=0;j<arr_or.length;j++){
+                                arr_or[j] = arr_or[j].trim();
+                                while (arr_or[j].substring(0,1).equals("(") ) {
+                                        arr_or[j] = arr_or[j].substring(1,arr_or[j].length());
+                                        arr_or[j] = arr_or[j].trim();
+                                }
+                                while ( arr_or[j].substring(arr_or[j].length()-1,arr_or[j].length()).equals(")")){
+                                        arr_or[j] = arr_or[j].substring(0,arr_or[j].length()-1);
+                                        arr_or[j] = arr_or[j].trim();
+                                }
+                                if (j > 0) { 
+                                        rel = " or ";
+                                } else {
+                                        rel = "";
+                                }
+                                simple_form = simple_form + rel + arr_or[j];
+                        }
+                        Admin.notifyUser(simple_form);
+                        if (arr_or.length > 1){
+                                simple_form = "(" + simple_form + ") ";
+                        }
+                        if (i > 0) { 
+                                rel = " and  ";
+                        } else {
+                                rel = "";
+                        }
+                        simple_form_all = simple_form_all + rel + simple_form;
+                        
+                }
+                
+                return simple_form_all;
+        }
         /**
          * construct the URL-Param