Renamed AddFile operation to Extract as this is more inline with the …

…Solr operation. Added support for extract only http://wiki.apache.org/solr/TikaExtractOnlyExampleOutput with an ExtractResponseParser. Fixed unit tests and added some for ExtractResponse.
lucaswilric · Feb 21, 2011 · eecd7f6 · eecd7f6
1 parent b240afd
commit eecd7f6
Show file tree

Hide file tree

Showing 30 changed files with 192 additions and 85 deletions.
diff --git a/AutofacContrib.SolrNet/Properties/AssemblyInfo.cs b/AutofacContrib.SolrNet/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 [assembly: AssemblyCopyright("Copyright Mauricio Scheffer 2007-2011")]
 [assembly: AssemblyVersion("0.3.0")]
 [assembly: AssemblyFileVersion("0.3.0")]
-[assembly: AssemblyInformationalVersion("e49362cb56cf56a04e0d1ca4b4b55a399481cebd")]
+[assembly: AssemblyInformationalVersion("b240afdbdc39432d93f8103286abd9374138f4a4")]
 [assembly: AssemblyDelaySign(false)]
 
 
diff --git a/AutofacContrib.SolrNet/SolrNetModule.cs b/AutofacContrib.SolrNet/SolrNetModule.cs
@@ -58,10 +58,11 @@ protected override void Load(ContainerBuilder builder)
                 typeof(MoreLikeThisResponseParser<>),
                 typeof(SpellCheckResponseParser<>),
                 typeof(StatsResponseParser<>),
-                typeof(CollapseResponseParser<>),
+                typeof(CollapseResponseParser<>)
             })
                 builder.RegisterGeneric(p).As(typeof(ISolrResponseParser<>));
             builder.RegisterType<HeaderResponseParser<string>>().As<ISolrHeaderResponseParser>();
