Changeset 22981 for main

Timestamp:

2010-09-28T15:45:30+13:00 (14 years ago)

Author:

ak19

Message:

Additional changes to previous commit: comma separated field values went wrong in normal advanced field queries because of the special comma processing added for sql queries last time. Katherine fixed this now to deal correctly with commas for all kinds of queries.

File:

• main/trunk/greenstone2/macros/query.dm (modified) (3 diffs)

main/trunk/greenstone2/macros/query.dm

@@ -604 +604 @@
 function updateq() \{
   
-   argq = "";
-   argq += format(document.QueryForm.q.value);
+   argq = "";   
+   _If_("_cgiarga_" eq "sqlq",argq += format(document.QueryForm.q.value, 1);)
+   _If_("_cgiarga_" eq "q",argq += format(document.QueryForm.q.value);)
 \}
 
@@ -612 +613 @@
 \}
 
-
 // convert spaces to plus
-// also convert other illegal characters (including commas) to %xx codes
+// also convert other illegal characters to %xx codes
 // This routine used to treat commas like spaces (replacing them with a plus), 
-// but this is no longer good enough for handling sql-queries
-function format(string) \{
+// but this is no longer good enough for handling sql-queries.
+// Now if keepcommas == 1, URL encode commas, else (if undefined or 0),
+// convert commas to plus.
+function format(string, keepcommas) \{
    var str = "" + string;
    var out = "", flag = 0;
    var ch = "";
    var j;
-   for (j = 0; j < str.length; j++) \{
+   for (j = 0; j < str.length; j++) \{   
        ch=str.charAt(j);
+       
+       if(ch == ",") \{
+        if(keepcommas == 1) \{
+            out += escape(ch);
+            flag=0;
+            continue;
+        \}         
+        else \{ // can be undefined or maybe 0?
+            if (flag == 0) \{     
+              out += "+";
+              flag=1;
+             \}
+        \}
+        continue;
+       \}
+       
        if (ch == " ") \{
            if (flag == 0) \{     
@@ -631 +649 @@
         continue;
     \}
-    if (ch == "," || ch == ";" || ch == ":" || ch == "/" || ch == "?" ||
+    if (ch == ";" || ch == ":" || ch == "/" || ch == "?" ||
             ch == "@" || ch == "&" || ch == "=" || ch == "#" ||
         ch == "%") \{