Changeset 12223 for trunk/cic-hcap

Timestamp:

2006-07-13T19:48:54+12:00 (18 years ago)

Author:

mdewsnip

Message:

Finished off the bibliography search page... I think.

File:

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

trunk/cic-hcap/macros/extra.dm

@@ -1160 +1160 @@
       if (abqv_value != "") \{
      var combiner = "&";
-     if (document.AdvancedBibliographyQueryForm.abqc[i].value == "or") \{
+     if (i < (document.AdvancedBibliographyQueryForm.abqv.length - 1) && document.AdvancedBibliographyQueryForm.abqc[i].value == "or") \{
         combiner = "|";
      \}
@@ -1166 +1166 @@
         abqv_value = '"' + abqv_value + '"';
          \}
-         addQueryTerm(document.AdvancedBibliographyQueryForm.q, "[" + abqv_value + "]:" + document.AdvancedBibliographyQueryForm.aqi[i].value, combiner);
+         addQueryTerm(document.AdvancedBibliographyQueryForm.q, "[" + abqv_value + "]:" + document.AdvancedBibliographyQueryForm.abqi[i].value, combiner);
       \}
    \}
 
+   // Remove the trailing combiner
+   document.AdvancedBibliographyQueryForm.q.value = removeFromEnd(document.AdvancedBibliographyQueryForm.q.value, " & ");
+   document.AdvancedBibliographyQueryForm.q.value = removeFromEnd(document.AdvancedBibliographyQueryForm.q.value, " | ");
    alert(document.AdvancedBibliographyQueryForm.q.value);
 \}
@@ -1195 +1198 @@
       <option value="or">or</option>
     </select>
+      </nobr>
+    </td>
+  </tr>
+}
+
+_cicabqlinenocombiner_ {
+  <tr>
+    <td>
+      <nobr>
+        <select name="abqi" onChange="prepareAdvancedBibliographySearch();">
+      <option value="RE">General keyword</option>
+      <option value="RR">Author keyword</option>
+      <option value="RF">Title keyword</option>
+    </select>
+
+    <select name="abqp" onChange="prepareAdvancedBibliographySearch();">
+      <option value='0'>contains</option>
+      <option value='1'>is</option>
+    </select>
+
+    <input name='abqv' type='text' style='width: 450px'/>
       </nobr>
     </td>
@@ -1242 +1266 @@
     _cicabqline_
     _cicabqline_
-    _cicabqline_
+    _cicabqlinenocombiner_
 
     <tr>