Changeset 6065 for SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/rest/RestService.java

Timestamp:

02/26/15 16:17:04 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha 25: removed unused iso-639-2 support and unused german tokenizer; fixed bug related to xml unencoding; changed weblicht config

File:

• SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/rest/RestService.java (modified) (8 diffs)

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/rest/RestService.java

@@ -7 +7 @@
 import eu.clarin.sru.fcs.aggregator.app.Aggregator;
 import eu.clarin.sru.fcs.aggregator.app.AggregatorConfiguration;
+import eu.clarin.sru.fcs.aggregator.app.AggregatorConfiguration.Params.WeblichtConfig;
 import eu.clarin.sru.fcs.aggregator.scan.Corpus;
 import eu.clarin.sru.fcs.aggregator.scan.Statistics;
@@ -12 +13 @@
 import eu.clarin.sru.fcs.aggregator.search.Result;
 import eu.clarin.sru.fcs.aggregator.search.Search;
-import eu.clarin.sru.fcs.aggregator.lang.LanguagesISO693_3;
-import eu.clarin.sru.fcs.aggregator.search.ExportException;
+import eu.clarin.sru.fcs.aggregator.util.LanguagesISO693;
 import eu.clarin.sru.fcs.aggregator.search.Exports;
 import java.io.IOException;
@@ -22 +22 @@
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -36 +34 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import opennlp.tools.tokenize.TokenizerModel;
 import org.slf4j.LoggerFactory;
 
@@ -113 +110 @@
                 log.info("get language codes", codes);
                 for (String code : codes) {
-                        String name = LanguagesISO693_3.getInstance().nameForCode_3(code);
+                        String name = LanguagesISO693.getInstance().nameForCode(code);
                         languages.put(code, name != null ? name : code);
                 }
@@ -192 +189 @@
                 }
 
-        if (format == null || format.trim().isEmpty() || format.trim().equals("text")) {
+                if (format == null || format.trim().isEmpty() || format.trim().equals("text")) {
                         String text = Exports.getExportText(search.getResults());
                         return download(text, MediaType.TEXT_PLAIN, search.getQuery() + ".txt");
                 } else if (format.equals("tcf")) {
-                        byte[] bytes = Exports.getExportTokenizedTCF(
-                                        search.getResults(), search.getSearchLanguage(),
-                                        Aggregator.getInstance().getTokenizerModel());
+                        byte[] bytes = Exports.getExportTCF(
+                                        search.getResults(), search.getSearchLanguage());
                         return download(bytes, TCF_MEDIA_TYPE, search.getQuery() + ".xml");
                 } else if (format.equals("excel")) {
@@ -240 +236 @@
                                 url = DataTransfer.uploadToDropOff(bytes, "text/plan", ".txt");
                         }
-                } else if (format.equals("tokens")) {
-                        byte[] bytes = Exports.getExportTokenizedTCF(
-                                        search.getResults(), search.getSearchLanguage(),
-                                        Aggregator.getInstance().getTokenizerModel());
+                } else if (format.equals("tcf")) {
+                        byte[] bytes = Exports.getExportTCF(
+                                        search.getResults(), search.getSearchLanguage());
                         if (bytes != null) {
                                 url = DataTransfer.uploadToDropOff(bytes, "text/tcf+xml", ".tcf");
@@ -251 +246 @@
                 }
 
-                URI weblichtUri = new URI(Aggregator.getInstance().getParams().getWEBLICHT_URL()
-                                + url);
+                WeblichtConfig weblicht = Aggregator.getInstance().getParams().getWeblichtConfig();
+                URI weblichtUri = new URI(weblicht.getUrl() + url);
                 return url == null
                                 ? Response.status(503).entity("error while exporting to weblicht").build()