You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ar...@apache.org on 2007/05/01 20:45:35 UTC
svn commit: r534192 [1/19] - in /incubator/lucene.net/trunk/C#: ./ src/
src/Demo/ src/Demo/DeleteFiles/ src/Demo/DemoLib/ src/Demo/DemoLib/HTML/
src/Demo/IndexFiles/ src/Demo/IndexHtml/ src/Demo/SearchFiles/
src/Lucene.Net/ src/Lucene.Net/Analysis/ src...
Author: aroush
Date: Tue May 1 11:45:26 2007
New Revision: 534192
URL: http://svn.apache.org/viewvc?view=rev&rev=534192
Log:
Apache Lucene.Net 2.1 build 001 "early-Alpha" release.
Added:
incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Demo/Demo-VS2005.sln
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/DemoLib-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/SearchFiles-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/AbstractField.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/FieldSelector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/FieldSelectorResult.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/Fieldable.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/LoadFirstFieldSelector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/MapFieldSelector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/SetBasedFieldSelector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldReaderException.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileDeleter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0-VS2005.sln
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0.csproj
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0.ndoc
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0.sln
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ComplexExplanation.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/PrefixFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/NearSpansOrdered.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/NearSpansUnordered.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/LockFactory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/NativeFSLockFactory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/NoLockFactory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/SimpleFSLockFactory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/SingleInstanceLockFactory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/ScorerDocQueue.cs
Modified:
incubator/lucene.net/trunk/C#/README.txt
incubator/lucene.net/trunk/C#/src/ABOUT.txt
incubator/lucene.net/trunk/C#/src/CHANGES.txt
incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/FileDocument.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.jj
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParseException.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/SimpleCharStream.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTMLDocument.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/IndexFiles.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.cs
incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/SearchFiles.cs
incubator/lucene.net/trunk/C#/src/HISTORY.txt
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Analyzer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/CharTokenizer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/ISOLatin1AccentFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/KeywordAnalyzer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/KeywordTokenizer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/LengthFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/LetterTokenizer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/LowerCaseFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/LowerCaseTokenizer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Package.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/PerFieldAnalyzerWrapper.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/PorterStemFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/PorterStemmer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/SimpleAnalyzer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/CharStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/FastCharStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/Package.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/ParseException.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardAnalyzer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardTokenizer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardTokenizer.jj
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardTokenizerConstants.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/Token.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/TokenMgrError.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/StopAnalyzer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/StopFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Token.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/TokenFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/TokenStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Tokenizer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/WhitespaceAnalyzer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/WhitespaceTokenizer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/WordlistLoader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/DateField.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/DateTools.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/Document.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/Field.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/NumberTools.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/Package.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/CompoundFileReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/CompoundFileWriter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/DocumentWriter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfos.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldsReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldsWriter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FilterIndexReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileNameFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileNames.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexModifier.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultiReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultipleTermPositions.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/Package.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ParallelReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentInfo.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentInfos.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentMerger.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermDocs.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermPositionVector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermPositions.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermVector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/Term.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermBuffer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermDocs.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermInfo.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermInfosReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermInfosWriter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermPositionVector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermPositions.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermVectorsReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermVectorsWriter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/LucenePackage.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Overview.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/Package.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/CharStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/FastCharStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/MultiFieldQueryParser.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/Package.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/QueryParser.JJ
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/QueryParser.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/QueryParserConstants.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/QueryParserTokenManager.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/Token.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/TokenMgrError.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanClause.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanScorer2.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/CachingWrapperFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ConjunctionScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ConstantScoreQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ConstantScoreRangeQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/DisjunctionMaxQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/DisjunctionMaxScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/DisjunctionSumScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ExactPhraseScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Explanation.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCache.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheImpl.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldDoc.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldDocSortedHitQueue.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldSortedHitQueue.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Filter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FilteredQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FilteredTermEnum.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FuzzyQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FuzzyTermEnum.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Hit.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/HitCollector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/HitIterator.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/HitQueue.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Hits.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/IndexSearcher.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MatchAllDocsQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiPhraseQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiSearcher.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiTermQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Package.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ParallelMultiSearcher.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/PhrasePositions.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/PhraseQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/PhraseQueue.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/PhraseScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/PrefixQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Query.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/QueryFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/QueryTermVector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/RangeFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/RangeQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/RemoteSearchable.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ReqExclScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ReqOptSumScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ScoreDoc.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ScoreDocComparator.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Scorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Searchable.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Searcher.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Similarity.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/SloppyPhraseScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Sort.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/SortComparator.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/SortComparatorSource.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/SortField.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/Package.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanFirstQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanNearQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanNotQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanOrQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanTermQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanWeight.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TopDocCollector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TopFieldDocCollector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TopFieldDocs.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Weight.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/WildcardQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/WildcardTermEnum.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/BufferedIndexInput.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/BufferedIndexOutput.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/Directory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/IndexInput.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/IndexOutput.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/Lock.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/MMapDirectory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/Package.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMDirectory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMFile.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMInputStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMOutputStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/BitVector.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/Constants.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/Package.html
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/PriorityQueue.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/SmallFloat.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/StringHelper.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/ToStringUtils.cs
Modified: incubator/lucene.net/trunk/C#/README.txt
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/README.txt?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/README.txt (original)
+++ incubator/lucene.net/trunk/C#/README.txt Tue May 1 11:45:26 2007
@@ -32,4 +32,4 @@
DOCUMENTATION
MSDN style API documentation for Apache Lucene.Net exists. Those can be found at this site:
- http://incubator.apache.org/lucene.net/docs/2.0/
\ No newline at end of file
+ http://incubator.apache.org/lucene.net/docs/2.1/
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/ABOUT.txt
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/ABOUT.txt?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/ABOUT.txt (original)
+++ incubator/lucene.net/trunk/C#/src/ABOUT.txt Tue May 1 11:45:26 2007
@@ -1 +1 @@
-Apache Lucene.Net is a port of Jakarta Lucene to C#. The port from Java to C# of version 1.4.0, 1.4.3, 1.9, 1.9.1 and 2.0 are done primary by George Aroush. To contact George Aroush please visit http://www.aroush.net/
+Apache Lucene.Net is a port of Jakarta Lucene to C#. The port from Java to C# of version 1.4.0, 1.4.3, 1.9, 1.9.1, 2.0 and 2.1 are done primary by George Aroush. To contact George Aroush please visit http://www.aroush.net/
Modified: incubator/lucene.net/trunk/C#/src/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/CHANGES.txt?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/CHANGES.txt (original)
+++ incubator/lucene.net/trunk/C#/src/CHANGES.txt Tue May 1 11:45:26 2007
@@ -1,16 +1,477 @@
+Lucene Change Log (per Java Lucene which are accumulated into Lucene.Net)
-NOTE: Those changes, outlined in this file, reflect changes made to Java Lucene.
-NOTE: All of those changes are carried over into Apache Lucene.Net as well.
-NOTE: See the file HISTORY.txt for changes specific to Apache Lucene.Net.
+$Id: CHANGES.txt 507610 2007-02-14 16:37:32Z yonik $
+======================= Release 2.1.0 2007-02-14 =======================
+Changes in runtime behavior
+
+ 1. 's' and 't' have been removed from the list of default stopwords
+ in StopAnalyzer (also used in by StandardAnalyzer). Having e.g. 's'
+ as a stopword meant that 's-class' led to the same results as 'class'.
+ Note that this problem still exists for 'a', e.g. in 'a-class' as
+ 'a' continues to be a stopword.
+ (Daniel Naber)
+
+ 2. LUCENE-478: Updated the list of Unicode code point ranges for CJK
+ (now split into CJ and K) in StandardAnalyzer. (John Wang and
+ Steven Rowe via Otis Gospodnetic)
+
+ 3. Modified some CJK Unicode code point ranges in StandardTokenizer.jj,
+ and added a few more of them to increase CJK character coverage.
+ Also documented some of the ranges.
+ (Otis Gospodnetic)
+
+ 4. LUCENE-489: Add support for leading wildcard characters (*, ?) to
+ QueryParser. Default is to disallow them, as before.
+ (Steven Parkes via Otis Gospodnetic)
+
+ 5. LUCENE-703: QueryParser changed to default to use of ConstantScoreRangeQuery
+ for range queries. Added useOldRangeQuery property to QueryParser to allow
+ selection of old RangeQuery class if required.
+ (Mark Harwood)
+
+ 6. LUCENE-543: WildcardQuery now performs a TermQuery if the provided term
+ does not contain a wildcard character (? or *), when previously a
+ StringIndexOutOfBoundsException was thrown.
+ (Michael Busch via Erik Hatcher)
+
+ 7. LUCENE-726: Removed the use of deprecated doc.fields() method and
+ Enumeration.
+ (Michael Busch via Otis Gospodnetic)
+
+ 8. LUCENE-436: Removed finalize() in TermInfosReader and SegmentReader,
+ and added a call to enumerators.remove() in TermInfosReader.close().
+ The finalize() overrides were added to help with a pre-1.4.2 JVM bug
+ that has since been fixed, plus we no longer support pre-1.4.2 JVMs.
+ (Otis Gospodnetic)
+
+ 9. LUCENE-771: The default location of the write lock is now the
+ index directory, and is named simply "write.lock" (without a big
+ digest prefix). The system properties "org.apache.lucene.lockDir"
+ nor "java.io.tmpdir" are no longer used as the global directory
+ for storing lock files, and the LOCK_DIR field of FSDirectory is
+ now deprecated. (Mike McCandless)
+
+New features
+
+ 1. LUCENE-503: New ThaiAnalyzer and ThaiWordFilter in contrib/analyzers
+ (Samphan Raruenrom via Chris Hostetter)
+
+ 2. LUCENE-545: New FieldSelector API and associated changes to
+ IndexReader and implementations. New Fieldable interface for use
+ with the lazy field loading mechanism. (Grant Ingersoll and Chuck
+ Williams via Grant Ingersoll)
+
+ 3. LUCENE-676: Move Solr's PrefixFilter to Lucene core. (Yura
+ Smolsky, Yonik Seeley)
+
+ 4. LUCENE-678: Added NativeFSLockFactory, which implements locking
+ using OS native locking (via java.nio.*). (Michael McCandless via
+ Yonik Seeley)
+
+ 5. LUCENE-544: Added the ability to specify different boosts for
+ different fields when using MultiFieldQueryParser (Matt Ericson
+ via Otis Gospodnetic)
+
+ 6. LUCENE-528: New IndexWriter.addIndexesNoOptimize() that doesn't
+ optimize the index when adding new segments, only performing
+ merges as needed. (Ning Li via Yonik Seeley)
+
+ 7. LUCENE-573: QueryParser now allows backslash escaping in
+ quoted terms and phrases. (Michael Busch via Yonik Seeley)
+
+ 8. LUCENE-716: QueryParser now allows specification of unicode
+ characters in terms via a unicode escape of the form \uXXXX
+ (Michael Busch via Yonik Seeley)
+
+ 9. LUCENE-709: Added RAMDirectory.sizeInBytes(), IndexWriter.ramSizeInBytes()
+ and IndexWriter.flushRamSegments(), allowing applications to
+ control the amount of memory used to buffer documents.
+ (Chuck Williams via Yonik Seeley)
+
+10. LUCENE-723: QueryParser now parses *:* as MatchAllDocsQuery
+ (Yonik Seeley)
+
+11. LUCENE-741: Command-line utility for modifying or removing norms
+ on fields in an existing index. This is mostly based on LUCENE-496
+ and lives in contrib/miscellaneous.
+ (Chris Hostetter, Otis Gospodnetic)
+
+12. LUCENE-759: Added NGramTokenizer and EdgeNGramTokenizer classes and
+ their passing unit tests.
+ (Otis Gospodnetic)
+
+13. LUCENE-565: Added methods to IndexWriter to more efficiently
+ handle updating documents (the "delete then add" use case). This
+ is intended to be an eventual replacement for the existing
+ IndexModifier. Added IndexWriter.flush() (renamed from
+ flushRamSegments()) to flush all pending updates (held in RAM), to
+ the Directory. (Ning Li via Mike McCandless)
+
+14. LUCENE-762: Added in SIZE and SIZE_AND_BREAK FieldSelectorResult options
+ which allow one to retrieve the size of a field without retrieving the actual field.
+ (Chuck Williams via Grant Ingersoll)
+
+15. LUCENE-799: Properly handle lazy, compressed fields. (Mike Klaas via Grant Ingersoll)
+
+API Changes
+
+ 1. LUCENE-438: Remove "final" from Token, implement Cloneable, allow
+ changing of termText via setTermText(). (Yonik Seeley)
+
+ 2. org.apache.lucene.analysis.nl.WordlistLoader has been deprecated
+ and is supposed to be replaced with the WordlistLoader class in
+ package org.apache.lucene.analysis (Daniel Naber)
+
+ 3. LUCENE-609: Revert return type of Document.getField(s) to Field
+ for backward compatibility, added new Document.getFieldable(s)
+ for access to new lazy loaded fields. (Yonik Seeley)
+
+ 4. LUCENE-608: Document.fields() has been deprecated and a new method
+ Document.getFields() has been added that returns a List instead of
+ an Enumeration (Daniel Naber)
+
+ 5. LUCENE-605: New Explanation.isMatch() method and new ComplexExplanation
+ subclass allows explain methods to produce Explanations which model
+ "matching" independent of having a positive value.
+ (Chris Hostetter)
+
+ 6. LUCENE-621: New static methods IndexWriter.setDefaultWriteLockTimeout
+ and IndexWriter.setDefaultCommitLockTimeout for overriding default
+ timeout values for all future instances of IndexWriter (as well
+ as for any other classes that may refrence the static values,
+ ie: IndexReader).
+ (Michael McCandless via Chris Hostetter)
+
+ 7. LUCENE-638: FSDirectory.list() now only returns the directory's
+ Lucene-related files. Thanks to this change one can now construct
+ a RAMDirectory from a file system directory that contains files
+ not related to Lucene.
+ (Simon Willnauer via Daniel Naber)
+
+ 8. LUCENE-635: Decoupling locking implementation from Directory
+ implementation. Added set/getLockFactory to Directory and moved
+ all locking code into subclasses of abstract class LockFactory.
+ FSDirectory and RAMDirectory still default to their prior locking
+ implementations, but now you can mix & match, for example using
+ SingleInstanceLockFactory (ie, in memory locking) locking with an
+ FSDirectory. Note that now you must call setDisableLocks before
+ the instantiation a FSDirectory if you wish to disable locking
+ for that Directory.
+ (Michael McCandless, Jeff Patterson via Yonik Seeley)
+
+ 9. LUCENE-657: Made FuzzyQuery non-final and inner ScoreTerm protected.
+ (Steven Parkes via Otis Gospodnetic)
+
+10. LUCENE-701: Lockless commits: a commit lock is no longer required
+ when a writer commits and a reader opens the index. This includes
+ a change to the index file format (see docs/fileformats.html for
+ details). It also removes all APIs associated with the commit
+ lock & its timeout. Readers are now truly read-only and do not
+ block one another on startup. This is the first step to getting
+ Lucene to work correctly over NFS (second step is
+ LUCENE-710). (Mike McCandless)
+
+11. LUCENE-722: DEFAULT_MIN_DOC_FREQ was misspelled DEFALT_MIN_DOC_FREQ
+ in Similarity's MoreLikeThis class. The misspelling has been
+ replaced by the correct spelling.
+ (Andi Vajda via Daniel Naber)
+
+12. LUCENE-738: Reduce the size of the file that keeps track of which
+ documents are deleted when the number of deleted documents is
+ small. This changes the index file format and cannot be
+ read by previous versions of Lucene. (Doron Cohen via Yonik Seeley)
+
+13. LUCENE-756: Maintain all norms in a single .nrm file to reduce the
+ number of open files and file descriptors for the non-compound index
+ format. This changes the index file format, but maintains the
+ ability to read and update older indicies. The first segment merge
+ on an older format index will create a single .nrm file for the new
+ segment. (Doron Cohen via Yonik Seeley)
+
+14. LUCENE-732: DateTools support has been added to QueryParser, with
+ setters for both the default Resolution, and per-field Resolution.
+ For backwards compatibility, DateField is still used if no Resolutions
+ are specified. (Michael Busch via Chris Hostetter)
+
+15. Added isOptimized() method to IndexReader.
+ (Otis Gospodnetic)
+
+16. LUCENE-773: Deprecate the FSDirectory.getDirectory(*) methods that
+ take a boolean "create" argument. Instead you should use
+ IndexWriter's "create" argument to create a new index.
+ (Mike McCandless)
+
+17. LUCENE-780: Add a static Directory.copy() method to copy files
+ from one Directory to another. (Jiri Kuhn via Mike McCandless)
+
+18. LUCENE-773: Added Directory.clearLock(String name) to forcefully
+ remove an old lock. The default implementation is to ask the
+ lockFactory (if non null) to clear the lock. (Mike McCandless)
+
+19. LUCENE-795: Directory.renameFile() has been deprecated as it is
+ not used anymore inside Lucene. (Daniel Naber)
+
+Bug fixes
+
+ 1. Fixed the web application demo (built with "ant war-demo") which
+ didn't work because it used a QueryParser method that had
+ been removed (Daniel Naber)
+
+ 2. LUCENE-583: ISOLatin1AccentFilter fails to preserve positionIncrement
+ (Yonik Seeley)
+
+ 3. LUCENE-575: SpellChecker min score is incorrectly changed by suggestSimilar
+ (Karl Wettin via Yonik Seeley)
+
+ 4. LUCENE-587: Explanation.toHtml was producing malformed HTML
+ (Chris Hostetter)
+
+ 5. Fix to allow MatchAllDocsQuery to be used with RemoteSearcher (Yonik Seeley)
+
+ 6. LUCENE-601: RAMDirectory and RAMFile made Serializable
+ (Karl Wettin via Otis Gospodnetic)
+
+ 7. LUCENE-557: Fixes to BooleanQuery and FilteredQuery so that the score
+ Explanations match up with the real scores.
+ (Chris Hostetter)
+
+ 8. LUCENE-607: ParallelReader's TermEnum fails to advance properly to
+ new fields (Chuck Williams, Christian Kohlschuetter via Yonik Seeley)
+
+ 9. LUCENE-610,LUCENE-611: Simple syntax changes to allow compilation with ecj:
+ disambiguate inner class scorer's use of doc() in BooleanScorer2,
+ other test code changes. (DM Smith via Yonik Seeley)
+
+10. LUCENE-451: All core query types now use ComplexExplanations so that
+ boosts of zero don't confuse the BooleanWeight explain method.
+ (Chris Hostetter)
+
+11. LUCENE-593: Fixed LuceneDictionary's inner Iterator
+ (KÃ¥re Fiedler Christiansen via Otis Gospodnetic)
+
+12. LUCENE-641: fixed an off-by-one bug with IndexWriter.setMaxFieldLength()
+ (Daniel Naber)
+
+13. LUCENE-659: Make PerFieldAnalyzerWrapper delegate getPositionIncrementGap()
+ to the correct analyzer for the field. (Chuck Williams via Yonik Seeley)
+
+14. LUCENE-650: Fixed NPE in Locale specific String Sort when Document
+ has no value.
+ (Oliver Hutchison via Chris Hostetter)
+
+15. LUCENE-683: Fixed data corruption when reading lazy loaded fields.
+ (Yonik Seeley)
+16. LUCENE-678: Fixed bug in NativeFSLockFactory which caused the same
+ lock to be shared between different directories.
+ (Michael McCandless via Yonik Seeley)
-Lucene Change Log
+17. LUCENE-690: Fixed thread unsafe use of IndexInput by lazy loaded fields.
+ (Yonik Seeley)
+
+18. LUCENE-696: Fix bug when scorer for DisjunctionMaxQuery has skipTo()
+ called on it before next(). (Yonik Seeley)
+
+19. LUCENE-569: Fixed SpanNearQuery bug, for 'inOrder' queries it would fail
+ to recognize ordered spans if they overlaped with unordered spans.
+ (Paul Elschot via Chris Hostetter)
+
+20. LUCENE-706: Updated fileformats.xml|html concerning the docdelta value
+ in the frequency file. (Johan Stuyts, Doron Cohen via Grant Ingersoll)
+
+21. LUCENE-715: Fixed private constructor in IndexWriter.java to
+ properly release the acquired write lock if there is an
+ IOException after acquiring the write lock but before finishing
+ instantiation. (Matthew Bogosian via Mike McCandless)
+
+22. LUCENE-651: Multiple different threads requesting the same
+ FieldCache entry (often for Sorting by a field) at the same
+ time caused multiple generations of that entry, which was
+ detrimental to performance and memory use.
+ (Oliver Hutchison via Otis Gospodnetic)
+
+23. LUCENE-717: Fixed build.xml not to fail when there is no lib dir.
+ (Doron Cohen via Otis Gospodnetic)
+
+24. LUCENE-728: Removed duplicate/old MoreLikeThis and SimilarityQueries
+ classes from contrib/similarity, as their new home is under
+ contrib/queries.
+ (Otis Gospodnetic)
+
+25. LUCENE-669: Do not double-close the RandomAccessFile in
+ FSIndexInput/Output during finalize(). Besides sending an
+ IOException up to the GC, this may also be the cause intermittent
+ "The handle is invalid" IOExceptions on Windows when trying to
+ close readers or writers. (Michael Busch via Mike McCandless)
+
+26. LUCENE-702: Fix IndexWriter.addIndexes(*) to not corrupt the index
+ on any exceptions (eg disk full). The semantics of these methods
+ is now transactional: either all indices are merged or none are.
+ Also fixed IndexWriter.mergeSegments (called outside of
+ addIndexes(*) by addDocument, optimize, flushRamSegments) and
+ IndexReader.commit() (called by close) to clean up and keep the
+ instance state consistent to what's actually in the index (Mike
+ McCandless).
+
+27. LUCENE-129: Change finalizers to do "try {...} finally
+ {super.finalize();}" to make sure we don't miss finalizers in
+ classes above us. (Esmond Pitt via Mike McCandless)
+
+28. LUCENE-754: Fix a problem introduced by LUCENE-651, causing
+ IndexReaders to hang around forever, in addition to not
+ fixing the original FieldCache performance problem.
+ (Chris Hostetter, Yonik Seeley)
+
+29. LUCENE-140: Fix IndexReader.deleteDocument(int docNum) to
+ correctly raise ArrayIndexOutOfBoundsException when docNum is too
+ large. Previously, if docNum was only slightly too large (within
+ the same multiple of 8, ie, up to 7 ints beyond maxDoc), no
+ exception would be raised and instead the index would become
+ silently corrupted. The corruption then only appears much later,
+ in mergeSegments, when the corrupted segment is merged with
+ segment(s) after it. (Mike McCandless)
+
+30. LUCENE-768: Fix case where an Exception during deleteDocument,
+ undeleteAll or setNorm in IndexReader could leave the reader in a
+ state where close() fails to release the write lock.
+ (Mike McCandless)
+
+31. Remove "tvp" from known index file extensions because it is
+ never used. (Nicolas Lalevée via Bernhard Messer)
+
+32. LUCENE-767: Change how SegmentReader.maxDoc() is computed to not
+ rely on file length check and instead use the SegmentInfo's
+ docCount that's already stored explicitly in the index. This is a
+ defensive bug fix (ie, there is no known problem seen "in real
+ life" due to this, just a possible future problem). (Chuck
+ Williams via Mike McCandless)
+
+Optimizations
+
+ 1. LUCENE-586: TermDocs.skipTo() is now more efficient for
+ multi-segment indexes. This will improve the performance of many
+ types of queries against a non-optimized index. (Andrew Hudson
+ via Yonik Seeley)
+
+ 2. LUCENE-623: RAMDirectory.close now nulls out its reference to all
+ internal "files", allowing them to be GCed even if references to the
+ RAMDirectory itself still exist. (Nadav Har'El via Chris Hostetter)
+
+ 3. LUCENE-629: Compressed fields are no longer uncompressed and
+ recompressed during segment merges (e.g. during indexing or
+ optimizing), thus improving performance . (Michael Busch via Otis
+ Gospodnetic)
+
+ 4. LUCENE-388: Improve indexing performance when maxBufferedDocs is
+ large by keeping a count of buffered documents rather than
+ counting after each document addition. (Doron Cohen, Paul Smith,
+ Yonik Seeley)
+
+ 5. Modified TermScorer.explain to use TermDocs.skipTo() instead of
+ looping through docs. (Grant Ingersoll)
+
+ 6. LUCENE-672: New indexing segment merge policy flushes all
+ buffered docs to their own segment and delays a merge until
+ mergeFactor segments of a certain level have been accumulated.
+ This increases indexing performance in the presence of deleted
+ docs or partially full segments as well as enabling future
+ optimizations.
+
+ NOTE: this also fixes an "under-merging" bug whereby it is
+ possible to get far too many segments in your index (which will
+ drastically slow down search, risks exhausting file descriptor
+ limit, etc.). This can happen when the number of buffered docs
+ at close, plus the number of docs in the last non-ram segment is
+ greater than mergeFactor. (Ning Li, Yonik Seeley)
+
+ 7. Lazy loaded fields unnecessarily retained an extra copy of loaded
+ String data. (Yonik Seeley)
+
+ 8. LUCENE-443: ConjunctionScorer performance increase. Speed up
+ any BooleanQuery with more than one mandatory clause.
+ (Abdul Chaudhry, Paul Elschot via Yonik Seeley)
+
+ 9. LUCENE-365: DisjunctionSumScorer performance increase of
+ ~30%. Speeds up queries with optional clauses. (Paul Elschot via
+ Yonik Seeley)
+
+ 10. LUCENE-695: Optimized BufferedIndexInput.readBytes() for medium
+ size buffers, which will speed up merging and retrieving binary
+ and compressed fields. (Nadav Har'El via Yonik Seeley)
+
+ 11. LUCENE-687: Lazy skipping on proximity file speeds up most
+ queries involving term positions, including phrase queries.
+ (Michael Busch via Yonik Seeley)
+
+ 12. LUCENE-714: Replaced 2 cases of manual for-loop array copying
+ with calls to System.arraycopy instead, in DocumentWriter.java.
+ (Nicolas Lalevee via Mike McCandless)
+
+ 13. LUCENE-729: Non-recursive skipTo and next implementation of
+ TermDocs for a MultiReader. The old implementation could
+ recurse up to the number of segments in the index. (Yonik Seeley)
+
+ 14. LUCENE-739: Improve segment merging performance by reusing
+ the norm array across different fields and doing bulk writes
+ of norms of segments with no deleted docs.
+ (Michael Busch via Yonik Seeley)
-$Id: CHANGES.txt 409697 2006-05-26 16:50:37Z cutting $
+ 15. LUCENE-745: Add BooleanQuery.clauses(), allowing direct access
+ to the List of clauses and replaced the internal synchronized Vector
+ with an unsynchronized List. (Yonik Seeley)
-Release 2.0.0 2005-05-26
+ 16. LUCENE-750: Remove finalizers from FSIndexOutput and move the
+ FSIndexInput finalizer to the actual file so all clones don't
+ register a new finalizer. (Yonik Seeley)
+
+Test Cases
+ 1. Added TestTermScorer.java (Grant Ingersoll)
+ 2. Added TestWindowsMMap.java (Benson Margulies via Mike McCandless)
+ 3. LUCENE-744 Append the user.name property onto the temporary directory that is created so it doesn't interfere with other users. (Grant Ingersoll)
+
+Documentation
+
+ 1. Added style sheet to xdocs named lucene.css and included in the
+ Anakia VSL descriptor. (Grant Ingersoll)
+
+ 2. Added scoring.xml document into xdocs. Updated Similarity.java
+ scoring formula.(Grant Ingersoll and Steve Rowe. Updates from:
+ Michael McCandless, Doron Cohen, Chris Hostetter, Doug Cutting).
+ Issue 664.
+
+ 3. Added javadocs for FieldSelectorResult.java. (Grant Ingersoll)
+
+ 4. Moved xdocs directory to src/site/src/documentation/content/xdocs per Issue 707. Site now builds using Forrest, just like the other Lucene siblings. See http://wiki.apache.org/jakarta-lucene/HowToUpdateTheWebsite for info on updating the website. (Grant Ingersoll with help from Steve Rowe, Chris Hostetter, Doug Cutting, Otis Gospodnetic, Yonik Seeley)
+
+ 5. Added in Developer and System Requriements sections under Resources (Grant Ingersoll)
+
+ 6. LUCENE-713 Updated the Term Vector section of File Formats to include documentation on how Offset and Position info are stored in the TVF file. (Grant Ingersoll, Samir Abdou)
+
+ 7. Added in link to Clover Test Code Coverage Reports under the Develop section in Resources (Grant Ingersoll)
+
+ 8. LUCENE-748: Added details for semantics of IndexWriter.close on
+ hitting an Exception. (Jed Wesley-Smith via Mike McCandless)
+
+ 9. Added some text about what is contained in releases. (Eric Haszlakiewicz via Grant Ingersoll)
+
+ 10. LUCENE-758: Fix javadoc to clarify that RAMDirectory(Directory)
+ makes a full copy of the starting Directory. (Mike McCandless)
+
+ 11. LUCENE-764: Fix javadocs to detail temporary space requirements
+ for IndexWriter's optimize(), addIndexes(*) and addDocument(...)
+ methods. (Mike McCandless)
+
+Build
+
+ 1. Added in clover test code coverage per http://issues.apache.org/jira/browse/LUCENE-721 To enable clover code coverage, you must have clover.jar in the ANT classpath and specify -Drun.clover=true on the command line.(Michael Busch and Grant Ingersoll)
+
+ 2. Added a sysproperty in common-build.xml per Lucene 752 to map java.io.tmpdir to ${build.dir}/test just like the tempDir sysproperty.
+
+ 3. LUCENE-757 Added new target named init-dist that does setup for distribution of both binary and source distributions. Called by package and package-*-src
+
+Release 2.0.0 2006-05-26
API Changes
@@ -21,11 +482,17 @@
2. DisjunctionSumScorer is no longer public.
(Paul Elschot via Otis Gospodnetic)
-
- 3. Creating a Field with both an empty name and an empty value
+
+ 3. Creating a Field with both an empty name and an empty value
now throws an IllegalArgumentException
(Daniel Naber)
+ 4. LUCENE-301: Added new IndexWriter({String,File,Directory},
+ Analyzer) constructors that do not take a boolean "create"
+ argument. These new constructors will create a new index if
+ necessary, else append to the existing one. (Dan Armbrust via
+ Mike McCandless)
+
New features
1. LUCENE-496: Command line tool for modifying the field norms of an
@@ -102,7 +569,7 @@
1.9 final
-Note that this realease is mostly but not 100% source compatible with
+Note that this release is mostly but not 100% source compatible with
the previous release of Lucene (1.4.3). In other words, you should
make sure your application compiles with this version of Lucene before
you replace the old Lucene JAR with the new one. Many methods have
@@ -303,7 +770,7 @@
must match in a BooleanQuery. See BooleanQuery.setMinimumNumberShouldMatch().
(Paul Elschot, Chris Hostetter via Yonik Seeley, LUCENE-395)
-27. Added DisjunctionMaxQuery which provides the maximum score across it's clauses.
+27. Added DisjunctionMaxQuery which provides the maximum score across its clauses.
It's very useful for searching across multiple fields.
(Chuck Williams via Yonik Seeley, LUCENE-323)
@@ -685,7 +1152,7 @@
8. Added new method Query.getSimilarity(Searcher), and changed
scorers to use it. This permits one to subclass a Query class so
- that it can specify it's own Similarity implementation, perhaps
+ that it can specify its own Similarity implementation, perhaps
one that delegates through that of the Searcher. (Julien Nioche
via Cutting)
Modified: incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DeleteFiles/AssemblyInfo.cs?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs Tue May 1 11:45:26 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
using System.Reflection;
using System.Runtime.CompilerServices;
@@ -16,7 +33,7 @@
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.1")]
//
// Version information for an assembly consists of the following four values:
@@ -29,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.0.0.003")]
+[assembly: AssemblyVersion("2.1.0.001")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Added: incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles-VS2005.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DeleteFiles/DeleteFiles-VS2005.csproj?view=auto&rev=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles-VS2005.csproj (added)
+++ incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles-VS2005.csproj Tue May 1 11:45:26 2007
@@ -0,0 +1,110 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>App.ico</ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>DeleteFiles</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Exe</OutputType>
+ <RootNamespace>DeleteFiles</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>bin\Debug\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>DeleteFiles.xml</DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Lucene.Net">
+ <Name>Lucene.Net</Name>
+ <HintPath>..\..\Lucene.Net\bin\Debug\Lucene.Net.dll</HintPath>
+ </Reference>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Data">
+ <Name>System.Data</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ <ProjectReference Include="..\DemoLib\DemoLib-VS2005.csproj">
+ <Name>DemoLib-VS2005</Name>
+ <Project>{F04CA2F4-E182-46A8-B914-F46AF5319E83}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="App.ico" />
+ <Compile Include="AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="DeleteFiles.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DeleteFiles/DeleteFiles.cs?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/DeleteFiles.cs Tue May 1 11:45:26 2007
@@ -16,10 +16,11 @@
*/
using System;
-using IndexReader = Lucene.Net.Index.IndexReader;
-using Term = Lucene.Net.Index.Term;
+
using Directory = Lucene.Net.Store.Directory;
using FSDirectory = Lucene.Net.Store.FSDirectory;
+using IndexReader = Lucene.Net.Index.IndexReader;
+using Term = Lucene.Net.Index.Term;
namespace Lucene.Net.Demo
{
Added: incubator/lucene.net/trunk/C#/src/Demo/Demo-VS2005.sln
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/Demo-VS2005.sln?view=auto&rev=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/Demo-VS2005.sln (added)
+++ incubator/lucene.net/trunk/C#/src/Demo/Demo-VS2005.sln Tue May 1 11:45:26 2007
@@ -0,0 +1,61 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoLib-VS2005", "DemoLib\DemoLib-VS2005.csproj", "{F04CA2F4-E182-46A8-B914-F46AF5319E83}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeleteFiles-VS2005", "DeleteFiles\DeleteFiles-VS2005.csproj", "{BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IndexFiles-VS2005", "IndexFiles\IndexFiles-VS2005.csproj", "{3E561192-4292-4998-BC67-8C1B82A56108}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IndexHtml-VS2005", "IndexHtml\IndexHtml-VS2005.csproj", "{2B86751C-0D3A-486E-A176-E995C63EB653}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchFiles-VS2005", "SearchFiles\SearchFiles-VS2005.csproj", "{5CF56C9F-F8DF-471E-B73A-C736464948C0}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3E561192-4292-4998-BC67-8C1B82A56108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E561192-4292-4998-BC67-8C1B82A56108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E561192-4292-4998-BC67-8C1B82A56108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E561192-4292-4998-BC67-8C1B82A56108}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2B86751C-0D3A-486E-A176-E995C63EB653}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2B86751C-0D3A-486E-A176-E995C63EB653}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2B86751C-0D3A-486E-A176-E995C63EB653}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2B86751C-0D3A-486E-A176-E995C63EB653}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5CF56C9F-F8DF-471E-B73A-C736464948C0}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/AssemblyInfo.cs?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs Tue May 1 11:45:26 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
using System.Reflection;
using System.Runtime.CompilerServices;
@@ -16,7 +33,7 @@
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.1")]
//
// Version information for an assembly consists of the following four values:
@@ -29,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.0.0.003")]
+[assembly: AssemblyVersion("2.1.0.001")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Added: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/DemoLib-VS2005.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/DemoLib-VS2005.csproj?view=auto&rev=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/DemoLib-VS2005.csproj (added)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/DemoLib-VS2005.csproj Tue May 1 11:45:26 2007
@@ -0,0 +1,142 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{F04CA2F4-E182-46A8-B914-F46AF5319E83}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>DemoLib</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <RootNamespace>DemoLib</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>bin\Debug\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>DemoLib.xml</DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Lucene.Net">
+ <Name>Lucene.Net</Name>
+ <HintPath>..\..\Lucene.Net\bin\Debug\Lucene.Net.dll</HintPath>
+ </Reference>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Data">
+ <Name>System.Data</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="FileDocument.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTMLDocument.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\Entities.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\HTMLParser.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\HTMLParserConstants.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\HTMLParserTokenManager.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\ParseException.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\ParserThread.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\SimpleCharStream.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\Tags.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\Test.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\Token.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="HTML\TokenMgrError.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <None Include="HTML\HTMLParser.jj" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/FileDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/FileDocument.cs?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/FileDocument.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/FileDocument.cs Tue May 1 11:45:26 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using DateTools = Lucene.Net.Documents.DateTools;
using Document = Lucene.Net.Documents.Document;
using Field = Lucene.Net.Documents.Field;
@@ -52,7 +53,7 @@
// 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.LastWriteTime.Ticks, DateTools.Resolution.MINUTE), Field.Store.YES, Field.Index.UN_TOKENIZED));
+ doc.Add(new Field("modified", DateTools.TimeToString(f.LastWriteTime.Millisecond, DateTools.Resolution.MINUTE), Field.Store.YES, Field.Index.UN_TOKENIZED));
// 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: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/HTMLParser.cs?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.cs Tue May 1 11:45:26 2007
@@ -82,6 +82,12 @@
}
}
+ /// <deprecated> Use HTMLParser(FileInputStream) instead
+ /// </deprecated>
+ public HTMLParser(System.IO.FileInfo file) : this(new System.IO.FileStream(file.FullName, System.IO.FileMode.Open, System.IO.FileAccess.Read))
+ {
+ }
+
public virtual System.String GetTitle()
{
if (pipeIn == null)
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.jj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/HTMLParser.jj?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.jj (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.jj Tue May 1 11:45:26 2007
@@ -1,392 +1,392 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// HTMLParser.jj
-
-options {
- STATIC = false;
- OPTIMIZE_TOKEN_MANAGER = true;
- //DEBUG_LOOKAHEAD = true;
- //DEBUG_TOKEN_MANAGER = true;
-}
-
-PARSER_BEGIN(HTMLParser)
-
-package org.apache.lucene.demo.html;
-
-import java.io.*;
-import java.util.Properties;
-
-public class HTMLParser {
- public static int SUMMARY_LENGTH = 200;
-
- StringBuffer title = new StringBuffer(SUMMARY_LENGTH);
- StringBuffer summary = new StringBuffer(SUMMARY_LENGTH * 2);
- Properties metaTags=new Properties();
- String currentMetaTag=null;
- String currentMetaContent=null;
- int length = 0;
- boolean titleComplete = false;
- boolean inTitle = false;
- boolean inMetaTag = false;
- boolean inStyle = false;
- boolean afterTag = false;
- boolean afterSpace = false;
- String eol = System.getProperty("line.separator");
- Reader pipeIn = null;
- Writer pipeOut;
- private MyPipedInputStream pipeInStream = null;
- private PipedOutputStream pipeOutStream = null;
-
- private class MyPipedInputStream extends PipedInputStream{
-
- public MyPipedInputStream(){
- super();
- }
-
- public MyPipedInputStream(PipedOutputStream src) throws IOException{
- super(src);
- }
-
- public boolean full() throws IOException{
- return this.available() >= PipedInputStream.PIPE_SIZE;
- }
- }
-
- /**
- * @deprecated Use HTMLParser(FileInputStream) instead
- */
- public HTMLParser(File file) throws FileNotFoundException {
- this(new FileInputStream(file));
- }
-
- public String getTitle() throws IOException, InterruptedException {
- if (pipeIn == null)
- getReader(); // spawn parsing thread
- while (true) {
- synchronized(this) {
- if (titleComplete || pipeInStream.full())
- break;
- wait(10);
- }
- }
- return title.toString().trim();
- }
-
- public Properties getMetaTags() throws IOException,
-InterruptedException {
- if (pipeIn == null)
- getReader(); // spawn parsing thread
- while (true) {
- synchronized(this) {
- if (titleComplete || pipeInStream.full())
- break;
- wait(10);
- }
- }
- return metaTags;
- }
-
-
- public String getSummary() throws IOException, InterruptedException {
- if (pipeIn == null)
- getReader(); // spawn parsing thread
- while (true) {
- synchronized(this) {
- if (summary.length() >= SUMMARY_LENGTH || pipeInStream.full())
- break;
- wait(10);
- }
- }
- if (summary.length() > SUMMARY_LENGTH)
- summary.setLength(SUMMARY_LENGTH);
-
- String sum = summary.toString().trim();
- String tit = getTitle();
- if (sum.startsWith(tit) || sum.equals(""))
- return tit;
- else
- return sum;
- }
-
- public Reader getReader() throws IOException {
- if (pipeIn == null) {
- pipeInStream = new MyPipedInputStream();
- pipeOutStream = new PipedOutputStream(pipeInStream);
- pipeIn = new InputStreamReader(pipeInStream, "UTF-16BE");
- pipeOut = new OutputStreamWriter(pipeOutStream, "UTF-16BE");
-
- Thread thread = new ParserThread(this);
- thread.start(); // start parsing
- }
-
- return pipeIn;
- }
-
- void addToSummary(String text) {
- if (summary.length() < SUMMARY_LENGTH) {
- summary.append(text);
- if (summary.length() >= SUMMARY_LENGTH) {
- synchronized(this) {
- notifyAll();
- }
- }
- }
- }
-
- void addText(String text) throws IOException {
- if (inStyle)
- return;
- if (inTitle)
- title.append(text);
- else {
- addToSummary(text);
- if (!titleComplete && !title.equals("")) { // finished title
- synchronized(this) {
- titleComplete = true; // tell waiting threads
- notifyAll();
- }
- }
- }
-
- length += text.length();
- pipeOut.write(text);
-
- afterSpace = false;
- }
-
- void addMetaTag() {
- metaTags.setProperty(currentMetaTag, currentMetaContent);
- currentMetaTag = null;
- currentMetaContent = null;
- return;
- }
-
- void addSpace() throws IOException {
- if (!afterSpace) {
- if (inTitle)
- title.append(" ");
- else
- addToSummary(" ");
-
- String space = afterTag ? eol : " ";
- length += space.length();
- pipeOut.write(space);
- afterSpace = true;
- }
- }
-
-// void handleException(Exception e) {
-// System.out.println(e.toString()); // print the error message
-// System.out.println("Skipping...");
-// Token t;
-// do {
-// t = getNextToken();
-// } while (t.kind != TagEnd);
-// }
-}
-
-PARSER_END(HTMLParser)
-
-
-void HTMLDocument() throws IOException :
-{
- Token t;
-}
-{
-// try {
- ( Tag() { afterTag = true; }
- | t=Decl() { afterTag = true; }
- | CommentTag() { afterTag = true; }
- | ScriptTag() { afterTag = true; }
- | t=<Word> { addText(t.image); afterTag = false; }
- | t=<Entity> { addText(Entities.decode(t.image)); afterTag = false; }
- | t=<Punct> { addText(t.image); afterTag = false; }
- | <Space> { addSpace(); afterTag = false; }
- )* <EOF>
-// } catch (ParseException e) {
-// handleException(e);
-// }
-}
-
-void Tag() throws IOException :
-{
- Token t1, t2;
- boolean inImg = false;
-}
-{
- t1=<TagName> {
- String tagName = t1.image.toLowerCase();
- if(Tags.WS_ELEMS.contains(tagName) ) {
- addSpace();
- }
- inTitle = tagName.equalsIgnoreCase("<title"); // keep track if in <TITLE>
- inMetaTag = tagName.equalsIgnoreCase("<META"); // keep track if in <META>
- inStyle = tagName.equalsIgnoreCase("<STYLE"); // keep track if in <STYLE>
- inImg = tagName.equalsIgnoreCase("<img"); // keep track if in <IMG>
- }
- (t1=<ArgName>
- (<ArgEquals>
- (t2=ArgValue() // save ALT text in IMG tag
- {
- if (inImg && t1.image.equalsIgnoreCase("alt") && t2 != null)
- addText("[" + t2.image + "]");
-
- if(inMetaTag &&
- ( t1.image.equalsIgnoreCase("name") ||
- t1.image.equalsIgnoreCase("HTTP-EQUIV")
- )
- && t2 != null)
- {
- currentMetaTag=t2.image.toLowerCase();
- if(currentMetaTag != null && currentMetaContent != null) {
- addMetaTag();
- }
- }
- if(inMetaTag && t1.image.equalsIgnoreCase("content") && t2 !=
-null)
- {
- currentMetaContent=t2.image.toLowerCase();
- if(currentMetaTag != null && currentMetaContent != null) {
- addMetaTag();
- }
- }
- }
- )?
- )?
- )*
- <TagEnd>
-}
-
-Token ArgValue() :
-{
- Token t = null;
-}
-{
- t=<ArgValue> { return t; }
-| LOOKAHEAD(2)
- <ArgQuote1> <CloseQuote1> { return t; }
-| <ArgQuote1> t=<Quote1Text> <CloseQuote1> { return t; }
-| LOOKAHEAD(2)
- <ArgQuote2> <CloseQuote2> { return t; }
-| <ArgQuote2> t=<Quote2Text> <CloseQuote2> { return t; }
-}
-
-
-Token Decl() :
-{
- Token t;
-}
-{
- t=<DeclName> ( <ArgName> | ArgValue() | <ArgEquals> )* <TagEnd>
- { return t; }
-}
-
-
-void CommentTag() :
-{}
-{
- (<Comment1> ( <CommentText1> )* <CommentEnd1>)
- |
- (<Comment2> ( <CommentText2> )* <CommentEnd2>)
-}
-
-void ScriptTag() :
-{}
-{
- <ScriptStart> ( <ScriptText> )* <ScriptEnd>
-}
-
-
-TOKEN :
-{
- < ScriptStart: "<script" > : WithinScript
-| < TagName: "<" ("/")? ["A"-"Z","a"-"z"] (<ArgName>)? > : WithinTag
-| < DeclName: "<" "!" ["A"-"Z","a"-"z"] (<ArgName>)? > : WithinTag
-
-| < Comment1: "<!--" > : WithinComment1
-| < Comment2: "<!" > : WithinComment2
-
-| < Word: ( <LET> | <LET> (["+","/"])+ | <NUM> ["\""] |
- <LET> ["-","'"] <LET> | ("$")? <NUM> [",","."] <NUM> )+ >
-| < #LET: ["A"-"Z","a"-"z","0"-"9"] >
-| < #NUM: ["0"-"9"] >
-| < #HEX: ["0"-"9","A"-"F","a"-"f"] >
-
-| < Entity: ( "&" (["A"-"Z","a"-"z"])+ (";")? | "&" "#" (<NUM>)+ (";")? | "&" "#" ["X","x"] (<HEX>)+ (";")? ) >
-
-| < Space: (<SP>)+ >
-| < #SP: [" ","\t","\r","\n"] >
-
-| < Punct: ~[] > // Keep this last. It is a catch-all.
-}
-
-<WithinScript> TOKEN:
-{
- < ScriptText: (~["<",">"])+ | "<" | ">" >
-| < ScriptEnd: "</script" (~["<",">"])* ">" > : DEFAULT
-}
-
-<WithinTag> TOKEN:
-{
- < ArgName: (~[" ","\t","\r","\n","=",">","'","\""])
- (~[" ","\t","\r","\n","=",">"])* >
-| < ArgEquals: "=" > : AfterEquals
-| < TagEnd: ">" | "=>" > : DEFAULT
-}
-
-<AfterEquals> TOKEN:
-{
- < ArgValue: (~[" ","\t","\r","\n","=",">","'","\""])
- (~[" ","\t","\r","\n",">"])* > : WithinTag
-}
-
-<WithinTag, AfterEquals> TOKEN:
-{
- < ArgQuote1: "'" > : WithinQuote1
-| < ArgQuote2: "\"" > : WithinQuote2
-}
-
-<WithinTag, AfterEquals> SKIP:
-{
- < <Space> >
-}
-
-<WithinQuote1> TOKEN:
-{
- < Quote1Text: (~["'"])+ >
-| < CloseQuote1: <ArgQuote1> > : WithinTag
-}
-
-<WithinQuote2> TOKEN:
-{
- < Quote2Text: (~["\""])+ >
-| < CloseQuote2: <ArgQuote2> > : WithinTag
-}
-
-
-<WithinComment1> TOKEN :
-{
- < CommentText1: (~["-"])+ | "-" >
-| < CommentEnd1: "-->" > : DEFAULT
-}
-
-<WithinComment2> TOKEN :
-{
- < CommentText2: (~[">"])+ >
-| < CommentEnd2: ">" > : DEFAULT
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// HTMLParser.jj
+
+options {
+ STATIC = false;
+ OPTIMIZE_TOKEN_MANAGER = true;
+ //DEBUG_LOOKAHEAD = true;
+ //DEBUG_TOKEN_MANAGER = true;
+}
+
+PARSER_BEGIN(HTMLParser)
+
+package Lucene.Net.demo.html;
+
+import java.io.*;
+import java.util.Properties;
+
+public class HTMLParser {
+ public static int SUMMARY_LENGTH = 200;
+
+ StringBuffer title = new StringBuffer(SUMMARY_LENGTH);
+ StringBuffer summary = new StringBuffer(SUMMARY_LENGTH * 2);
+ Properties metaTags=new Properties();
+ String currentMetaTag=null;
+ String currentMetaContent=null;
+ int length = 0;
+ boolean titleComplete = false;
+ boolean inTitle = false;
+ boolean inMetaTag = false;
+ boolean inStyle = false;
+ boolean afterTag = false;
+ boolean afterSpace = false;
+ String eol = System.getProperty("line.separator");
+ Reader pipeIn = null;
+ Writer pipeOut;
+ private MyPipedInputStream pipeInStream = null;
+ private PipedOutputStream pipeOutStream = null;
+
+ private class MyPipedInputStream extends PipedInputStream{
+
+ public MyPipedInputStream(){
+ super();
+ }
+
+ public MyPipedInputStream(PipedOutputStream src) throws IOException{
+ super(src);
+ }
+
+ public boolean full() throws IOException{
+ return this.available() >= PipedInputStream.PIPE_SIZE;
+ }
+ }
+
+ /**
+ * @deprecated Use HTMLParser(FileInputStream) instead
+ */
+ public HTMLParser(File file) throws FileNotFoundException {
+ this(new FileInputStream(file));
+ }
+
+ public String getTitle() throws IOException, InterruptedException {
+ if (pipeIn == null)
+ getReader(); // spawn parsing thread
+ while (true) {
+ synchronized(this) {
+ if (titleComplete || pipeInStream.full())
+ break;
+ wait(10);
+ }
+ }
+ return title.toString().trim();
+ }
+
+ public Properties getMetaTags() throws IOException,
+InterruptedException {
+ if (pipeIn == null)
+ getReader(); // spawn parsing thread
+ while (true) {
+ synchronized(this) {
+ if (titleComplete || pipeInStream.full())
+ break;
+ wait(10);
+ }
+ }
+ return metaTags;
+ }
+
+
+ public String getSummary() throws IOException, InterruptedException {
+ if (pipeIn == null)
+ getReader(); // spawn parsing thread
+ while (true) {
+ synchronized(this) {
+ if (summary.length() >= SUMMARY_LENGTH || pipeInStream.full())
+ break;
+ wait(10);
+ }
+ }
+ if (summary.length() > SUMMARY_LENGTH)
+ summary.setLength(SUMMARY_LENGTH);
+
+ String sum = summary.toString().trim();
+ String tit = getTitle();
+ if (sum.startsWith(tit) || sum.equals(""))
+ return tit;
+ else
+ return sum;
+ }
+
+ public Reader getReader() throws IOException {
+ if (pipeIn == null) {
+ pipeInStream = new MyPipedInputStream();
+ pipeOutStream = new PipedOutputStream(pipeInStream);
+ pipeIn = new InputStreamReader(pipeInStream, "UTF-16BE");
+ pipeOut = new OutputStreamWriter(pipeOutStream, "UTF-16BE");
+
+ Thread thread = new ParserThread(this);
+ thread.start(); // start parsing
+ }
+
+ return pipeIn;
+ }
+
+ void addToSummary(String text) {
+ if (summary.length() < SUMMARY_LENGTH) {
+ summary.append(text);
+ if (summary.length() >= SUMMARY_LENGTH) {
+ synchronized(this) {
+ notifyAll();
+ }
+ }
+ }
+ }
+
+ void addText(String text) throws IOException {
+ if (inStyle)
+ return;
+ if (inTitle)
+ title.append(text);
+ else {
+ addToSummary(text);
+ if (!titleComplete && !title.equals("")) { // finished title
+ synchronized(this) {
+ titleComplete = true; // tell waiting threads
+ notifyAll();
+ }
+ }
+ }
+
+ length += text.length();
+ pipeOut.write(text);
+
+ afterSpace = false;
+ }
+
+ void addMetaTag() {
+ metaTags.setProperty(currentMetaTag, currentMetaContent);
+ currentMetaTag = null;
+ currentMetaContent = null;
+ return;
+ }
+
+ void addSpace() throws IOException {
+ if (!afterSpace) {
+ if (inTitle)
+ title.append(" ");
+ else
+ addToSummary(" ");
+
+ String space = afterTag ? eol : " ";
+ length += space.length();
+ pipeOut.write(space);
+ afterSpace = true;
+ }
+ }
+
+// void handleException(Exception e) {
+// System.out.println(e.toString()); // print the error message
+// System.out.println("Skipping...");
+// Token t;
+// do {
+// t = getNextToken();
+// } while (t.kind != TagEnd);
+// }
+}
+
+PARSER_END(HTMLParser)
+
+
+void HTMLDocument() throws IOException :
+{
+ Token t;
+}
+{
+// try {
+ ( Tag() { afterTag = true; }
+ | t=Decl() { afterTag = true; }
+ | CommentTag() { afterTag = true; }
+ | ScriptTag() { afterTag = true; }
+ | t=<Word> { addText(t.image); afterTag = false; }
+ | t=<Entity> { addText(Entities.decode(t.image)); afterTag = false; }
+ | t=<Punct> { addText(t.image); afterTag = false; }
+ | <Space> { addSpace(); afterTag = false; }
+ )* <EOF>
+// } catch (ParseException e) {
+// handleException(e);
+// }
+}
+
+void Tag() throws IOException :
+{
+ Token t1, t2;
+ boolean inImg = false;
+}
+{
+ t1=<TagName> {
+ String tagName = t1.image.toLowerCase();
+ if(Tags.WS_ELEMS.contains(tagName) ) {
+ addSpace();
+ }
+ inTitle = tagName.equalsIgnoreCase("<title"); // keep track if in <TITLE>
+ inMetaTag = tagName.equalsIgnoreCase("<META"); // keep track if in <META>
+ inStyle = tagName.equalsIgnoreCase("<STYLE"); // keep track if in <STYLE>
+ inImg = tagName.equalsIgnoreCase("<img"); // keep track if in <IMG>
+ }
+ (t1=<ArgName>
+ (<ArgEquals>
+ (t2=ArgValue() // save ALT text in IMG tag
+ {
+ if (inImg && t1.image.equalsIgnoreCase("alt") && t2 != null)
+ addText("[" + t2.image + "]");
+
+ if(inMetaTag &&
+ ( t1.image.equalsIgnoreCase("name") ||
+ t1.image.equalsIgnoreCase("HTTP-EQUIV")
+ )
+ && t2 != null)
+ {
+ currentMetaTag=t2.image.toLowerCase();
+ if(currentMetaTag != null && currentMetaContent != null) {
+ addMetaTag();
+ }
+ }
+ if(inMetaTag && t1.image.equalsIgnoreCase("content") && t2 !=
+null)
+ {
+ currentMetaContent=t2.image.toLowerCase();
+ if(currentMetaTag != null && currentMetaContent != null) {
+ addMetaTag();
+ }
+ }
+ }
+ )?
+ )?
+ )*
+ <TagEnd>
+}
+
+Token ArgValue() :
+{
+ Token t = null;
+}
+{
+ t=<ArgValue> { return t; }
+| LOOKAHEAD(2)
+ <ArgQuote1> <CloseQuote1> { return t; }
+| <ArgQuote1> t=<Quote1Text> <CloseQuote1> { return t; }
+| LOOKAHEAD(2)
+ <ArgQuote2> <CloseQuote2> { return t; }
+| <ArgQuote2> t=<Quote2Text> <CloseQuote2> { return t; }
+}
+
+
+Token Decl() :
+{
+ Token t;
+}
+{
+ t=<DeclName> ( <ArgName> | ArgValue() | <ArgEquals> )* <TagEnd>
+ { return t; }
+}
+
+
+void CommentTag() :
+{}
+{
+ (<Comment1> ( <CommentText1> )* <CommentEnd1>)
+ |
+ (<Comment2> ( <CommentText2> )* <CommentEnd2>)
+}
+
+void ScriptTag() :
+{}
+{
+ <ScriptStart> ( <ScriptText> )* <ScriptEnd>
+}
+
+
+TOKEN :
+{
+ < ScriptStart: "<script" > : WithinScript
+| < TagName: "<" ("/")? ["A"-"Z","a"-"z"] (<ArgName>)? > : WithinTag
+| < DeclName: "<" "!" ["A"-"Z","a"-"z"] (<ArgName>)? > : WithinTag
+
+| < Comment1: "<!--" > : WithinComment1
+| < Comment2: "<!" > : WithinComment2
+
+| < Word: ( <LET> | <LET> (["+","/"])+ | <NUM> ["\""] |
+ <LET> ["-","'"] <LET> | ("$")? <NUM> [",","."] <NUM> )+ >
+| < #LET: ["A"-"Z","a"-"z","0"-"9"] >
+| < #NUM: ["0"-"9"] >
+| < #HEX: ["0"-"9","A"-"F","a"-"f"] >
+
+| < Entity: ( "&" (["A"-"Z","a"-"z"])+ (";")? | "&" "#" (<NUM>)+ (";")? | "&" "#" ["X","x"] (<HEX>)+ (";")? ) >
+
+| < Space: (<SP>)+ >
+| < #SP: [" ","\t","\r","\n"] >
+
+| < Punct: ~[] > // Keep this last. It is a catch-all.
+}
+
+<WithinScript> TOKEN:
+{
+ < ScriptText: (~["<",">"])+ | "<" | ">" >
+| < ScriptEnd: "</script" (~["<",">"])* ">" > : DEFAULT
+}
+
+<WithinTag> TOKEN:
+{
+ < ArgName: (~[" ","\t","\r","\n","=",">","'","\""])
+ (~[" ","\t","\r","\n","=",">"])* >
+| < ArgEquals: "=" > : AfterEquals
+| < TagEnd: ">" | "=>" > : DEFAULT
+}
+
+<AfterEquals> TOKEN:
+{
+ < ArgValue: (~[" ","\t","\r","\n","=",">","'","\""])
+ (~[" ","\t","\r","\n",">"])* > : WithinTag
+}
+
+<WithinTag, AfterEquals> TOKEN:
+{
+ < ArgQuote1: "'" > : WithinQuote1
+| < ArgQuote2: "\"" > : WithinQuote2
+}
+
+<WithinTag, AfterEquals> SKIP:
+{
+ < <Space> >
+}
+
+<WithinQuote1> TOKEN:
+{
+ < Quote1Text: (~["'"])+ >
+| < CloseQuote1: <ArgQuote1> > : WithinTag
+}
+
+<WithinQuote2> TOKEN:
+{
+ < Quote2Text: (~["\""])+ >
+| < CloseQuote2: <ArgQuote2> > : WithinTag
+}
+
+
+<WithinComment1> TOKEN :
+{
+ < CommentText1: (~["-"])+ | "-" >
+| < CommentEnd1: "-->" > : DEFAULT
+}
+
+<WithinComment2> TOKEN :
+{
+ < CommentText2: (~[">"])+ >
+| < CommentEnd2: ">" > : DEFAULT
+}
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParseException.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/ParseException.cs?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParseException.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParseException.cs Tue May 1 11:45:26 2007
@@ -31,7 +31,7 @@
/// mechanisms so long as you retain the public fields.
/// </summary>
[Serializable]
- public class ParseException:System.Exception
+ public class ParseException : System.Exception
{
/// <summary> This method has the standard behavior when this object has been
/// created using the standard constructors. Otherwise, it uses
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/SimpleCharStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/SimpleCharStream.cs?view=diff&rev=534192&r1=534191&r2=534192
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/SimpleCharStream.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/SimpleCharStream.cs Tue May 1 11:45:26 2007
@@ -218,7 +218,27 @@
return (c);
}
- public virtual int GetEndColumn()
+ /// <deprecated>
+ /// </deprecated>
+ /// <seealso cref="getEndColumn">
+ /// </seealso>
+
+ public virtual int GetColumn()
+ {
+ return bufcolumn[bufpos];
+ }
+
+ /// <deprecated>
+ /// </deprecated>
+ /// <seealso cref="getEndLine">
+ /// </seealso>
+
+ public virtual int GetLine()
+ {
+ return bufline[bufpos];
+ }
+
+ public virtual int GetEndColumn()
{
return bufcolumn[bufpos];
}