Changeset 4765

Timestamp:

2003-06-23T14:37:37+12:00 (21 years ago)

Author:

kjdon

Message:

changed the textsome, textall macros - took the test on cgiargb out of the text macros, so the text only has text in it, like textsome {some}. Note: have to change all the other languages to reflect this. qf now used for form search type instead of b. mgpp now only has one index, so removed the hselection stuff from the search form

File:

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

trunk/gsdl/macros/query.dm

@@ -20 +20 @@
 _advformlist_ {}
 _regformlist_ {}
-_fqfselection_ {}
+#_fqfselection_ {}
 
 
@@ -65 +65 @@
 #######################################################################
 
-_pagescriptextra_ {_If_("_cgiargct_" eq "1" && "_cgiargqt_" eq "1",_formpagescriptextra_,_dummypagescriptextra_)
+_pagescriptextra_ {_If_("_cgiargqt_" eq "1" or "_cgiargqto_" eq "2",_formpagescriptextra_,_dummypagescriptextra_)
 _If_("_cgiarghd_" ne "0",_historypagescriptextra_) }
 
@@ -83 +83 @@
   var args="";
   args = "&fqa=0&fqv="+argfqv+"&fqf="+argfqf;
-  _If_(_cgiargb_,args += "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc;)
+  _If_(_cgiargqf_,args += "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc;)
 
   return args;
@@ -125 +125 @@
   \}
   else \{
-     if ("_cgiargb_" == "1") \{ // advanced query
+     if ("_cgiargqf_" == "1") \{ // advanced query
         document.QueryForm.q.value += " "+value;
     updateq();
@@ -142 +142 @@
     
     stdarg = "";
-    _If_(_cgiargh_,_getharg_)
     _If_(_gselection_,_getgarg_)    
     _If_(_cgiargj_,_getjarg_)
@@ -149 +148 @@
     if (value != "_cgiargt_") stdarg += "&t="+value;
 
-    stdarg += "&r=1&hs=1";    
+    stdarg += "&r=1&hs=1"; // &h=idx    
     return stdarg;
   \}
@@ -155 +154 @@
 }
 
+#h will always be the same now
 #some macros to go with getstdargs()
-_getharg_{
-    value = document.QueryForm.h.options[document.QueryForm.h.selectedIndex].value;
-    if (value != "_cgiargh_") stdarg += "&h="+value;
-}
+#_getharg_{
+#    value = document.QueryForm.h.options[document.QueryForm.h.selectedIndex].value;
+#    if (value != "_cgiargh_") stdarg += "&h="+value;
+#}
 
 _getgarg_{
@@ -185 +185 @@
    if (document.QueryForm.fqf != null) \{initfqf();\}
    initfqv();
-   if ( "_cgiargb_" == "1") \{
+   if ( "_cgiargqf_" == "1") \{
       initfqs();        
       initfqk();
@@ -207 +207 @@
    \}
    if (fqf.length < document.QueryForm.fqf.length) \{ // initialize remaining ones
-      var v=1; // the option with a null value is either at place 1 or 2
-      if (document.QueryForm.fqf[0].options[v].value !="") v++;
       for (i=fqf.length;i<document.QueryForm.fqf.length;i++) \{
       var z=i;
@@ -214 +212 @@
          z = z-(document.QueryForm.fqf[i].options.length-1);
       \}
-      if (z>=v)z++; // skip over the void value
-      
       document.QueryForm.fqf[i].options[z].selected = true;
       
@@ -474 +470 @@
 #_httpquery_ has a=q&e=compressedargs
 #if adv form, need to set k=0 and s=0
-_advformargs_{_If_(_cgiargb_,&k=0&s=0)}
+_advformargs_{_If_(_cgiargqf_,&k=0&s=0)}
 
 _searchfunctions_ {
@@ -490 +486 @@
    clearfqv();
 
-   if ("_cgiargb_" == "1") \{
+   if ("_cgiargqf_" == "1") \{
       clearfqk();
       clearfqs();
@@ -544 +540 @@
 }
 
-_selectqueryform_{_If_(_cgiargqt_,_fieldqueryform_,_queryform_)}
+_selectqueryform_{_If_("_cgiargqt_" eq "1",_fieldqueryform_,_selectqueryform2_)}
+_selectqueryform2_{_If_("_cgiargqto_" eq "2", _fieldqueryform_, _queryform_)}
 
 _queryform_ {
-<!-- query form (\_query:queryform\_) -->
+<!-- query form (\_query:plainqueryform\_) -->
 <form name=QueryForm method=get action="_gwcgi_">
-
 <input type=hidden name="a" value="q">
 <input type=hidden name="r" value="1">
@@ -560 +556 @@
 }
 
-_queryformcontent_{_basicqueryform_}
-
-_basicqueryform_ {<table><tr><td>
+_queryformcontent_{<table><tr><td>
 <nobr>_textselect_</nobr>
 </td></tr>
@@ -609 +603 @@
 <!-- field query form (\_query:fieldqueryform\_) -->
 <form name=QueryForm method=get action="_gwcgi_">
+
 <table><tr><td>
 <nobr>
@@ -614 +609 @@
 </nobr>
 </td></tr>
-_If_(_cgiargb_,_advancedforms_,_simpleforms_)
+_If_(_cgiargqf_,_advancedforms_,_simpleforms_)
 </table>
-_If_(_cgiargb_,<center>_iconblankbar_</center><br>
+_If_(_cgiargqf_,<center>_iconblankbar_</center><br>
 <center>_advancedformextra_</center>)
 </form>
@@ -678 +673 @@
 </select>}
 
-_textselect_ {_If_(_cgiargb_,_textadvancedsearch_,_textsimplesearch_)}
-_textformselect_ {_If_(_cgiargb_,_textformadvancedsearch_,_textformsimplesearch_)}
+_textselect_ {_If_(_cgiargct_, _textmgppselect_, _textmgselect_)}
+_textmgselect_ {_If_(_cgiargb_,_textadvancedsearch_,_textsimplesearch_)}
+_textmgppselect_ { _If_(_cgiargb_,_textadvancedsearchmgpp_, _textsimplesearchmgpp_)}
+_textformselect_ {_If_(_cgiargqf_,_textformadvancedsearch_,_textformsimplesearch_)}
 
 _ZZ_{_textallfields_}
@@ -697 +694 @@
 _querytypeselection_ {
 <select name="t">
-<option value="1"_If_(_cgiargt_, selected)>_textsome_
-<option value="0"_If_(_cgiargt_,, selected)>_textall_
+<option value="1"_If_(_cgiargt_, selected)>_If_(_cgiargb_,_textranked_,_textsome_)
+<option value="0"_If_(_cgiargt_,, selected)>_If_(_cgiargb_,_textboolean_,_textall_)
 </select>
 }
@@ -704 +701 @@
 _formquerytypeselection_ {
 <select name="t">
-<option value="1"_If_(_cgiargt_, selected)>_textformsome_
-<option value="0"_If_(_cgiargt_,, selected)>_textformall_
+<option value="1"_If_(_cgiargt_, selected)>_If_(_cgiargqf_,_textranked_,_textsome_)
+<option value="0"_If_(_cgiargt_,, selected)>_If_(_cgiargqf_,_textnatural_,_textall_)
 </select>
 }