From 624a4ae0d78a8b2800b4325b7b42854a35481d5f Mon Sep 17 00:00:00 2001 From: s5260822 Date: Tue, 18 Mar 2025 20:34:29 +0100 Subject: [PATCH] moved to global variables --- .../org/texttechnologylab/project/gruppe_05_1/Main.java | 6 ++++++ .../project/gruppe_05_1/database/MongoDBHandler.java | 2 +- .../project/gruppe_05_1/nlp/XmiExtractor.java | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) 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 6fef613..5b37f88 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 @@ -30,6 +30,12 @@ public class Main { private static final FileObjectFactory xmlFactory = FileObjectFactory.getFactory(); private static final MongoObjectFactory mongoFactory = MongoObjectFactory.getFactory(); + public static final String CONFIG_DIR = "src/main/resources/config"; + public static final String JAVALIN_TEMPLATE_DIR = "src/main/resources/templates"; + public static final String JAVALIN_STATIC_FILES_DIR = "src/main/resources/static"; + public static final String JCAS_SPEECHES_TYPESYSTEM_DIR = "src/main/resources/speeches/TypeSystem"; + public static final String MEMBER_IMAGES_DIR = "src/main/resources/membersOfParliamentImages/"; + public static void main(String[] args) throws Exception { UPLOAD_MEMBER_PHOTOS = Arrays.asList(args).contains("uploadMemberPhotos"); FORCE_UPLOAD_MEMBERS = Arrays.asList(args).contains("forceUploadMembers"); 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 e7d38d4..682376c 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 @@ -31,12 +31,12 @@ import java.util.*; import java.util.concurrent.TimeUnit; import static com.mongodb.client.model.Filters.eq; +import static org.texttechnologylab.project.gruppe_05_1.Main.MEMBER_IMAGES_DIR; public class MongoDBHandler { public static final String propertiesFileName = "mongoDB.properties"; public static final String DEFAULT_ID_FIELD_NAME = "_id"; - public static final String MEMBER_IMAGES_DIR = "src/main/resources/membersOfParliamentImages/"; private final MongoClient mongoClient; private final MongoDatabase database; private static MongoDatabase mongoDatabase = null; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/XmiExtractor.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/XmiExtractor.java index 335d73e..89fee0d 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/XmiExtractor.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/XmiExtractor.java @@ -22,6 +22,8 @@ import org.apache.uima.cas.impl.XmiCasDeserializer; import org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler; import org.texttechnologylab.project.gruppe_05_1.util.Logger; +import static org.texttechnologylab.project.gruppe_05_1.Main.JCAS_SPEECHES_TYPESYSTEM_DIR; + public class XmiExtractor { @@ -86,7 +88,7 @@ public class XmiExtractor { private void processXmiGzStream(InputStream inputStream, String filename) { JCas jCas = null; try (GZIPInputStream gis = new GZIPInputStream(inputStream)) { - jCas = JCasFactory.createJCas("src/main/resources/speeches/TypeSystem"); + jCas = JCasFactory.createJCas(JCAS_SPEECHES_TYPESYSTEM_DIR); XmiCasDeserializer.deserialize(gis, jCas.getCas(), true); Document analysisResults = new Document();