You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by cc...@apache.org on 2012/02/28 21:52:36 UTC
[Lucene.Net] svn commit: r1294826 [4/6] - in
/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk: ./
build/vs2010/contrib/ build/vs2010/test/ lib/ lib/NUnit.org/NUnit/2.5.9/
lib/NUnit.org/NUnit/2.5.9/bin/net-1.1/framework/
lib/NUnit.org/NUnit/2.5.9/doc/ src/ src/...
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/suiteBuilders.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/suiteBuilders.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/suiteBuilders.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/suiteBuilders.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/teardown.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/teardown.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/teardown.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/teardown.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/test.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/test.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/test.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/test.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testCase.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testCase.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testCase.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testCase.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testCaseSource.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testCaseSource.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testCaseSource.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testCaseSource.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testDecorators.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testDecorators.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testDecorators.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testDecorators.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testFixture.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testFixture.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testFixture.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testFixture.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testProperties.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testProperties.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testProperties.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testProperties.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testcaseBuilders.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testcaseBuilders.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testcaseBuilders.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testcaseBuilders.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testcaseProviders.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testcaseProviders.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testcaseProviders.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/testcaseProviders.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/theory.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/theory.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/theory.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/theory.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/throwsConstraint.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/throwsConstraint.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/throwsConstraint.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/throwsConstraint.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/timeout.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/timeout.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/timeout.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/timeout.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/typeAsserts.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/typeAsserts.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/typeAsserts.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/typeAsserts.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/typeConstraints.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/typeConstraints.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/typeConstraints.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/typeConstraints.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/upgrade.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/upgrade.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/upgrade.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/upgrade.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/utilityAsserts.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/utilityAsserts.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/utilityAsserts.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/utilityAsserts.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/valueSource.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/valueSource.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/valueSource.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/valueSource.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/values.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/values.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/values.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/values.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/vsSupport.html
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/vsSupport.html?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/vsSupport.html (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/doc/vsSupport.html Tue Feb 28 20:52:32 2012
@@ -15,9 +15,9 @@
<!-- Standard Header for NUnit.org -->
<div id="header">
<a id="logo" href="http://www.nunit.org"><img src="img/logo.gif" alt="NUnit.org" title="NUnit.org"></a>
- <div id="nav">
- <a href="http://www.nunit.org">NUnit</a>
- <a class="active" href="index.html">Documentation</a>
+ <div id="nav">
+ <a href="http://www.nunit.org">NUnit</a>
+ <a class="active" href="index.html">Documentation</a>
</div>
</div>
<!-- End of Header -->
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/fit-license.txt
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/fit-license.txt?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/fit-license.txt (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/lib/NUnit.org/NUnit/2.5.9/fit-license.txt Tue Feb 28 20:52:32 2012
@@ -339,4 +339,4 @@ This General Public License does not per
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
\ No newline at end of file
+Public License instead of this License.
Propchange: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/
------------------------------------------------------------------------------
svn:mergeinfo = /incubator/lucene.net/trunk/src:1199072-1294798
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/De/GermanAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/De/GermanAnalyzer.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/De/GermanAnalyzer.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/De/GermanAnalyzer.cs Tue Feb 28 20:52:32 2012
@@ -127,7 +127,7 @@ namespace Lucene.Net.Analysis.De
{
stopSet = CharArraySet.UnmodifiableSet(CharArraySet.Copy(stopwords));
exclusionSet = CharArraySet.UnmodifiableSet(CharArraySet.Copy(stemExclusionSet));
- SetOverridesTokenStreamMethod(typeof(GermanAnalyzer));
+ SetOverridesTokenStreamMethod<GermanAnalyzer>();
this.matchVersion = matchVersion;
}
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/EmptyTokenStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/EmptyTokenStream.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/EmptyTokenStream.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/EmptyTokenStream.cs Tue Feb 28 20:52:32 2012
@@ -29,5 +29,10 @@ namespace Lucene.Net.Analyzers.Miscellan
{
return false;
}
+
+ protected override void Dispose(bool disposing)
+ {
+ // Do nothing
+ }
}
}
\ No newline at end of file
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PatternAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PatternAnalyzer.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PatternAnalyzer.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PatternAnalyzer.cs Tue Feb 28 20:52:32 2012
@@ -377,6 +377,11 @@ namespace Lucene.Net.Analyzers.Miscellan
int finalOffset = str.Length;
this.offsetAtt.SetOffset(finalOffset, finalOffset);
}
+
+ protected override void Dispose(bool disposing)
+ {
+ // Do Nothing
+ }
}
@@ -469,6 +474,11 @@ namespace Lucene.Net.Analyzers.Miscellan
this.offsetAtt.SetOffset(finalOffset, finalOffset);
}
+ protected override void Dispose(bool disposing)
+ {
+ // Do Nothing
+ }
+
private bool IsTokenChar(char c, bool isLetter)
{
return isLetter ? char.IsLetter(c) : !char.IsWhiteSpace(c);
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs Tue Feb 28 20:52:32 2012
@@ -1,4 +1,4 @@
-/*
+/*
* 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.
@@ -69,10 +69,9 @@ namespace Lucene.Net.Analyzers.Miscellan
_suffix.Reset();
}
-
- public override void Close()
+ protected override void Dispose(bool disposing)
{
- _suffix.Close();
+ _suffix.Dispose();
}
}
}
\ No newline at end of file
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAwareTokenStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAwareTokenStream.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAwareTokenStream.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/PrefixAwareTokenStream.cs Tue Feb 28 20:52:32 2012
@@ -163,10 +163,10 @@ namespace Lucene.Net.Analyzers.Miscellan
return suffixToken;
}
- public override void Close()
+ protected override void Dispose(bool disposing)
{
- Prefix.Close();
- Suffix.Close();
+ Prefix.Dispose();
+ Suffix.Dispose();
}
public override void Reset()
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/SingleTokenTokenStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/SingleTokenTokenStream.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/SingleTokenTokenStream.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Miscellaneous/SingleTokenTokenStream.cs Tue Feb 28 20:52:32 2012
@@ -62,6 +62,11 @@ namespace Lucene.Net.Analyzers.Miscellan
_exhausted = false;
}
+ protected override void Dispose(bool disposing)
+ {
+ // Do nothing
+ }
+
public Token GetToken()
{
return (Token) _singleToken.Clone();
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Nl/DutchAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Nl/DutchAnalyzer.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Nl/DutchAnalyzer.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Nl/DutchAnalyzer.cs Tue Feb 28 20:52:32 2012
@@ -116,7 +116,7 @@ namespace Lucene.Net.Analysis.Nl
stoptable = CharArraySet.UnmodifiableSet(CharArraySet.Copy(stopwords));
excltable = CharArraySet.UnmodifiableSet(CharArraySet.Copy(stemExclusionTable));
this.matchVersion = matchVersion;
- SetOverridesTokenStreamMethod(typeof(DutchAnalyzer));
+ SetOverridesTokenStreamMethod<DutchAnalyzer>();
}
/**
@@ -153,7 +153,7 @@ namespace Lucene.Net.Analysis.Nl
public DutchAnalyzer(Version matchVersion, FileInfo stopwords)
{
// this is completely broken!
- SetOverridesTokenStreamMethod(typeof(DutchAnalyzer));
+ SetOverridesTokenStreamMethod<DutchAnalyzer>();
try
{
stoptable = WordlistLoader.GetWordSet(stopwords);
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs Tue Feb 28 20:52:32 2012
@@ -39,8 +39,8 @@ public class QueryAutoStopWordAnalyzer :
*/
public QueryAutoStopWordAnalyzer(Version matchVersion, Analyzer _delegate)
{
- this._delegate = _delegate;
- SetOverridesTokenStreamMethod(typeof(QueryAutoStopWordAnalyzer));
+ this._delegate = _delegate;
+ SetOverridesTokenStreamMethod<QueryAutoStopWordAnalyzer>();
this.matchVersion = matchVersion;
}
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Shingle/ShingleAnalyzerWrapper.cs Tue Feb 28 20:52:32 2012
@@ -39,7 +39,7 @@ namespace Lucene.Net.Analyzers.Shingle
public ShingleAnalyzerWrapper(Analyzer defaultAnalyzer)
{
this.defaultAnalyzer = defaultAnalyzer;
- SetOverridesTokenStreamMethod(typeof(ShingleAnalyzerWrapper));
+ SetOverridesTokenStreamMethod<ShingleAnalyzerWrapper>();
}
public ShingleAnalyzerWrapper(Analyzer defaultAnalyzer, int maxShingleSize)
@@ -55,7 +55,7 @@ namespace Lucene.Net.Analyzers.Shingle
public ShingleAnalyzerWrapper(Version matchVersion)
{
this.defaultAnalyzer = new StandardAnalyzer(matchVersion);
- SetOverridesTokenStreamMethod(typeof(ShingleAnalyzerWrapper));
+ SetOverridesTokenStreamMethod<ShingleAnalyzerWrapper>();
}
/**
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Shingle/ShingleMatrixFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Shingle/ShingleMatrixFilter.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Shingle/ShingleMatrixFilter.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Shingle/ShingleMatrixFilter.cs Tue Feb 28 20:52:32 2012
@@ -284,6 +284,11 @@ namespace Lucene.Net.Analyzers.Shingle
_input.Reset();
}
+ protected override void Dispose(bool disposing)
+ {
+ // Do nothing
+ }
+
public override sealed bool IncrementToken()
{
if (Matrix == null)
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Th/ThaiAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Th/ThaiAnalyzer.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Th/ThaiAnalyzer.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Analyzers/Th/ThaiAnalyzer.cs Tue Feb 28 20:52:32 2012
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Th
public ThaiAnalyzer(Version matchVersion)
{
- SetOverridesTokenStreamMethod(typeof(ThaiAnalyzer));
+ SetOverridesTokenStreamMethod<ThaiAnalyzer>();
this.matchVersion = matchVersion;
}
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Core/Analysis/Ext/Analysis.Ext.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Core/Analysis/Ext/Analysis.Ext.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/FastVectorHighlighter/Support.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/FastVectorHighlighter/Support.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/FastVectorHighlighter/Support.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/FastVectorHighlighter/Support.cs Tue Feb 28 20:52:32 2012
@@ -71,13 +71,3 @@ namespace Lucene.Net.Search.Vectorhighli
}
}
-// LUCENENET-464 - This looks like it's here for .NET 2.0 compatability. I believe
-// official support for that has been dropped. - cc
-//namespace System.Runtime.CompilerServices
-//{
-// [AttributeUsage(AttributeTargets.Method)]
-// public sealed class ExtensionAttribute : Attribute
-// {
-// public ExtensionAttribute() { }
-// }
-//}
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/Highlighter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/Highlighter.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/Highlighter.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/Highlighter.cs Tue Feb 28 20:52:32 2012
@@ -16,10 +16,10 @@
*/
using System;
+using Lucene.Net.Util;
using Analyzer = Lucene.Net.Analysis.Analyzer;
using Token = Lucene.Net.Analysis.Token;
using TokenStream = Lucene.Net.Analysis.TokenStream;
-using PriorityQueue = Lucene.Net.Util.PriorityQueue;
namespace Lucene.Net.Highlight
{
@@ -198,151 +198,152 @@ namespace Lucene.Net.Highlight
/// <throws> IOException </throws>
public TextFragment[] GetBestTextFragments(TokenStream tokenStream, System.String text, bool mergeContiguousFragments, int maxNumFragments)
{
- System.Collections.ArrayList docFrags = new System.Collections.ArrayList();
- System.Text.StringBuilder newText = new System.Text.StringBuilder();
+ //System.Collections.ArrayList docFrags = new System.Collections.ArrayList();
+ //System.Text.StringBuilder newText = new System.Text.StringBuilder();
- TextFragment currentFrag = new TextFragment(newText, newText.Length, docFrags.Count);
- fragmentScorer.StartFragment(currentFrag);
- docFrags.Add(currentFrag);
+ //TextFragment currentFrag = new TextFragment(newText, newText.Length, docFrags.Count);
+ //fragmentScorer.StartFragment(currentFrag);
+ //docFrags.Add(currentFrag);
- FragmentQueue fragQueue = new FragmentQueue(maxNumFragments);
+ //FragmentQueue fragQueue = new FragmentQueue(maxNumFragments);
- try
- {
- Lucene.Net.Analysis.Token token;
- System.String tokenText;
- int startOffset;
- int endOffset;
- int lastEndOffset = 0;
- textFragmenter.Start(text);
+ //try
+ //{
+ // Lucene.Net.Analysis.Token token;
+ // System.String tokenText;
+ // int startOffset;
+ // int endOffset;
+ // int lastEndOffset = 0;
+ // textFragmenter.Start(text);
- TokenGroup tokenGroup = new TokenGroup();
- token = tokenStream.Next();
- while ((token != null) && (token.StartOffset() < maxDocBytesToAnalyze))
- {
- if ((tokenGroup.numTokens > 0) && (tokenGroup.IsDistinct(token)))
- {
- //the current token is distinct from previous tokens -
- // markup the cached token group info
- startOffset = tokenGroup.matchStartOffset;
- endOffset = tokenGroup.matchEndOffset;
- tokenText = text.Substring(startOffset, (endOffset) - (startOffset));
- System.String markedUpText = formatter.HighlightTerm(encoder.EncodeText(tokenText), tokenGroup);
- //store any whitespace etc from between this and last group
- if (startOffset > lastEndOffset)
- newText.Append(encoder.EncodeText(text.Substring(lastEndOffset, (startOffset) - (lastEndOffset))));
- newText.Append(markedUpText);
- lastEndOffset = System.Math.Max(endOffset, lastEndOffset);
- tokenGroup.Clear();
+ // TokenGroup tokenGroup = new TokenGroup();
+ // token = tokenStream.Next();
+ // while ((token != null) && (token.StartOffset() < maxDocBytesToAnalyze))
+ // {
+ // if ((tokenGroup.numTokens > 0) && (tokenGroup.IsDistinct(token)))
+ // {
+ // //the current token is distinct from previous tokens -
+ // // markup the cached token group info
+ // startOffset = tokenGroup.matchStartOffset;
+ // endOffset = tokenGroup.matchEndOffset;
+ // tokenText = text.Substring(startOffset, (endOffset) - (startOffset));
+ // System.String markedUpText = formatter.HighlightTerm(encoder.EncodeText(tokenText), tokenGroup);
+ // //store any whitespace etc from between this and last group
+ // if (startOffset > lastEndOffset)
+ // newText.Append(encoder.EncodeText(text.Substring(lastEndOffset, (startOffset) - (lastEndOffset))));
+ // newText.Append(markedUpText);
+ // lastEndOffset = System.Math.Max(endOffset, lastEndOffset);
+ // tokenGroup.Clear();
- //check if current token marks the start of a new fragment
- if (textFragmenter.IsNewFragment(token))
- {
- currentFrag.SetScore(fragmentScorer.GetFragmentScore());
- //record stats for a new fragment
- currentFrag.textEndPos = newText.Length;
- currentFrag = new TextFragment(newText, newText.Length, docFrags.Count);
- fragmentScorer.StartFragment(currentFrag);
- docFrags.Add(currentFrag);
- }
- }
+ // //check if current token marks the start of a new fragment
+ // if (textFragmenter.IsNewFragment(token))
+ // {
+ // currentFrag.SetScore(fragmentScorer.GetFragmentScore());
+ // //record stats for a new fragment
+ // currentFrag.textEndPos = newText.Length;
+ // currentFrag = new TextFragment(newText, newText.Length, docFrags.Count);
+ // fragmentScorer.StartFragment(currentFrag);
+ // docFrags.Add(currentFrag);
+ // }
+ // }
- tokenGroup.AddToken(token, fragmentScorer.GetTokenScore(token));
+ // tokenGroup.AddToken(token, fragmentScorer.GetTokenScore(token));
- // if(lastEndOffset>maxDocBytesToAnalyze)
- // {
- // break;
- // }
- token = tokenStream.Next();
- }
- currentFrag.SetScore(fragmentScorer.GetFragmentScore());
+ // // if(lastEndOffset>maxDocBytesToAnalyze)
+ // // {
+ // // break;
+ // // }
+ // token = tokenStream.Next();
+ // }
+ // currentFrag.SetScore(fragmentScorer.GetFragmentScore());
- if (tokenGroup.numTokens > 0)
- {
- //flush the accumulated text (same code as in above loop)
- startOffset = tokenGroup.matchStartOffset;
- endOffset = tokenGroup.matchEndOffset;
- tokenText = text.Substring(startOffset, (endOffset) - (startOffset));
- System.String markedUpText = formatter.HighlightTerm(encoder.EncodeText(tokenText), tokenGroup);
- //store any whitespace etc from between this and last group
- if (startOffset > lastEndOffset)
- newText.Append(encoder.EncodeText(text.Substring(lastEndOffset, (startOffset) - (lastEndOffset))));
- newText.Append(markedUpText);
- lastEndOffset = System.Math.Max(lastEndOffset, endOffset);
- }
+ // if (tokenGroup.numTokens > 0)
+ // {
+ // //flush the accumulated text (same code as in above loop)
+ // startOffset = tokenGroup.matchStartOffset;
+ // endOffset = tokenGroup.matchEndOffset;
+ // tokenText = text.Substring(startOffset, (endOffset) - (startOffset));
+ // System.String markedUpText = formatter.HighlightTerm(encoder.EncodeText(tokenText), tokenGroup);
+ // //store any whitespace etc from between this and last group
+ // if (startOffset > lastEndOffset)
+ // newText.Append(encoder.EncodeText(text.Substring(lastEndOffset, (startOffset) - (lastEndOffset))));
+ // newText.Append(markedUpText);
+ // lastEndOffset = System.Math.Max(lastEndOffset, endOffset);
+ // }
- //Test what remains of the original text beyond the point where we stopped analyzing
- if ((lastEndOffset < text.Length) && (text.Length < maxDocBytesToAnalyze))
- {
- //append it to the last fragment
- newText.Append(encoder.EncodeText(text.Substring(lastEndOffset)));
- }
+ // //Test what remains of the original text beyond the point where we stopped analyzing
+ // if ((lastEndOffset < text.Length) && (text.Length < maxDocBytesToAnalyze))
+ // {
+ // //append it to the last fragment
+ // newText.Append(encoder.EncodeText(text.Substring(lastEndOffset)));
+ // }
- currentFrag.textEndPos = newText.Length;
+ // currentFrag.textEndPos = newText.Length;
- //sort the most relevant sections of the text
- for (System.Collections.IEnumerator i = docFrags.GetEnumerator(); i.MoveNext(); )
- {
- currentFrag = (TextFragment) i.Current;
+ // //sort the most relevant sections of the text
+ // for (System.Collections.IEnumerator i = docFrags.GetEnumerator(); i.MoveNext(); )
+ // {
+ // currentFrag = (TextFragment) i.Current;
- //If you are running with a version of Lucene before 11th Sept 03
- // you do not have PriorityQueue.insert() - so uncomment the code below
- /*
- if (currentFrag.getScore() >= minScore)
- {
- fragQueue.put(currentFrag);
- if (fragQueue.size() > maxNumFragments)
- { // if hit queue overfull
- fragQueue.pop(); // remove lowest in hit queue
- minScore = ((TextFragment) fragQueue.top()).getScore(); // reset minScore
- }
+ // //If you are running with a version of Lucene before 11th Sept 03
+ // // you do not have PriorityQueue.insert() - so uncomment the code below
+ // /*
+ // if (currentFrag.getScore() >= minScore)
+ // {
+ // fragQueue.put(currentFrag);
+ // if (fragQueue.size() > maxNumFragments)
+ // { // if hit queue overfull
+ // fragQueue.pop(); // remove lowest in hit queue
+ // minScore = ((TextFragment) fragQueue.top()).getScore(); // reset minScore
+ // }
- }
- */
- //The above code caused a problem as a result of Christoph Goller's 11th Sept 03
- //fix to PriorityQueue. The correct method to use here is the new "insert" method
- // USE ABOVE CODE IF THIS DOES NOT COMPILE!
- fragQueue.Insert(currentFrag);
- }
+ // }
+ // */
+ // //The above code caused a problem as a result of Christoph Goller's 11th Sept 03
+ // //fix to PriorityQueue. The correct method to use here is the new "insert" method
+ // // USE ABOVE CODE IF THIS DOES NOT COMPILE!
+ // fragQueue.Insert(currentFrag);
+ // }
- //return the most relevant fragments
- TextFragment[] frag = new TextFragment[fragQueue.Size()];
- for (int i = frag.Length - 1; i >= 0; i--)
- {
- frag[i] = (TextFragment) fragQueue.Pop();
- }
+ // //return the most relevant fragments
+ // TextFragment[] frag = new TextFragment[fragQueue.Size()];
+ // for (int i = frag.Length - 1; i >= 0; i--)
+ // {
+ // frag[i] = (TextFragment) fragQueue.Pop();
+ // }
- //merge any contiguous fragments to improve readability
- if (mergeContiguousFragments)
- {
- MergeContiguousFragments(frag);
- System.Collections.ArrayList fragTexts = new System.Collections.ArrayList();
- for (int i = 0; i < frag.Length; i++)
- {
- if ((frag[i] != null) && (frag[i].GetScore() > 0))
- {
- fragTexts.Add(frag[i]);
- }
- }
- frag = (TextFragment[]) fragTexts.ToArray(typeof(TextFragment));
- }
+ // //merge any contiguous fragments to improve readability
+ // if (mergeContiguousFragments)
+ // {
+ // MergeContiguousFragments(frag);
+ // System.Collections.ArrayList fragTexts = new System.Collections.ArrayList();
+ // for (int i = 0; i < frag.Length; i++)
+ // {
+ // if ((frag[i] != null) && (frag[i].GetScore() > 0))
+ // {
+ // fragTexts.Add(frag[i]);
+ // }
+ // }
+ // frag = (TextFragment[]) fragTexts.ToArray(typeof(TextFragment));
+ // }
- return frag;
- }
- finally
- {
- if (tokenStream != null)
- {
- try
- {
- tokenStream.Close();
- }
- catch (System.Exception e)
- {
- }
- }
- }
+ // return frag;
+ //}
+ //finally
+ //{
+ // if (tokenStream != null)
+ // {
+ // try
+ // {
+ // tokenStream.Close();
+ // }
+ // catch (System.Exception e)
+ // {
+ // }
+ // }
+ //}
+ throw new NotImplementedException("Not yet ported to 3.0.3");
}
@@ -507,21 +508,19 @@ namespace Lucene.Net.Highlight
}
}
- class FragmentQueue : PriorityQueue
+ class FragmentQueue : PriorityQueue<TextFragment>
{
public FragmentQueue(int size)
{
Initialize(size);
}
-
- public override bool LessThan(System.Object a, System.Object b)
+
+ public override bool LessThan(TextFragment a, TextFragment b)
{
- TextFragment fragA = (TextFragment) a;
- TextFragment fragB = (TextFragment) b;
- if (fragA.GetScore() == fragB.GetScore())
- return fragA.fragNum > fragB.fragNum;
+ if (a.GetScore() == b.GetScore())
+ return a.fragNum > b.fragNum;
else
- return fragA.GetScore() < fragB.GetScore();
+ return a.GetScore() < b.GetScore();
}
}
}
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/QueryScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/QueryScorer.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/QueryScorer.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/QueryScorer.cs Tue Feb 28 20:52:32 2012
@@ -102,7 +102,7 @@ namespace Lucene.Net.Highlight
*/
public virtual float GetTokenScore(Token token)
{
- System.String termText = token.TermText();
+ System.String termText = token.Term();
WeightedTerm queryTerm = (WeightedTerm) termsToFind[termText];
if (queryTerm == null)
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/QueryTermExtractor.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/QueryTermExtractor.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/QueryTermExtractor.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/QueryTermExtractor.cs Tue Feb 28 20:52:32 2012
@@ -16,6 +16,7 @@
*/
using System;
+using System.Collections.Generic;
using IndexReader = Lucene.Net.Index.IndexReader;
using Term = Lucene.Net.Index.Term;
using BooleanClause = Lucene.Net.Search.BooleanClause;
@@ -134,16 +135,14 @@ namespace Lucene.Net.Highlight
GetTermsFromFilteredQuery((FilteredQuery) query, terms, prohibited, fieldName);
else
{
- System.Collections.Hashtable nonWeightedTerms = new System.Collections.Hashtable();
+ var nonWeightedTerms = new HashSet<Term>();
query.ExtractTerms(nonWeightedTerms);
- System.Collections.IDictionaryEnumerator iter = nonWeightedTerms.GetEnumerator();
- while (iter.MoveNext())
+ foreach (var term in nonWeightedTerms)
{
- Term term = (Term)iter.Value;
if ((fieldName == null) || (term.Field() == fieldName))
{
- WeightedTerm temp = new WeightedTerm(query.GetBoost(), term.Text());
+ var temp = new WeightedTerm(query.GetBoost(), term.Text());
terms.Add(temp, temp);
}
}
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/TokenSources.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/TokenSources.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/TokenSources.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Highlighter/TokenSources.cs Tue Feb 28 20:52:32 2012
@@ -19,6 +19,7 @@
* Created on 28-Oct-2004
*/
using System;
+using Lucene.Net.Analysis.Tokenattributes;
using Analyzer = Lucene.Net.Analysis.Analyzer;
using Token = Lucene.Net.Analysis.Token;
using TokenStream = Lucene.Net.Analysis.TokenStream;
@@ -43,18 +44,32 @@ namespace Lucene.Net.Highlight
{
internal Token[] tokens;
internal int currentToken = 0;
+ TermAttribute termAtt;
+ OffsetAttribute offsetAtt;
+
internal StoredTokenStream(Token[] tokens)
{
this.tokens = tokens;
+ termAtt = AddAttribute<TermAttribute>();
+ offsetAtt = AddAttribute<OffsetAttribute>();
}
- public override Token Next()
+ public override bool IncrementToken()
{
- if (currentToken >= tokens.Length)
- {
- return null;
- }
- return tokens[currentToken++];
+ if (currentToken >= tokens.Length)
+ {
+ return false;
+ }
+ ClearAttributes();
+ Token token = tokens[currentToken++];
+ termAtt.SetTermBuffer(token.Term());
+ offsetAtt.SetOffset(token.StartOffset(), token.EndOffset());
+ return true;
}
+
+ protected override void Dispose(bool disposing)
+ {
+ // do nothing
+ }
}
private class AnonymousClassComparator : System.Collections.IComparer
{
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Similarity/Similar/MoreLikeThis.cs Tue Feb 28 20:52:32 2012
@@ -16,8 +16,11 @@
*/
using System;
-
-using PriorityQueue = Lucene.Net.Util.PriorityQueue;
+using System.IO;
+using Lucene.Net.Analysis.Tokenattributes;
+using Lucene.Net.Search;
+using Lucene.Net.Store;
+using Lucene.Net.Util;
using IndexReader = Lucene.Net.Index.IndexReader;
using Term = Lucene.Net.Index.Term;
using TermFreqVector = Lucene.Net.Index.TermFreqVector;
@@ -27,11 +30,11 @@ using TermQuery = Lucene.Net.Search.Term
using BooleanQuery = Lucene.Net.Search.BooleanQuery;
using IndexSearcher = Lucene.Net.Search.IndexSearcher;
using Query = Lucene.Net.Search.Query;
-using Hits = Lucene.Net.Search.Hits;
using Analyzer = Lucene.Net.Analysis.Analyzer;
using TokenStream = Lucene.Net.Analysis.TokenStream;
using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
using Document = Lucene.Net.Documents.Document;
+using Version = Lucene.Net.Util.Version;
namespace Similarity.Net
{
@@ -150,7 +153,7 @@ namespace Similarity.Net
/// <summary> Default analyzer to parse source doc with.</summary>
/// <seealso cref="GetAnalyzer">
/// </seealso>
- public static readonly Analyzer DEFAULT_ANALYZER = new StandardAnalyzer();
+ public static readonly Analyzer DEFAULT_ANALYZER = new StandardAnalyzer(Version.LUCENE_CURRENT);
/// <summary> Ignore terms with less than this frequency in the source doc.</summary>
/// <seealso cref="GetMinTermFreq">
@@ -558,7 +561,7 @@ namespace Similarity.Net
}
/// <summary> Create the More like query from a PriorityQueue</summary>
- private Query CreateQuery(PriorityQueue q)
+ private Query CreateQuery(PriorityQueue<object[]> q)
{
BooleanQuery query = new BooleanQuery();
System.Object cur;
@@ -605,7 +608,7 @@ namespace Similarity.Net
/// </summary>
/// <param name="words">a map of words keyed on the word(String) with Int objects as the values.
/// </param>
- private PriorityQueue CreateQueue(System.Collections.IDictionary words)
+ private PriorityQueue<object[]> CreateQueue(System.Collections.IDictionary words)
{
// have collected all words in doc and their freqs
int numDocs = ir.NumDocs();
@@ -647,7 +650,7 @@ namespace Similarity.Net
float score = tf * idf;
// only really need 1st 3 entries, other ones are for troubleshooting
- res.Insert(new System.Object[]{word, topField, (float) score, (float) idf, (System.Int32) docFreq, (System.Int32) tf});
+ res.InsertWithOverflow(new System.Object[]{word, topField, score, idf, docFreq, tf});
}
return res;
}
@@ -699,11 +702,10 @@ namespace Similarity.Net
}
}
- System.IO.StreamWriter temp_writer;
- temp_writer = new System.IO.StreamWriter(System.Console.OpenStandardOutput(), System.Console.Out.Encoding);
- temp_writer.AutoFlush = true;
- System.IO.StreamWriter o = temp_writer;
- IndexReader r = IndexReader.Open(indexName);
+ var o = new System.IO.StreamWriter(System.Console.OpenStandardOutput(), System.Console.Out.Encoding)
+ {AutoFlush = true};
+ var dir = FSDirectory.Open(new DirectoryInfo(indexName));
+ IndexReader r = IndexReader.Open(dir, true);
o.WriteLine("Open index " + indexName + " which has " + r.NumDocs() + " docs");
MoreLikeThis mlt = new MoreLikeThis(r);
@@ -726,17 +728,19 @@ namespace Similarity.Net
o.WriteLine("q: " + query);
o.WriteLine();
- IndexSearcher searcher = new IndexSearcher(indexName);
+ IndexSearcher searcher = new IndexSearcher(dir, true);
- Hits hits = searcher.Search(query);
- int len = hits.Length();
+ TopDocs hits = searcher.Search(query, null, 25);
+ int len = hits.TotalHits;
o.WriteLine("found: " + len + " documents matching");
o.WriteLine();
+
+ ScoreDoc[] scoreDocs = hits.ScoreDocs;
for (int i = 0; i < System.Math.Min(25, len); i++)
{
- Document d = hits.Doc(i);
+ Document d = searcher.Doc(scoreDocs[i].doc);
System.String summary = d.Get("summary");
- o.WriteLine("score : " + hits.Score(i));
+ o.WriteLine("score : " + scoreDocs[i].score);
o.WriteLine("url : " + d.Get("url"));
o.WriteLine("\ttitle : " + d.Get("title"));
if (summary != null)
@@ -750,7 +754,7 @@ namespace Similarity.Net
/// </summary>
/// <param name="docNum">the id of the lucene document from which to find terms
/// </param>
- private PriorityQueue RetrieveTerms(int docNum)
+ private PriorityQueue<object[]> RetrieveTerms(int docNum)
{
System.Collections.IDictionary termFreqMap = new System.Collections.Hashtable();
for (int i = 0; i < fieldNames.Length; i++)
@@ -821,33 +825,30 @@ namespace Similarity.Net
private void AddTermFrequencies(System.IO.TextReader r, System.Collections.IDictionary termFreqMap, System.String fieldName)
{
TokenStream ts = analyzer.TokenStream(fieldName, r);
- Lucene.Net.Analysis.Token token;
- int tokenCount = 0;
- while ((token = ts.Next()) != null)
- {
- // for every token
- System.String word = token.TermText();
- tokenCount++;
- if (tokenCount > maxNumTokensParsed)
- {
- break;
- }
- if (IsNoiseWord(word))
- {
- continue;
- }
-
- // increment frequency
- Int cnt = (Int) termFreqMap[word];
- if (cnt == null)
- {
- termFreqMap[word] = new Int();
- }
- else
- {
- cnt.x++;
- }
- }
+ int tokenCount=0;
+ // for every token
+ var termAtt = ts.AddAttribute<TermAttribute>();
+
+ while (ts.IncrementToken()) {
+ String word = termAtt.Term();
+ tokenCount++;
+ if(tokenCount>maxNumTokensParsed)
+ {
+ break;
+ }
+ if(IsNoiseWord(word)){
+ continue;
+ }
+
+ // increment frequency
+ Int cnt = (Int)termFreqMap[word];
+ if (cnt == null) {
+ termFreqMap[word] = new Int();
+ }
+ else {
+ cnt.x++;
+ }
+ }
}
@@ -901,7 +902,7 @@ namespace Similarity.Net
/// </returns>
/// <seealso cref="RetrieveInterestingTerms">
/// </seealso>
- public PriorityQueue RetrieveTerms(System.IO.StreamReader r)
+ public PriorityQueue<object[]> RetrieveTerms(System.IO.StreamReader r)
{
System.Collections.IDictionary words = new System.Collections.Hashtable();
for (int i = 0; i < fieldNames.Length; i++)
@@ -927,7 +928,7 @@ namespace Similarity.Net
public System.String[] RetrieveInterestingTerms(System.IO.StreamReader r)
{
System.Collections.ArrayList al = new System.Collections.ArrayList(maxQueryTerms);
- PriorityQueue pq = RetrieveTerms(r);
+ PriorityQueue<object[]> pq = RetrieveTerms(r);
System.Object cur;
int lim = maxQueryTerms; // have to be careful, retrieveTerms returns all words but that's probably not useful to our caller...
// we just want to return the top words
@@ -942,19 +943,17 @@ namespace Similarity.Net
}
/// <summary> PriorityQueue that orders words by score.</summary>
- private class FreqQ : PriorityQueue
+ private class FreqQ : PriorityQueue<object[]>
{
internal FreqQ(int s)
{
Initialize(s);
}
- override public bool LessThan(System.Object a, System.Object b)
+ override public bool LessThan(System.Object[] a, System.Object[] b)
{
- System.Object[] aa = (System.Object[]) a;
- System.Object[] bb = (System.Object[]) b;
- System.Single fa = (System.Single) aa[2];
- System.Single fb = (System.Single) bb[2];
+ System.Single fa = (System.Single) a[2];
+ System.Single fb = (System.Single) b[2];
return (float) fa > (float) fb;
}
}
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Similarity/Similar/SimilarityQueries.cs Tue Feb 28 20:52:32 2012
@@ -16,7 +16,9 @@
*/
using System;
-
+using System.Collections.Generic;
+using System.IO;
+using Lucene.Net.Analysis.Tokenattributes;
using Analyzer = Lucene.Net.Analysis.Analyzer;
using TokenStream = Lucene.Net.Analysis.TokenStream;
using Term = Lucene.Net.Index.Term;
@@ -28,7 +30,7 @@ using BooleanClause = Lucene.Net.Search.
namespace Similarity.Net
{
-
+
/// <summary> Simple similarity measures.
///
///
@@ -41,7 +43,7 @@ namespace Similarity.Net
private SimilarityQueries()
{
}
-
+
/// <summary> Simple similarity query generators.
/// Takes every unique word and forms a boolean query where all words are optional.
/// After you get this you'll use to to query your <see cref="IndexSearcher"/> for similar docs.
@@ -86,27 +88,27 @@ namespace Similarity.Net
/// <returns> a query with all unique words in 'body'
/// </returns>
/// <throws> IOException this can't happen... </throws>
- public static Query FormSimilarQuery(System.String body, Analyzer a, System.String field, System.Collections.Hashtable stop)
+ public static Query FormSimilarQuery(System.String body, Analyzer a, System.String field,
+ System.Collections.Hashtable stop)
{
- TokenStream ts = a.TokenStream(field, new System.IO.StringReader(body));
- Lucene.Net.Analysis.Token t;
- BooleanQuery tmp = new BooleanQuery();
- System.Collections.Hashtable already = new System.Collections.Hashtable(); // ignore dups
- while ((t = ts.Next()) != null)
+ TokenStream ts = a.TokenStream(field, new StringReader(body));
+ var termAtt = ts.AddAttribute<TermAttribute>();
+
+ var tmp = new BooleanQuery();
+ var already = new HashSet<String>(); // ignore dups
+ while (ts.IncrementToken())
{
- System.String word = t.TermText();
+ String word = termAtt.Term();
// ignore opt stop words
- if (stop != null && stop.Contains(word))
- continue;
+ if (stop != null &&
+ stop.Contains(word)) continue;
// ignore dups
- if (already.Contains(word) == true)
- continue;
- already.Add(word, word);
+ if (!already.Add(word)) continue;
// add to query
- TermQuery tq = new TermQuery(new Term(field, word));
+ var tq = new TermQuery(new Term(field, word));
try
{
- tmp.Add(tq, BooleanClause.Occur.SHOULD); //false, false);
+ tmp.Add(tq, BooleanClause.Occur.SHOULD);
}
catch (BooleanQuery.TooManyClauses too)
{
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballAnalyzer.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballAnalyzer.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/Snowball/Lucene.Net/Analysis/Snowball/SnowballAnalyzer.cs Tue Feb 28 20:52:32 2012
@@ -46,7 +46,7 @@ namespace Lucene.Net.Analysis.Snowball
public SnowballAnalyzer(Version matchVersion, System.String name)
{
this.name = name;
- SetOverridesTokenStreamMethod(typeof(SnowballAnalyzer));
+ SetOverridesTokenStreamMethod<SnowballAnalyzer>();
this.matchVersion = matchVersion;
}
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/SpellChecker/Spell/SpellChecker.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/SpellChecker/Spell/SpellChecker.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/SpellChecker/Spell/SpellChecker.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/contrib/SpellChecker/Spell/SpellChecker.cs Tue Feb 28 20:52:32 2012
@@ -252,7 +252,7 @@ namespace SpellChecker.Net.Search.Spell
int maxHits = 10 * numSug;
// System.out.println("Q: " + query);
- ScoreDoc[] hits = indexSearcher.Search(query, null, maxHits).scoreDocs;
+ ScoreDoc[] hits = indexSearcher.Search(query, null, maxHits).ScoreDocs;
// System.out.println("HITS: " + hits.length());
SuggestWordQueue sugQueue = new SuggestWordQueue(numSug);
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Index/SegmentTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Index/SegmentTermEnum.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Index/SegmentTermEnum.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Index/SegmentTermEnum.cs Tue Feb 28 20:52:32 2012
@@ -243,7 +243,7 @@ namespace Lucene.Net.Index
/// <summary>Closes the enumeration to further activity, freeing resources. </summary>
protected override void Dispose(bool disposing)
{
- input.Close();
+ input.Dispose();
}
}
}
\ No newline at end of file
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Index/SegmentTermPositions.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Index/SegmentTermPositions.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Index/SegmentTermPositions.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Index/SegmentTermPositions.cs Tue Feb 28 20:52:32 2012
@@ -59,7 +59,7 @@ namespace Lucene.Net.Index
{
base.Dispose(disposing);
if (proxStream != null)
- proxStream.Close();
+ proxStream.Dispose();
}
public int NextPosition()
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Lucene.Net.Search.RemoteSearchable.config
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Lucene.Net.Search.RemoteSearchable.config?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Lucene.Net.Search.RemoteSearchable.config (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Lucene.Net.Search.RemoteSearchable.config Tue Feb 28 20:52:32 2012
@@ -1,6 +1,32 @@
-<?xml version='1.0'?>
<!--
- 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.
--->
-<configuration>
<System.Runtime.Remoting>
<customErrors mode = "off" />
</System.Runtime.Remoting>
</configuration>
\ No newline at end of file
+<?xml version='1.0'?>
+<!--
+
+ 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.
+
+-->
+
+<configuration>
+
+ <System.Runtime.Remoting>
+
+ <customErrors mode = "off" />
+
+ </System.Runtime.Remoting>
+
+</configuration>
+
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Lucene.Net.Search.TestSort.config
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Lucene.Net.Search.TestSort.config?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Lucene.Net.Search.TestSort.config (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Lucene.Net.Search.TestSort.config Tue Feb 28 20:52:32 2012
@@ -1,6 +1,32 @@
-<?xml version='1.0'?>
<!--
- 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.
--->
-<configuration>
<System.Runtime.Remoting>
<customErrors mode = "off" />
</System.Runtime.Remoting>
</configuration>
\ No newline at end of file
+<?xml version='1.0'?>
+<!--
+
+ 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.
+
+-->
+
+<configuration>
+
+ <System.Runtime.Remoting>
+
+ <customErrors mode = "off" />
+
+ </System.Runtime.Remoting>
+
+</configuration>
+
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Util/Cache/Cache.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Util/Cache/Cache.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Util/Cache/Cache.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Util/Cache/Cache.cs Tue Feb 28 20:52:32 2012
@@ -73,7 +73,7 @@ namespace Lucene.Net.Util.Cache
{
lock (mutex)
{
- cache.Close();
+ cache.Dispose();
}
}
Modified: incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Util/Cache/SimpleMapCache.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Util/Cache/SimpleMapCache.cs?rev=1294826&r1=1294825&r2=1294826&view=diff
==============================================================================
--- incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Util/Cache/SimpleMapCache.cs (original)
+++ incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk/src/core/Util/Cache/SimpleMapCache.cs Tue Feb 28 20:52:32 2012
@@ -119,7 +119,8 @@ namespace Lucene.Net.Util.Cache
cache.Dispose(disposing);
}
- isDisposed = true;
+ isDisposed = true;
+ base.Dispose(disposing);
}
}