Changeset 12768 for trunk/gsdl/macros

Timestamp:

2006-09-18T12:10:45+12:00 (18 years ago)

Author:

kjdon

Message:

no longer use arg qf for simple/advanced form. Use the b arg, so that its the same whether plain or form searching

File:

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

trunk/gsdl/macros/query.dm

@@ -88 +88 @@
   var args="";
   args = "&fqa=0&fqv="+argfqv+"&fqf="+argfqf;
-  _If_(_cgiargqf_,args += "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc;)
+  _If_(_cgiargb_,args += "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc;)
 
   return args;
@@ -131 +131 @@
   \}
   else \{
-     if ("_cgiargqf_" == "1") \{ // advanced query
+     if ("_cgiargb_" == "1") \{ // advanced query
         document.QueryForm.q.value += " "+value;
     document.QueryForm.q.focus();      
@@ -192 +192 @@
    if (document.QueryForm.fqf != null) \{initfqf();\}
    initfqv();
-   if ( "_cgiargqf_" == "1") \{
+   if ( "_cgiargb_" == "1") \{
       initfqs();        
       initfqk();
@@ -491 +491 @@
 #_httpquery_ has a=q&e=compressedargs
 #if adv form, need to set k=0 and s=0
-_advformargs_{_If_(_cgiargqf_,&k=0&s=0)}
+_advformargs_{_If_(_cgiargb_,&k=0&s=0)}
 
 _searchfunctions_ {
@@ -507 +507 @@
    clearfqv();
 
-   if ("_cgiargqf_" == "1") \{
+   if ("_cgiargb_" == "1") \{
       clearfqk();
       clearfqs();
@@ -644 +644 @@
 </nobr>
 </td></tr>
-_If_(_cgiargqf_,_advancedforms_,_simpleforms_)
+_If_(_cgiargb_,_advancedforms_,_simpleforms_)
 </table>
-_If_(_cgiargqf_,<div class="divbar">&nbsp;</div>
+_If_(_cgiargb_,<div class="divbar">&nbsp;</div>
 <center>_advancedformextra_</center>)
 
@@ -711 +711 @@
 _textselect_ {_If_(_cgiargb_,_chooseadvancedsearch_,_textsimplesearch_)}
 _chooseadvancedsearch_ {_If_(_cgiargct_,_If_("_cgiargct_" eq "2",_textadvancedlucenesearch_,_textadvancedmgppsearch_),_textadvancedsearch_}
-_textformselect_ {_If_(_cgiargqf_,_textformadvancedsearch_,_textformsimplesearch_)}
+_textformselect_ {_If_(_cgiargb_,_textformadvancedsearch_,_textformsimplesearch_)}
 # mg uses hselection for index, mgpp uses fqfselection 
 _indexselection_{_If_(_cgiargct_,_fqfselection_,_hselection_)}
@@ -754 +754 @@
 _formquerytypeselection_ {
 <select name="t">
-<option value="1"_If_(_cgiargt_, selected)>_If_(_cgiargqf_,_textranked_,_textsome_)
-<option value="0"_If_(_cgiargt_,, selected)>_If_(_cgiargqf_,_textnatural_,_textall_)
+<option value="1"_If_(_cgiargt_, selected)>_If_(_cgiargb_,_textranked_,_textsome_)
+<option value="0"_If_(_cgiargt_,, selected)>_If_(_cgiargb_,_textnatural_,_textall_)
 </select>
 }