Author: jnioche
Date: Tue Aug 3 16:36:15 2010
New Revision: 981959
URL: http://svn.apache.org/viewvc?rev=981959&view=rev
Log:
NUTCH-859 : Diff trunk and nutchbase
Added:
nutch/branches/nutchbase/conf/solrindex-mapping.xml
Modified:
nutch/branches/nutchbase/build.xml
nutch/branches/nutchbase/conf/nutch-default.xml
Modified: nutch/branches/nutchbase/build.xml
URL:
http://svn.apache.org/viewvc/nutch/branches/nutchbase/build.xml?rev=981959&r1=981958&r2=981959&view=diff
==============================================================================
--- nutch/branches/nutchbase/build.xml (original)
+++ nutch/branches/nutchbase/build.xml Tue Aug 3 16:36:15 2010
@@ -77,7 +77,6 @@
encoding="${build.encoding}"
srcdir="${src.dir}"
includes="org/apache/nutch/**/*.java"
-
excludes="org/apache/nutch/scoring/webgraph/**/*.java,org/apache/nutch/tools/compat/**/*.java,org/apache/nutch/tools/arc/**/*.java,org/apache/nutch/indexer/field/**/*.java"
destdir="${build.classes}"
debug="${javac.debug}"
optimize="${javac.optimize}"
@@ -173,7 +172,6 @@
encoding="${build.encoding}"
srcdir="${test.src.dir}"
includes="org/apache/nutch*/**/*.java"
-
excludes="org/apache/nutch/scoring/webgraph/**/*.java,org/apache/nutch/tools/compat/**/*.java,org/apache/nutch/tools/arc/**/*.java"
destdir="${test.build.classes}"
debug="${javac.debug}"
optimize="${javac.optimize}"
Modified: nutch/branches/nutchbase/conf/nutch-default.xml
URL:
http://svn.apache.org/viewvc/nutch/branches/nutchbase/conf/nutch-default.xml?rev=981959&r1=981958&r2=981959&view=diff
==============================================================================
--- nutch/branches/nutchbase/conf/nutch-default.xml (original)
+++ nutch/branches/nutchbase/conf/nutch-default.xml Tue Aug 3 16:36:15 2010
@@ -832,7 +832,7 @@
<property>
<name>plugin.includes</name>
-
<value>protocol-http|urlfilter-regex|parse-tika|index-(basic|anchor)|urlnormalizer-(pass|regex|basic)|scoring-opic|query-(basic|site|url)|summary-basic</value>
+
<value>protocol-http|urlfilter-regex|parse-tika|index-(basic|anchor)|urlnormalizer-(pass|regex|basic)|scoring-opic</value>
<description>Regular expression naming plugin directory names to
include. Any plugin not matching this expression is excluded.
In any case you need at least include the nutch-extensionpoints plugin. By
Added: nutch/branches/nutchbase/conf/solrindex-mapping.xml
URL:
http://svn.apache.org/viewvc/nutch/branches/nutchbase/conf/solrindex-mapping.xml?rev=981959&view=auto
==============================================================================
--- nutch/branches/nutchbase/conf/solrindex-mapping.xml (added)
+++ nutch/branches/nutchbase/conf/solrindex-mapping.xml Tue Aug 3 16:36:15 2010
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<mapping>
+ <!-- Simple mapping of fields created by Nutch IndexingFilters
+ to fields defined (and expected) in Solr schema.xml.
+
+ Any fields in NutchDocument that match a name defined
+ in field/@source will be renamed to the corresponding
+ field/@dest.
+ Additionally, if a field name (before mapping) matches
+ a copyField/@source then its values will be copied to
+ the corresponding copyField/@dest.
+
+ uniqueKey has the same meaning as in Solr schema.xml
+ and defaults to "id" if not defined.
+ -->
+ <fields>
+ <field dest="content" source="content"/>
+ <field dest="site" source="site"/>
+ <field dest="title" source="title"/>
+ <field dest="host" source="host"/>
+ <field dest="segment" source="segment"/>
+ <field dest="boost" source="boost"/>
+ <field dest="digest" source="digest"/>
+ <field dest="tstamp" source="tstamp"/>
+ <field dest="id" source="url"/>
+ <copyField source="url" dest="url"/>
+ </fields>
+ <uniqueKey>id</uniqueKey>
+</mapping>
