svn commit: r1492611 - in /stanbol/trunk/enhancement-engines/entityhublinking: pom.xml src/main/java/org/apache/stanbol/enhancer/engines/entityhublinking/EntitySearcherUtils.java

[rwesten]

Author: rwesten
Date: Thu Jun 13 10:25:27 2013
New Revision: 1492611

URL: http://svn.apache.org/r1492611
Log:
STANBOL-1110: Updated the EntityhubLinkingEngine to use the Proximity Ranking 
feature for the reasons described in the issue

Modified:
    stanbol/trunk/enhancement-engines/entityhublinking/pom.xml
    
stanbol/trunk/enhancement-engines/entityhublinking/src/main/java/org/apache/stanbol/enhancer/engines/entityhublinking/EntitySearcherUtils.java

Modified: stanbol/trunk/enhancement-engines/entityhublinking/pom.xml
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/entityhublinking/pom.xml?rev=1492611&r1=1492610&r2=1492611&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/entityhublinking/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/entityhublinking/pom.xml Thu Jun 13 
10:25:27 2013
@@ -85,6 +85,11 @@
 
     <dependency>
       <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
       
<artifactId>org.apache.stanbol.enhancer.engines.entitylinking.engine</artifactId>
       <version>0.10.1-SNAPSHOT</version>
     </dependency>

Modified: 
stanbol/trunk/enhancement-engines/entityhublinking/src/main/java/org/apache/stanbol/enhancer/engines/entityhublinking/EntitySearcherUtils.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/entityhublinking/src/main/java/org/apache/stanbol/enhancer/engines/entityhublinking/EntitySearcherUtils.java?rev=1492611&r1=1492610&r2=1492611&view=diff
==============================================================================
--- 
stanbol/trunk/enhancement-engines/entityhublinking/src/main/java/org/apache/stanbol/enhancer/engines/entityhublinking/EntitySearcherUtils.java
 (original)
+++ 
stanbol/trunk/enhancement-engines/entityhublinking/src/main/java/org/apache/stanbol/enhancer/engines/entityhublinking/EntitySearcherUtils.java
 Thu Jun 13 10:25:27 2013
@@ -16,10 +16,15 @@
 */
 package org.apache.stanbol.enhancer.engines.entityhublinking;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
 import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.stanbol.enhancer.engines.entitylinking.EntitySearcher;
 import org.apache.stanbol.entityhub.servicesapi.model.rdf.RdfResourceEnum;
 import org.apache.stanbol.entityhub.servicesapi.query.FieldQuery;
@@ -64,7 +69,13 @@ public class EntitySearcherUtils {
         //also add the entity rankings
         query.addSelectedField(RdfResourceEnum.entityRank.getUri());
         query.setLimit(20);//TODO make configurable
-        query.setConstraint(field.getUnicodeString(), new 
TextConstraint(search, languages));
+        //List<String> search2 = new ArrayList<String>(search.size() + 1);
+        //Collections.reverse(search);
+        //search2.add(StringUtils.join(search, " "));
+        //search2.addAll(search);
+        TextConstraint tc = new TextConstraint(search, languages);
+        tc.setProximityRanking(true); //STANBOL-1104
+        query.setConstraint(field.getUnicodeString(),tc);
         return query;
     }