You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2016/02/23 10:57:24 UTC
svn commit: r1731825 - in
/stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking:
FstLinkingEngine.java TaggingSession.java
Author: rwesten
Date: Tue Feb 23 09:57:23 2016
New Revision: 1731825
URL: http://svn.apache.org/viewvc?rev=1731825&view=rev
Log:
STANBOL-1448: computeEnhancement(..) can now be called if no FST corpus is available for a language. Needed to adapt the code to account for this
Modified:
stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java
stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/TaggingSession.java
Modified: stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java?rev=1731825&r1=1731824&r2=1731825&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java (original)
+++ stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java Tue Feb 23 09:57:23 2016
@@ -240,6 +240,10 @@ public class FstLinkingEngine implements
} catch (CorpusException e) {
throw new EngineException(this, ci, e);
}
+ if(!session.hasCorpus()){
+ //no corpus available for processing the request
+ return;
+ }
long taggingStart = System.currentTimeMillis();
final NavigableMap<int[],Tag> tags = new TreeMap<int[],Tag>(Tag.SPAN_COMPARATOR);
try {
Modified: stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/TaggingSession.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/TaggingSession.java?rev=1731825&r1=1731824&r2=1731825&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/TaggingSession.java (original)
+++ stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/TaggingSession.java Tue Feb 23 09:57:23 2016
@@ -158,12 +158,6 @@ public class TaggingSession implements C
solrDocfields.add(idField);
//obtain the language specific fields for the session
- if(langCorpusInfo == null && defaultCorpusInfo == null){
- //this should not happen, because the canEnhance method of the
- //engine should already reject such calls
- throw new IllegalStateException("No FST Corpus configured for language '"
- +language+"' and also no default FST Corpus is present.!");
- }
if(langCorpusInfo != null){
this.langCorpus = new Corpus(langCorpusInfo,
obtainFstCorpus(indexVersion,langCorpusInfo));
@@ -657,5 +651,13 @@ public class TaggingSession implements C
public boolean isSkipAltTokens() {
return config.isSkipAltTokens();
}
+ /**
+ * If this session has a FST corpus for tagging
+ * @return <code>true</code> if a language and/or a default corpus is available.
+ * <code>false</code> if both are <code>null</code>
+ */
+ public boolean hasCorpus() {
+ return langCorpus != null || defaultCorpus != null;
+ }
}