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

Timestamp:

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

Author:

gaba

Message:

 

File:

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

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 {