lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aro...@apache.org
Subject svn commit: r730298 - in /incubator/lucene.net/trunk/C#/contrib/Highlighter.Net: ./ Highlighter.Net/ Test/
Date Wed, 31 Dec 2008 02:41:18 GMT
Author: aroush
Date: Tue Dec 30 18:41:18 2008
New Revision: 730298

URL: http://svn.apache.org/viewvc?rev=730298&view=rev
Log:
Port of Highlighter.Net from 2.0 to 2.3.2

Added:
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.csproj   (contents, props changed)
      - copied, changed from r730276, incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net-2.0.0.csproj
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test.csproj   (contents, props changed)
      - copied, changed from r730276, incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test-2.0.0.csproj
Removed:
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net-2.0.0.csproj
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test-2.0.0.csproj
Modified:
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/HISTORY.txt
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/AssemblyInfo.cs
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.sln
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.xml
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.cs
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/QueryTermExtractor.cs
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/TokenGroup.cs
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/AssemblyInfo.cs
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/HighlighterTest.cs
    incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test.sln

Modified: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/HISTORY.txt
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/HISTORY.txt?rev=730298&r1=730297&r2=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/HISTORY.txt (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/HISTORY.txt Tue Dec 30 18:41:18 2008
@@ -2,6 +2,10 @@
 -----------------------
 
 
+29Jan08:
+	- Release: Highlighter.Net.2.3.2 build 001 "final"
+
+
 07Jan07:
 	- Release: Highlighter.Net.2.0.0 build 001 "final"
 	- Fix: Lucene.Net.Highlight.QueryTermExtractor.GetTerms -- was using the wrong integrator
@@ -15,4 +19,4 @@
 
 
 05Jan05:
-	- Release: Highlighter.Net.1.4.0 RC1 build 001
\ No newline at end of file
+	- Release: Highlighter.Net.1.4.0 RC1 build 001

Modified: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Highlighter.Net/AssemblyInfo.cs?rev=730298&r1=730297&r2=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/AssemblyInfo.cs Tue Dec 30 18:41:18 2008
@@ -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;
 
@@ -11,12 +28,13 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("The Apache Software Foundation")]
 [assembly: AssemblyProduct("Highligther.Net")]
