Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 65309 invoked from network); 10 Sep 2008 21:40:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Sep 2008 21:40:02 -0000 Received: (qmail 41346 invoked by uid 500); 10 Sep 2008 21:39:59 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 41318 invoked by uid 500); 10 Sep 2008 21:39:59 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 41304 invoked by uid 99); 10 Sep 2008 21:39:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Sep 2008 14:39:59 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Sep 2008 21:38:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9254F238889D; Wed, 10 Sep 2008 14:39:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r694004 [1/4] - in /lucene/java/trunk: ./ contrib/analyzers/src/test/org/apache/lucene/analysis/query/ contrib/analyzers/src/test/org/apache/lucene/analysis/shingle/ contrib/ant/src/java/org/apache/lucene/ant/ contrib/benchmark/src/java/org... Date: Wed, 10 Sep 2008 21:38:55 -0000 To: java-commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080910213901.9254F238889D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Wed Sep 10 14:38:52 2008 New Revision: 694004 URL: http://svn.apache.org/viewvc?rev=694004&view=rev Log: LUCENE-1366: rename Field.Index.* options Modified: lucene/java/trunk/CHANGES.txt lucene/java/trunk/contrib/analyzers/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java lucene/java/trunk/contrib/analyzers/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/HtmlDocument.java lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/TextDocument.java lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/BasicDocMaker.java lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/standard/StandardBenchmarker.java lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java lucene/java/trunk/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/index/TestFieldNormModifier.java lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/index/TestTermVectorAccessor.java lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/ChainedFilterTest.java lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/TestLengthNormModifier.java lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/search/regex/TestRegexQuery.java lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java lucene/java/trunk/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java lucene/java/trunk/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java lucene/java/trunk/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java lucene/java/trunk/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java lucene/java/trunk/src/demo/org/apache/lucene/demo/FileDocument.java lucene/java/trunk/src/demo/org/apache/lucene/demo/HTMLDocument.java lucene/java/trunk/src/java/org/apache/lucene/document/AbstractField.java lucene/java/trunk/src/java/org/apache/lucene/document/Field.java lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java lucene/java/trunk/src/java/org/apache/lucene/index/IndexModifier.java lucene/java/trunk/src/java/org/apache/lucene/search/Sort.java lucene/java/trunk/src/test/org/apache/lucene/SearchTest.java lucene/java/trunk/src/test/org/apache/lucene/SearchTestForDuplicates.java lucene/java/trunk/src/test/org/apache/lucene/TestDemo.java lucene/java/trunk/src/test/org/apache/lucene/TestHitIterator.java lucene/java/trunk/src/test/org/apache/lucene/TestMergeSchedulerExternal.java lucene/java/trunk/src/test/org/apache/lucene/TestSearch.java lucene/java/trunk/src/test/org/apache/lucene/TestSearchForDuplicates.java lucene/java/trunk/src/test/org/apache/lucene/TestSnapshotDeletionPolicy.java lucene/java/trunk/src/test/org/apache/lucene/ThreadSafetyTest.java lucene/java/trunk/src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java lucene/java/trunk/src/test/org/apache/lucene/document/TestDocument.java lucene/java/trunk/src/test/org/apache/lucene/index/DocHelper.java lucene/java/trunk/src/test/org/apache/lucene/index/TestAddIndexesNoOptimize.java lucene/java/trunk/src/test/org/apache/lucene/index/TestAtomicUpdate.java lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java lucene/java/trunk/src/test/org/apache/lucene/index/TestCheckIndex.java lucene/java/trunk/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java lucene/java/trunk/src/test/org/apache/lucene/index/TestCrash.java lucene/java/trunk/src/test/org/apache/lucene/index/TestDeletionPolicy.java lucene/java/trunk/src/test/org/apache/lucene/index/TestDoc.java lucene/java/trunk/src/test/org/apache/lucene/index/TestDocumentWriter.java lucene/java/trunk/src/test/org/apache/lucene/index/TestFilterIndexReader.java lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexFileDeleter.java lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexModifier.java lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexReader.java lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexReaderReopen.java lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWriter.java lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWriterDelete.java lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWriterMerging.java lucene/java/trunk/src/test/org/apache/lucene/index/TestLazyBug.java lucene/java/trunk/src/test/org/apache/lucene/index/TestLazyProxSkipping.java lucene/java/trunk/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java lucene/java/trunk/src/test/org/apache/lucene/index/TestMultiSegmentReader.java lucene/java/trunk/src/test/org/apache/lucene/index/TestNorms.java lucene/java/trunk/src/test/org/apache/lucene/index/TestOmitTf.java lucene/java/trunk/src/test/org/apache/lucene/index/TestParallelReader.java lucene/java/trunk/src/test/org/apache/lucene/index/TestParallelTermEnum.java lucene/java/trunk/src/test/org/apache/lucene/index/TestPayloads.java lucene/java/trunk/src/test/org/apache/lucene/index/TestSegmentTermDocs.java lucene/java/trunk/src/test/org/apache/lucene/index/TestSegmentTermEnum.java lucene/java/trunk/src/test/org/apache/lucene/index/TestStressIndexing.java lucene/java/trunk/src/test/org/apache/lucene/index/TestStressIndexing2.java lucene/java/trunk/src/test/org/apache/lucene/index/TestTermVectorsReader.java lucene/java/trunk/src/test/org/apache/lucene/index/TestTermdocPerf.java lucene/java/trunk/src/test/org/apache/lucene/index/TestThreadedOptimize.java lucene/java/trunk/src/test/org/apache/lucene/index/TestTransactions.java lucene/java/trunk/src/test/org/apache/lucene/index/store/TestRAMDirectory.java lucene/java/trunk/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java lucene/java/trunk/src/test/org/apache/lucene/queryParser/TestQueryParser.java lucene/java/trunk/src/test/org/apache/lucene/search/BaseTestRangeFilter.java lucene/java/trunk/src/test/org/apache/lucene/search/TestBoolean2.java lucene/java/trunk/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java lucene/java/trunk/src/test/org/apache/lucene/search/TestBooleanOr.java lucene/java/trunk/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestBooleanScorer.java lucene/java/trunk/src/test/org/apache/lucene/search/TestConstantScoreRangeQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestCustomSearcherSort.java lucene/java/trunk/src/test/org/apache/lucene/search/TestDateFilter.java lucene/java/trunk/src/test/org/apache/lucene/search/TestDateSort.java lucene/java/trunk/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestDocBoost.java lucene/java/trunk/src/test/org/apache/lucene/search/TestExplanations.java lucene/java/trunk/src/test/org/apache/lucene/search/TestExtendedFieldCache.java lucene/java/trunk/src/test/org/apache/lucene/search/TestFilteredQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestFilteredSearch.java lucene/java/trunk/src/test/org/apache/lucene/search/TestFuzzyQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSearcher.java lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java lucene/java/trunk/src/test/org/apache/lucene/search/TestNot.java lucene/java/trunk/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixFilter.java lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestRangeQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java lucene/java/trunk/src/test/org/apache/lucene/search/TestRemoteSearchable.java lucene/java/trunk/src/test/org/apache/lucene/search/TestScorerPerf.java lucene/java/trunk/src/test/org/apache/lucene/search/TestSearchHitsWithDeletions.java lucene/java/trunk/src/test/org/apache/lucene/search/TestSetNorm.java lucene/java/trunk/src/test/org/apache/lucene/search/TestSimilarity.java lucene/java/trunk/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/TestSort.java lucene/java/trunk/src/test/org/apache/lucene/search/TestSpanQueryFilter.java lucene/java/trunk/src/test/org/apache/lucene/search/TestTermScorer.java lucene/java/trunk/src/test/org/apache/lucene/search/TestTermVectors.java lucene/java/trunk/src/test/org/apache/lucene/search/TestThreadSafe.java lucene/java/trunk/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java lucene/java/trunk/src/test/org/apache/lucene/search/TestWildcard.java lucene/java/trunk/src/test/org/apache/lucene/search/function/FunctionTestSetup.java lucene/java/trunk/src/test/org/apache/lucene/search/payloads/PayloadHelper.java lucene/java/trunk/src/test/org/apache/lucene/search/payloads/TestBoostingTermQuery.java lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestBasics.java lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java lucene/java/trunk/src/test/org/apache/lucene/store/TestBufferedIndexInput.java lucene/java/trunk/src/test/org/apache/lucene/store/TestLockFactory.java lucene/java/trunk/src/test/org/apache/lucene/store/TestWindowsMMap.java Modified: lucene/java/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/CHANGES.txt (original) +++ lucene/java/trunk/CHANGES.txt Wed Sep 10 14:38:52 2008 @@ -149,6 +149,11 @@ which is equivalent to getDirectory().fileModified(getSegmentsFileName()). (Mike McCandless) +23. LUCENE-1366: Rename Field.Index options to be more accurate: + TOKENIZED becomes ANALYZED; UN_TOKENIZED becomes NOT_ANALYZED; + NO_NORMS becomes NOT_ANALYZED_NO_NORMS and a new ANALYZED_NO_NORMS + is added. (Mike McCandless) + Bug fixes 1. LUCENE-1134: Fixed BooleanQuery.rewrite to only optimize a single Modified: lucene/java/trunk/contrib/analyzers/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/analyzers/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (original) +++ lucene/java/trunk/contrib/analyzers/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java Wed Sep 10 14:38:52 2008 @@ -51,8 +51,8 @@ Document doc = new Document(); String variedFieldValue = variedFieldValues[i % variedFieldValues.length]; String repetitiveFieldValue = repetitiveFieldValues[i % repetitiveFieldValues.length]; - doc.add(new Field("variedField", variedFieldValue, Field.Store.YES, Field.Index.TOKENIZED)); - doc.add(new Field("repetitiveField", repetitiveFieldValue, Field.Store.YES, Field.Index.TOKENIZED)); + doc.add(new Field("variedField", variedFieldValue, Field.Store.YES, Field.Index.ANALYZED)); + doc.add(new Field("repetitiveField", repetitiveFieldValue, Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(doc); } writer.close(); Modified: lucene/java/trunk/contrib/analyzers/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/analyzers/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (original) +++ lucene/java/trunk/contrib/analyzers/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java Wed Sep 10 14:38:52 2008 @@ -65,17 +65,17 @@ Document doc; doc = new Document(); doc.add(new Field("content", "please divide this sentence into shingles", - Field.Store.YES,Field.Index.TOKENIZED)); + Field.Store.YES,Field.Index.ANALYZED)); writer.addDocument(doc); doc = new Document(); doc.add(new Field("content", "just another test sentence", - Field.Store.YES,Field.Index.TOKENIZED)); + Field.Store.YES,Field.Index.ANALYZED)); writer.addDocument(doc); doc = new Document(); doc.add(new Field("content", "a sentence which contains no test", - Field.Store.YES,Field.Index.TOKENIZED)); + Field.Store.YES,Field.Index.ANALYZED)); writer.addDocument(doc); writer.close(); Modified: lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/HtmlDocument.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/HtmlDocument.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/HtmlDocument.java (original) +++ lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/HtmlDocument.java Wed Sep 10 14:38:52 2008 @@ -95,8 +95,8 @@ org.apache.lucene.document.Document luceneDoc = new org.apache.lucene.document.Document(); - luceneDoc.add(new Field("title", htmlDoc.getTitle(), Field.Store.YES, Field.Index.TOKENIZED)); - luceneDoc.add(new Field("contents", htmlDoc.getBody(), Field.Store.YES, Field.Index.TOKENIZED)); + luceneDoc.add(new Field("title", htmlDoc.getTitle(), Field.Store.YES, Field.Index.ANALYZED)); + luceneDoc.add(new Field("contents", htmlDoc.getBody(), Field.Store.YES, Field.Index.ANALYZED)); return luceneDoc; } @@ -119,8 +119,8 @@ org.apache.lucene.document.Document luceneDoc = new org.apache.lucene.document.Document(); - luceneDoc.add(new Field("title", htmlDoc.getTitle(), Field.Store.YES, Field.Index.TOKENIZED)); - luceneDoc.add(new Field("contents", htmlDoc.getBody(), Field.Store.YES, Field.Index.TOKENIZED)); + luceneDoc.add(new Field("title", htmlDoc.getTitle(), Field.Store.YES, Field.Index.ANALYZED)); + luceneDoc.add(new Field("contents", htmlDoc.getBody(), Field.Store.YES, Field.Index.ANALYZED)); String contents = null; BufferedReader br = Modified: lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java (original) +++ lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java Wed Sep 10 14:38:52 2008 @@ -330,12 +330,12 @@ } else { // Add the path of the file as a field named "path". Use a Keyword field, so // that the index stores the path, and so that the path is searchable - doc.add(new Field("path", file.getPath(), Field.Store.YES, Field.Index.UN_TOKENIZED)); + doc.add(new Field("path", file.getPath(), Field.Store.YES, Field.Index.NOT_ANALYZED)); // Add the last modified date of the file a field named "modified". Use a // Keyword field, so that it's searchable, but so that no attempt is made // to tokenize the field into words. - doc.add(new Field("modified", DateTools.timeToString(file.lastModified(), DateTools.Resolution.MILLISECOND), Field.Store.YES, Field.Index.UN_TOKENIZED)); + doc.add(new Field("modified", DateTools.timeToString(file.lastModified(), DateTools.Resolution.MILLISECOND), Field.Store.YES, Field.Index.NOT_ANALYZED)); writer.addDocument(doc); totalIndexed++; Modified: lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/TextDocument.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/TextDocument.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/TextDocument.java (original) +++ lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/TextDocument.java Wed Sep 10 14:38:52 2008 @@ -79,8 +79,8 @@ // make a new, empty document Document doc = new Document(); - doc.add(new Field("title", f.getName(), Field.Store.YES, Field.Index.TOKENIZED)); - doc.add(new Field("contents", textDoc.getContents(), Field.Store.YES, Field.Index.TOKENIZED)); + doc.add(new Field("title", f.getName(), Field.Store.YES, Field.Index.ANALYZED)); + doc.add(new Field("contents", textDoc.getContents(), Field.Store.YES, Field.Index.ANALYZED)); doc.add(new Field("rawcontents", textDoc.getContents(), Field.Store.YES, Field.Index.NO)); // return the document Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/BasicDocMaker.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/BasicDocMaker.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/BasicDocMaker.java (original) +++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/BasicDocMaker.java Wed Sep 10 14:38:52 2008 @@ -71,7 +71,7 @@ protected Config config; protected Field.Store storeVal = Field.Store.NO; - protected Field.Index indexVal = Field.Index.TOKENIZED; + protected Field.Index indexVal = Field.Index.ANALYZED; protected Field.TermVector termVecVal = Field.TermVector.NO; private synchronized int incrNumDocsCreated() { @@ -196,7 +196,7 @@ boolean tokenized = config.get("doc.tokenized",true); boolean termVec = config.get("doc.term.vector",false); storeVal = (stored ? Field.Store.YES : Field.Store.NO); - indexVal = (tokenized ? Field.Index.TOKENIZED : Field.Index.UN_TOKENIZED); + indexVal = (tokenized ? Field.Index.ANALYZED : Field.Index.NOT_ANALYZED); boolean termVecPositions = config.get("doc.term.vector.positions",false); boolean termVecOffsets = config.get("doc.term.vector.offsets",false); if (termVecPositions && termVecOffsets) Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java (original) +++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java Wed Sep 10 14:38:52 2008 @@ -63,19 +63,19 @@ bodyField = new Field(BasicDocMaker.BODY_FIELD, "", storeVal, - Field.Index.TOKENIZED, + Field.Index.ANALYZED, termVecVal); titleField = new Field(BasicDocMaker.TITLE_FIELD, "", storeVal, - Field.Index.TOKENIZED, + Field.Index.ANALYZED, termVecVal); dateField = new Field(BasicDocMaker.DATE_FIELD, "", storeVal, - Field.Index.TOKENIZED, + Field.Index.ANALYZED, termVecVal); - idField = new Field(BasicDocMaker.ID_FIELD, "", Field.Store.YES, Field.Index.NO_NORMS); + idField = new Field(BasicDocMaker.ID_FIELD, "", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS); doc = new Document(); doc.add(bodyField); @@ -111,17 +111,17 @@ Field localTitleField = new Field(BasicDocMaker.TITLE_FIELD, title, storeVal, - Field.Index.TOKENIZED, + Field.Index.ANALYZED, termVecVal); Field localBodyField = new Field(BasicDocMaker.BODY_FIELD, body, storeVal, - Field.Index.TOKENIZED, + Field.Index.ANALYZED, termVecVal); Field localDateField = new Field(BasicDocMaker.BODY_FIELD, date, storeVal, - Field.Index.TOKENIZED, + Field.Index.ANALYZED, termVecVal); Document localDoc = new Document(); localDoc.add(localBodyField); Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/standard/StandardBenchmarker.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/standard/StandardBenchmarker.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/standard/StandardBenchmarker.java (original) +++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benchmark/standard/StandardBenchmarker.java Wed Sep 10 14:38:52 2008 @@ -258,11 +258,11 @@ for (int i = 0; i < tags.length; i++) { doc.add(new Field("tag" + i, tags[i], stored == true ? Field.Store.YES : Field.Store.NO, - tokenized == true ? Field.Index.TOKENIZED : Field.Index.UN_TOKENIZED, tfv == true ? Field.TermVector.YES : Field.TermVector.NO)); + tokenized == true ? Field.Index.ANALYZED : Field.Index.NOT_ANALYZED, tfv == true ? Field.TermVector.YES : Field.TermVector.NO)); } } doc.add(new Field("file", in.getCanonicalPath(), stored == true ? Field.Store.YES : Field.Store.NO, - tokenized == true ? Field.Index.TOKENIZED : Field.Index.UN_TOKENIZED, tfv == true ? Field.TermVector.YES : Field.TermVector.NO)); + tokenized == true ? Field.Index.ANALYZED : Field.Index.NOT_ANALYZED, tfv == true ? Field.TermVector.YES : Field.TermVector.NO)); BufferedReader reader = new BufferedReader(new FileReader(in)); String line = null; //First line is the date, 3rd is the title, rest is body @@ -279,17 +279,17 @@ Date date = format.parse(dateStr.trim()); - doc.add(new Field("date", DateTools.dateToString(date, DateTools.Resolution.SECOND), Field.Store.YES, Field.Index.UN_TOKENIZED)); + doc.add(new Field("date", DateTools.dateToString(date, DateTools.Resolution.SECOND), Field.Store.YES, Field.Index.NOT_ANALYZED)); if (title != null) { doc.add(new Field("title", title, stored == true ? Field.Store.YES : Field.Store.NO, - tokenized == true ? Field.Index.TOKENIZED : Field.Index.UN_TOKENIZED, tfv == true ? Field.TermVector.YES : Field.TermVector.NO)); + tokenized == true ? Field.Index.ANALYZED : Field.Index.NOT_ANALYZED, tfv == true ? Field.TermVector.YES : Field.TermVector.NO)); } if (body.length() > 0) { doc.add(new Field("body", body.toString(), stored == true ? Field.Store.YES : Field.Store.NO, - tokenized == true ? Field.Index.TOKENIZED : Field.Index.UN_TOKENIZED, tfv == true ? Field.TermVector.YES : Field.TermVector.NO)); + tokenized == true ? Field.Index.ANALYZED : Field.Index.NOT_ANALYZED, tfv == true ? Field.TermVector.YES : Field.TermVector.NO)); } return doc; Modified: lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original) +++ lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Wed Sep 10 14:38:52 2008 @@ -1021,7 +1021,7 @@ RAMDirectory ramDir1 = new RAMDirectory(); IndexWriter writer1 = new IndexWriter(ramDir1, new StandardAnalyzer(), true); Document d = new Document(); - Field f = new Field(FIELD_NAME, "multiOne", Field.Store.YES, Field.Index.TOKENIZED); + Field f = new Field(FIELD_NAME, "multiOne", Field.Store.YES, Field.Index.ANALYZED); d.add(f); writer1.addDocument(d); writer1.optimize(); @@ -1032,7 +1032,7 @@ RAMDirectory ramDir2 = new RAMDirectory(); IndexWriter writer2 = new IndexWriter(ramDir2, new StandardAnalyzer(), true); d = new Document(); - f = new Field(FIELD_NAME, "multiTwo", Field.Store.YES, Field.Index.TOKENIZED); + f = new Field(FIELD_NAME, "multiTwo", Field.Store.YES, Field.Index.ANALYZED); d.add(f); writer2.addDocument(d); writer2.optimize(); @@ -1265,7 +1265,7 @@ private Document doc( String f, String v ){ Document doc = new Document(); - doc.add( new Field( f, v, Store.YES, Index.TOKENIZED ) ); + doc.add( new Field( f, v, Store.YES, Index.ANALYZED ) ); return doc; } @@ -1395,7 +1395,7 @@ private void addDoc(IndexWriter writer, String text) throws IOException { Document d = new Document(); - Field f = new Field(FIELD_NAME, text, Field.Store.YES, Field.Index.TOKENIZED); + Field f = new Field(FIELD_NAME, text, Field.Store.YES, Field.Index.ANALYZED); d.add(f); writer.addDocument(d); Modified: lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (original) +++ lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java Wed Sep 10 14:38:52 2008 @@ -148,18 +148,18 @@ } private void assembleDocument(Document document, int i) { - document.add(new Field("a", i + " Do you really want to go and live in that house all winter?", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + document.add(new Field("a", i + " Do you really want to go and live in that house all winter?", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); if (i > 0) { - document.add(new Field("b0", i + " All work and no play makes Jack a dull boy", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); - document.add(new Field("b1", i + " All work and no play makes Jack a dull boy", Field.Store.YES, Field.Index.NO_NORMS, Field.TermVector.NO)); - document.add(new Field("b2", i + " All work and no play makes Jack a dull boy", Field.Store.NO, Field.Index.UN_TOKENIZED, Field.TermVector.NO)); + document.add(new Field("b0", i + " All work and no play makes Jack a dull boy", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + document.add(new Field("b1", i + " All work and no play makes Jack a dull boy", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS, Field.TermVector.NO)); + document.add(new Field("b2", i + " All work and no play makes Jack a dull boy", Field.Store.NO, Field.Index.NOT_ANALYZED, Field.TermVector.NO)); document.add(new Field("b3", i + " All work and no play makes Jack a dull boy", Field.Store.YES, Field.Index.NO, Field.TermVector.NO)); if (i > 1) { - document.add(new Field("c", i + " Redrum redrum", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + document.add(new Field("c", i + " Redrum redrum", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); if (i > 2) { - document.add(new Field("d", i + " Hello Danny, come and play with us... forever and ever. and ever.", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + document.add(new Field("d", i + " Hello Danny, come and play with us... forever and ever. and ever.", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); if (i > 3) { - Field f = new Field("e", i + " Heres Johnny!", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS); + Field f = new Field("e", i + " Heres Johnny!", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS); f.setOmitNorms(true); document.add(f); if (i > 4) { Modified: lucene/java/trunk/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original) +++ lucene/java/trunk/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Wed Sep 10 14:38:52 2008 @@ -226,7 +226,7 @@ * Convenience method; Tokenizes the given field text and adds the resulting * terms to the index; Equivalent to adding an indexed non-keyword Lucene * {@link org.apache.lucene.document.Field} that is - * {@link org.apache.lucene.document.Field.Index#TOKENIZED tokenized}, + * {@link org.apache.lucene.document.Field.Index#ANALYZED tokenized}, * {@link org.apache.lucene.document.Field.Store#NO not stored}, * {@link org.apache.lucene.document.Field.TermVector#WITH_POSITIONS termVectorStored with positions} (or * {@link org.apache.lucene.document.Field.TermVector#WITH_POSITIONS termVectorStored with positions and offsets}), Modified: lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original) +++ lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Wed Sep 10 14:38:52 2008 @@ -368,7 +368,7 @@ private Document createDocument(String content) { Document doc = new Document(); - doc.add(new Field(FIELD_NAME, content, Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS)); + doc.add(new Field(FIELD_NAME, content, Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS)); return doc; } Modified: lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/index/TestFieldNormModifier.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/index/TestFieldNormModifier.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/index/TestFieldNormModifier.java (original) +++ lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/index/TestFieldNormModifier.java Wed Sep 10 14:38:52 2008 @@ -64,13 +64,13 @@ for (int i = 0; i < NUM_DOCS; i++) { Document d = new Document(); - d.add(new Field("field", "word", Field.Store.YES, Field.Index.TOKENIZED)); - d.add(new Field("nonorm", "word", Field.Store.YES, Field.Index.NO_NORMS)); - d.add(new Field("untokfield", "20061212 20071212", Field.Store.YES, Field.Index.TOKENIZED)); + d.add(new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED)); + d.add(new Field("nonorm", "word", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); + d.add(new Field("untokfield", "20061212 20071212", Field.Store.YES, Field.Index.ANALYZED)); for (int j = 1; j <= i; j++) { - d.add(new Field("field", "crap", Field.Store.YES, Field.Index.TOKENIZED)); - d.add(new Field("nonorm", "more words", Field.Store.YES, Field.Index.NO_NORMS)); + d.add(new Field("field", "crap", Field.Store.YES, Field.Index.ANALYZED)); + d.add(new Field("nonorm", "more words", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); } writer.addDocument(d); } Modified: lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/index/TestTermVectorAccessor.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/index/TestTermVectorAccessor.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/index/TestTermVectorAccessor.java (original) +++ lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/index/TestTermVectorAccessor.java Wed Sep 10 14:38:52 2008 @@ -34,33 +34,33 @@ Document doc; doc = new Document(); - doc.add(new Field("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); - doc.add(new Field("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); - doc.add(new Field("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + doc.add(new Field("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + doc.add(new Field("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + doc.add(new Field("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); iw.addDocument(doc); doc = new Document(); - doc.add(new Field("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS)); - doc.add(new Field("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS)); - doc.add(new Field("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS)); + doc.add(new Field("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS)); + doc.add(new Field("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS)); + doc.add(new Field("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS)); iw.addDocument(doc); doc = new Document(); - doc.add(new Field("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.YES)); - doc.add(new Field("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.YES)); - doc.add(new Field("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.YES)); + doc.add(new Field("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.YES)); + doc.add(new Field("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.YES)); + doc.add(new Field("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.YES)); iw.addDocument(doc); doc = new Document(); - doc.add(new Field("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO)); - doc.add(new Field("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO)); - doc.add(new Field("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO)); + doc.add(new Field("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.NO)); + doc.add(new Field("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.NO)); + doc.add(new Field("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.NO)); iw.addDocument(doc); doc = new Document(); - doc.add(new Field("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); - doc.add(new Field("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO)); - doc.add(new Field("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.YES)); + doc.add(new Field("a", "a b a c a d a e a f a g a h a", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + doc.add(new Field("b", "a b c b d b e b f b g b h b", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.NO)); + doc.add(new Field("c", "a c b c d c e c f c g c h c", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.YES)); iw.addDocument(doc); iw.close(); Modified: lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/ChainedFilterTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/ChainedFilterTest.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/ChainedFilterTest.java (original) +++ lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/ChainedFilterTest.java Wed Sep 10 14:38:52 2008 @@ -58,9 +58,9 @@ for (int i = 0; i < MAX; i++) { Document doc = new Document(); - doc.add(new Field("key", "" + (i + 1), Field.Store.YES, Field.Index.UN_TOKENIZED)); - doc.add(new Field("owner", (i < MAX / 2) ? "bob" : "sue", Field.Store.YES, Field.Index.UN_TOKENIZED)); - doc.add(new Field("date", cal.getTime().toString(), Field.Store.YES, Field.Index.UN_TOKENIZED)); + doc.add(new Field("key", "" + (i + 1), Field.Store.YES, Field.Index.NOT_ANALYZED)); + doc.add(new Field("owner", (i < MAX / 2) ? "bob" : "sue", Field.Store.YES, Field.Index.NOT_ANALYZED)); + doc.add(new Field("date", cal.getTime().toString(), Field.Store.YES, Field.Index.NOT_ANALYZED)); writer.addDocument(doc); cal.add(Calendar.DATE, 1); Modified: lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/TestLengthNormModifier.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/TestLengthNormModifier.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (original) +++ lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/TestLengthNormModifier.java Wed Sep 10 14:38:52 2008 @@ -65,15 +65,15 @@ for (int i = 0; i < NUM_DOCS; i++) { Document d = new Document(); d.add(new Field("field", "word", - Field.Store.YES, Field.Index.TOKENIZED)); + Field.Store.YES, Field.Index.ANALYZED)); d.add(new Field("nonorm", "word", - Field.Store.YES, Field.Index.NO_NORMS)); + Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); for (int j = 1; j <= i; j++) { d.add(new Field("field", "crap", - Field.Store.YES, Field.Index.TOKENIZED)); + Field.Store.YES, Field.Index.ANALYZED)); d.add(new Field("nonorm", "more words", - Field.Store.YES, Field.Index.NO_NORMS)); + Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); } writer.addDocument(d); } Modified: lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (original) +++ lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java Wed Sep 10 14:38:52 2008 @@ -60,10 +60,10 @@ private void addDoc(IndexWriter writer, String accessRights, String price, String date, String inStock) throws IOException { Document doc=new Document(); - doc.add(new Field("accessRights",accessRights,Field.Store.YES,Field.Index.TOKENIZED)); - doc.add(new Field("price",price,Field.Store.YES,Field.Index.TOKENIZED)); - doc.add(new Field("date",date,Field.Store.YES,Field.Index.TOKENIZED)); - doc.add(new Field("inStock",inStock,Field.Store.YES,Field.Index.TOKENIZED)); + doc.add(new Field("accessRights",accessRights,Field.Store.YES,Field.Index.ANALYZED)); + doc.add(new Field("price",price,Field.Store.YES,Field.Index.ANALYZED)); + doc.add(new Field("date",date,Field.Store.YES,Field.Index.ANALYZED)); + doc.add(new Field("inStock",inStock,Field.Store.YES,Field.Index.ANALYZED)); writer.addDocument(doc); } Modified: lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java (original) +++ lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java Wed Sep 10 14:38:52 2008 @@ -70,9 +70,9 @@ private void addDoc(IndexWriter writer, String url, String text, String date) throws IOException { Document doc=new Document(); - doc.add(new Field(KEY_FIELD,url,Field.Store.YES,Field.Index.UN_TOKENIZED)); - doc.add(new Field("text",text,Field.Store.YES,Field.Index.TOKENIZED)); - doc.add(new Field("date",date,Field.Store.YES,Field.Index.TOKENIZED)); + doc.add(new Field(KEY_FIELD,url,Field.Store.YES,Field.Index.NOT_ANALYZED)); + doc.add(new Field("text",text,Field.Store.YES,Field.Index.ANALYZED)); + doc.add(new Field("date",date,Field.Store.YES,Field.Index.ANALYZED)); writer.addDocument(doc); } Modified: lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (original) +++ lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java Wed Sep 10 14:38:52 2008 @@ -43,7 +43,7 @@ { Document doc=new Document(); int term=i*10; //terms are units of 10; - doc.add(new Field(fieldName,""+term,Field.Store.YES,Field.Index.UN_TOKENIZED)); + doc.add(new Field(fieldName,""+term,Field.Store.YES,Field.Index.NOT_ANALYZED)); w.addDocument(doc); } w.close(); Modified: lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/search/regex/TestRegexQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/search/regex/TestRegexQuery.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/search/regex/TestRegexQuery.java (original) +++ lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/search/regex/TestRegexQuery.java Wed Sep 10 14:38:52 2008 @@ -39,7 +39,7 @@ IndexWriter writer = new IndexWriter(directory, new SimpleAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED); Document doc = new Document(); - doc.add(new Field(FN, "the quick brown fox jumps over the lazy dog", Field.Store.NO, Field.Index.TOKENIZED)); + doc.add(new Field(FN, "the quick brown fox jumps over the lazy dog", Field.Store.NO, Field.Index.ANALYZED)); writer.addDocument(doc); writer.optimize(); writer.close(); Modified: lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (original) +++ lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java Wed Sep 10 14:38:52 2008 @@ -36,13 +36,13 @@ RAMDirectory directory = new RAMDirectory(); IndexWriter writer = new IndexWriter(directory, new SimpleAnalyzer(), true); Document doc = new Document(); -// doc.add(new Field("field", "the quick brown fox jumps over the lazy dog", Field.Store.NO, Field.Index.TOKENIZED)); +// doc.add(new Field("field", "the quick brown fox jumps over the lazy dog", Field.Store.NO, Field.Index.ANALYZED)); // writer.addDocument(doc); // doc = new Document(); - doc.add(new Field("field", "auto update", Field.Store.NO, Field.Index.TOKENIZED)); + doc.add(new Field("field", "auto update", Field.Store.NO, Field.Index.ANALYZED)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("field", "first auto update", Field.Store.NO, Field.Index.TOKENIZED)); + doc.add(new Field("field", "first auto update", Field.Store.NO, Field.Index.ANALYZED)); writer.addDocument(doc); writer.optimize(); writer.close(); Modified: lucene/java/trunk/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java (original) +++ lucene/java/trunk/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java Wed Sep 10 14:38:52 2008 @@ -384,7 +384,7 @@ private static Document createDocument(String text, int ng1, int ng2) { Document doc = new Document(); - doc.add(new Field(F_WORD, text, Field.Store.YES, Field.Index.UN_TOKENIZED)); // orig term + doc.add(new Field(F_WORD, text, Field.Store.YES, Field.Index.NOT_ANALYZED)); // orig term addGram(text, doc, ng1, ng2); return doc; } @@ -396,14 +396,14 @@ String end = null; for (int i = 0; i < len - ng + 1; i++) { String gram = text.substring(i, i + ng); - doc.add(new Field(key, gram, Field.Store.NO, Field.Index.UN_TOKENIZED)); + doc.add(new Field(key, gram, Field.Store.NO, Field.Index.NOT_ANALYZED)); if (i == 0) { - doc.add(new Field("start" + ng, gram, Field.Store.NO, Field.Index.UN_TOKENIZED)); + doc.add(new Field("start" + ng, gram, Field.Store.NO, Field.Index.NOT_ANALYZED)); } end = gram; } if (end != null) { // may not be present if len==ng1 - doc.add(new Field("end" + ng, end, Field.Store.NO, Field.Index.UN_TOKENIZED)); + doc.add(new Field("end" + ng, end, Field.Store.NO, Field.Index.NOT_ANALYZED)); } } } Modified: lucene/java/trunk/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (original) +++ lucene/java/trunk/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java Wed Sep 10 14:38:52 2008 @@ -53,23 +53,23 @@ Document doc; doc = new Document(); - doc.add(new Field("aaa", "foo", Field.Store.YES, Field.Index.TOKENIZED)); + doc.add(new Field("aaa", "foo", Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("aaa", "foo", Field.Store.YES, Field.Index.TOKENIZED)); + doc.add(new Field("aaa", "foo", Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("contents", "Tom", Field.Store.YES, Field.Index.TOKENIZED)); + doc.add(new Field("contents", "Tom", Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("contents", "Jerry", Field.Store.YES, Field.Index.TOKENIZED)); + doc.add(new Field("contents", "Jerry", Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("zzz", "bar", Field.Store.YES, Field.Index.TOKENIZED)); + doc.add(new Field("zzz", "bar", Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(doc); writer.optimize(); Modified: lucene/java/trunk/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (original) +++ lucene/java/trunk/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java Wed Sep 10 14:38:52 2008 @@ -50,8 +50,8 @@ for (int i = 0; i < 1000; i++) { Document doc = new Document(); - doc.add(new Field("field1", English.intToEnglish(i), Field.Store.YES, Field.Index.TOKENIZED)); - doc.add(new Field("field2", English.intToEnglish(i + 1), Field.Store.YES, Field.Index.TOKENIZED)); // + word thousand + doc.add(new Field("field1", English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED)); + doc.add(new Field("field2", English.intToEnglish(i + 1), Field.Store.YES, Field.Index.ANALYZED)); // + word thousand writer.addDocument(doc); } writer.close(); Modified: lucene/java/trunk/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java (original) +++ lucene/java/trunk/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java Wed Sep 10 14:38:52 2008 @@ -40,7 +40,7 @@ IndexWriter.MaxFieldLength.LIMITED); for (int j = 0; j < docs.length; j++) { Document d = new Document(); - d.add(new Field(fieldName, docs[j], Field.Store.NO, Field.Index.TOKENIZED)); + d.add(new Field(fieldName, docs[j], Field.Store.NO, Field.Index.ANALYZED)); writer.addDocument(d); } writer.close(); Modified: lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java (original) +++ lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java Wed Sep 10 14:38:52 2008 @@ -122,9 +122,9 @@ //this will allow us to retrive the results later //and map this list model's row to a row in the decorated //list model - document.add(new Field(ROW_NUMBER, "" + row, Field.Store.YES, Field.Index.TOKENIZED)); + document.add(new Field(ROW_NUMBER, "" + row, Field.Store.YES, Field.Index.ANALYZED)); //add the string representation of the row to the index - document.add(new Field(FIELD_NAME, String.valueOf(listModel.getElementAt(row)).toLowerCase(), Field.Store.YES, Field.Index.TOKENIZED)); + document.add(new Field(FIELD_NAME, String.valueOf(listModel.getElementAt(row)).toLowerCase(), Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(document); } writer.optimize(); Modified: lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java (original) +++ lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java Wed Sep 10 14:38:52 2008 @@ -173,14 +173,14 @@ //this will allow us to retrive the results later //and map this table model's row to a row in the decorated //table model - document.add(new Field(ROW_NUMBER, "" + row, Field.Store.YES, Field.Index.TOKENIZED)); + document.add(new Field(ROW_NUMBER, "" + row, Field.Store.YES, Field.Index.ANALYZED)); //iterate through all columns //index the value keyed by the column name //NOTE: there could be a problem with using column names with spaces for (int column=0; column < tableModel.getColumnCount(); column++){ String columnName = tableModel.getColumnName(column); String columnValue = String.valueOf(tableModel.getValueAt(row, column)).toLowerCase(); - document.add(new Field(columnName, columnValue, Field.Store.YES, Field.Index.TOKENIZED)); + document.add(new Field(columnName, columnValue, Field.Store.YES, Field.Index.ANALYZED)); } writer.addDocument(document); } Modified: lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java (original) +++ lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java Wed Sep 10 14:38:52 2008 @@ -256,7 +256,7 @@ int n = index(word2Nums, num2Words, g, doc); if (n > 0) { - doc.add( new Field( F_WORD, g, Field.Store.YES, Field.Index.UN_TOKENIZED)); + doc.add( new Field( F_WORD, g, Field.Store.YES, Field.Index.NOT_ANALYZED)); if ((++row % mod) == 0) { o.println("\trow=" + row + "/" + word2Nums.size() + " doc= " + doc); Modified: lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java (original) +++ lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java Wed Sep 10 14:38:52 2008 @@ -70,8 +70,8 @@ String date=line.substring(0,endOfDate).trim(); String content=line.substring(endOfDate).trim(); org.apache.lucene.document.Document doc =new org.apache.lucene.document.Document(); - doc.add(new Field("date",date,Field.Store.YES,Field.Index.TOKENIZED)); - doc.add(new Field("contents",content,Field.Store.YES,Field.Index.TOKENIZED)); + doc.add(new Field("date",date,Field.Store.YES,Field.Index.ANALYZED)); + doc.add(new Field("contents",content,Field.Store.YES,Field.Index.ANALYZED)); writer.addDocument(doc); line=d.readLine(); } Modified: lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java (original) +++ lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java Wed Sep 10 14:38:52 2008 @@ -128,7 +128,7 @@ if(st.hasMoreTokens()) { String value=st.nextToken().trim(); - result.add(new Field(name,value,Field.Store.YES,Field.Index.TOKENIZED)); + result.add(new Field(name,value,Field.Store.YES,Field.Index.ANALYZED)); } } return result; Modified: lucene/java/trunk/src/demo/org/apache/lucene/demo/FileDocument.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/demo/org/apache/lucene/demo/FileDocument.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/demo/org/apache/lucene/demo/FileDocument.java (original) +++ lucene/java/trunk/src/demo/org/apache/lucene/demo/FileDocument.java Wed Sep 10 14:38:52 2008 @@ -47,14 +47,14 @@ // Add the path of the file as a field named "path". Use a field that is // indexed (i.e. searchable), but don't tokenize the field into words. - doc.add(new Field("path", f.getPath(), Field.Store.YES, Field.Index.UN_TOKENIZED)); + doc.add(new Field("path", f.getPath(), Field.Store.YES, Field.Index.NOT_ANALYZED)); // Add the last modified date of the file a field named "modified". Use // a field that is indexed (i.e. searchable), but don't tokenize the field // into words. doc.add(new Field("modified", DateTools.timeToString(f.lastModified(), DateTools.Resolution.MINUTE), - Field.Store.YES, Field.Index.UN_TOKENIZED)); + Field.Store.YES, Field.Index.NOT_ANALYZED)); // Add the contents of the file to a field named "contents". Specify a Reader, // so that the text of the file is tokenized and indexed, but not stored. Modified: lucene/java/trunk/src/demo/org/apache/lucene/demo/HTMLDocument.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/demo/org/apache/lucene/demo/HTMLDocument.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/demo/org/apache/lucene/demo/HTMLDocument.java (original) +++ lucene/java/trunk/src/demo/org/apache/lucene/demo/HTMLDocument.java Wed Sep 10 14:38:52 2008 @@ -49,19 +49,19 @@ // Add the url as a field named "path". Use a field that is // indexed (i.e. searchable), but don't tokenize the field into words. doc.add(new Field("path", f.getPath().replace(dirSep, '/'), Field.Store.YES, - Field.Index.UN_TOKENIZED)); + Field.Index.NOT_ANALYZED)); // Add the last modified date of the file a field named "modified". // Use a field that is indexed (i.e. searchable), but don't tokenize // the field into words. doc.add(new Field("modified", DateTools.timeToString(f.lastModified(), DateTools.Resolution.MINUTE), - Field.Store.YES, Field.Index.UN_TOKENIZED)); + Field.Store.YES, Field.Index.NOT_ANALYZED)); // Add the uid as a field, so that index can be incrementally maintained. // This field is not stored with document, it is indexed, but it is not // tokenized prior to indexing. - doc.add(new Field("uid", uid(f), Field.Store.NO, Field.Index.UN_TOKENIZED)); + doc.add(new Field("uid", uid(f), Field.Store.NO, Field.Index.NOT_ANALYZED)); FileInputStream fis = new FileInputStream(f); HTMLParser parser = new HTMLParser(fis); @@ -75,7 +75,7 @@ doc.add(new Field("summary", parser.getSummary(), Field.Store.YES, Field.Index.NO)); // Add the title as a field that it can be searched and that is stored. - doc.add(new Field("title", parser.getTitle(), Field.Store.YES, Field.Index.TOKENIZED)); + doc.add(new Field("title", parser.getTitle(), Field.Store.YES, Field.Index.ANALYZED)); // return the document return doc; Modified: lucene/java/trunk/src/java/org/apache/lucene/document/AbstractField.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/document/AbstractField.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/document/AbstractField.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/document/AbstractField.java Wed Sep 10 14:38:52 2008 @@ -68,16 +68,20 @@ if (index == Field.Index.NO) { this.isIndexed = false; this.isTokenized = false; - } else if (index == Field.Index.TOKENIZED) { + } else if (index == Field.Index.ANALYZED) { this.isIndexed = true; this.isTokenized = true; - } else if (index == Field.Index.UN_TOKENIZED) { + } else if (index == Field.Index.NOT_ANALYZED) { this.isIndexed = true; this.isTokenized = false; - } else if (index == Field.Index.NO_NORMS) { + } else if (index == Field.Index.NOT_ANALYZED_NO_NORMS) { this.isIndexed = true; this.isTokenized = false; this.omitNorms = true; + } else if (index == Field.Index.ANALYZED_NO_NORMS) { + this.isIndexed = true; + this.isTokenized = true; + this.omitNorms = true; } else { throw new IllegalArgumentException("unknown index parameter " + index); } Modified: lucene/java/trunk/src/java/org/apache/lucene/document/Field.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/document/Field.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/document/Field.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/document/Field.java Wed Sep 10 14:38:52 2008 @@ -69,30 +69,49 @@ * {@link Field.Store stored}. */ public static final Index NO = new Index("NO"); - /** Index the field's value so it can be searched. An Analyzer will be used - * to tokenize and possibly further normalize the text before its - * terms will be stored in the index. This is useful for common text. - */ - public static final Index TOKENIZED = new Index("TOKENIZED"); + /** Index the tokens produced by running the field's + * value through an Analyzer. This is useful for + * common text. */ + public static final Index ANALYZED = new Index("ANALYZED"); + + /** @deprecated this has been renamed to {@link #ANALYZED} */ + public static final Index TOKENIZED = ANALYZED; /** Index the field's value without using an Analyzer, so it can be searched. * As no analyzer is used the value will be stored as a single term. This is * useful for unique Ids like product numbers. */ - public static final Index UN_TOKENIZED = new Index("UN_TOKENIZED"); + public static final Index NOT_ANALYZED = new Index("NOT_ANALYZED"); - /** Index the field's value without an Analyzer, and disable - * the storing of norms. No norms means that index-time boosting - * and field length normalization will be disabled. The benefit is - * less memory usage as norms take up one byte per indexed field - * for every document in the index. - * Note that once you index a given field with norms enabled, - * disabling norms will have no effect. In other words, for NO_NORMS - * to have the above described effect on a field, all instances of that - * field must be indexed with NO_NORMS from the beginning. - */ - public static final Index NO_NORMS = new Index("NO_NORMS"); + /** @deprecated This has been renamed to {@link #NOT_ANALYZED} */ + public static final Index UN_TOKENIZED = NOT_ANALYZED; + /** Expert: Index the field's value without an Analyzer, + * and also disable the storing of norms. Note that you + * can also separately enable/disable norms by calling + * {@link #setOmitNorms}. No norms means that + * index-time field and document boosting and field + * length normalization are disabled. The benefit is + * less memory usage as norms take up one byte of RAM + * per indexed field for every document in the index, + * during searching. Note that once you index a given + * field with norms enabled, disabling norms will + * have no effect. In other words, for this to have the + * above described effect on a field, all instances of + * that field must be indexed with NOT_ANALYZED_NO_NORMS + * from the beginning. */ + public static final Index NOT_ANALYZED_NO_NORMS = new Index("NOT_ANALYZED_NO_NORMS"); + + /** @deprecated This has been renamed to + * {@link #NOT_ANALYZED_NO_NORMS} */ + public static final Index NO_NORMS = NOT_ANALYZED_NO_NORMS; + + /** Expert: Index the tokens produced by running the + * field's value through an Analyzer, and also + * separately disable the storing of norms. See + * {@link #NOT_ANALYZED_NO_NORMS} for what norms are + * and why you may want to disable them. */ + public static final Index ANALYZED_NO_NORMS = new Index("ANALYZED_NO_NORMS"); } /** Specifies whether and how a field should have term vectors. */ @@ -284,16 +303,20 @@ if (index == Index.NO) { this.isIndexed = false; this.isTokenized = false; - } else if (index == Index.TOKENIZED) { + } else if (index == Index.ANALYZED) { this.isIndexed = true; this.isTokenized = true; - } else if (index == Index.UN_TOKENIZED) { + } else if (index == Index.NOT_ANALYZED) { this.isIndexed = true; this.isTokenized = false; - } else if (index == Index.NO_NORMS) { + } else if (index == Index.NOT_ANALYZED_NO_NORMS) { this.isIndexed = true; this.isTokenized = false; this.omitNorms = true; + } else if (index == Index.ANALYZED_NO_NORMS) { + this.isIndexed = true; + this.isTokenized = true; + this.omitNorms = true; } else { throw new IllegalArgumentException("unknown index parameter " + index); } Modified: lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/index/FieldsReader.java Wed Sep 10 14:38:52 2008 @@ -405,9 +405,9 @@ private Field.Index getIndexType(FieldInfo fi, boolean tokenize) { Field.Index index; if (fi.isIndexed && tokenize) - index = Field.Index.TOKENIZED; + index = Field.Index.ANALYZED; else if (fi.isIndexed && !tokenize) - index = Field.Index.UN_TOKENIZED; + index = Field.Index.NOT_ANALYZED; else index = Field.Index.NO; return index; Modified: lucene/java/trunk/src/java/org/apache/lucene/index/IndexModifier.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/IndexModifier.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/index/IndexModifier.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/index/IndexModifier.java Wed Sep 10 14:38:52 2008 @@ -57,8 +57,8 @@     // create an index in /tmp/index, overwriting an existing one:
    IndexModifier indexModifier = new IndexModifier("/tmp/index", analyzer, true);
    Document doc = new Document();
