svn commit: r1572948 - in /stanbol/trunk: ./ enhancement-engines/ enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java

[rwesten]

Author: rwesten
Date: Fri Feb 28 13:47:51 2014
New Revision: 1572948

URL: http://svn.apache.org/r1572948
Log:
merged fix for STANBOL-1290 to trunk

Modified:
    stanbol/trunk/   (props changed)
    stanbol/trunk/enhancement-engines/   (props changed)
    
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java

Propchange: stanbol/trunk/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12:r1572944

Propchange: stanbol/trunk/enhancement-engines/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12/enhancement-engines:r1572944

Modified: 
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java?rev=1572948&r1=1572947&r2=1572948&view=diff
==============================================================================
--- 
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java
 (original)
+++ 
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java
 Fri Feb 28 13:47:51 2014
@@ -312,7 +312,9 @@ public class FstLinkingEngine implements
                     
suggestions.subList(maxSuggestions,suggestions.size()).clear();
                 }
                 //adapt score based on entity ranking
-                adaptScoresForEntityRankings(suggestions);
+                if(elConfig.isRankEqualScoresBasedOnEntityRankings()){
+                    adaptScoresForEntityRankings(suggestions);
+                }
             }
             if(log.isTraceEnabled()){ //log the suggestion information
                 log.trace("Suggestions:");