Changeset 12036

Timestamp:

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

Author:

mdewsnip

Message:

Added "combiner" arguments to addQueryTerm() and addIndexValue().

File:

• trunk/cic-hcap/macros/extra.dm (modified) (1 diff)

trunk/cic-hcap/macros/extra.dm

@@ -1251 +1251 @@
       if (document.QueryForm.aqv[i].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);
+         addQueryTerm(document.QueryForm.q, "[" + document.QueryForm.aqv[i].value + "]:" + document.QueryForm.aqi[real_index].value, "&");
       \}
    \}
 
-   addIndexValue(document.QueryForm.q, document.QueryForm.fuq, "FU");
-   addIndexValue(document.QueryForm.q, document.QueryForm.tmq, "TM");
-   addIndexValue(document.QueryForm.q, document.QueryForm.syq, "SY");
-   addIndexValue(document.QueryForm.q, document.QueryForm.maq, "MA");
-   addIndexValue(document.QueryForm.q, document.QueryForm.deq, "DE");
-   addIndexValue(document.QueryForm.q, document.QueryForm.stq, "ST");
-\}
-
-function addIndexValue(query_field_reference, select_reference, index_code)
+   addIndexValue(document.QueryForm.q, document.QueryForm.fuq, "FU", "&");
+   addIndexValue(document.QueryForm.q, document.QueryForm.tmq, "TM", "&");
+   addIndexValue(document.QueryForm.q, document.QueryForm.syq, "SY", "&");
+   addIndexValue(document.QueryForm.q, document.QueryForm.maq, "MA", "&");
+   addIndexValue(document.QueryForm.q, document.QueryForm.deq, "DE", "&");
+   addIndexValue(document.QueryForm.q, document.QueryForm.stq, "ST", "&");
+
+   // Remove the trailing combiner
+   if (document.QueryForm.q.value.lastIndexOf('\)') != -1) \{
+      document.QueryForm.q.value = document.QueryForm.q.value.substring(0, document.QueryForm.q.value.lastIndexOf('\)') + 1);
+   \}
+   alert(document.QueryForm.q.value);
+\}
+
+function addQueryTerm(query_field_reference, index_value, combiner)
+\{
+   if (index_value != "") \{
+      query_field_reference.value += "(" + index_value + ") " + combiner + " ";
+   \}
+\}
+
+function addIndexValue(query_field_reference, select_reference, index_code, combiner)
 \{
    var index_value = "";
    for (var i = 0; i < select_reference.options.length; i++) \{
       if (select_reference.options[i].selected) \{
-         index_value += ((index_value != "") ? " & " : "");
+         index_value += ((index_value != "") ? " " + combiner + " " : "");
      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 != "") ? " & " : "");
-      query_field_reference.value += "(" + index_value + ")";
-   \}
+   addQueryTerm(query_field_reference, index_value, "&");
 \}