-[assembly: AssemblyCopyright("Copyright 2007 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("Copyright 2007 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Copyright 2007 - 2008 The Apache Software Foundation")]
+[assembly: AssemblyTrademark("Copyright 2007 - 2008 The Apache Software Foundation")]
 [assembly: AssemblyDefaultAlias("Lucene.Net.Highlight")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyInformationalVersionAttribute("2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.2")]
+
 
 //
 // Version information for an assembly consists of the following four values:
@@ -29,7 +47,8 @@
 // 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.001")]
+[assembly: AssemblyVersion("2.3.2.001")]
+
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

Copied: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.csproj (from r730276, incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net-2.0.0.csproj)
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.csproj?p2=incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.csproj&p1=incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net-2.0.0.csproj&r1=730276&r2=730298&rev=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net-2.0.0.csproj (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.csproj Tue Dec 30 18:41:18 2008
@@ -1,194 +1,157 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{901D5415-383C-4AA6-A256-879558841BEA}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "Highlighter.Net"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "Lucene.Net.Search.Highlight"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = "Highlighter.Net.xml"
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "true"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "..\bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "..\bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
-                />
-                <Reference
-                    Name = "Lucene.Net"
-                    AssemblyName = "Lucene.Net"
-                    HintPath = "..\..\..\src\Lucene.Net\bin\Debug\Lucene.Net.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "DefaultEncoder.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Encoder.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Formatter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Fragmenter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "GradientFormatter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Highlighter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "NullFragmenter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Package.html"
-                    BuildAction = "Content"
-                />
-                <File
-                    RelPath = "QueryScorer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "QueryTermExtractor.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Scorer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "SimpleFragmenter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "SimpleHTMLEncoder.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "SimpleHTMLFormatter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "SpanGradientFormatter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "TextFragment.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "TokenGroup.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "TokenSources.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WeightedTerm.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
+<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>{901D5415-383C-4AA6-A256-879558841BEA}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Highlighter.Net</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Lucene.Net.Search.Highlight</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>Highlighter.Net.xml</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>
+    </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>..\..\..\src\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="DefaultEncoder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Encoder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Formatter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Fragmenter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="GradientFormatter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Highlighter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="NullFragmenter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="QueryScorer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="QueryTermExtractor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scorer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimpleFragmenter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimpleHTMLEncoder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimpleHTMLFormatter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SpanGradientFormatter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextFragment.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TokenGroup.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TokenSources.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WeightedTerm.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Content Include="Package.html" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

Propchange: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.csproj
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.sln
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.sln?rev=730298&r1=730297&r2=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.sln (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.sln Tue Dec 30 18:41:18 2008
@@ -1,24 +1,26 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Highlighter.Net-2.0.0", "Highlighter.Net-2.0.0.csproj", "{901D5415-383C-4AA6-A256-879558841BEA}"
-	ProjectSection(ProjectDependencies) = postProject
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Highlighter.Net", "Highlighter.Net.csproj", "{901D5415-383C-4AA6-A256-879558841BEA}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{901D5415-383C-4AA6-A256-879558841BEA}.Debug.ActiveCfg = Debug|.NET
-		{901D5415-383C-4AA6-A256-879558841BEA}.Debug.Build.0 = Debug|.NET
-		{901D5415-383C-4AA6-A256-879558841BEA}.Release.ActiveCfg = Release|.NET
-		{901D5415-383C-4AA6-A256-879558841BEA}.Release.Build.0 = Release|.NET
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{901D5415-383C-4AA6-A256-879558841BEA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
 	EndGlobalSection
 EndGlobal

Modified: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.xml
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.xml?rev=730298&r1=730297&r2=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.xml (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.Net.xml Tue Dec 30 18:41:18 2008
@@ -4,21 +4,25 @@
         <name>Highlighter.Net</name>
     </assembly>
     <members>
-        <member name="T:Lucene.Net.Highlight.DefaultEncoder">
-            <summary> Simple {@link Encoder} implementation that does not modify the output</summary>
-            <author>  Nicko Cadell
-            
+        <member name="T:Lucene.Net.Highlight.WeightedTerm">
+            <summary>Lightweight class to hold term and a weight value used for scoring this term </summary>
+            <author>  Mark Harwood
             </author>
         </member>
-        <member name="T:Lucene.Net.Highlight.Encoder">
-            <summary> Encodes original text. The Encoder works with the Formatter to generate the output.
-            
-            </summary>
-            <author>  Nicko Cadell
-            </author>
+        <member name="M:Lucene.Net.Highlight.WeightedTerm.GetTerm">
+            <returns> the term value (stemmed)
+            </returns>
         </member>
-        <member name="M:Lucene.Net.Highlight.Encoder.EncodeText(System.String)">
-            <param name="originalText">The section of text being output
+        <member name="M:Lucene.Net.Highlight.WeightedTerm.GetWeight">
+            <returns> the weight associated with this term
+            </returns>
+        </member>
+        <member name="M:Lucene.Net.Highlight.WeightedTerm.SetTerm(System.String)">
+            <param name="term">the term value (stemmed)
+            </param>
+        </member>
+        <member name="M:Lucene.Net.Highlight.WeightedTerm.SetWeight(System.Single)">
+            <param name="weight">the weight associated with this term
             </param>
         </member>
         <member name="T:Lucene.Net.Highlight.Formatter">
@@ -34,6 +38,48 @@
             their scores and positions.
             </param>
         </member>
+        <member name="T:Lucene.Net.Highlight.TextFragment">
+            <summary> Low-level class used to record information about a section of a document 
+            with a score.
+            </summary>
+            <author>  MAHarwood
+            
+            
+            </author>
+        </member>
+        <member name="M:Lucene.Net.Highlight.TextFragment.Merge(Lucene.Net.Highlight.TextFragment)">
+            <param name="frag2">Fragment to be merged into this one
+            </param>
+        </member>
+        <member name="M:Lucene.Net.Highlight.TextFragment.Follows(Lucene.Net.Highlight.TextFragment)">
+            <param name="fragment">
+            </param>
+            <returns> true if this fragment follows the one passed
+            </returns>
+        </member>
+        <member name="M:Lucene.Net.Highlight.TextFragment.GetFragNum">
+            <returns> the fragment sequence number
+            </returns>
+        </member>
+        <member name="T:Lucene.Net.Highlight.SimpleHTMLFormatter">
+            <summary> Simple {@link Formatter} implementation to highlight terms with a pre and post tag</summary>
+            <author>  MAHarwood
+            
+            </author>
+        </member>
+        <member name="M:Lucene.Net.Highlight.SimpleHTMLFormatter.#ctor">
+            <summary> Default constructor uses HTML: &lt;B&gt; tags to markup terms
+            
+            
+            </summary>
+        </member>
+        <member name="T:Lucene.Net.Highlight.SimpleFragmenter">
+            <summary> {@link Fragmenter} implementation which breaks text up into same-size 
+            fragments with no concerns over spotting sentence boundaries.
+            </summary>
+            <author>  mark@searcharea.co.uk
+            </author>
+        </member>
         <member name="T:Lucene.Net.Highlight.Fragmenter">
             <summary> Implements the policy for breaking text into multiple fragments for consideration
             by the {@link Highlighter} class. A sophisticated implementation may do this on the basis
@@ -52,57 +98,18 @@
             <param name="">nextToken
             </param>
         </member>
-        <member name="T:Lucene.Net.Highlight.GradientFormatter">
-            <summary> Formats text with different color intensity depending on the score of the
-            term.
-            
-            </summary>
-            <author>  maharwood
-            </author>
-        </member>
-        <member name="M:Lucene.Net.Highlight.GradientFormatter.#ctor(System.Single,System.String,System.String,System.String,System.String)">
-            <summary> Sets the color range for the IDF scores
-            
-            </summary>
-            <param name="">maxScore
-            The score (and above) displayed as maxColor (See QueryScorer.getMaxWeight 
-            which can be used to callibrate scoring scale)
-            </param>
-            <param name="">minForegroundColor
-            The hex color used for representing IDF scores of zero eg
-            #FFFFFF (white) or null if no foreground color required
-            </param>
-            <param name="">maxForegroundColor
-            The largest hex color used for representing IDF scores eg
-            #000000 (black) or null if no foreground color required
-            </param>
-            <param name="">minBackgroundColor
-            The hex color used for representing IDF scores of zero eg
-            #FFFFFF (white) or null if no background color required
-            </param>
-            <param name="">maxBackgroundColor
-            The largest hex color used for representing IDF scores eg
-            #000000 (black) or null if no background color required
+        <member name="M:Lucene.Net.Highlight.SimpleFragmenter.#ctor(System.Int32)">
+            <summary> </summary>
+            <param name="fragmentSize">size in bytes of each fragment
             </param>
         </member>
-        <member name="M:Lucene.Net.Highlight.GradientFormatter.HexToInt(System.String)">
-            <summary> Converts a hex string into an int. Integer.parseInt(hex, 16) assumes the
-            input is nonnegative unless there is a preceding minus sign. This method
-            reads the input as twos complement instead, so if the input is 8 bytes
-            long, it will correctly restore a negative int produced by
-            Integer.toHexString() but not neccesarily one produced by
-            Integer.toString(x,16) since that method will produce a string like '-FF'
-            for negative integer values.
-            
-            </summary>
-            <param name="">hex
-            A string in capital or lower case hex, of no more then 16
-            characters.
+        <member name="M:Lucene.Net.Highlight.SimpleFragmenter.GetFragmentSize">
+            <returns> size in bytes of each fragment
+            </returns>
+        </member>
+        <member name="M:Lucene.Net.Highlight.SimpleFragmenter.SetFragmentSize(System.Int32)">
+            <param name="size">size in bytes of each fragment
             </param>
-            <throws>  NumberFormatException </throws>
-            <summary>             if the string is more than 16 characters long, or if any
-            character is not in the set [0-9a-fA-f]
-            </summary>
         </member>
         <member name="T:Lucene.Net.Highlight.Highlighter">
             <summary> Class used to markup highlighted terms found in the best sections of a 
@@ -265,75 +272,23 @@
             <param name="">scorer
             </param>
         </member>
-        <member name="T:Lucene.Net.Highlight.NullFragmenter">
-            <summary> {@link Fragmenter} implementation which does not fragment the text.
-            This is useful for highlighting the entire content of a document or field.
-            </summary>
-        </member>
-        <member name="T:Lucene.Net.Highlight.QueryScorer">
-            <summary> {@link Scorer} implementation which scores text fragments by the number of unique query terms found.
-            This class uses the {@link QueryTermExtractor} class to process determine the query terms and 
-            their boosts to be used. 
-            </summary>
-            <author>  mark@searcharea.co.uk
-            </author>
-        </member>
-        <member name="T:Lucene.Net.Highlight.Scorer">
-            <summary> Adds to the score for a fragment based on its tokens</summary>
-            <author>  mark@searcharea.co.uk
+        <member name="T:Lucene.Net.Highlight.DefaultEncoder">
+            <summary> Simple {@link Encoder} implementation that does not modify the output</summary>
+            <author>  Nicko Cadell
+            
             </author>
         </member>
-        <member name="M:Lucene.Net.Highlight.Scorer.StartFragment(Lucene.Net.Highlight.TextFragment)">
-            <summary> called when a new fragment is started for consideration</summary>
-            <param name="">newFragment
-            </param>
-        </member>
-        <member name="M:Lucene.Net.Highlight.Scorer.GetTokenScore(Lucene.Net.Analysis.Token)">
-            <summary> Called for each token in the current fragment</summary>
-            <param name="token">The token to be scored
-            </param>
-            <returns> a score which is passed to the Highlighter class to influence the mark-up of the text
-            (this return value is NOT used to score the fragment)
-            </returns>
-        </member>
-        <member name="M:Lucene.Net.Highlight.Scorer.GetFragmentScore">
-            <summary> Called when the highlighter has no more tokens for the current fragment - the scorer returns
-            the weighting it has derived for the most recent fragment, typically based on the tokens
-            passed to getTokenScore(). 
+        <member name="T:Lucene.Net.Highlight.Encoder">
+            <summary> Encodes original text. The Encoder works with the Formatter to generate the output.
             
             </summary>
+            <author>  Nicko Cadell
+            </author>
         </member>
-        <member name="M:Lucene.Net.Highlight.QueryScorer.#ctor(Lucene.Net.Search.Query)">
-            <summary> </summary>
-            <param name="query">a Lucene query (ideally rewritten using query.rewrite 
-            before being passed to this class and the searcher)
-            </param>
-        </member>
-        <member name="M:Lucene.Net.Highlight.QueryScorer.#ctor(Lucene.Net.Search.Query,System.String)">
-            <summary> </summary>
-            <param name="query">a Lucene query (ideally rewritten using query.rewrite 
-            before being passed to this class and the searcher)
-            </param>
-            <param name="fieldName">the Field name which is used to match Query terms
-            </param>
-        </member>
-        <member name="M:Lucene.Net.Highlight.QueryScorer.#ctor(Lucene.Net.Search.Query,Lucene.Net.Index.IndexReader,System.String)">
-            <summary> </summary>
-            <param name="query">a Lucene query (ideally rewritten using query.rewrite 
-            before being passed to this class and the searcher)
-            </param>
-            <param name="reader">used to compute IDF which can be used to a) score selected fragments better 
-            b) use graded highlights eg set font color intensity
-            </param>
-            <param name="fieldName">the field on which Inverse Document Frequency (IDF) calculations are based
+        <member name="M:Lucene.Net.Highlight.Encoder.EncodeText(System.String)">
+            <param name="originalText">The section of text being output
             </param>
         </member>
-        <member name="M:Lucene.Net.Highlight.QueryScorer.GetMaxTermWeight">
-            <summary> </summary>
-            <returns> The highest weighted term (useful for passing to GradientFormatter to set
-            top end of coloring scale.  
-            </returns>
-        </member>
         <member name="T:Lucene.Net.Highlight.QueryTermExtractor">
             <summary> Utility class used to extract the terms used in a query, plus any weights.
             This class will not find terms for MultiTermQuery, RangeQuery and PrefixQuery classes
@@ -389,116 +344,137 @@
             <returns> an array of the terms used in a query, plus their weights.
             </returns>
         </member>
-        <member name="T:Lucene.Net.Highlight.SimpleFragmenter">
-            <summary> {@link Fragmenter} implementation which breaks text up into same-size 
-            fragments with no concerns over spotting sentence boundaries.
+        <member name="M:Lucene.Net.Highlight.QueryTermExtractor.GetTermsFromBooleanQuery(Lucene.Net.Search.BooleanQuery,System.Collections.Hashtable,System.Boolean,System.String)">
+            <summary> extractTerms is currently the only query-independent means of introspecting queries but it only reveals
+            a list of terms for that query - not the boosts each individual term in that query may or may not have.
+            "Container" queries such as BooleanQuery should be unwrapped to get at the boost info held
+            in each child element. 
+            Some discussion around this topic here:
+            http://www.gossamer-threads.com/lists/lucene/java-dev/34208?search_string=introspection;#34208
+            Unfortunately there seemed to be limited interest in requiring all Query objects to implement
+            something common which would allow access to child queries so what follows here are query-specific
+            implementations for accessing embedded query elements. 
             </summary>
-            <author>  mark@searcharea.co.uk
-            </author>
         </member>
-        <member name="M:Lucene.Net.Highlight.SimpleFragmenter.#ctor(System.Int32)">
-            <summary> </summary>
-            <param name="fragmentSize">size in bytes of each fragment
-            </param>
-        </member>
-        <member name="M:Lucene.Net.Highlight.SimpleFragmenter.GetFragmentSize">
-            <returns> size in bytes of each fragment
-            </returns>
-        </member>
-        <member name="M:Lucene.Net.Highlight.SimpleFragmenter.SetFragmentSize(System.Int32)">
-            <param name="size">size in bytes of each fragment
-            </param>
+        <member name="T:Lucene.Net.Highlight.NullFragmenter">
+            <summary> {@link Fragmenter} implementation which does not fragment the text.
+            This is useful for highlighting the entire content of a document or field.
+            </summary>
         </member>
-        <member name="T:Lucene.Net.Highlight.SimpleHTMLEncoder">
-            <summary> Simple {@link Encoder} implementation to escape text for HTML output</summary>
-            <author>  Nicko Cadell
+        <member name="T:Lucene.Net.Highlight.GradientFormatter">
+            <summary> Formats text with different color intensity depending on the score of the
+            term.
             
+            </summary>
+            <author>  maharwood
             </author>
         </member>
-        <member name="M:Lucene.Net.Highlight.SimpleHTMLEncoder.HtmlEncode(System.String)">
-            <summary> Encode string into HTML</summary>
-        </member>
-        <member name="T:Lucene.Net.Highlight.SimpleHTMLFormatter">
-            <summary> Simple {@link Formatter} implementation to highlight terms with a pre and post tag</summary>
-            <author>  MAHarwood
+        <member name="M:Lucene.Net.Highlight.GradientFormatter.#ctor(System.Single,System.String,System.String,System.String,System.String)">
+            <summary> Sets the color range for the IDF scores
             
-            </author>
+            </summary>
+            <param name="">maxScore
+            The score (and above) displayed as maxColor (See QueryScorer.getMaxWeight 
+            which can be used to callibrate scoring scale)
+            </param>
+            <param name="">minForegroundColor
+            The hex color used for representing IDF scores of zero eg
+            #FFFFFF (white) or null if no foreground color required
+            </param>
+            <param name="">maxForegroundColor
+            The largest hex color used for representing IDF scores eg
+            #000000 (black) or null if no foreground color required
+            </param>
+            <param name="">minBackgroundColor
+            The hex color used for representing IDF scores of zero eg
+            #FFFFFF (white) or null if no background color required
+            </param>
+            <param name="">maxBackgroundColor
+            The largest hex color used for representing IDF scores eg
+            #000000 (black) or null if no background color required
+            </param>
         </member>
-        <member name="M:Lucene.Net.Highlight.SimpleHTMLFormatter.#ctor">
-            <summary> Default constructor uses HTML: &lt;B&gt; tags to markup terms
-            
+        <member name="M:Lucene.Net.Highlight.GradientFormatter.HexToInt(System.String)">
+            <summary> Converts a hex string into an int. Integer.parseInt(hex, 16) assumes the
+            input is nonnegative unless there is a preceding minus sign. This method
+            reads the input as twos complement instead, so if the input is 8 bytes
+            long, it will correctly restore a negative int produced by
+            Integer.toHexString() but not neccesarily one produced by
+            Integer.toString(x,16) since that method will produce a string like '-FF'
+            for negative integer values.
             
             </summary>
+            <param name="">hex
+            A string in capital or lower case hex, of no more then 16
+            characters.
+            </param>
+            <throws>  NumberFormatException </throws>
+            <summary>             if the string is more than 16 characters long, or if any
+            character is not in the set [0-9a-fA-f]
+            </summary>
         </member>
-        <member name="T:Lucene.Net.Highlight.SpanGradientFormatter">
-            <summary> Formats text with different color intensity depending on the score of the
-            term using the span tag.  GradientFormatter uses a bgcolor argument to the font tag which
-            doesn't work in Mozilla, thus this class.
-            
+        <member name="T:Lucene.Net.Highlight.QueryScorer">
+            <summary> {@link Scorer} implementation which scores text fragments by the number of unique query terms found.
+            This class uses the {@link QueryTermExtractor} class to process determine the query terms and 
+            their boosts to be used. 
             </summary>
-            <seealso cref="T:Lucene.Net.Highlight.GradientFormatter">
-            </seealso>
-            <author>  David Spencer dave@searchmorph.com
+            <author>  mark@searcharea.co.uk
             </author>
         </member>
-        <member name="T:Lucene.Net.Highlight.TextFragment">
-            <summary> Low-level class used to record information about a section of a document 
-            with a score.
-            </summary>
-            <author>  MAHarwood
-            
-            
+        <member name="T:Lucene.Net.Highlight.Scorer">
+            <summary> Adds to the score for a fragment based on its tokens</summary>
+            <author>  mark@searcharea.co.uk
             </author>
         </member>
-        <member name="M:Lucene.Net.Highlight.TextFragment.Merge(Lucene.Net.Highlight.TextFragment)">
-            <param name="frag2">Fragment to be merged into this one
+        <member name="M:Lucene.Net.Highlight.Scorer.StartFragment(Lucene.Net.Highlight.TextFragment)">
+            <summary> called when a new fragment is started for consideration</summary>
+            <param name="">newFragment
             </param>
         </member>
-        <member name="M:Lucene.Net.Highlight.TextFragment.Follows(Lucene.Net.Highlight.TextFragment)">
-            <param name="fragment">
+        <member name="M:Lucene.Net.Highlight.Scorer.GetTokenScore(Lucene.Net.Analysis.Token)">
+            <summary> Called for each token in the current fragment</summary>
+            <param name="token">The token to be scored
             </param>
-            <returns> true if this fragment follows the one passed
-            </returns>
-        </member>
-        <member name="M:Lucene.Net.Highlight.TextFragment.GetFragNum">
-            <returns> the fragment sequence number
+            <returns> a score which is passed to the Highlighter class to influence the mark-up of the text
+            (this return value is NOT used to score the fragment)
             </returns>
         </member>
-        <member name="T:Lucene.Net.Highlight.TokenGroup">
-            <summary> One, or several overlapping tokens, along with the score(s) and the
-            scope of the original text
+        <member name="M:Lucene.Net.Highlight.Scorer.GetFragmentScore">
+            <summary> Called when the highlighter has no more tokens for the current fragment - the scorer returns
+            the weighting it has derived for the most recent fragment, typically based on the tokens
+            passed to getTokenScore(). 
+            
             </summary>
-            <author>  MAHarwood
-            </author>
         </member>
-        <member name="M:Lucene.Net.Highlight.TokenGroup.GetToken(System.Int32)">
+        <member name="M:Lucene.Net.Highlight.QueryScorer.#ctor(Lucene.Net.Search.Query)">
             <summary> </summary>
-            <param name="index">a value between 0 and numTokens -1
+            <param name="query">a Lucene query (ideally rewritten using query.rewrite 
+            before being passed to this class and the searcher)
             </param>
-            <returns> the "n"th token
-            </returns>
         </member>
-        <member name="M:Lucene.Net.Highlight.TokenGroup.GetScore(System.Int32)">
+        <member name="M:Lucene.Net.Highlight.QueryScorer.#ctor(Lucene.Net.Search.Query,System.String)">
             <summary> </summary>
-            <param name="index">a value between 0 and numTokens -1
+            <param name="query">a Lucene query (ideally rewritten using query.rewrite 
+            before being passed to this class and the searcher)
+            </param>
+            <param name="fieldName">the Field name which is used to match Query terms
             </param>
-            <returns> the "n"th score
-            </returns>
-        </member>
-        <member name="M:Lucene.Net.Highlight.TokenGroup.GetEndOffset">
-            <returns> the end position in the original text
-            </returns>
-        </member>
-        <member name="M:Lucene.Net.Highlight.TokenGroup.GetNumTokens">
-            <returns> the number of tokens in this group
-            </returns>
         </member>
-        <member name="M:Lucene.Net.Highlight.TokenGroup.GetStartOffset">
-            <returns> the start position in the original text
-            </returns>
+        <member name="M:Lucene.Net.Highlight.QueryScorer.#ctor(Lucene.Net.Search.Query,Lucene.Net.Index.IndexReader,System.String)">
+            <summary> </summary>
+            <param name="query">a Lucene query (ideally rewritten using query.rewrite 
+            before being passed to this class and the searcher)
+            </param>
+            <param name="reader">used to compute IDF which can be used to a) score selected fragments better 
+            b) use graded highlights eg set font color intensity
+            </param>
+            <param name="fieldName">the field on which Inverse Document Frequency (IDF) calculations are based
+            </param>
         </member>
-        <member name="M:Lucene.Net.Highlight.TokenGroup.GetTotalScore">
-            <returns> all tokens' scores summed up
+        <member name="M:Lucene.Net.Highlight.QueryScorer.GetMaxTermWeight">
+            <summary> </summary>
+            <returns> The highest weighted term (useful for passing to GradientFormatter to set
+            top end of coloring scale.  
             </returns>
         </member>
         <member name="T:Lucene.Net.Highlight.TokenSources">
@@ -555,26 +531,62 @@
             to eek out the last drops of performance, set to true. If in doubt, set to false.
             </param>
         </member>
-        <member name="T:Lucene.Net.Highlight.WeightedTerm">
-            <summary>Lightweight class to hold term and a weight value used for scoring this term </summary>
-            <author>  Mark Harwood
+        <member name="T:Lucene.Net.Highlight.TokenGroup">
+            <summary> One, or several overlapping tokens, along with the score(s) and the
+            scope of the original text
+            </summary>
+            <author>  MAHarwood
             </author>
         </member>
-        <member name="M:Lucene.Net.Highlight.WeightedTerm.GetTerm">
-            <returns> the term value (stemmed)
+        <member name="M:Lucene.Net.Highlight.TokenGroup.GetToken(System.Int32)">
+            <summary> </summary>
+            <param name="index">a value between 0 and numTokens -1
+            </param>
+            <returns> the "n"th token
             </returns>
         </member>
-        <member name="M:Lucene.Net.Highlight.WeightedTerm.GetWeight">
-            <returns> the weight associated with this term
+        <member name="M:Lucene.Net.Highlight.TokenGroup.GetScore(System.Int32)">
+            <summary> </summary>
+            <param name="index">a value between 0 and numTokens -1
+            </param>
+            <returns> the "n"th score
             </returns>
         </member>
-        <member name="M:Lucene.Net.Highlight.WeightedTerm.SetTerm(System.String)">
-            <param name="term">the term value (stemmed)
-            </param>
+        <member name="M:Lucene.Net.Highlight.TokenGroup.GetEndOffset">
+            <returns> the end position in the original text
+            </returns>
         </member>
-        <member name="M:Lucene.Net.Highlight.WeightedTerm.SetWeight(System.Single)">
-            <param name="weight">the weight associated with this term
-            </param>
+        <member name="M:Lucene.Net.Highlight.TokenGroup.GetNumTokens">
+            <returns> the number of tokens in this group
+            </returns>
+        </member>
+        <member name="M:Lucene.Net.Highlight.TokenGroup.GetStartOffset">
+            <returns> the start position in the original text
+            </returns>
+        </member>
+        <member name="M:Lucene.Net.Highlight.TokenGroup.GetTotalScore">
+            <returns> all tokens' scores summed up
+            </returns>
+        </member>
+        <member name="T:Lucene.Net.Highlight.SpanGradientFormatter">
+            <summary> Formats text with different color intensity depending on the score of the
+            term using the span tag.  GradientFormatter uses a bgcolor argument to the font tag which
+            doesn't work in Mozilla, thus this class.
+            
+            </summary>
+            <seealso cref="T:Lucene.Net.Highlight.GradientFormatter">
+            </seealso>
+            <author>  David Spencer dave@searchmorph.com
+            </author>
+        </member>
+        <member name="T:Lucene.Net.Highlight.SimpleHTMLEncoder">
+            <summary> Simple {@link Encoder} implementation to escape text for HTML output</summary>
+            <author>  Nicko Cadell
+            
+            </author>
+        </member>
+        <member name="M:Lucene.Net.Highlight.SimpleHTMLEncoder.HtmlEncode(System.String)">
+            <summary> Encode string into HTML</summary>
         </member>
     </members>
 </doc>

Modified: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Highlighter.Net/Highlighter.cs?rev=730298&r1=730297&r2=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.cs (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/Highlighter.cs Tue Dec 30 18:41:18 2008
@@ -17,6 +17,7 @@
 
 using System;
 using Analyzer = Lucene.Net.Analysis.Analyzer;
+using Token = Lucene.Net.Analysis.Token;
 using TokenStream = Lucene.Net.Analysis.TokenStream;
 using PriorityQueue = Lucene.Net.Util.PriorityQueue;
 
@@ -216,22 +217,22 @@
 				textFragmenter.Start(text);
 				
 				TokenGroup tokenGroup = new TokenGroup();
-				
-				while ((token = tokenStream.Next()) != null)
+				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.startOffset;
-						endOffset = tokenGroup.endOffset;
+						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 = endOffset;
+						lastEndOffset = System.Math.Max(endOffset, lastEndOffset);
 						tokenGroup.Clear();
 						
 						//check if current token marks the start of a new fragment						
@@ -248,30 +249,34 @@
 					
 					tokenGroup.AddToken(token, fragmentScorer.GetTokenScore(token));
 					
-					if (lastEndOffset > maxDocBytesToAnalyze)
-					{
-						break;
-					}
+					//				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.startOffset;
-					endOffset = tokenGroup.endOffset;
+					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 = endOffset;
+					lastEndOffset = System.Math.Max(lastEndOffset, endOffset);
 				}
 				
-				// append text after end of last token
-				//			if (lastEndOffset < text.length())
-				//				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;
 				
@@ -520,4 +525,4 @@
 				return fragA.GetScore() < fragB.GetScore();
 		}
 	}
-}
\ No newline at end of file
+}