+            builder.RegisterType<ExtractResponseParser>().As<ISolrExtractResponseParser>();
             foreach (var p in new[] {
                 typeof(MappedPropertiesIsInSolrSchemaRule),
                 typeof(RequiredFieldsAreMappedRule),

diff --git a/Castle.Facilities.SolrNetIntegration/Properties/AssemblyInfo.cs b/Castle.Facilities.SolrNetIntegration/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 [assembly: AssemblyCopyright("Copyright Mauricio Scheffer 2007-2011")]
 [assembly: AssemblyVersion("0.3.0")]
 [assembly: AssemblyFileVersion("0.3.0")]
-[assembly: AssemblyInformationalVersion("e49362cb56cf56a04e0d1ca4b4b55a399481cebd")]
+[assembly: AssemblyInformationalVersion("b240afdbdc39432d93f8103286abd9374138f4a4")]
 [assembly: AssemblyDelaySign(false)]
 
 
diff --git a/Castle.Facilities.SolrNetIntegration/SolrNetFacility.cs b/Castle.Facilities.SolrNetIntegration/SolrNetFacility.cs
@@ -92,6 +92,7 @@ protected override void Init() {
                 Kernel.Register(Component.For(typeof (ISolrResponseParser<>)).ImplementedBy(parserType));
             }
             Kernel.Register(Component.For<ISolrHeaderResponseParser>().ImplementedBy<HeaderResponseParser<string>>());
+            Kernel.Register(Component.For<ISolrExtractResponseParser>().ImplementedBy<ExtractResponseParser>());
             foreach (var validationRule in new[] {
                 typeof(MappedPropertiesIsInSolrSchemaRule),
                 typeof(RequiredFieldsAreMappedRule),

diff --git a/HttpWebAdapters/Properties/AssemblyInfo.cs b/HttpWebAdapters/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 [assembly: AssemblyCopyright("Copyright Mauricio Scheffer 2007-2011")]
 [assembly: AssemblyVersion("0.3.0")]
 [assembly: AssemblyFileVersion("0.3.0")]
-[assembly: AssemblyInformationalVersion("e49362cb56cf56a04e0d1ca4b4b55a399481cebd")]
+[assembly: AssemblyInformationalVersion("b240afdbdc39432d93f8103286abd9374138f4a4")]
 [assembly: AssemblyDelaySign(false)]
 
 
diff --git a/NHibernate.SolrNet/Properties/AssemblyInfo.cs b/NHibernate.SolrNet/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 [assembly: AssemblyCopyright("Copyright Mauricio Scheffer 2007-2011")]
 [assembly: AssemblyVersion("0.3.0")]
 [assembly: AssemblyFileVersion("0.3.0")]
-[assembly: AssemblyInformationalVersion("e49362cb56cf56a04e0d1ca4b4b55a399481cebd")]
+[assembly: AssemblyInformationalVersion("b240afdbdc39432d93f8103286abd9374138f4a4")]
 [assembly: AssemblyDelaySign(false)]
 
 
diff --git a/Ninject.Integration.SolrNet/Properties/AssemblyInfo.cs b/Ninject.Integration.SolrNet/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 [assembly: AssemblyCopyright("Copyright Mauricio Scheffer 2007-2011")]
 [assembly: AssemblyVersion("0.3.0")]
 [assembly: AssemblyFileVersion("0.3.0")]
-[assembly: AssemblyInformationalVersion("e49362cb56cf56a04e0d1ca4b4b55a399481cebd")]
+[assembly: AssemblyInformationalVersion("b240afdbdc39432d93f8103286abd9374138f4a4")]
 [assembly: AssemblyDelaySign(false)]
 
 
diff --git a/Ninject.Integration.SolrNet/SolrNetModule.cs b/Ninject.Integration.SolrNet/SolrNetModule.cs
@@ -60,6 +60,7 @@ public override void Load() {
             })
                 Bind(typeof(ISolrResponseParser<>)).To(p);
             Bind<ISolrHeaderResponseParser>().To<HeaderResponseParser<string>>();
+            Bind<ISolrExtractResponseParser>().To<ExtractResponseParser>();
             foreach (var p in new[] {
                 typeof(MappedPropertiesIsInSolrSchemaRule),
                 typeof(RequiredFieldsAreMappedRule),

diff --git a/SolrNet.DSL/Properties/AssemblyInfo.cs b/SolrNet.DSL/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 [assembly: AssemblyCopyright("Copyright Mauricio Scheffer 2007-2011")]
 [assembly: AssemblyVersion("0.3.0")]
 [assembly: AssemblyFileVersion("0.3.0")]
-[assembly: AssemblyInformationalVersion("e49362cb56cf56a04e0d1ca4b4b55a399481cebd")]
+[assembly: AssemblyInformationalVersion("b240afdbdc39432d93f8103286abd9374138f4a4")]
 [assembly: AssemblyDelaySign(false)]
 
 
diff --git a/SolrNet.Tests/AddBinaryCommandTests.cs → SolrNet.Tests/ExtractCommandTests.cs b/SolrNet.Tests/AddBinaryCommandTests.cs → SolrNet.Tests/ExtractCommandTests.cs
@@ -23,19 +23,23 @@
 
 namespace SolrNet.Tests {
     [TestFixture]
-    public class AddBinaryCommandTests {
+    public class ExtractCommandTests {
         [Test]
         public void Execute() {
             var mocks = new MockRepository();
             var conn = mocks.StrictMock<ISolrConnection>();
-            With.Mocks(mocks).Expecting(() =>
-            {
-                Expect.Call(conn.PostBinary("/update/extract", null, new List<KeyValuePair<string, string>>()))
-                    .Repeat.Once()
-                    .Return("");
-            }).Verify(() =>
-            {
-                var cmd = new AddBinaryCommand(new AddBinaryParameters(null, "1", "text.doc"));
+            var parameters = new ExtractParameters(null, "1", "text.doc");
+
+            With.Mocks(mocks).Expecting(() => {
+                Expect.Call(conn.PostBinary("/update/extract", null, new List<KeyValuePair<string, string>> {
+                    new KeyValuePair<string, string>("literal.id", parameters.Id),
+                    new KeyValuePair<string, string>("resource.name", parameters.ResourceName),
+                }))
+                .Repeat.Once()
+                .Return("");
+            })
+            .Verify(() => {
+                var cmd = new ExtractCommand(new ExtractParameters(null, "1", "text.doc"));
                 cmd.Execute(conn);
             });
         }

diff --git a/SolrNet.Tests/FilterQueryTests.cs b/SolrNet.Tests/FilterQueryTests.cs
@@ -33,7 +33,7 @@ public void FilterQueries() {
             var mocks = new MockRepository();
             var queryExec = mocks.StrictMock<ISolrQueryExecuter<Document>>();
             var docSerializer = mocks.StrictMock<ISolrDocumentSerializer<Document>>();
-            ISolrBasicReadOnlyOperations<Document> solr = new SolrBasicServer<Document>(conn, queryExec, docSerializer, null, null, null);
+            ISolrBasicReadOnlyOperations<Document> solr = new SolrBasicServer<Document>(conn, queryExec, docSerializer, null, null, null, null);
             solr.Query(SolrQuery.All, new QueryOptions {
                 FilterQueries = new[] {new SolrQuery("id:0")},
             });

diff --git a/SolrNet.Tests/Resources/responseWithExtractContent.xml b/SolrNet.Tests/Resources/responseWithExtractContent.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<response>
+    <lst name="responseHeader">
+        <int name="status">0</int>
+        <int name="QTime">58</int>
+    </lst>
+    <str>Hello world!</str>
+</response>
diff --git a/SolrNet.Tests/SolrNet.Tests.csproj b/SolrNet.Tests/SolrNet.Tests.csproj
@@ -91,7 +91,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AddBinaryCommandTests.cs" />
+    <Compile Include="ExtractCommandTests.cs" />
     <Compile Include="AddCommandTests.cs" />
     <Compile Include="AllPropertiesMappingManagerTests.cs" />
     <Compile Include="AttributesMappingManagerTests.cs" />
@@ -182,6 +182,9 @@
     <None Include="App.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <EmbeddedResource Include="Resources\responseWithExtractContent.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\solrSchemaBasic.xml" />