Changeset 1594 for MDService2

Timestamp:

10/24/11 20:53:12 (13 years ago)

Author:

gaba

Message:

escape querystring

Location:

MDService2/branches/MDService_simple3

Files:

• WebContent/scripts/mdservice_model.js (modified) (1 diff)
• WebContent/scripts/mdservice_searchclause.js (modified) (5 diffs)
• WebContent/scripts/mdservice_ui_load.js (modified) (1 diff)
• src/xsl/html_snippets.xsl (modified) (1 diff)

MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_model.js

@@ -437 +437 @@
         var params = "?";
         if (this.query != null) {
-                escaped_sq = escape(this.query);
-                //escaped_sq =escape(this.query).replace(/%20/g,"%2520").replace(/\%2[27]/g,"%2522") ;
-                //escaped_sq = escaped_sq.replace(/%7C/g,"%257C").replace(/\+/g,"%2B"); 
-                //params = params + "query=" + escape(this.query) + "&";
-                params = params + "query=" + escaped_sq + "&";
+                params = params + "query=" + escapequerystring(this.query) + "&";
         }
         /*

MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_searchclause.js

@@ -42 +42 @@
                 this.relation = "=";
         }
+        
+        this.is_complex = true;
 }
 
@@ -317 +319 @@
                         return "ISOCAT( " + this.category + ") " + this.relation + " " + this.value;
         }
-        return this.index.replace(" ","_") + " " + this.relation + " " + this.value;
+        return this.index.trim().replace(" ","_") + " " + this.relation + " " + this.value;
+};
+
+/** special handling for special characters: double escaping (escape the %-sign)
+ * to survive the %-encoding through the request (and parsing) down to the transformation in XCQL2XPath.xsl
+ * it's: whitespace, and single and double-quotes (unified to double quotes %22)
+*/ 
+SearchClause.prototype.escape = function(){
+        var escape_string = "";
+        var escape_value_string = "";
+        
+        escape_value_string =escape(this.value).replace(/%20/g,"%2520").replace(/\%2[27]/g,"%2522").replace(/%7C/g,"%257C").replace(/\+/g,"%2B"); 
+
+        if (this.is_complex) {
+                escape_string = escape_string + escape(this.index.trim().replace(" ","_") + " " + this.relation + " ") + escape_value_string;
+        } else {
+                // case more simple words in search
+                escape_string = escape_value_string;
+        }       
+        return escape_string;
+        
+};
+
+SearchClause.createFromData = function(scstr){
+        var n;
+        var scarr;
+        var rel = "";
+        n = scstr.indexOf("=");
+        if (n > 0){
+                scarr = scstr.split("=");
+                rel = "=";
+        }
+        n = scstr.indexOf(" any ");
+        if (n > 0){
+                scarr = scstr.split(" any ");
+                rel = "any";
+        }
+        n = scstr.indexOf(" contains ");
+        if (n > 0){
+                scarr = scstr.split(" contains ");
+                rel = "contains";
+        }
+        n = scstr.indexOf("<");
+        if (n > 0){
+                scarr = scstr.split("<");
+                rel = "<";
+        }
+        n = scstr.indexOf(">");
+        if (n > 0){
+                scarr = scstr.split(">");
+                rel = ">";
+        }
+        n = scstr.indexOf(" all ");
+        if (n > 0){
+                scarr = scstr.split(" all ");
+                rel = "all";
+        }
+        //notifyUser("scarr:" + scarr[0] + scarr[1],'debug');
+        
+        if (scarr == undefined) {
+                //this.issimpletext = true;
+                sc = new SearchClause('*','any',scstr);
+                sc.is_complex = false;
+        } else {
+                //this.issimpletext = false;
+                sc = new SearchClause(scarr[0],rel,scarr[1]);
+                sc.is_complex = true;
+        }
+
+        return sc;
 };
 /*
@@ -516 +587 @@
                         if (i > 0) {screl = "and";}
                         for( var j=0;j<arr_or.length;j++){
-                                var scstr = $.trim(arr_or[j]);
+                                if (j > 0) {screl = "or";}
                                 
-                                // parse rel
-                                //notifyUser("j:"+scstr,'debug');
-                                var n;
-                                var scarr;
-                                var rel = "";
-                                n = scstr.indexOf("=");
-                                if (n > 0){
-                                        scarr = scstr.split("=");
-                                        rel = "=";
-                                }
-                                n = scstr.indexOf(" any ");
-                                if (n > 0){
-                                        scarr = scstr.split(" any ");
-                                        rel = "any";
-                                }
-                                n = scstr.indexOf(" contains ");
-                                if (n > 0){
-                                        scarr = scstr.split(" contains ");
-                                        rel = "contains";
-                                }
-                                n = scstr.indexOf("<");
-                                if (n > 0){
-                                        scarr = scstr.split("<");
-                                        rel = "<";
-                                }
-                                n = scstr.indexOf(">");
-                                if (n > 0){
-                                        scarr = scstr.split(">");
-                                        rel = ">";
-                                }
-                                n = scstr.indexOf(" all ");
-                                if (n > 0){
-                                        scarr = scstr.split(" all ");
-                                        rel = "all";
-                                }
-                                //var simplecalusetext = scstr.split("");
-                                if (j > 0) {screl = "or";}
-                                //notifyUser("scarr:" + scarr[0] + scarr[1],'debug');
-                                
-                                if (scarr == undefined) {
-                                        sc = new SearchClause('*','any',scstr);//sc = new SearchClause('','','');
-                                } else {
-                                        sc = new SearchClause(scarr[0],rel,scarr[1]);
-                                }
-
-                                this.addsearchclause(sc,screl,i,j);
-                                //searchclauseset.addsearchclause(sc,screl,i,j);
+                                sc = SearchClause.createFromData($.trim(arr_or[j]));
+                                this.addsearchclause(sc,screl,i,j);                             
                         }
                 }
         },
+        
         
         buildsctext: function(){
@@ -596 +623 @@
                 }       
                 if ((i == 1 && j == 1) && (this.sctext.substring(0,6) == '* any ')) {
-                        this.sctext  = sctext.replace('* any ','');
+                        this.sctext  = this.sctext.replace('* any ','');
                 }
                 if (uncompletequery){
@@ -643 +670 @@
 };
 
+function escapequerystring(querystring){
+        var arr = Query.simplequerystring(querystring);
+        var sc, screl;
+        var escape_string = "";
+        var add_bracket = false;
+        
+        //notifyUser(arr,'debug');
+        var arr_and = arr.split(" and ");
+        screl = "";
+        for( var i=0;i<arr_and.length;i++){
+                var scstring = $.trim(arr_and[i]);
+                
+                add_bracket = false;
+                if (scstring.substring(0,1) == "(" && scstring.substring(scstring.length-1) == ")") {
+                        scstring = scstring.substring(1,scstring.length-1);
+                        scstring = $.trim(scstring);
+                        escape_string = escape_string + "(";
+                        add_bracket = true;
+                }
+                
+                //notifyUser("i:" + scstring,'debug');
+                var arr_or = scstring.split(" or ");
+                if (i > 0) {screl = "and";}
+                
+                for( var j=0;j<arr_or.length;j++){
+                        var scstr = $.trim(arr_or[j]);          
+                        if (j > 0) {screl = "or";}
+                        
+                        sc = SearchClause.createFromData(scstr);
+                        if (screl != ""){
+                                escape_string  = escape_string + "%20" + screl + "%20";
+                        }
+                        escape_string = escape_string + sc.escape();
+                }
+                if (add_bracket){
+                        escape_string = escape_string + ")";
+                }
+        }
+        return escape_string;
+}
+

MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui_load.js

@@ -24 +24 @@
 function loadTooltiptable() {
          
-         var uri = window.location.pathname + "static/info.xml";
+         var uri = window.location.pathname + "/../../static/info.xml";
          
          $.get(uri,function(data, textStatus){

MDService2/branches/MDService_simple3/src/xsl/html_snippets.xsl

@@ -123 +123 @@
                                         </td>
                                         <td valign="top">
-                                                <label>Complex query</label><span id="switch-input" name='detail_index' class='cmd'></span><br/>
+                                                <label>Complex query</label><span id="switch-input" class='cmd'></span><br/>
                                                 <!--  <div id="searchclauselist"></div>-->                                                      
                                                 <!--<input type="checkbox" checked="false" id="input-withsummary" name="WS"/><label>with Summary</label>