Changeset 4175

Timestamp:

2003-04-17T10:36:43+12:00 (21 years ago)

Author:

kjdon

Message:

changed the form searching stuff so that it doesn't use the escape function - this was causing trouble under windows for non latin characters. instead, have changed the format function to escape out any reserved characters (%, &, + etc) just in case these are entered in the box. haven't done all teh 'unsafe' characters, may need to do these too??

File:

• trunk/gsdl/macros/query.dm (modified) (4 diffs)

trunk/gsdl/macros/query.dm

@@ -321 +321 @@
 \}
 
+   //argfqv += escape(format(document.QueryForm.fqv[0].value));
 
 function updatefqv() \{
@@ -326 +327 @@
    var i;
    argfqv="";
-   argfqv += escape(format(document.QueryForm.fqv[0].value));
+   argfqv += format(document.QueryForm.fqv[0].value);
    for (i=1; i<document.QueryForm.fqv.length;i++) \{
        argfqv += ",";
-       argfqv +=  escape(format(document.QueryForm.fqv[i].value)); 
+       argfqv +=  format(document.QueryForm.fqv[i].value); 
    \}
 \}
@@ -429 +430 @@
 \}
 
+//argq += escape(document.QueryForm.q.value);
+
 function updateq() \{
    argq = "";
-   argq += escape(document.QueryForm.q.value);
+   argq += format(document.QueryForm.q.value);
 \}
 
@@ -440 +443 @@
 
 // convert commas and spaces to plus
+// also convert other illegal characters to %xx codes
 function format(string) \{
    var str = "" + string;
    var out = "", flag = 0;
+   var ch = "";
    var j;
    for (j = 0; j < str.length; j++) \{
-       if (str.charAt(j) == " "|| str.charAt(j) == ",") \{
-       if ( flag == 0) \{
-      out += "+";
-      flag=1;
-      \}
+       ch=str.charAt(j);
+       if (ch == " "|| ch == ",") \{
+           if ( flag == 0) \{     
+          out += "+";
+          flag=1;
+        \}
+        continue;
     \}
-       else \{
-          out += str.charAt(j);
-      flag=0;
-       \}
+    if (ch == ";" || ch == ":" || ch == "/" || ch == "?" ||
+            ch == "@" || ch == "&" || ch == "=" || ch == "#") \{
+        out += escape(ch);
+        flag=0;
+        continue;
+     \}       
+    out += str.charAt(j);
+    flag=0;
    \}
    return out;