You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by eh...@apache.org on 2010/06/18 14:28:59 UTC
svn commit: r955974 - in /lucene/dev/trunk/solr/example/solr/conf/velocity:
VM_global_library.vm layout.vm
Author: ehatcher
Date: Fri Jun 18 12:28:58 2010
New Revision: 955974
URL: http://svn.apache.org/viewvc?rev=955974&view=rev
Log:
SOLR-1894: Fix for Solritas and multicore
Modified:
lucene/dev/trunk/solr/example/solr/conf/velocity/VM_global_library.vm
lucene/dev/trunk/solr/example/solr/conf/velocity/layout.vm
Modified: lucene/dev/trunk/solr/example/solr/conf/velocity/VM_global_library.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/conf/velocity/VM_global_library.vm?rev=955974&r1=955973&r2=955974&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/conf/velocity/VM_global_library.vm (original)
+++ lucene/dev/trunk/solr/example/solr/conf/velocity/VM_global_library.vm Fri Jun 18 12:28:58 2010
@@ -1,6 +1,6 @@
#macro(param $key)$request.params.get($key)#end
-#macro(url_for_solr)/solr#end
+#macro(url_for_solr)/solr#if($request.core.name != "")/$request.core.name#end#end
#macro(url_for_home)#url_for_solr/browse#end
#macro(q)q=$!{esc.url($params.get('q'))}#end
Modified: lucene/dev/trunk/solr/example/solr/conf/velocity/layout.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/conf/velocity/layout.vm?rev=955974&r1=955973&r2=955974&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/conf/velocity/layout.vm (original)
+++ lucene/dev/trunk/solr/example/solr/conf/velocity/layout.vm Fri Jun 18 12:28:58 2010
@@ -4,10 +4,10 @@
<title>#param('title')</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-<script type="text/javascript" src="/solr/admin/jquery-1.2.3.min.js"></script>
- <link rel="stylesheet" type="text/css" href="/solr/admin/file?file=/velocity/main.css&contentType=text/css"/>
- <link rel="stylesheet" href="/solr/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
- <script type="text/javascript" src="/solr/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
+<script type="text/javascript" src="#{url_for_solr}/admin/jquery-1.2.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>
<script>