-    doc.add(new Field("id", "1", Field.Store.YES, Field.Index.UN_TOKENIZED));
-    doc.add(new Field("body", "a simple test", Field.Store.YES, Field.Index.TOKENIZED));
+    doc.add(new Field("id", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+    doc.add(new Field("body", "a simple test", Field.Store.YES, Field.Index.ANALYZED));
    indexModifier.addDocument(doc);
    int deleted = indexModifier.delete(new Term("id", "1"));
    System.out.println("Deleted " + deleted + " document");
@@ -593,8 +593,8 @@ // create an index in /tmp/index, overwriting an existing one: IndexModifier indexModifier = new IndexModifier("/tmp/index", analyzer, true); Document doc = new Document(); - doc.add(new Fieldable("id", "1", Fieldable.Store.YES, Fieldable.Index.UN_TOKENIZED)); - doc.add(new Fieldable("body", "a simple test", Fieldable.Store.YES, Fieldable.Index.TOKENIZED)); + doc.add(new Fieldable("id", "1", Fieldable.Store.YES, Fieldable.Index.NOT_ANALYZED)); + doc.add(new Fieldable("body", "a simple test", Fieldable.Store.YES, Fieldable.Index.ANALYZED)); indexModifier.addDocument(doc); int deleted = indexModifier.delete(new Term("id", "1")); System.out.println("Deleted " + deleted + " document"); Modified: lucene/java/trunk/src/java/org/apache/lucene/search/Sort.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/Sort.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/search/Sort.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/search/Sort.java Wed Sep 10 14:38:52 2008 @@ -30,7 +30,7 @@ * and does not need to be stored (unless you happen to want it back with the * rest of your document data). In other words: * - *

document.add (new Field ("byNumber", Integer.toString(x), Field.Store.NO, Field.Index.UN_TOKENIZED));

+ *

document.add (new Field ("byNumber", Integer.toString(x), Field.Store.NO, Field.Index.NOT_ANALYZED));

* * *

Valid Types of Values

Modified: lucene/java/trunk/src/test/org/apache/lucene/SearchTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/SearchTest.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/SearchTest.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/SearchTest.java Wed Sep 10 14:38:52 2008 @@ -44,7 +44,7 @@ }; for (int j = 0; j < docs.length; j++) { Document d = new Document(); - d.add(new Field("contents", docs[j], Field.Store.YES, Field.Index.TOKENIZED)); + d.add(new Field("contents", docs[j], Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(d); } writer.close(); Modified: lucene/java/trunk/src/test/org/apache/lucene/SearchTestForDuplicates.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/SearchTestForDuplicates.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/SearchTestForDuplicates.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/SearchTestForDuplicates.java Wed Sep 10 14:38:52 2008 @@ -50,8 +50,8 @@ for (int j = 0; j < MAX_DOCS; j++) { Document d = new Document(); - d.add(new Field(PRIORITY_FIELD, HIGH_PRIORITY, Field.Store.YES, Field.Index.TOKENIZED)); - d.add(new Field(ID_FIELD, Integer.toString(j), Field.Store.YES, Field.Index.TOKENIZED)); + d.add(new Field(PRIORITY_FIELD, HIGH_PRIORITY, Field.Store.YES, Field.Index.ANALYZED)); + d.add(new Field(ID_FIELD, Integer.toString(j), Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(d); } writer.close(); Modified: lucene/java/trunk/src/test/org/apache/lucene/TestDemo.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/TestDemo.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/TestDemo.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/TestDemo.java Wed Sep 10 14:38:52 2008 @@ -56,7 +56,7 @@ Document doc = new Document(); String text = "This is the text to be indexed."; doc.add(new Field("fieldname", text, Field.Store.YES, - Field.Index.TOKENIZED)); + Field.Index.ANALYZED)); iwriter.addDocument(doc); iwriter.close(); Modified: lucene/java/trunk/src/test/org/apache/lucene/TestHitIterator.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/TestHitIterator.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/TestHitIterator.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/TestHitIterator.java Wed Sep 10 14:38:52 2008 @@ -46,11 +46,11 @@ IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED); Document doc = new Document(); - doc.add(new Field("field", "iterator test doc 1", Field.Store.YES, Field.Index.TOKENIZED)); + doc.add(new Field("field", "iterator test doc 1", Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("field", "iterator test doc 2", Field.Store.YES, Field.Index.TOKENIZED)); + doc.add(new Field("field", "iterator test doc 2", Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(doc); writer.close(); Modified: lucene/java/trunk/src/test/org/apache/lucene/TestMergeSchedulerExternal.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/TestMergeSchedulerExternal.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/TestMergeSchedulerExternal.java Wed Sep 10 14:38:52 2008 @@ -88,7 +88,7 @@ dir.failOn(new FailOnlyOnMerge()); Document doc = new Document(); - Field idField = new Field("id", "", Field.Store.YES, Field.Index.UN_TOKENIZED); + Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED); doc.add(idField); IndexWriter writer = new IndexWriter(dir, true, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED); Modified: lucene/java/trunk/src/test/org/apache/lucene/TestSearch.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/TestSearch.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/TestSearch.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/TestSearch.java Wed Sep 10 14:38:52 2008 @@ -93,7 +93,7 @@ }; for (int j = 0; j < docs.length; j++) { Document d = new Document(); - d.add(new Field("contents", docs[j], Field.Store.YES, Field.Index.TOKENIZED)); + d.add(new Field("contents", docs[j], Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(d); } writer.close(); Modified: lucene/java/trunk/src/test/org/apache/lucene/TestSearchForDuplicates.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/TestSearchForDuplicates.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/TestSearchForDuplicates.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/TestSearchForDuplicates.java Wed Sep 10 14:38:52 2008 @@ -93,8 +93,8 @@ for (int j = 0; j < MAX_DOCS; j++) { Document d = new Document(); - d.add(new Field(PRIORITY_FIELD, HIGH_PRIORITY, Field.Store.YES, Field.Index.TOKENIZED)); - d.add(new Field(ID_FIELD, Integer.toString(j), Field.Store.YES, Field.Index.TOKENIZED)); + d.add(new Field(PRIORITY_FIELD, HIGH_PRIORITY, Field.Store.YES, Field.Index.ANALYZED)); + d.add(new Field(ID_FIELD, Integer.toString(j), Field.Store.YES, Field.Index.ANALYZED)); writer.addDocument(d); } writer.close(); Modified: lucene/java/trunk/src/test/org/apache/lucene/TestSnapshotDeletionPolicy.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/TestSnapshotDeletionPolicy.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/TestSnapshotDeletionPolicy.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/TestSnapshotDeletionPolicy.java Wed Sep 10 14:38:52 2008 @@ -72,7 +72,7 @@ // Force frequent commits writer.setMaxBufferedDocs(2); Document doc = new Document(); - doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); for(int i=0;i<7;i++) writer.addDocument(doc); IndexCommit cp = (IndexCommit) dp.snapshot(); @@ -115,7 +115,7 @@ final Thread t = new Thread() { public void run() { Document doc = new Document(); - doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); while(System.currentTimeMillis() < stopTime) { for(int i=0;i<27;i++) { try { @@ -159,7 +159,7 @@ // final segment, so deletion policy has a chance to // delete again: Document doc = new Document(); - doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); + doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); writer.addDocument(doc); // Make sure we don't have any leftover files in the Modified: lucene/java/trunk/src/test/org/apache/lucene/ThreadSafetyTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/ThreadSafetyTest.java?rev=694004&r1=694003&r2=694004&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/ThreadSafetyTest.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/ThreadSafetyTest.java Wed Sep 10 14:38:52 2008 @@ -56,8 +56,8 @@ for (int i = 0; i < 1024*ITERATIONS; i++) { Document d = new Document(); int n = RANDOM.nextInt(); - d.add(new Field("id", Integer.toString(n), Field.Store.YES, Field.Index.UN_TOKENIZED)); - d.add(new Field("contents", English.intToEnglish(n), Field.Store.NO, Field.Index.TOKENIZED)); + d.add(new Field("id", Integer.toString(n), Field.Store.YES, Field.Index.NOT_ANALYZED)); + d.add(new Field("contents", English.intToEnglish(n), Field.Store.NO, Field.Index.ANALYZED)); System.out.println("Adding " + n); // Switch between single and multiple file segments