You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by gs...@apache.org on 2009/02/07 17:02:41 UTC
svn commit: r741907 - in /lucene/solr/trunk/contrib/extraction: CHANGES.txt
src/main/java/org/apache/solr/handler/extraction/SolrContentHandler.java
src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
Author: gsingers
Date: Sat Feb 7 16:02:41 2009
New Revision: 741907
URL: http://svn.apache.org/viewvc?rev=741907&view=rev
Log:
SOLR-284: remove auto key generation and update tests
Modified:
lucene/solr/trunk/contrib/extraction/CHANGES.txt
lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/SolrContentHandler.java
lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
Modified: lucene/solr/trunk/contrib/extraction/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/extraction/CHANGES.txt?rev=741907&r1=741906&r2=741907&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/extraction/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/extraction/CHANGES.txt Sat Feb 7 16:02:41 2009
@@ -23,3 +23,5 @@
================== Release 1.4-dev ==================
1. SOLR-284: Added in support for extraction. (Eric Pugh, Chris Harris, gsingers)
+
+2. SOLR-284: Removed "silent success" key generation (gsingers)
\ No newline at end of file
Modified: lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/SolrContentHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/SolrContentHandler.java?rev=741907&r1=741906&r2=741907&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/SolrContentHandler.java (original)
+++ lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/SolrContentHandler.java Sat Feb 7 16:02:41 2009
@@ -180,57 +180,12 @@
}
}
}
- //make sure we have a unique id, if one is needed
- SchemaField uniqueField = schema.getUniqueKeyField();
- if (uniqueField != null) {
- String uniqueFieldName = uniqueField.getName();
- SolrInputField uniqFld = document.getField(uniqueFieldName);
- if (uniqFld == null) {
- String uniqId = generateId(uniqueField);
- if (uniqId != null) {
- document.addField(uniqueFieldName, uniqId);
- }
- }
- }
if (log.isDebugEnabled()) {
log.debug("Doc: " + document);
}
return document;
}
- /**
- * Generate an ID for the document. First try to get
- * {@link ExtractingMetadataConstants#STREAM_NAME} from the
- * {@link org.apache.tika.metadata.Metadata}, then try {@link ExtractingMetadataConstants#STREAM_SOURCE_INFO}
- * then try {@link org.apache.tika.metadata.Metadata#IDENTIFIER}.
- * If those all are null, then generate a random UUID using {@link java.util.UUID#randomUUID()}.
- *
- * @param uniqueField The SchemaField representing the unique field.
- * @return The id as a string
- */
- protected String generateId(SchemaField uniqueField) {
- //we don't have a unique field specified, so let's add one
- String uniqId = null;
- FieldType type = uniqueField.getType();
- if (type instanceof StrField || type instanceof TextField) {
- uniqId = metadata.get(ExtractingMetadataConstants.STREAM_NAME);
- if (uniqId == null) {
- uniqId = metadata.get(ExtractingMetadataConstants.STREAM_SOURCE_INFO);
- }
- if (uniqId == null) {
- uniqId = metadata.get(Metadata.IDENTIFIER);
- }
- if (uniqId == null) {
- //last chance, just create one
- uniqId = UUID.randomUUID().toString();
- }
- } else if (type instanceof UUIDField) {
- uniqId = UUID.randomUUID().toString();
- } else {
- uniqId = String.valueOf(getNextId());
- }
- return uniqId;
- }
@Override
Modified: lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java?rev=741907&r1=741906&r2=741907&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java (original)
+++ lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java Sat Feb 7 16:02:41 2009
@@ -38,6 +38,7 @@
"ext.map.creator", "extractedCreator", "ext.map.Keywords", "extractedKeywords",
"ext.map.Author", "extractedAuthor",
"ext.def.fl", "extractedContent",
+ "ext.literal.id", "one",
"ext.map.Last-Modified", "extractedDate"
);
assertQ(req("title:solr-word"), "//*[@numFound='0']");
@@ -48,6 +49,7 @@
"ext.map.creator", "extractedCreator", "ext.map.Keywords", "extractedKeywords",
"ext.map.Author", "extractedAuthor",
"ext.map.language", "extractedLanguage",
+ "ext.literal.id", "two",
"ext.def.fl", "extractedContent",
"ext.map.Last-Modified", "extractedDate"
);
@@ -58,6 +60,7 @@
loadLocal("version_control.xml", "ext.map.created", "extractedDate", "ext.map.producer", "extractedProducer",
"ext.map.creator", "extractedCreator", "ext.map.Keywords", "extractedKeywords",
"ext.map.Author", "extractedAuthor",
+ "ext.literal.id", "three",
"ext.def.fl", "extractedContent",
"ext.map.Last-Modified", "extractedDate"
);
@@ -77,6 +80,7 @@
"ext.map.creator", "extractedCreator", "ext.map.Keywords", "extractedKeywords",
"ext.map.Author", "extractedAuthor",
"ext.def.fl", "extractedContent",
+ "ext.literal.id", "one",
"ext.literal.extractionLiteralMV", "one",
"ext.literal.extractionLiteralMV", "two",
"ext.map.Last-Modified", "extractedDate"
@@ -94,6 +98,7 @@
"ext.map.creator", "extractedCreator", "ext.map.Keywords", "extractedKeywords",
"ext.map.Author", "extractedAuthor",
"ext.def.fl", "extractedContent",
+ "ext.literal.id", "two",
"ext.literal.extractionLiteral", "one",
"ext.literal.extractionLiteral", "two",
"ext.map.Last-Modified", "extractedDate"
@@ -107,6 +112,7 @@
"ext.map.creator", "extractedCreator", "ext.map.Keywords", "extractedKeywords",
"ext.map.Author", "extractedAuthor",
"ext.def.fl", "extractedContent",
+ "ext.literal.id", "three",
"ext.literal.extractionLiteral", "one",
"ext.map.Last-Modified", "extractedDate"
);
@@ -124,6 +130,7 @@
loadLocal("version_control.txt", "ext.map.created", "extractedDate", "ext.map.producer", "extractedProducer",
"ext.map.creator", "extractedCreator", "ext.map.Keywords", "extractedKeywords",
"ext.map.Author", "extractedAuthor",
+ "ext.literal.id", "one",
"ext.map.language", "extractedLanguage",
"ext.def.fl", "extractedContent",
ExtractingParams.STREAM_TYPE, "text/plain"
@@ -141,6 +148,7 @@
loadLocal("version_control.txt", "ext.map.created", "extractedDate", "ext.map.producer", "extractedProducer",
"ext.map.creator", "extractedCreator", "ext.map.Keywords", "extractedKeywords",
"ext.map.Author", "extractedAuthor",
+ "ext.literal.id", "one",
"ext.map.language", "extractedLanguage",
"ext.def.fl", "extractedContent",
ExtractingParams.RESOURCE_NAME, "version_control.txt"