Changeset 12035

Timestamp:

2006-07-06T14:06:12+12:00 (18 years ago)

Author:

mdewsnip

Message:

Fixed the problem with the values not matching up to the indexes once the indexes change.

File:

• trunk/cic-hcap/macros/extra.dm (modified) (4 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='true'><option value='0'>contains</option><option value='1' selected='true'>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>}
+_cicaqpdefault_ {<select id='aqp_1_field' name='aqp'><option value='0'>contains</option><option value='1'>is</option></select>}
+_cicaqptypeofplace_ {<select id='aqp_1_field' name='aqp' disabled='true'><option value='0'>contains</option><option value='1' selected='true'>is</option></select>}
+
+_cicaqvdefault_ {<input id='aqv_1_field' name='aqv' type='text' style='width: 450px'/>}
+_cicaqvtypeofplace_ {<select id='aqv_1_field' 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>}
 
 _cicaqline_ {
@@ -910 +910 @@
 
     <span id="aqp_1_">
-      _cicaqpdefault_
+      _cicaqpdefault_(_1_)
     </span>
 
     <span id="aqv_1_">
-      _cicaqvdefault_
+      _cicaqvdefault_(_1_)
     </span>
 
@@ -1228 +1228 @@
    for (var i = 0; i < document.QueryForm.aqi.length; i++) \{
       if (document.QueryForm.aqi[i].value != document.QueryForm.aqib[i].value) \{
-         alert("Changed " + i + ": " + document.QueryForm.aqi[i].value);
          if (document.QueryForm.aqi[i].value == "PL") \{
-            document.getElementById("aqp" + i).innerHTML = "_cicaqptypeofplace_";
-        document.getElementById("aqv" + i).innerHTML = "_cicaqvtypeofplace_";
+            document.getElementById("aqp" + i).innerHTML = "_cicaqptypeofplace_(" + i + ")";
+        document.getElementById("aqv" + i).innerHTML = "_cicaqvtypeofplace_(" + i + ")";
      \}
      else \{
-            document.getElementById("aqp" + i).innerHTML = "_cicaqpdefault_";
-        document.getElementById("aqv" + i).innerHTML = "_cicaqvdefault_";
+            document.getElementById("aqp" + i).innerHTML = "_cicaqpdefault_(" + i + ")";
+        document.getElementById("aqv" + i).innerHTML = "_cicaqvdefault_(" + i + ")";
      \}
 
@@ -1249 +1248 @@
    document.QueryForm.q.value = "";
 
-   for (var i = 0; i < document.QueryForm.aqi.length; i++) \{
-      alert(i + ": " + document.QueryForm.aqi[i].value + "," + document.QueryForm.aqv[i].value);
+   for (var i = 0; i < document.QueryForm.aqv.length; i++) \{
       if (document.QueryForm.aqv[i].value != "") \{
-         addQueryTerm(document.QueryForm.q, "[" + document.QueryForm.aqv[i].value + "]:" + document.QueryForm.aqi[i].value);
-     alert(document.QueryForm.aqi[i].value + " -- " + document.QueryForm.q.value);
+         var real_index = /aqv([0-9]+)field/.exec(document.QueryForm.aqv[i].id)[1];
+         addQueryTerm(document.QueryForm.q, "[" + document.QueryForm.aqv[i].value + "]:" + document.QueryForm.aqi[real_index].value);
       \}
    \}