Changeset 12222 for trunk/cic-hcap

Timestamp:

2006-07-13T19:38:43+12:00 (18 years ago)

Author:

mdewsnip

Message:

More changes to advanced search forms, particularly bibliography.

File:

• trunk/cic-hcap/macros/extra.dm (modified) (7 diffs)

trunk/cic-hcap/macros/extra.dm

@@ -1147 +1147 @@
 \{
 \}
+
+function initalizeAdvancedBibliographySearch()
+\{
+\}
+
+function prepareAdvancedBibliographySearch()
+\{
+   document.AdvancedBibliographyQueryForm.q.value = "";
+
+   for (var i = 0; i < document.AdvancedBibliographyQueryForm.abqv.length; i++) \{
+      var abqv_value = document.AdvancedBibliographyQueryForm.abqv[i].value;
+      if (abqv_value != "") \{
+     var combiner = "&";
+     if (document.AdvancedBibliographyQueryForm.abqc[i].value == "or") \{
+        combiner = "|";
+     \}
+     if (document.AdvancedBibliographyQueryForm.abqp[i].value == "1") \{
+        abqv_value = '"' + abqv_value + '"';
+         \}
+         addQueryTerm(document.AdvancedBibliographyQueryForm.q, "[" + abqv_value + "]:" + document.AdvancedBibliographyQueryForm.aqi[i].value, combiner);
+      \}
+   \}
+
+   alert(document.AdvancedBibliographyQueryForm.q.value);
+\}
 }
 
@@ -1153 +1178 @@
     <td>
       <nobr>
-        <select name="abqi" onChange="prepareBibliographySearch();">
+        <select name="abqi" onChange="prepareAdvancedBibliographySearch();">
       <option value="RE">General keyword</option>
       <option value="RR">Author keyword</option>
@@ -1159 +1184 @@
     </select>
 
-    <select name='abqp'>
+    <select name="abqp" onChange="prepareAdvancedBibliographySearch();">
       <option value='0'>contains</option>
       <option value='1'>is</option>
@@ -1166 +1191 @@
     <input name='abqv' type='text' style='width: 450px'/>
 
-    <select name="abqc">
+    <select name="abqc" onChange="prepareAdvancedBibliographySearch();">
       <option value="and">and</option>
       <option value="or">or</option>
@@ -1208 +1233 @@
 <form name=AdvancedBibliographyQueryForm method=get action="_gwcgi_" onSubmit="prepareAdvancedBibliographySearch();">
   <input type="hidden" name="a" value="q">
+  <input type="hidden" name="q" value="">
+  <input type="hidden" name="qt" value="1">
+  <input type="hidden" name="qf" value="1">
+  <input type="hidden" name="fqa" value="1">
+  <input type="hidden" name="m" value="-1">
 
   <table>
@@ -1264 +1294 @@
     <input type="hidden" name="aqib" value="">
 
-    <select name='aqp'>
+    <select name="aqp" onChange="prepareAdvancedSearch();">
       <option value='0'>contains</option>
       <option value='1'>is</option>
@@ -1273 +1303 @@
     </span>
 
-    <select name="aqc">
+    <select name="aqc" onChange="prepareAdvancedSearch();">
       <option value="and">and</option>
       <option value="or">or</option>