Skip to content

Finnish and Swedish support through NatLibFi Maui #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sampov2 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Finnish and Swedish support through NatLibFi Maui #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3812c5c
Use fi.nationallibrary/maui instead of cygri, use newer Jena library …
sampov2 Oct 18, 2019
47f6c91
Use release version 1.4.6 of maui
sampov2 Oct 18, 2019
4b1f84c
Register Finnish stemmer and stopwords
sampov2 Oct 28, 2019
3ec6371
Add Swedish stemmer and stopwords
sampov2 Oct 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@

<dependencies>
<dependency>
<groupId>com.entopix</groupId>
<groupId>fi.nationallibrary</groupId>
<artifactId>maui</artifactId>
<version>1.3.1-cygri</version>
<version>1.4.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -51,11 +51,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/topbraid/mauiserver/VocabularyResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import javax.servlet.ServletContext;

import org.apache.jena.rdf.model.Model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.topbraid.mauiserver.framework.Request;
Expand All @@ -14,7 +15,6 @@

import com.entopix.maui.vocab.Vocabulary;
import com.entopix.maui.vocab.VocabularyStore;
import com.hp.hpl.jena.rdf.model.Model;

public class VocabularyResource extends Resource
implements Gettable, Puttable, Deletable {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/topbraid/mauiserver/framework/Request.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.StringUtils;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
import org.apache.jena.shared.JenaException;
import org.topbraid.mauiserver.MauiServerException;
import org.topbraid.mauiserver.framework.Resource.Deletable;
import org.topbraid.mauiserver.framework.Resource.Postable;
Expand All @@ -26,9 +29,6 @@
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.shared.JenaException;

public class Request {
private final HttpServletRequest request;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/topbraid/mauiserver/framework/Response.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

import javax.servlet.http.HttpServletResponse;

import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
import org.apache.jena.shared.JenaException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.shared.JenaException;

public abstract class Response {
private final static Logger log = LoggerFactory.getLogger(Response.class);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/topbraid/mauiserver/persistence/TaggerStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
import java.util.List;

import org.apache.commons.io.FileUtils;
import org.apache.jena.rdf.model.Model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.topbraid.mauiserver.MauiServerException;
import org.topbraid.mauiserver.tagger.JobReport;
import org.topbraid.mauiserver.tagger.TaggerConfiguration;

import com.entopix.maui.filters.MauiFilter;
import com.hp.hpl.jena.rdf.model.Model;

public class TaggerStore {
private static final Logger log = LoggerFactory.getLogger(TaggerStore.class);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/topbraid/mauiserver/persistence/VocabularyStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import java.io.FileOutputStream;
import java.io.IOException;

import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.shared.JenaException;
import com.hp.hpl.jena.util.FileManager;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.shared.JenaException;
import org.apache.jena.util.FileManager;

public class VocabularyStore extends FileStore<Model> {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/topbraid/mauiserver/tagger/Tagger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.topbraid.mauiserver.tagger;

import org.apache.jena.rdf.model.Model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.topbraid.mauiserver.MauiServerException;
Expand All @@ -8,7 +9,6 @@
import com.entopix.maui.filters.MauiFilter;
import com.entopix.maui.main.MauiWrapper;
import com.entopix.maui.vocab.Vocabulary;
import com.hp.hpl.jena.rdf.model.Model;

public class Tagger {
private final static Logger log = LoggerFactory.getLogger(Tagger.class);
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/org/topbraid/mauiserver/tagger/TaggerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,20 @@
import org.topbraid.mauiserver.MauiServer;
import org.topbraid.mauiserver.MauiServerException;

import com.entopix.maui.stemmers.CachingFinnishStemmer;
import com.entopix.maui.stemmers.FrenchStemmer;
import com.entopix.maui.stemmers.GermanStemmer;
import com.entopix.maui.stemmers.PorterStemmer;
import com.entopix.maui.stemmers.SpanishStemmer;
import com.entopix.maui.stemmers.Stemmer;
import com.entopix.maui.stemmers.SwedishStemmer;
import com.entopix.maui.stopwords.Stopwords;
import com.entopix.maui.stopwords.StopwordsEnglish;
import com.entopix.maui.stopwords.StopwordsFinnish;
import com.entopix.maui.stopwords.StopwordsFrench;
import com.entopix.maui.stopwords.StopwordsGerman;
import com.entopix.maui.stopwords.StopwordsSpanish;
import com.entopix.maui.stopwords.StopwordsSwedish;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
Expand Down Expand Up @@ -48,6 +52,8 @@ public class TaggerConfiguration {
put("fr", FrenchStemmer.class);
put("de", GermanStemmer.class);
put("es", SpanishStemmer.class);
put("fi", CachingFinnishStemmer.class);
put("sv", SwedishStemmer.class);
}};

@SuppressWarnings("serial")
Expand All @@ -56,6 +62,8 @@ public class TaggerConfiguration {
put("fr", StopwordsFrench.class);
put("de", StopwordsGerman.class);
put("es", StopwordsSpanish.class);
put("fi", StopwordsFinnish.class);
put("sv", StopwordsSwedish.class);
}};

public TaggerConfiguration(String id) {
Expand Down