You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gs...@apache.org on 2011/03/02 17:05:31 UTC
svn commit: r1076272 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/
solr/example/solr/conf/ solr/example/solr/conf/velocity/
Author: gsingers
Date: Wed Mar 2 16:05:30 2011
New Revision: 1076272
URL: http://svn.apache.org/viewvc?rev=1076272&view=rev
Log:
SOLR-2178: 3.x backport
Added:
lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/cluster.vm
- copied, changed from r1027743, lucene/dev/trunk/solr/example/solr/conf/velocity/cluster.vm
lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/clusterResults.vm
- copied unchanged from r1027743, lucene/dev/trunk/solr/example/solr/conf/velocity/clusterResults.vm
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/facets.vm
lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/query.vm
Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml?rev=1076272&r1=1076271&r2=1076272&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml Wed Mar 2 16:05:30 2011
@@ -1202,9 +1202,7 @@
See http://project.carrot2.org/algorithms.html for the
algorithm's characteristics.
-->
- <str name="carrot.algorithm">
- org.carrot2.clustering.lingo.LingoClusteringAlgorithm
- </str>
+ <str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str>
<!-- Overriding values for Carrot2 default algorithm attributes.
For a description of all available attributes, see:
@@ -1225,9 +1223,7 @@
</lst>
<lst name="engine">
<str name="name">stc</str>
- <str name="carrot.algorithm">
- org.carrot2.clustering.stc.STCClusteringAlgorithm
- </str>
+ <str name="carrot.algorithm">org.carrot2.clustering.stc.STCClusteringAlgorithm</str>
</lst>
</searchComponent>
@@ -1260,7 +1256,7 @@
<str name="defType">edismax</str>
<str name="qf">
- text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
+ text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
</str>
<str name="q.alt">*:*</str>
<str name="rows">10</str>
Copied: lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/cluster.vm (from r1027743, lucene/dev/trunk/solr/example/solr/conf/velocity/cluster.vm)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/cluster.vm?p2=lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/cluster.vm&p1=lucene/dev/trunk/solr/example/solr/conf/velocity/cluster.vm&r1=1027743&r2=1076272&rev=1076272&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/conf/velocity/cluster.vm (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/cluster.vm Wed Mar 2 16:05:30 2011
@@ -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.
+ -->
+
<h2 #annTitle("Clusters generated by Carrot2 using the /clustering RequestHandler")>Clusters</h2>
<div id="clusters">
Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see results
Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/facets.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/facets.vm?rev=1076272&r1=1076271&r2=1076272&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/facets.vm (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/facets.vm Wed Mar 2 16:05:30 2011
@@ -2,6 +2,7 @@
#parse('facet_queries.vm')
#parse('facet_ranges.vm')
#parse('facet_dates.vm')
+#parse('cluster.vm')
Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/query.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/query.vm?rev=1076272&r1=1076271&r2=1076272&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/query.vm (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/query.vm Wed Mar 2 16:05:30 2011
@@ -5,7 +5,7 @@
<div class="query-boost"><span #annTitle("Add the boost function &bf=price to the query")><input type="checkbox" name="bf" value="price" #if($request.params.get('bf') == 'price')checked="true"#end>Boost by Price</input></span>
<span >
#set($loc = $request.params.get('pt'))
- #set($dist = $request.params.get('d'))
+ #set($dist = $request.params.get('d', "10"))
<label #annTitle("Add the &pt parameter")>Location Filter:
<select id="pt" name="pt">
<option value="none" #if($loc == '')selected="true"#end>No Filter</option>
@@ -15,7 +15,7 @@
<option value="37.7752,-122.4232" #if($loc == '37.7752,-122.4232')selected="true"#end>San Francisco CA</option>
</select>
</label>
- <span #annTitle("Add the &d parameter")>Distance (KM): <input id="d" name="d" type="text" size="6" value="#if($dist != '')$dist#{else}10#end"/></span>
+ <span #annTitle("Add the &d parameter")>Distance (KM): <input id="d" name="d" type="text" size="6" value="#if($dist != '')${dist}#{else}10#end"/></span>
<input type="hidden" name="sfield" value="store"/>
<input type="hidden" id="spatialFQ" name="fq" value=""/>
</div>