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:43:02 UTC
svn commit: r1076285 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/
solr/example/solr/conf/solrconfig.xml
solr/example/solr/conf/velocity/VM_global_library.vm
solr/example/solr/conf/velocity/clusterResults.vm
solr/example/solr/conf/velocity/head.vm
Author: gsingers
Date: Wed Mar 2 16:43:01 2011
New Revision: 1076285
URL: http://svn.apache.org/viewvc?rev=1076285&view=rev
Log:
SOLR-2398: 3.x backport
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/VM_global_library.vm
lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/clusterResults.vm
lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/head.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=1076285&r1=1076284&r2=1076285&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:43:01 2011
@@ -779,7 +779,7 @@
<str name="v.layout">layout</str>
<str name="title">Solritas</str>
- <str name="defType">edismax</str>
+ <str name="defType">dismax</str>
<str name="q.alt">*:*</str>
<str name="rows">10</str>
<str name="fl">*,score</str>
Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/VM_global_library.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/VM_global_library.vm?rev=1076285&r1=1076284&r2=1076285&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/VM_global_library.vm (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/VM_global_library.vm Wed Mar 2 16:43:01 2011
@@ -20,7 +20,7 @@
#macro(qOpts)#set($queryOpts = $request.params.get("queryOpts"))#if($queryOpts && $queryOpts != "")&queryOpts=$queryOpts#end#end
-#macro(lensNoQ)?#if($request.params.getParams('fq') and $list.size($request.params.getParams('fq')) > 0)&#fqs($request.params.getParams('fq'))#end#debug#boostPrice#annotate#spatial#qOpts#group#end
+#macro(lensNoQ)?#if($request.params.getParams('fq') and $list.size($request.params.getParams('fq')) > 0)&#fqs($request.params.getParams('fq'))#end#debug#boostPrice#annotate#spatial#qOpts#end
#macro(lens)#lensNoQ#q#end
Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/clusterResults.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/clusterResults.vm?rev=1076285&r1=1076284&r2=1076285&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/clusterResults.vm (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/clusterResults.vm Wed Mar 2 16:43:01 2011
@@ -1,7 +1,24 @@
#foreach ($clusters in $response.response.clusters)
#set($labels = $clusters.get('labels'))
#set($docs = $clusters.get('docs'))
- <h3>#foreach ($label in $labels)$label#if( $foreach.hasNext ),#end#end</h3>
+ <!--
+ 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.
+ -->
+
+<h3>#foreach ($label in $labels)$label#if( $foreach.hasNext ),#end#end</h3>
<ol>
#foreach ($cluDoc in $docs)
<li><a href="#url_for_home?q=id:$cluDoc">$cluDoc</a></li>
Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/head.vm?rev=1076285&r1=1076284&r2=1076285&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/head.vm (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/head.vm Wed Mar 2 16:43:01 2011
@@ -20,7 +20,7 @@
<title>#param('title')</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-<script type="text/javascript" src="#{url_for_solr}/admin/jquery-1.2.3.min.js"></script>
+<script type="text/javascript" src="#{url_for_solr}/admin/jquery-1.4.3.min.js"></script>
<link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
<link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
<script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>