Add webui patch to allow filtering via regex

Closes #2028
jens-maus · Nov 11, 2022 · d0b7dff · d0b7dff
1 parent f24f3fa
commit d0b7dff
Show file tree

Hide file tree

Showing 3 changed files with 93,562 additions and 0 deletions.
diff --git a/buildroot-external/patches/occu/0170-WebUI-RegexSearchInDeviceLists.patch b/buildroot-external/patches/occu/0170-WebUI-RegexSearchInDeviceLists.patch
@@ -0,0 +1,92 @@
+--- occu/WebUI/www/webui/webui.js.orig
++++ occu/WebUI/www/webui/webui.js
+@@ -7872,26 +7872,21 @@
+   };
+
+   /**
+-   * Pr�ft, ob der Filter auf einen Text zutrifft
++   * Pr�ft, ob der Filter auf einen Text zutrifft
+    **/
+   this.match = function(text)
+   {
+@@ -7881,17 +7881,13 @@
+     var patternList = m_value.toLowerCase().split("|");
+     //var patternList = m_value.split("|");
+     text            = text.toLowerCase();
+-    
+-    for (var i = 0, len = patternList.length; i < len; i++)
+-    {
+-      if (0 <= text.indexOf(patternList[i])) { return true; }
+-    }
+-    
++    var r = new RegExp(m_value.toLowerCase());                                                                                                                  
++    if (r.test(text) === true) {return true; } 
+     return false;
+   };
+
+   /**
+-   * Schlie�t den Filter und ruft dei Callback-Funktion auf
++   * Schlie�t den Filter und ruft dei Callback-Funktion auf
+    **/
+   this.set = function()
+   {
+@@ -32410,7 +32405,8 @@
+     {
+       if (typeof obj['type'] != 'undefined') {
+         if (obj['type'] === "")                      { return false; }
+-        if (obj['type'].toLowerCase().indexOf(this.filType) == -1) { return false; }
++        var r = new RegExp(this.filType);                                           
++        if (r.test(obj['type'].toLowerCase()) === false) {return false; }
+       }
+     }
+     if (this.filDesc !== "")
+@@ -32420,7 +32417,8 @@
+       {
+         //conInfo( "iseFilter: desc="+obj['desc'] );
+         if (obj['desc'] === "")                      { return false; }
+-        if (obj['desc'].toLowerCase().indexOf(this.filDesc) == -1) { return false; }
++        var r = new RegExp(this.filDesc);                                           
++        if (r.test(obj['desc'].toLowerCase()) === false) {return false; }
+       }
+     }
+     if (this.filName !== "")
+@@ -32429,7 +32427,8 @@
+       {
+         if (obj['name'] === "")                      { return false; }
+         var transName = translateString(obj['name']);
+-        if (transName.toLowerCase().indexOf(this.filName) == -1) { return false; }
++        var r = new RegExp(this.filName);                                           
++        if (r.test(transName.toLowerCase()) === false) {return false; }
+       }
+     }
+     if (this.filSn !== "")
+@@ -32437,7 +32436,8 @@
+       if (typeof obj['sn'] != 'undefined')
+       {
+         if (obj['sn'] === "")                     { return false; }
+-        if (obj['sn'].toLowerCase().indexOf(this.filSn) == -1) { return false; }
++        var r = new RegExp(this.filSn);                                           
++        if (r.test(obj['sn'].toLowerCase()) === false) {return false; }
+       }
+     }
+     if (this.filUnit !== "")
+@@ -32445,7 +32445,8 @@
+       if (typeof obj['unit'] != 'undefined')
+       {
+         if (obj['unit'] === "")                      { return false; }
+-        if (obj['unit'].toLowerCase().indexOf(this.filUnit) == -1) { return false; }
++        var r = new RegExp(this.filUnit);                                           
++        if (r.test(obj['unit'].toLowerCase()) === false) {return false; }
+       }
+     }
+
+@@ -32469,7 +32470,8 @@
+     if (this.filChnLink !== "")
+     {
+       if (obj['chn'] === "")                         { return false; }
+-      if (obj['chn'].toLowerCase().indexOf(this.filChnLink) == -1) { return false; }
++      var r = new RegExp(this.filChnLink);                                           
++      if (r.test(obj['chn'].toLowerCase()) === false) {return false; }
+     }
+ /*    
+     if (this.filVarTypes !== "")