Author: rwesten
Date: Sun Apr 10 15:08:43 2011
New Revision: 1090815
URL: http://svn.apache.org/viewvc?rev=1090815&view=rev
Log:
Temporary added a static reference to OnlineMode to the
ReferencedSiteEntityTaggingEngine until STANBOL-162 is resolved.
In addition this engine is removed from the list of expected enhancement
engines in the EnhancementTestBase
Modified:
incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
Modified: incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml?rev=1090815&r1=1090814&r2=1090815&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml Sun Apr 10
15:08:43 2011
@@ -85,6 +85,10 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
<scope>compile</scope>
</dependency>
Modified:
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java?rev=1090815&r1=1090814&r2=1090815&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java
(original)
+++
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java
Sun Apr 10 15:08:43 2011
@@ -36,6 +36,8 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.stanboltools.offline.OfflineMode;
+import org.apache.stanbol.commons.stanboltools.offline.OnlineMode;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
@@ -71,7 +73,7 @@ import static org.apache.stanbol.enhance
*
* @author ogrisel, rwesten
*/
-@Component(getConfigurationFactory = true,
+@Component(configurationFactory = true,
policy = ConfigurationPolicy.REQUIRE, //the baseUri is required!
specVersion = "1.1",
metatype = true,
@@ -82,6 +84,15 @@ public class ReferencedSiteEntityTagging
private final Logger log = LoggerFactory.getLogger(getClass());
+ /**
+ * TODO: workaround for STANBOL-162
+ * This Reference is used to statically mark this Engine as to require
+ * {@link OnlineMode} until it can dynamically detect the mode based on the
+ * used ReferencedSite. See STANBOL-162 for details.
+ */
+ @Reference
+ OnlineMode offlineMode;
+
@Property(value="dbpedia")
public static final String REFERENCED_SITE_ID =
"org.apache.stanbol.enhancer.engines.entitytagging.referencedSiteId";
@Property(boolValue=true)
@@ -267,6 +278,8 @@ public class ReferencedSiteEntityTagging
+ " because property" + DC_TYPE + " is not present");
return Collections.emptyList();
}
+ //remove punctations form the search string
+ name = cleanupKeywords(name);
log.debug("Process TextAnnotation " + name + " type=" + type);
FieldQuery query = site.getQueryFactory().createFieldQuery();
@@ -328,4 +341,12 @@ public class ReferencedSiteEntityTagging
ENHANCEMENT_ENGINE_ORDERING,
(Object) defaultOrder));
}
+ /**
+ * Removes punctuations form a parsed string
+ * @param keywords
+ * @return
+ */
+ private static String cleanupKeywords(String keywords) {
+ return keywords.replaceAll("\\p{P}", " ").trim();
+ }
}
Modified:
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java?rev=1090815&r1=1090814&r2=1090815&view=diff
==============================================================================
---
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
(original)
+++
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
Sun Apr 10 15:08:43 2011
@@ -73,8 +73,9 @@ public class EnhancerTestBase extends St
"org.apache.stanbol.*NamedEntityExtractionEnhancementEngine",
"org.apache.stanbol.*OpenCalaisEngine",
"org.apache.stanbol.*EntityMentionEnhancementEngine",
- "org.apache.stanbol.*CachingDereferencerEngine",
-
"org.apache.stanbol.*ReferencedSiteEntityTaggingEnhancementEngine"
+ "org.apache.stanbol.*CachingDereferencerEngine"
+ //removed because not available in offline mode
+
//"org.apache.stanbol.*ReferencedSiteEntityTaggingEnhancementEngine"
);
/* List of expected referencedSites could also be made