Modified: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/QueryTermExtractor.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Highlighter.Net/QueryTermExtractor.cs?rev=730298&r1=730297&r2=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/QueryTermExtractor.cs (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/QueryTermExtractor.cs Tue Dec 30 18:41:18 2008
@@ -18,6 +18,9 @@
 using System;
 using IndexReader = Lucene.Net.Index.IndexReader;
 using Term = Lucene.Net.Index.Term;
+using BooleanClause = Lucene.Net.Search.BooleanClause;
+using BooleanQuery = Lucene.Net.Search.BooleanQuery;
+using FilteredQuery = Lucene.Net.Search.FilteredQuery;
 using Query = Lucene.Net.Search.Query;
 
 namespace Lucene.Net.Highlight
@@ -125,24 +128,55 @@
 		{
 			try
 			{
-				System.Collections.Hashtable nonWeightedTerms = new System.Collections.Hashtable();
-				query.ExtractTerms(nonWeightedTerms);
+				if (query is BooleanQuery)
+					GetTermsFromBooleanQuery((BooleanQuery) query, terms, prohibited, fieldName);
+				else if (query is FilteredQuery)
+					GetTermsFromFilteredQuery((FilteredQuery) query, terms, prohibited, fieldName);
+				else
+				{
+					System.Collections.Hashtable nonWeightedTerms = new System.Collections.Hashtable();
+					query.ExtractTerms(nonWeightedTerms);
 
-                System.Collections.IDictionaryEnumerator iter =  nonWeightedTerms.GetEnumerator();
-                while (iter.MoveNext())
-                {
-                    Term term = (Term)iter.Value;
-                    if ((fieldName == null) || (term.Field() == fieldName))
+                    System.Collections.IDictionaryEnumerator iter =  nonWeightedTerms.GetEnumerator();
+                    while (iter.MoveNext())
                     {
-                        WeightedTerm temp = new  WeightedTerm(query.GetBoost(), term.Text());
-                        terms.Add(temp, temp);
+                        Term term = (Term)iter.Value;
+                        if ((fieldName == null) || (term.Field() == fieldName))
+                        {
+                            WeightedTerm temp = new  WeightedTerm(query.GetBoost(), term.Text());
+                            terms.Add(temp, temp);
+                        }
                     }
-                }
+				}
 			}
 			catch (System.NotSupportedException ignore)
 			{
 				//this is non-fatal for our purposes
 			}
 		}
+		
+		/// <summary> extractTerms is currently the only query-independent means of introspecting queries but it only reveals
+		/// a list of terms for that query - not the boosts each individual term in that query may or may not have.
+		/// "Container" queries such as BooleanQuery should be unwrapped to get at the boost info held
+		/// in each child element. 
+		/// Some discussion around this topic here:
+		/// http://www.gossamer-threads.com/lists/lucene/java-dev/34208?search_string=introspection;#34208
+		/// Unfortunately there seemed to be limited interest in requiring all Query objects to implement
+		/// something common which would allow access to child queries so what follows here are query-specific
+		/// implementations for accessing embedded query elements. 
+		/// </summary>
+		private static void  GetTermsFromBooleanQuery(BooleanQuery query, System.Collections.Hashtable terms, bool prohibited, System.String fieldName)
+		{
+			BooleanClause[] queryClauses = query.GetClauses();
+			for (int i = 0; i < queryClauses.Length; i++)
+			{
+				if (prohibited || queryClauses[i].GetOccur() != BooleanClause.Occur.MUST_NOT)
+					GetTerms(queryClauses[i].GetQuery(), terms, prohibited, fieldName);
+			}
+		}
+		private static void  GetTermsFromFilteredQuery(FilteredQuery query, System.Collections.Hashtable terms, bool prohibited, System.String fieldName)
+		{
+			GetTerms(query.GetQuery(), terms, prohibited, fieldName);
+		}
 	}
