Author: ehatcher
Date: Mon Dec 15 11:41:35 2008
New Revision: 726780
URL: http://svn.apache.org/viewvc?rev=726780&view=rev
Log:
Convert templates to using new QueryResponse response object
Added:
lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/debug.vm
Modified:
lucene/solr/trunk/contrib/velocity/src/main/java/footer.vm
lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/browse.vm
lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/hit.vm
Modified: lucene/solr/trunk/contrib/velocity/src/main/java/footer.vm
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/java/footer.vm?rev=726780&r1=726779&r2=726780&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/java/footer.vm (original)
+++ lucene/solr/trunk/contrib/velocity/src/main/java/footer.vm Mon Dec 15
11:41:35 2008
@@ -1,9 +1,6 @@
#if($params.getBool("debugQuery",false))
-<pre>
- request = $request
-
- response = $response.values
-</pre>
+ #parse("debug.vm")
#end
+<hr/>
Generated by <a
href="http://wiki.apache.org/solr/VelocityResponseWriter";>VelocityResponseWriter</a>
\ No newline at end of file
Modified:
lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/browse.vm
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/browse.vm?rev=726780&r1=726779&r2=726780&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/browse.vm
(original)
+++ lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/browse.vm
Mon Dec 15 11:41:35 2008
@@ -1,70 +1,67 @@
-#set($doclist=$response.values.response)
#set($searcher=$request.searcher)
#set($params=$request.params)
-#set($fields=$response.returnFields)
<html>
-## TODO: Implement layouts
-<head>
- <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"/>
-</head>
-<body>
-
-<div>
- #parse("header.vm")
-
- #set($filter_queries = $params.getParams('fq'))
- #foreach($fq in $filter_queries)
- > <a
href="#url_for_filters($filter_queries.subList(0,$velocityCount))">$fq</a>
- #end
-</div>
-
-<div class="query-box">
- <form id="query-form" action="/solr/itas" method="GET">
- Query: <input type="text" name="q" value="$!params.get('q')"/>
- </form>
-</div>
-
-<div class="facet-fields">
- #foreach($field in $response.values.facet_counts.facet_fields)
- <span class="facet-field">$field.key</span>
- <ul>
- #foreach($facet in $field.value)
- #set($facetURL = "#url_for_nested_facet($field.key, $facet.key)")
- #if ($facetURL != '')
- <li><a href="$facetURL">$facet.key</a> ($facet.value)</li>
- #end
- #end
- </ul>
- #end
-</div>
-
-<div class="pagination">
- <span><span class="results-found">$page.results_found</span> results found
in ${response.responseHeader.QTime} ms</span>
-</div>
-
-<div class="results">
- #foreach($id in $doclist.iterator())
- #set($doc = $searcher.doc($id,$response.returnFields))
- #parse("hit.vm")
- #end
-</div>
-
-<div class="pagination">
- #link_to_previous_page("previous")
- <span class="results-found">$page.results_found</span> results found.
- Page <span class="page-num">$page.current_page_number</span> of <span
- class="page-count">$page.page_count</span>
- #link_to_next_page("next")
-
- <br/>
-</div>
-
-<div>
- #parse("footer.vm")
-</div>
+ <head>
+ <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"/>
+ </head>
+ <body>
+
+ <div>
+ #parse("header.vm")
+
+ #set($filter_queries = $params.getParams('fq'))
+ #foreach($fq in $filter_queries)
+ > <a
href="#url_for_filters($filter_queries.subList(0,$velocityCount))">$fq</a>
+ #end
+ </div>
+
+ <div class="query-box">
+ <form id="query-form" action="/solr/itas" method="GET">
+ Query: <input type="text" name="q" value="$!params.get('q')"/>
+ </form>
+ </div>
+
+
+ <div class="facet-fields">
+ #foreach($field in $response.facetFields)
+ <span class="facet-field">$field.name</span>
+ <ul>
+ #foreach($facet in $field.values)
+ #set($facetURL = "#url_for_nested_facet($field.name,
$facet.name)")
+ #if ($facetURL != '')
+ <li><a href="$facetURL">$facet.name</a> ($facet.count)</li>
+ #end
+ #end
+ </ul>
+ #end
+ </div>
+
+ <div class="pagination">
+ <span><span class="results-found">$page.results_found</span> results
found in ${response.responseHeader.QTime} ms</span>
+ </div>
+
+ <div class="results">
+ #foreach($doc in $response.results)
+ #parse("hit.vm")
+ #end
+ </div>
+
+ <div class="pagination">
+ #link_to_previous_page("previous")
+ <span class="results-found">$page.results_found</span> results found.
+ Page <span class="page-num">$page.current_page_number</span> of <span
+ class="page-count">$page.page_count</span>
+ #link_to_next_page("next")
+
+ <br/>
+ </div>
+
+ <div>
+ #parse("footer.vm")
+ </div>
-</body>
+ </body>
</html>
\ No newline at end of file
Added: lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/debug.vm
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/debug.vm?rev=726780&view=auto
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/debug.vm
(added)
+++ lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/debug.vm Mon
Dec 15 11:41:35 2008
@@ -0,0 +1,9 @@
+<h1>REQUEST</h1>
+<div>
+$esc.html($request)
+</div>
+
+<h1>RESPONSE</h1>
+<div>
+$esc.html($response)
+</div>
Modified: lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/hit.vm
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/hit.vm?rev=726780&r1=726779&r2=726780&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/hit.vm
(original)
+++ lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/hit.vm Mon
Dec 15 11:41:35 2008
@@ -1,18 +1,16 @@
<div class="result-document">
- #foreach($field in $doc.fields)
- #if($response.returnFields.contains("*") ||
$response.returnFields.contains($field.name()))
+ #foreach($fieldname in $doc.fieldNames)
<p>
- <span class="field-name">$field.name() :</span>
+ <span class="field-name">$fieldname :</span>
<span>
- ##TODO: Need to provide helpers for field values, including HTML
escaping and highlighting
- #foreach($value in $doc.getFieldables($field.name()))
- $request.schema.getFieldType($field.name()).toExternal($value)
+ #foreach($value in $doc.getFieldValues($fieldname))
+ $value
#end
</span>
</p>
- #end
#end
#if($params.getBool("debugQuery",false))
- <a href="#" onclick='jQuery(this).siblings("pre").toggle(); return
false;'>toggle explain</a> <pre
style="display:none">$response.values.debug.explain.get($doc.get('id'))</pre>
+ <a href="#" onclick='jQuery(this).siblings("pre").toggle(); return
false;'>toggle explain</a>
+ <pre
style="display:none">$response.getExplainMap().get($doc.getFirstValue('id'))</pre>
#end
</div>
