Changeset 12037 for trunk/cic-hcap

Timestamp:

2006-07-06T15:23:14+12:00 (18 years ago)

Author:

mdewsnip

Message:

Improvements to combiner stuff.

File:

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

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, "&");
+     var combiner = "&";
+     if (document.QueryForm.aqc[real_index].value == "or") \{
+        combiner = "|";
+     \}
+         addQueryTerm(document.QueryForm.q, "[" + document.QueryForm.aqv[i].value + "]:" + document.QueryForm.aqi[real_index].value, combiner);
       \}
    \}
 
+   document.QueryForm.q.value += "(";
    addIndexValue(document.QueryForm.q, document.QueryForm.fuq, "FU", "&");
    addIndexValue(document.QueryForm.q, document.QueryForm.tmq, "TM", "&");
@@ -1261 +1266 @@
    addIndexValue(document.QueryForm.q, document.QueryForm.deq, "DE", "&");
    addIndexValue(document.QueryForm.q, document.QueryForm.stq, "ST", "&");
+   document.QueryForm.q.value = removeFromEnd(document.QueryForm.q.value, " & ");
+   document.QueryForm.q.value = removeFromEnd(document.QueryForm.q.value, " | ");
+   document.QueryForm.q.value += ")";
 
    // 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);
-   \}
+   document.QueryForm.q.value = removeFromEnd(document.QueryForm.q.value, "()");
+   document.QueryForm.q.value = removeFromEnd(document.QueryForm.q.value, " & ");
+   document.QueryForm.q.value = removeFromEnd(document.QueryForm.q.value, " | ");
    alert(document.QueryForm.q.value);
 \}
@@ -1288 +1296 @@
 \}
 
+function removeFromEnd(source_string, offender)
+\{
+   if (source_string.length < offender.length) \{
+      return source_string;
+   \}
+
+   if (source_string.substring(source_string.length - offender.length, source_string.length) != offender) \{
+      return source_string;
+   \}
+
+   return source_string.substring(0, source_string.length - offender.length);
+\}
+
 function initializereferencessearch()
 \{