-}
\ No newline at end of file
+}

Modified: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/TokenGroup.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Highlighter.Net/TokenGroup.cs?rev=730298&r1=730297&r2=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/TokenGroup.cs (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Highlighter.Net/TokenGroup.cs Tue Dec 30 18:41:18 2008
@@ -35,6 +35,9 @@
 		internal int numTokens = 0;
 		internal int startOffset = 0;
 		internal int endOffset = 0;
+		internal float tot;
+		
+		internal int matchStartOffset, matchEndOffset;
 		
 		
 		internal virtual void  AddToken(Token token, float score)
@@ -43,13 +46,28 @@
 			{
 				if (numTokens == 0)
 				{
-					startOffset = token.StartOffset();
-					endOffset = token.EndOffset();
+					startOffset = matchStartOffset = token.StartOffset();
+					endOffset = matchEndOffset = token.EndOffset();
+					tot += score;
 				}
 				else
 				{
 					startOffset = Math.Min(startOffset, token.StartOffset());
 					endOffset = Math.Max(endOffset, token.EndOffset());
+					if (score > 0)
+					{
+						if (tot == 0)
+						{
+							matchStartOffset = token.StartOffset();
+							matchEndOffset = token.EndOffset();
+						}
+						else
+						{
+							matchStartOffset = Math.Min(matchStartOffset, token.StartOffset());
+							matchEndOffset = Math.Max(matchEndOffset, token.EndOffset());
+						}
+						tot += score;
+					}
 				}
 				tokens[numTokens] = token;
 				scores[numTokens] = score;
@@ -66,6 +84,7 @@
 		internal virtual void  Clear()
 		{
 			numTokens = 0;
+			tot = 0;
 		}
 		
 		/// <summary> </summary>
@@ -113,12 +132,7 @@
 		/// </returns>
 		public virtual float GetTotalScore()
 		{
-			float total = 0;
-			for (int i = 0; i < numTokens; i++)
-			{
-				total += scores[i];
-			}
-			return total;
+			return tot;
 		}
 	}
-}
\ No newline at end of file
+}

