fix to db2ResultSQL

Mattk70 · Mar 2, 2024 · 1094c28 · 1094c28
1 parent eb9dde6
commit 1094c28
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/js/ui.js b/js/ui.js
@@ -2369,7 +2369,7 @@ function onChartData(args) {
             }
         },
         KeyD: function (e) {
-            if (( e.ctrlKey || e.metaKey) && e.shiftKey) worker.postMessage({ action: 'convert-dataset' });
+            if (( e.ctrlKey || e.metaKey) && e.shiftKey) worker.postMessage({ action: 'create-dataset' });
         },
         KeyE: function (e) {
             if (( e.ctrlKey || e.metaKey) && region) exportAudio();

diff --git a/js/worker.js b/js/worker.js
@@ -29,10 +29,10 @@ let TEMP, appPath, BATCH_SIZE, LABELS, BACKEND, batchChunksToSend = {};
 let LIST_WORKER;
 const DEBUG = false;
 
-const DATASET = false;
+const DATASET = true;
 const adding_chirpity_additions = false;
 const dataset_database = DATASET;
-const DATASET_SAVE_LOCATION = "E:/DATASETS/BirdNET_pngs";
+const DATASET_SAVE_LOCATION = "E:/DATASETS/NEW_MODEL_PNGs";
 
 // Adapted from https://stackoverflow.com/questions/6117814/get-week-of-year-in-javascript-like-in-php
 Date.prototype.getWeekNumber = function(){
@@ -1474,9 +1474,11 @@ const prepSummaryStatement = (included) => {
                 JOIN species
                 ON species.id = records.speciesID
                 JOIN files ON records.fileID = files.id
-                ${filtersApplied(included) ? `WHERE speciesID IN (${prepParams(STATE.included)}` : ''}) 
-                AND confidence >= ${STATE.detect.confidence}`;
-                let params = filtersApplied(included) ? STATE.included : [];
+                WHERE confidence >= ${STATE.detect.confidence}`;
+
+                db2ResultSQL+= filtersApplied(included) ? ` AND speciesID IN (${prepParams(STATE.included)})` : '';
+
+                let params = filtersApplied(included) ? included : [];
                 if (species) {
                     db2ResultSQL += ` AND species.cname = ?`;
                     params.push(species)
@@ -1746,11 +1748,11 @@ const prepSummaryStatement = (included) => {
                         await parseMessage(message).catch( (error) => {
                             console.warn("Parse message error", error, 'message was', message);
                         });
-                        // Dial down the getSummary calls if the queue length starts growing
-                        // if (messageQueue.length > NUM_WORKERS * 2 )  {
-                        //     STATE.incrementor = Math.min(STATE.incrementor *= 2, 256);
-                        //     console.log('increased incrementor to ', STATE.incrementor)
-                        // }
+                        //Dial down the getSummary calls if the queue length starts growing
+                        if (messageQueue.length > NUM_WORKERS * 2 )  {
+                            STATE.incrementor = Math.min(STATE.incrementor *= 2, 256);
+                            console.log('increased incrementor to ', STATE.incrementor)
+                        }
 
 
                         // Set isParsing to false to allow the next message to be processed