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

[rwesten]

Author: rwesten
Date: Tue Mar  4 08:48:07 2014
New Revision: 1573938

URL: http://svn.apache.org/r1573938
Log:
STANBOL-1283: merged r1573936 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:r1573936

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

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=1573938&r1=1573937&r2=1573938&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
 Tue Mar  4 08:48:07 2014
@@ -307,22 +307,23 @@ public class FstLinkingEngine implements
                     } while(numInclude < suggestions.size() && actScore >= 
minIncludeScore);
                     maxSuggestions = numInclude - 1;
                 }
-                //remove all suggestions > maxSuggestions
-                if(suggestions.size() > maxSuggestions){
-                    
suggestions.subList(maxSuggestions,suggestions.size()).clear();
-                }
                 //adapt score based on entity ranking
                 if(elConfig.isRankEqualScoresBasedOnEntityRankings()){
                     adaptScoresForEntityRankings(suggestions);
                 }
-            }
-            if(log.isTraceEnabled()){ //log the suggestion information
-                log.trace("Suggestions:");
-                int si=1;
-                for(Match m : suggestions){
-                    log.trace(" {}. {} - {} ({})", new Object[]{
-                            si,m.getScore(),m.getMatchLabel(),m.getUri()});
-                    si++;
+                if(log.isTraceEnabled()){ //log the suggestion information
+                    log.trace("Suggestions:");
+                    int si=1;
+                    for(Match m : suggestions){
+                        log.trace(" {}. {} - {} ({})", new Object[]{
+                                si <= maxSuggestions ? si : "--",
+                                m.getScore(),m.getMatchLabel(),m.getUri()});
+                        si++;
+                    }
+                }
+                //remove all suggestions > maxSuggestions
+                if(suggestions.size() > maxSuggestions){
+                    
suggestions.subList(maxSuggestions,suggestions.size()).clear();
                 }
             }
             tag.setSuggestions(suggestions);