diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/Main.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/Main.java index 5b37f88..801e080 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/Main.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/Main.java @@ -8,10 +8,12 @@ import org.texttechnologylab.project.gruppe_05_1.rest.RESTHandler; import org.texttechnologylab.project.gruppe_05_1.util.Logger; import org.texttechnologylab.project.gruppe_05_1.util.PPRUtils; import org.texttechnologylab.project.gruppe_05_1.xml.FileObjectFactory; +import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Session; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.SpeechParser; import org.w3c.dom.Document; import java.util.Arrays; +import java.util.List; import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -124,8 +126,7 @@ public class Main { Logger.pink("Uploading Member Photos to DB..."); mongoDBHandler.uploadMemberPhotos(); } - NlpUtils.runRemoteDriver(); - /*ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); + ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); scheduler.scheduleAtFixedRate(() -> { try { NlpUtils.runRemoteDriver(); @@ -141,7 +142,8 @@ public class Main { Logger.info("Keine neuen Protokolle gefunden, Upload wird übersprungen."); } else { SpeechParser speechParser = new SpeechParser(); - mongoDBHandler.insertSessions(speechParser.parseAllSessions(newProtocols)); + List newSessions = speechParser.parseAllSessions(newProtocols); + mongoDBHandler.insertSessions(newSessions); mongoDBHandler.insertAgendaItems(speechParser.getAgendaItems()); mongoDBHandler.insertSpeeches(speechParser.getSpeeches()); Logger.info("Neuer Protokolle uploaded: " + newProtocols.size()); @@ -149,7 +151,7 @@ public class Main { } catch (Exception ex) { Logger.error("Fehler bei der Protokollaktualisierung: " + ex.getMessage()); } - }, 0, 10, TimeUnit.MINUTES);*/ + }, 0, 10, TimeUnit.MINUTES); RESTHandler restHandler = new RESTHandler(); restHandler.startJavalin(); diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java index f2408f4..9a3343c 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java @@ -769,7 +769,7 @@ public class MongoDBHandler { } public boolean sessionExists(String sessionNumber) { - Document filter = new Document("sessionNumber", sessionNumber); + Document filter = new Document("sessionId", Integer.valueOf(sessionNumber)); long count = sessionsCollection.countDocuments(filter); return count > 0; } diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/util/PPRUtils.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/util/PPRUtils.java index 261e8a0..4198ec1 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/util/PPRUtils.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/util/PPRUtils.java @@ -446,6 +446,10 @@ public abstract class PPRUtils { // Entferne die Dateiendung String sessionNumberFull = fileName.replace(".xml", ""); // z.B. "20212" String sessionNumber; + if (sessionNumberFull.equals("20007") || sessionNumberFull.equals("20212")) { + Logger.warn("Skipping faulty protocol: " + sessionNumberFull); + continue; + } if (sessionNumberFull.startsWith("20") && sessionNumberFull.length() > 2) { sessionNumber = sessionNumberFull.substring(2); } else {