fix build regex matching

2 files changed, 11 insertions, 7 deletions

diff --git a/crunch_global.sql b/crunch_global.sql
index d5485da..f79b9b4 100644
--- a/crunch_global.sql
+++ b/crunch_global.sql
@@ -45,12 +45,12 @@ join build b on ((  -- only per patch global
     st.name = 'all' and
     reg.name = 'all' and
 
-    b.item_1 is not null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_1, ';', b.item_1_count, :build_regex_end) and
-    b.item_2 is not null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_2, ';', b.item_2_count, :build_regex_end) and
-    b.item_3 is not null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_3, ';', b.item_3_count, :build_regex_end) and
-    b.item_4 is not null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_4, ';', b.item_4_count, :build_regex_end) and
-    b.item_5 is not null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_5, ';', b.item_5_count, :build_regex_end) and
-    b.item_6 is not null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_6, ';', b.item_6_count, :build_regex_end) and
+    (b.item_1 is null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_1, ';', b.item_1_count, :build_regex_end)) and
+    (b.item_2 is null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_2, ';', b.item_2_count, :build_regex_end)) and
+    (b.item_3 is null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_3, ';', b.item_3_count, :build_regex_end)) and
+    (b.item_4 is null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_4, ';', b.item_4_count, :build_regex_end)) and
+    (b.item_5 is null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_5, ';', b.item_5_count, :build_regex_end)) and
+    (b.item_6 is null or p_s.item_grants RLIKE concat(:build_regex_start, b.item_6, ';', b.item_6_count, :build_regex_end)) and
     b.dimension_on = 'global'
 ) or b.name = 'all')
 
diff --git a/worker.js b/worker.js
index 8d277de..ae01dc5 100644
--- a/worker.js
+++ b/worker.js
@@ -102,7 +102,11 @@ if (LOGGLY_TOKEN)
     // execute the scripts
     async function crunch() {
         const profiler = logger.startTimer();
-        logger.info("crunching");
+        logger.info("crunching", {
+            players: participants_player.size,
+            teams: teams.size,
+            globals: participants_global.size
+        });
 
         // prevent async issues
         const api_ids_player = [...participants_player],