* nodes page looks good, going generic

[plewww.git] / planetlab / js / plc_filter.js

diff --git a/planetlab/js/plc_filter.js b/planetlab/js/plc_filter.js
index 78b41ee..f11c72c 100644 (file)
--- a/planetlab/js/plc_filter.js
+++ b/planetlab/js/plc_filter.js
@@ -22,29 +22,58 @@ function plc_table_tbody_matching (tbody, matching) {
   tbody.className=cn;
 }
 
-// /* scan the table, and mark as visible the rows that have at least one cell that contains the pattern */
-function plc_table_filter (table_id,pattern_id) {
+/* scan the table, and mark as visible 
+   the rows that match (either AND or OR the patterns) */
+function plc_table_filter (table_id,pattern_id,and_id) {
   var tbody = document.getElementById(table_id).getElementsByTagName("tbody")[0];
   var rows=tbody.rows;
-  var pattern_text = document.getElementById(pattern_id).value;
+  var pattern_area = document.getElementById(pattern_id);
+  var pattern_text = pattern_area.value;
   var row_index, row, cells, cell_index, cell, visible;
   var pattern,i;
   var matching_entries=0;
+  var and_button=document.getElementById(and_id);
+  var and_if_true=and_button.checked;
+
   
   // remove whitespaces at the beginning and end
   pattern_text = pattern_text.replace(/[ \t]+$/,"");
   pattern_text = pattern_text.replace(/^[ \t]+/,"");
   
+  if (pattern_text.indexOf ("&") != -1) {
+    pattern_text = pattern_text.replace(/&$/,"").replace(/&/," ");
+    pattern_area.value=pattern_text;
+    and_button.checked=true;
+    return;
+  } else if (pattern_text.indexOf ("|") != -1 ) {
+    pattern_text = pattern_text.replace(/\|$/,"").replace(/\|/," ");
+    pattern_area.value=pattern_text;
+    and_button.checked=false;
+    return;
+  }
+    
   var patterns = pattern_text.split(" ");
 
   for (row_index = 0; row=rows[row_index]; row_index++) {
+      cells=row.cells;
     
-    /* xxx deal with empty patterns and whitespaces */
+    /*empty pattern */
     if (patterns.length == 0) {
       visible=true;
+    } else if (and_if_true) {
+      /* AND mode: all patterns must match */
+      visible=true;
+      for (i in patterns) {
+       var pattern_matched=false;
+       pattern=patterns[i];
+       for (cell_index = 0; cell=cells[cell_index]; cell_index++) {
+         if ( cell.innerHTML.match(pattern)) pattern_matched=true;
+       }
+       if ( ! pattern_matched ) visible=false;
+      }
     } else {
+      /* OR mode: any match is good enough */
       visible=false;
-      cells=row.cells;
       for (cell_index = 0; cell=cells[cell_index]; cell_index++) {
        for (i in patterns) {
          pattern=patterns[i];