Changeset 28223

Timestamp:

2013-09-05T13:47:41+12:00 (11 years ago)

Author:

kjdon

Message:

tidying up advanced form stem/case/accent boxes. added in boxes and javascript for accentfolding tick boxes. Made all three dependent on ks/ss/afs support args for display - if the collection doesn't provide stemming for example, then we don't want any stemming checkboxes

Location:

main/trunk/greenstone2/macros

Files:

• english.dm (modified) (1 diff)
• query.dm (modified) (11 diffs)

main/trunk/greenstone2/macros/english.dm

@@ -422 +422 @@
 
 #these go together in form search:
-#"Words  (fold, stem)  ... in field"
+#"Words  fold case fold accents stem  ... in field"
 _textwordphrase_ {Words}
 _textinfield_ {... in field}
 _textfieldphrase_ {Field}
 _textinwords_ {... in word(s)}
-_textfoldstem_ {(fold, stem)}
+_textformcasefold_ {fold case}
+_textformaccentfold_ {fold accents}
+_textformstem_ {stem}
 
 _textadvquery_ {Or enter a query directly:}

main/trunk/greenstone2/macros/query.dm

@@ -91 +91 @@
   args = "&fqa=0&fqv="+argfqv+"&fqf="+argfqf;
   _If_(_cgiargb_,
-     args += "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc;
+     args += "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc+"&fqaf="+argfqaf;
   )
   _If_("_cgiarga_" eq "sqlq",args += "&sqlfqf="+argsqlfqf + "&sqlfqc="+argsqlfqc;)
@@ -102 +102 @@
 function getqueryargs () \{
   var args =  "&fqa=1"+"&q="+argq+"&fqv="+argfqv+"&fqf="+argfqf+
-     "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc;
+     "&fqk="+argfqk+"&fqs="+argfqs+"&fqc="+argfqc+"&fqaf="+argfqaf;
  _If_("_cgiarga_" eq "sqlq",args += "&sqlfqf="+argsqlfqf + "&sqlfqc="+argsqlfqc;)
  return args;
@@ -211 +211 @@
 argfqk="_cgiargfqk_";
 argfqs="_cgiargfqs_";
+argfqaf="_cgiargfqaf_";
 argfqc="_cgiargfqc_";
 _If_("_cgiarga_" eq "sqlq",
@@ -224 +225 @@
    if (document.QueryForm.fqs != null) \{initfqs(); \}
    if (document.QueryForm.fqk != null) \{initfqk(); \}
+   if (document.QueryForm.fqaf != null) \{initfqaf(); \}
    if (document.QueryForm.fqc != null) \{initfqc(); \}
 _If_("_cgiarga_" eq "sqlq",
@@ -556 +558 @@
 \}
 
-// kqk - the casefolding checkboxes
+// fqk - the casefolding checkboxes
 function initfqk() \{
    var i;
@@ -595 +597 @@
    \}
    updatefqk();
+\}
+
+// fqaf - the casefolding checkboxes
+function initfqaf() \{
+   var i;
+   fqaf = argfqaf.split(",");
+   for (i=0; i<fqaf.length; i++) \{
+       if (fqaf[i]=="1") \{
+      document.QueryForm.fqaf[i].checked = true;
+       \}
+   \}
+   updatefqaf();
+
+\}
+
+
+function updatefqaf() \{
+   argfqaf="";
+   if (document.QueryForm.fqaf[0].checked) \{
+      argfqaf += "1";
+   \}
+   else \{
+      argfqaf += "0";   
+   \}
+   var i;
+   for (i=1; i<document.QueryForm.fqaf.length; i++) \{
+       if (document.QueryForm.fqaf[i].checked) \{
+      argfqaf += ",1";
+    \}
+    else \{
+      argfqaf += ",0";
+    \}
+   \}
+\}
+
+function clearfqaf() \{
+   var i;
+   for (i=0; i<document.QueryForm.fqaf.length; i++) \{
+       document.QueryForm.fqaf[i].checked = false;
+   \}
+   updatefqaf();
 \}
 
@@ -688 +731 @@
       if (document.QueryForm.fqk != null) \{clearfqk();\}
       if (document.QueryForm.fqs != null) \{clearfqs();\}
+      if (document.QueryForm.fqaf != null) \{clearfqaf();\}
       if (document.QueryForm.fqc != null) \{clearfqc();\}
 _If_("_cgiarga_" eq "sqlq",
@@ -894 +938 @@
 }
 
-
-
+_stemcaseheader_ {
+_If_("_cgiargct_" eq "1",_If_("_cgiargks_" eq "1",<th align="center" style="font-size:smaller;">_textformcasefold_</th>)
+_If_("_cgiargafs_" eq "1",<th align="center" style="font-size:smaller;">_textformaccentfold_</th>)_If_("_cgiargss_" eq "1",<th align="center" style="font-size:smaller;">_textformstem_</th>)
+
+}
 _advancedforms_{
 <table border="0" cellspacing="0" cellpadding="0" width="90%">
-<tr><th></th><th align="left">_textwordphrase_</th>_If_("_cgiargct_" eq "1",<th colspan="2"><nobr>_textfoldstem_</nobr></th>)<th align="center">&nbsp;&nbsp;_textinfield_</th></tr> 
+<tr><th></th><th align="left">_textwordphrase_</th>_stemcaseheader_<th align="center">&nbsp;&nbsp;_textinfield_</th></tr>   
 _advformlist_
 <tr>
@@ -982 +1029 @@
 #
 
+_stemcaseboxes_ {
+_If_("_cgiargks_" eq "1",<td align="center"><input type="checkbox" name="fqk" onClick="updatefqk();"></td>)
+_If_("_cgiargafs_" eq "1",<td align="center"><input type="checkbox" name="fqaf" onClick="updatefqaf();"></td>)
+_If_("_cgiargss_" eq "1",<td align="center"><input type="checkbox" name="fqs" onClick="updatefqs();"></td>)
+}
 _regformelement_{
 <tr><td><input type="text" size="39" name="fqv" onChange="updatefqv();" onkeypress="updatefqv(); entersubmit(event);"></td>
@@ -989 +1041 @@
 _firstadvformelement_{
 <tr><td></td><td><input type="text" size="31" name="fqv" onChange="updatefqv();" onkeypress="updatefqv(); entersubmit(event);"></td>
-_If_("_cgiargct_" eq "1",<td align="center"><input type="checkbox" name="fqk" onClick="updatefqk();"></td>
-<td align="center"><input type="checkbox" name="fqs" onClick="updatefqs();"></td>)
+_stemcaseboxes_
 <td align="right">_fqfselection_</td></tr>}
 
@@ -996 +1047 @@
 <tr><td>_fqcselection_</td>
 <td><input type="text" size="31" name="fqv" onChange="updatefqv();" onkeypress="updatefqv(); entersubmit(event);"></td>
-_If_("_cgiargct_" eq "1",<td align="center"><input type="checkbox" name="fqk" onClick="updatefqk();"></td>
-<td align="center"><input type="checkbox" name="fqs" onClick="updatefqs();"></td>)
+_stemcaseboxes_
 <td align="right">_fqfselection_</td></tr>}