Changeset 22876

Show
Ignore:
Timestamp:
07.09.2010 15:27:13 (9 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/macros/query.dm

    r22875 r22876  
    101101 
    102102function getqueryargs () \{ 
    103   return "&fqa=1"+"&q="+argq+"&fqv="+argfqv+"&fqf="+argfqf+ 
    104      "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc+ 
    105          "&sqlfqf="+argsqlfqf + "&sqlfqc="+argsqlfqc ; 
     103  var args =  "&fqa=1"+"&q="+argq+"&fqv="+argfqv+"&fqf="+argfqf+ 
     104     "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc; 
     105 _If_("_cgiarga_" eq "sqlq",args += "&sqlfqf="+argsqlfqf + "&sqlfqc="+argsqlfqc;) 
     106 return args; 
    106107\} 
    107108 
     
    654655 
    655656function runQuery() \{ 
    656 window.location="_httpquery_"+getstdargs()+"_advformargs_"+getqueryargs(); 
     657  window.location="_httpquery_"+getstdargs()+"_advformargs_"+getqueryargs(); 
    657658\} 
    658659