Changeset 11983

Timestamp:

2006-06-30T14:29:24+12:00 (18 years ago)

Author:

mdewsnip

Message:

More of the new advanced search page.

File:

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

trunk/cic-hcap/macros/extra.dm

@@ -890 +890 @@
 }
 
+_cicaqpdefault_ {<select name='aqp'><option value='0'>contains</option><option value='1'>is</option></select>}
+_cicaqptypeofplace_ {<select name='aqp' disabled><option value='0'>contains</option><option value='1' selected>is</option></select>}
+
+_cicaqvdefault_ {<input name='aqv' type='text' style='width: 450px'/>}
+_cicaqvtypeofplace_ {<select name='aqv' style='width: 450px'><option value='Individual building'>Individual building</option><option value='Landscape site'>Landscape site</option><option value='Campus arrangement'>Campus arrangement</option><option value='Building group'>Building group</option></select>}
+
 _advancedformsnew_ {
 <input type="hidden" name="a" value="q">
@@ -902 +908 @@
     <center>
       <nobr>
-        <select name="aqi" onChange="prepareadvancedsearch();">
+        <select name="aqi" onChange="changedAQI();">
           <option value="ZZ">Keyword</option>
       <option value="PL">Type of place</option>
@@ -909 +915 @@
         </select>
 
-        <select name="aqp">
-          <option value="0">contains</option>
-      <option value="1">is</option>
-        </select>
-
-        <span id="agv">
-          <input name="aqv" type="text" style="width: 450px"/>
+    <span id="aqp">
+      _cicaqpdefault_
+    </span>
+
+        <span id="aqv">
+      _cicaqvdefault_
         </span>
+
+    <select name="aqc">
+      <option value="and">and</option>
+      <option value="or">or</option>
+    </select>
       </nobr>
     </center>
@@ -1206 +1216 @@
 \}
 
+function changedAQI()
+\{
+   if (document.QueryForm.aqi.value == "PL") \{
+      document.getElementById('aqp').innerHTML = "_cicaqptypeofplace_";
+      document.getElementById('aqv').innerHTML = "_cicaqvtypeofplace_";
+   \}
+   else \{
+      document.getElementById('aqp').innerHTML = "_cicaqpdefault_";
+      document.getElementById('aqv').innerHTML = "_cicaqvdefault_";
+   \}
+\}
+
 function prepareadvancedsearch()
 \{
    document.QueryForm.q.value = "";
+
+   if (document.QueryForm.aqv.value != "") \{
+      addQueryTerm(document.QueryForm.q, "[" + document.QueryForm.aqv.value + "]:" + document.QueryForm.aqi.value);
+   \}
 
    addIndexValue(document.QueryForm.q, document.QueryForm.fuq, "FU");
@@ -1225 +1251 @@
    for (var i = 0; i < select_reference.options.length; i++) \{
       if (select_reference.options[i].selected) \{
-         index_value += ((index_value != "") ? " | " : "");
+         index_value += ((index_value != "") ? " & " : "");
      index_value += '["' + select_reference.options[i].value + '"]:' + index_code;
       \}
    \}
-
+   addQueryTerm(query_field_reference, index_value);
+\}
+
+function addQueryTerm(query_field_reference, index_value)
+\{
    if (index_value != "") \{
       query_field_reference.value += ((query_field_reference.value != "") ? " & " : "");