Skip to content

Commit

Permalink
fixed merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Mattk70 committed Nov 5, 2023
1 parent 4f94a2e commit 5771709
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions js/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const createDB = async (file) => {
await db.runAsync(`CREATE TABLE records(
dateTime INTEGER, position INTEGER, fileID INTEGER,
speciesID INTEGER, confidence INTEGER, label TEXT,
comment TEXT, end INTEGER, callCount INTEGER, isDaylight INTEGER, isDaylight INTEGER,
comment TEXT, end INTEGER, callCount INTEGER, isDaylight INTEGER,
UNIQUE (dateTime, fileID, speciesID),
CONSTRAINT fk_files
FOREIGN KEY (fileID) REFERENCES files(id) ON DELETE CASCADE,
Expand Down Expand Up @@ -1595,8 +1595,9 @@ const terminateWorkers = () => {
predictWorkers = [];
}

const insertRecord = async (timestamp, timestamp, key, speciesID, confidence, file) => {
const insertRecord = async (timestamp, key, speciesID, confidence, file) => {
const isDaylight = isDuringDaylight(timestamp, STATE.lat, STATE.lon);
const offset = key * 1000;
let changes, fileID;
confidence = Math.round(confidence);
const db = memoryDB; //STATE.db;
Expand Down

0 comments on commit 5771709

Please sign in to comment.