You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2012/09/11 15:38:23 UTC
svn commit: r1383412 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/example/
solr/example/solr/collection1/conf/velocity/browse.vm
solr/example/solr/collection1/conf/velocity/main.css solr/lib/
Author: janhoy
Date: Tue Sep 11 13:38:23 2012
New Revision: 1383412
URL: http://svn.apache.org/viewvc?rev=1383412&view=rev
Log:
SOLR-3824: Velocity - Error messages from search not displayed (merge from trunk)
Added:
lucene/dev/branches/branch_4x/solr/lib/ (props changed)
- copied from r1383405, lucene/dev/trunk/solr/lib/
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/browse.vm
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/main.css
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1383412&r1=1383411&r2=1383412&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Sep 11 13:38:23 2012
@@ -174,6 +174,8 @@ Other Changes
* SOLR-3691: SimplePostTool: Mode for crawling/posting web pages
See http://wiki.apache.org/solr/ExtractingRequestHandler for examples (janhoy)
+* SOLR-3824: Velocity: Error messages from search not displayed (janhoy)
+
================== 4.0.0-BETA ===================
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/browse.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/browse.vm?rev=1383412&r1=1383411&r2=1383412&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/browse.vm (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/browse.vm Tue Sep 11 13:38:23 2012
@@ -20,6 +20,13 @@
class="page-count">$page.page_count</span>#end
</div>
+<div class="error">
+ #if(${response.response.error.code})
+ <h1>ERROR ${response.response.error.code}</h1>
+ ${response.response.error.msg}
+ #end
+</div>
+
<div class="results">
#if($response.response.get('grouped'))
#foreach($grouping in $response.response.get('grouped'))
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/main.css?rev=1383412&r1=1383411&r2=1383412&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/main.css (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/velocity/main.css Tue Sep 11 13:38:23 2012
@@ -196,4 +196,13 @@ li.show {
.group-value{
font-weight: bold;
-}
\ No newline at end of file
+}
+
+.error {
+ color: white;
+ background-color: red;
+ left: 210px;
+ width:80%;
+ position: relative;
+
+}