Changeset 22876

Timestamp:

2010-09-07T15:27:13+12:00 (14 years ago)

Author:

kjdon

Message:

in getsearchargs, need to test for sql query before adding argsqlfqf as otherwise its not defined and the javascript doesn't work.

File:

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

main/trunk/greenstone2/macros/query.dm

@@ -101 +101 @@
 
 function getqueryargs () \{
-  return "&fqa=1"+"&q="+argq+"&fqv="+argfqv+"&fqf="+argfqf+
-     "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc+
-         "&sqlfqf="+argsqlfqf + "&sqlfqc="+argsqlfqc ;
+  var args =  "&fqa=1"+"&q="+argq+"&fqv="+argfqv+"&fqf="+argfqf+
+     "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc;
+ _If_("_cgiarga_" eq "sqlq",args += "&sqlfqf="+argsqlfqf + "&sqlfqc="+argsqlfqc;)
+ return args;
 \}
 
@@ -654 +655 @@
 
 function runQuery() \{
-window.location="_httpquery_"+getstdargs()+"_advformargs_"+getqueryargs();
+  window.location="_httpquery_"+getstdargs()+"_advformargs_"+getqueryargs();
 \}