Author: bdelacretaz
Date: Thu Apr 7 12:20:13 2011
New Revision: 1089850
URL: http://svn.apache.org/viewvc?rev=1089850&view=rev
Log:
Improve debug logging
Modified:
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/EngineCore.java
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/model/DefaultSignImpl.java
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/model/InMemoryRepresentation.java
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=1089850&r1=1089849&r2=1089850&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
Thu Apr 7 12:20:13 2011
@@ -299,12 +299,14 @@ public class ReferencedSiteEntityTagging
}
query.setLimit(this.numSuggestions);
QueryResultList<Sign> results = site.findSigns(query);
+ log.debug("{} results returned by query {}", results.size(), query);
List<NonLiteral> annotationsToRelate = new ArrayList<NonLiteral>();
annotationsToRelate.add(textAnnotation);
annotationsToRelate.addAll(subsumedAnnotations);
for (Sign guess : results) {
+ log.debug("Adding {} to ContentItem {}", guess, contentItemId);
EnhancementRDFUtils.writeEntityAnnotation(this, literalFactory,
graph, contentItemId, annotationsToRelate, guess);
}
Modified:
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/EngineCore.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/EngineCore.java?rev=1089850&r1=1089849&r2=1089850&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/EngineCore.java
(original)
+++
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/EngineCore.java
Thu Apr 7 12:20:13 2011
@@ -48,8 +48,6 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import
org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EngineException;
@@ -57,6 +55,8 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.InvalidContentException;
import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
import org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Core of our EnhancementEngine, separated from the OSGi service to make it
easier to test this.
@@ -64,7 +64,7 @@ import org.apache.stanbol.enhancer.servi
public class EngineCore implements EnhancementEngine {
protected static final String TEXT_PLAIN_MIMETYPE = "text/plain";
- public static final Log log =
LogFactory.getLog(NamedEntityExtractionEnhancementEngine.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final DataFileProvider dataFileProvider;
private final String bundleSymbolicName;
protected final SentenceModel sentenceModel;
@@ -112,9 +112,10 @@ public class EngineCore implements Enhan
// TODO: make the length of the data a field of the ContentItem
// interface to be able to filter out empty items in the canEnhance
// method
- log.warn("nothing to extract knowledge from");
+ log.warn("nothing to extract knowledge from in ContentItem {}",
ci);
return;
}
+ log.debug("computeEnhancements {} text={}", ci.getId(),
StringUtils.abbreviate(text, 100));
try {
for (Map.Entry<String,Object[]> type : entityTypes.entrySet()) {
@@ -124,7 +125,7 @@ public class EngineCore implements Enhan
TokenNameFinderModel nameFinderModel = (TokenNameFinderModel)
typeInfo[1];
findNamedEntities(ci, text, typeUri, typeLabel,
nameFinderModel);
}
- } catch (Exception e) { // TODO: makes it sense to catch Exception
here?
+ } catch (Exception e) {
throw new EngineException(this, ci, e);
}
}
@@ -142,6 +143,8 @@ public class EngineCore implements Enhan
log.warn("NULL was parsed as text for content item " + ci.getId()
+ "! -> call ignored");
return;
}
+ log.debug("findNamedEntities typeUri={}, type={}, text=",
+ new Object[]{ typeUri, typeLabel, StringUtils.abbreviate(text,
100) });
LiteralFactory literalFactory = LiteralFactory.getInstance();
MGraph g = ci.getMetadata();
Map<String,List<NameOccurrence>> entityNames =
extractNameOccurrences(nameFinderModel, text);
@@ -298,12 +301,7 @@ public class EngineCore implements Enhan
}
}
finder.clearAdaptiveData();
-
- if (log.isDebugEnabled()) {
- for (List<NameOccurrence> occurrences : nameOccurrences.values()) {
- log.debug("Occurrences found: " +
StringUtils.join(occurrences, ", "));
- }
- }
+ log.debug("{} name occurrences found: {}", nameOccurrences.size(),
nameOccurrences);
return nameOccurrences;
}
Modified:
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/model/DefaultSignImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/model/DefaultSignImpl.java?rev=1089850&r1=1089849&r2=1089850&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/model/DefaultSignImpl.java
(original)
+++
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/model/DefaultSignImpl.java
Thu Apr 7 12:20:13 2011
@@ -50,6 +50,19 @@ public class DefaultSignImpl implements
}
@Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(getClass().getSimpleName());
+ sb.append(", site=");
+ sb.append(getSignSite());
+ sb.append(", id=");
+ sb.append(getId());
+ sb.append(", representation=");
+ sb.append(getRepresentation());
+ return sb.toString();
+ }
+
+ @Override
public String getSignSite() {
return signSite;
}
Modified:
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/model/InMemoryRepresentation.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/model/InMemoryRepresentation.java?rev=1089850&r1=1089849&r2=1089850&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/model/InMemoryRepresentation.java
(original)
+++
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/model/InMemoryRepresentation.java
Thu Apr 7 12:20:13 2011
@@ -424,7 +424,7 @@ public class InMemoryRepresentation impl
}
@Override
public String toString() {
- return InMemoryRepresentation.class.getSimpleName()+getId();
+ return getClass().getSimpleName() + " " + getId();
}
@Override
public int hashCode() {
