From fba8b484c86aa57e7142f102cea66f604f1e1265 Mon Sep 17 00:00:00 2001
From: wbudic <vilijanac@gmail.com>
Date: Sun, 14 Feb 2021 08:08:50 +1100
Subject: [PATCH] Keywords splitting is now on all non word character types.

---
 Current Development Check List.md | 1 +
 htdocs/cgi-bin/main.cgi           | 4 ++--
 htdocs/cgi-bin/wsrc/main.css      | 8 ++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Current Development Check List.md b/Current Development Check List.md
index dc8afae..3e66705 100644
--- a/Current Development Check List.md	
+++ b/Current Development Check List.md	
@@ -9,6 +9,7 @@
 * Search keep in session should preserve and always set options as selection till it is ticked.
   * Reset Whole View to page view, should still set the search option till it is ticked.
   * Unticking Keep in Session should be honored on next browsing.
+  * Keyword should be stripped from, punctuations.
 * Global view overrides. These get generated in the db if set on logon. And used instead of the normal view.
   * Overrides must always show todays log entries, regardless of criteria.
   * VIEW_OVERRIDE_SYSLOGS={0/1}, anon if set 1-true, will hide older than today system logs. Doesn't affect category and keywords searches/views.
diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index e380a10..6e6a6fb 100755
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -277,7 +277,7 @@ qq(<FORM id="frm_log" action="data.cgi" onSubmit="return formDelValidation();">
     }
     elsif ( $rs_keys && $rs_keys ne '*' ) {
 
-        my @keywords = split / /, $rs_keys;
+        my @keywords = split /\W/, $rs_keys;
         if ($prm_vc && $prm_vc != $prm_xc) {
 
 
@@ -309,7 +309,7 @@ qq(<FORM id="frm_log" action="data.cgi" onSubmit="return formDelValidation();">
         }
 
         if (@keywords) {
-            foreach (@keywords) {
+            foreach (@keywords) { next if $_ eq "";
                 #was previous an OR?, replace with an AND we filter further by keywords.
                 $stmS =~ s/\sOR$/ and/gi;
                 if(Settings::isProgressDB()){$stmS .= " LOWER(LOG) ~ '" . lc $_ . "'"}
diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css
index 75f1d43..f960317 100644
--- a/htdocs/cgi-bin/wsrc/main.css
+++ b/htdocs/cgi-bin/wsrc/main.css
@@ -1,5 +1,9 @@
+body{
+    font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Bookman,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
+    font-size: 14px;
+}
 p {
-    font-family: Bookman;
+    
     margin-left: 70px;
     font-weight: bold;
 }
@@ -7,7 +11,7 @@ p {
 table,
 th,
 td {
-    font-family: Bookman;
+    
     border-collapse: collapse;
     padding: 5px;
     margin: auto;
-- 
2.34.1