Modified: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Test/AssemblyInfo.cs?rev=730298&r1=730297&r2=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/AssemblyInfo.cs Tue Dec 30 18:41:18 2008
@@ -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;
 
@@ -11,12 +28,13 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("The Apache Software Foundation")]
 [assembly: AssemblyProduct("Highligther.Net.Test")]
-[assembly: AssemblyCopyright("Copyright 2007 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("Copyright 2007 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Copyright 2007 - 2008 The Apache Software Foundation")]
+[assembly: AssemblyTrademark("Copyright 2007 - 2008 The Apache Software Foundation")]
 [assembly: AssemblyDefaultAlias("Lucene.Net.Highlight")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyInformationalVersionAttribute("2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
+
 
 //
 // Version information for an assembly consists of the following four values:
@@ -29,7 +47,8 @@
 // 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.001")]
+[assembly: AssemblyVersion("2.3.1.001")]
+
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

Modified: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/HighlighterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Test/HighlighterTest.cs?rev=730298&r1=730297&r2=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/HighlighterTest.cs (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/HighlighterTest.cs Tue Dec 30 18:41:18 2008
@@ -16,8 +16,11 @@
  */
 
 using System;
+
 using NUnit.Framework;
+
 using Analyzer = Lucene.Net.Analysis.Analyzer;
+using WhitespaceAnalyzer = Lucene.Net.Analysis.WhitespaceAnalyzer;
 using LowerCaseTokenizer = Lucene.Net.Analysis.LowerCaseTokenizer;
 using Token = Lucene.Net.Analysis.Token;
 using TokenStream = Lucene.Net.Analysis.TokenStream;
@@ -37,6 +40,7 @@
 using Query = Lucene.Net.Search.Query;
 using RangeFilter = Lucene.Net.Search.RangeFilter;
 using Searcher = Lucene.Net.Search.Searcher;
+using TermQuery = Lucene.Net.Search.TermQuery;
 using SpanNearQuery = Lucene.Net.Search.Spans.SpanNearQuery;
 using SpanQuery = Lucene.Net.Search.Spans.SpanQuery;
 using SpanTermQuery = Lucene.Net.Search.Spans.SpanTermQuery;
@@ -118,6 +122,88 @@
 		}
         */
 
+		private class AnonymousClassTokenStream : TokenStream
+		{
+			public AnonymousClassTokenStream(HighlighterTest enclosingInstance)
+			{
+				InitBlock(enclosingInstance);
+			}
+			private void  InitBlock(HighlighterTest enclosingInstance)
+			{
+				this.enclosingInstance = enclosingInstance;
+				lst = new System.Collections.ArrayList();
+				Token t;
+				t = new Token("hi", 0, 2);
+				lst.Add(t);
+				t = new Token("hispeed", 0, 8);
+				lst.Add(t);
+				t = new Token("speed", 3, 8);
+				t.SetPositionIncrement(0);
+				lst.Add(t);
+				t = new Token("10", 8, 10);
+				lst.Add(t);
+				t = new Token("foo", 11, 14);
+				lst.Add(t);
+				iter = lst.GetEnumerator();
+			}
+			private HighlighterTest enclosingInstance;
+			public HighlighterTest Enclosing_Instance
+			{
+				get
+				{
+					return enclosingInstance;
+				}
+				
+			}
+			internal System.Collections.IEnumerator iter;
+			internal System.Collections.ArrayList lst;
+			public override Token Next()
+			{
+				return iter.MoveNext() ? (Token) iter.Current : null;
+			}
+		}
+
+		private class AnonymousClassTokenStream1 : TokenStream
+		{
+			public AnonymousClassTokenStream1(HighlighterTest enclosingInstance)
+			{
+				InitBlock(enclosingInstance);
+			}
+			private void  InitBlock(HighlighterTest enclosingInstance)
+			{
+				this.enclosingInstance = enclosingInstance;
+				lst = new System.Collections.ArrayList();
+				Token t;
+				t = new Token("hispeed", 0, 8);
+				lst.Add(t);
+				t = new Token("hi", 0, 2);
+				t.SetPositionIncrement(0);
+				lst.Add(t);
+				t = new Token("speed", 3, 8);
+				lst.Add(t);
+				t = new Token("10", 8, 10);
+				lst.Add(t);
+				t = new Token("foo", 11, 14);
+				lst.Add(t);
+				iter = lst.GetEnumerator();
+			}
+			private HighlighterTest enclosingInstance;
+			public HighlighterTest Enclosing_Instance
+			{
+				get
+				{
+					return enclosingInstance;
+				}
+				
+			}
+			internal System.Collections.IEnumerator iter;
+			internal System.Collections.ArrayList lst;
+			public override Token Next()
+			{
+				return iter.MoveNext() ? (Token) iter.Current : null;
+			}
+		}
+
 		private IndexReader reader;
 		private const System.String FIELD_NAME = "contents";
 		private Query query;
@@ -190,7 +276,14 @@
         [Test]
         public virtual void  TestGetRangeFragments()
 		{
-			DoSearching(FIELD_NAME + ":[kannedy TO kznnedy]"); //bug?needs lower case
+			System.String queryString = FIELD_NAME + ":[kannedy TO kznnedy]";
+			
+			//Need to explicitly set the QueryParser property to use RangeQuery rather than RangeFilters
+			QueryParser parser = new QueryParser(FIELD_NAME, new StandardAnalyzer());
+			parser.SetUseOldRangeQuery(true);
+			query = parser.Parse(queryString);
+			DoSearching(query);
+			
 			DoStandardHighlights();
 			Assert.IsTrue(numHighlights == 5, "Failed to find correct number of highlights " + numHighlights + " found");
 		}
@@ -217,6 +310,18 @@
 		}
 		
         [Test]
+		public virtual void  TestOffByOne()
+		{
+			TermQuery query = new TermQuery(new Term("data", "help"));
+			Highlighter hg = new Highlighter(new SimpleHTMLFormatter(), new QueryScorer(query));
+			hg.SetTextFragmenter(new NullFragmenter());
+			
+			System.String match = null;
+			match = hg.GetBestFragment(new StandardAnalyzer(), "data", "help me [54-65]");
+			Assert.AreEqual("<B>help</B> me [54-65]", match);
+		}
+		
+        [Test]
         public virtual void  TestGetBestFragmentsFilteredQuery()
 		{
 			RangeFilter rf = new RangeFilter("contents", "john", "john", true, true);
@@ -396,6 +501,38 @@
 			Assert.IsTrue(numHighlights == 0, "Setting MaxDocBytesToAnalyze should have prevented " + "us from finding matches for this record: " + numHighlights + " found");
 		}
 		
+        [Test]
+		public virtual void  TestMaxSizeHighlightTruncates()
+		{
+			System.String goodWord = "goodtoken";
+			System.String[] stopWords = new System.String[]{"stoppedtoken"};
+			
+			TermQuery query = new TermQuery(new Term("data", goodWord));
+			SimpleHTMLFormatter fm = new SimpleHTMLFormatter();
+			Highlighter hg = new Highlighter(fm, new QueryScorer(query));
+			hg.SetTextFragmenter(new NullFragmenter());
+			
+			System.String match = null;
+			System.Text.StringBuilder sb = new System.Text.StringBuilder();
+			sb.Append(goodWord);
+			for (int i = 0; i < 10000; i++)
+			{
+				sb.Append(" ");
+				sb.Append(stopWords[0]);
+			}
+			
+			hg.SetMaxDocBytesToAnalyze(100);
+			match = hg.GetBestFragment(new StandardAnalyzer(stopWords), "data", sb.ToString());
+			Assert.IsTrue(match.Length < hg.GetMaxDocBytesToAnalyze(), "Matched text should be no more than 100 chars in length ");
+			
+			//add another tokenized word to the overrall length - but set way beyond 
+			//the length of text under consideration (after a large slug of stop words + whitespace)
+			sb.Append(" ");
+			sb.Append(goodWord);
+			match = hg.GetBestFragment(new StandardAnalyzer(stopWords), "data", sb.ToString());
+			Assert.IsTrue(match.Length < hg.GetMaxDocBytesToAnalyze(), "Matched text should be no more than 100 chars in length ");
+		}
+		
 		
 		[Test]
 		public virtual void  TestUnRewrittenQuery()
@@ -567,6 +704,88 @@
 			reader.Close();
 		}
 		
+		protected internal virtual TokenStream GetTS2()
+		{
+			//String s = "Hi-Speed10 foo";
+			return new AnonymousClassTokenStream(this);
+		}
+		
+		// same token-stream as above, but the bigger token comes first this time
+		protected internal virtual TokenStream GetTS2a()
+		{
+			//String s = "Hi-Speed10 foo";
+			return new AnonymousClassTokenStream1(this);
+		}
+		
+        [Test]
+		public virtual void  TestOverlapAnalyzer2()
+		{
+			
+			System.String s = "Hi-Speed10 foo";
+			
+			Query query; Highlighter highlighter; System.String result;
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("foo");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2(), s, 3, "...");
+			Assert.AreEqual(result, "Hi-Speed10 <B>foo</B>");
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("10");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2(), s, 3, "...");
+			Assert.AreEqual(result, "Hi-Speed<B>10</B> foo");
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("hi");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2(), s, 3, "...");
+			Assert.AreEqual(result, "<B>Hi</B>-Speed10 foo");
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("speed");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2(), s, 3, "...");
+			Assert.AreEqual(result, "Hi-<B>Speed</B>10 foo");
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("hispeed");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2(), s, 3, "...");
+			Assert.AreEqual(result, "<B>Hi-Speed</B>10 foo");
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("hi speed");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2(), s, 3, "...");
+			Assert.AreEqual(result, "<B>Hi-Speed</B>10 foo");
+			
+			/////////////////// same tests, just put the bigger overlapping token first
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("foo");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2a(), s, 3, "...");
+			Assert.AreEqual(result, "Hi-Speed10 <B>foo</B>");
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("10");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2a(), s, 3, "...");
+			Assert.AreEqual(result, "Hi-Speed<B>10</B> foo");
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("hi");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2a(), s, 3, "...");
+			Assert.AreEqual(result, "<B>Hi</B>-Speed10 foo");
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("speed");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2a(), s, 3, "...");
+			Assert.AreEqual(result, "Hi-<B>Speed</B>10 foo");
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("hispeed");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2a(), s, 3, "...");
+			Assert.AreEqual(result, "<B>Hi-Speed</B>10 foo");
+			
+			query = new QueryParser("text", new WhitespaceAnalyzer()).Parse("hi speed");
+			highlighter = new Highlighter(new QueryScorer(query));
+			result = highlighter.GetBestFragments(GetTS2a(), s, 3, "...");
+			Assert.AreEqual(result, "<B>Hi-Speed</B>10 foo");
+		}
 		
 		
 		/*
@@ -952,4 +1171,4 @@
             ;
         }			
     }
-}
\ No newline at end of file
+}

Copied: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test.csproj (from r730276, incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test-2.0.0.csproj)
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Test/Test.csproj?p2=incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Test/Test.csproj&p1=incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Test/Test-2.0.0.csproj&r1=730276&r2=730298&rev=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test-2.0.0.csproj (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test.csproj Tue Dec 30 18:41:18 2008
@@ -1,151 +1,122 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "Highlighter.Net.Test"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "Lucene.Net.Search.Highlight.Test"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = "Test.xml"
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "true"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-                <Reference
-                    Name = "system.runtime.remoting"
-                    AssemblyName = "System.Runtime.Remoting"
-                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\system.runtime.remoting.dll"
-                />
-                <Reference
-                    Name = "nunit.framework"
-                    AssemblyName = "nunit.framework"
-                    HintPath = "D:\DEVS\NUnit\bin\nunit.framework.dll"
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"
-                />
-                <Reference
-                    Name = "nunit.core"
-                    AssemblyName = "nunit.core"
-                    HintPath = "D:\DEVS\NUnit\bin\nunit.core.dll"
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"
-                />
-                <Reference
-                    Name = "nunit.tests"
-                    AssemblyName = "nunit.tests"
-                    HintPath = "D:\DEVS\NUnit\bin\nunit.tests.dll"
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"
-                />
-                <Reference
-                    Name = "nunit.extensions"
-                    AssemblyName = "nunit.extensions"
-                    HintPath = "D:\DEVS\NUnit\bin\nunit.extensions.dll"
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"
-                />
-                <Reference
-                    Name = "nunit.mocks"
-                    AssemblyName = "nunit.mocks"
-                    HintPath = "D:\DEVS\NUnit\bin\nunit.mocks.dll"
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"
-                />
-                <Reference
-                    Name = "nunit.util"
-                    AssemblyName = "nunit.util"
-                    HintPath = "D:\DEVS\NUnit\bin\nunit.util.dll"
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"
-                />
-                <Reference
-                    Name = "Highlighter.Net"
-                    AssemblyName = "Highlighter.Net"
-                    HintPath = "..\bin\Debug\Highlighter.Net.dll"
-                />
-                <Reference
-                    Name = "Lucene.Net"
-                    AssemblyName = "Lucene.Net"
-                    HintPath = "..\..\Lucene.Net-2.0.1-001.src\Lucene.Net\bin\Debug\Lucene.Net.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "HighlighterTest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
+<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>{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Highlighter.Net.Test</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Lucene.Net.Search.Highlight.Test</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>Test.xml</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>
+    </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="Highlighter.Net">
+      <Name>Highlighter.Net</Name>
+      <HintPath>..\bin\Debug\Highlighter.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Lucene.Net">
+      <Name>Lucene.Net</Name>
+      <HintPath>..\..\..\src\Lucene.Net\bin\Debug\Lucene.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.core">
+      <Name>nunit.core</Name>
+      <HintPath>C:\DEVS\NUnit 2.4.7\bin\nunit.core.dll</HintPath>
+      <AssemblyFolderKey>hklm\dn\nunit.framework</AssemblyFolderKey>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <Name>nunit.framework</Name>
+      <HintPath>C:\DEVS\NUnit 2.4.7\bin\nunit.framework.dll</HintPath>
+      <AssemblyFolderKey>hklm\dn\nunit.framework</AssemblyFolderKey>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting">
+      <Name>system.runtime.remoting</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="HighlighterTest.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

Propchange: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test.csproj
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test.sln
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/contrib/Highlighter.Net/Test/Test.sln?rev=730298&r1=730297&r2=730298&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test.sln (original)
+++ incubator/lucene.net/trunk/C#/contrib/Highlighter.Net/Test/Test.sln Tue Dec 30 18:41:18 2008
@@ -1,24 +1,26 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test-2.0.0", "Test-2.0.0.csproj", "{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}"
-	ProjectSection(ProjectDependencies) = postProject
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test.csproj", "{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Debug.ActiveCfg = Debug|.NET
-		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Debug.Build.0 = Debug|.NET
-		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Release.ActiveCfg = Release|.NET
-		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Release.Build.0 = Release|.NET
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAF68BCF-F781-45FC-98B3-2B9CEE411E01}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
 	EndGlobalSection
 EndGlobal



Mime
View raw message