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 2011/09/06 15:24:09 UTC

svn commit: r1165659 - in /lucene/dev/branches/branch_3x/solr: CHANGES.txt example/solr/conf/solrconfig.xml example/solr/conf/velocity/VM_global_library.vm example/solr/conf/velocity/facet_dates.vm example/solr/conf/velocity/facet_ranges.vm

Author: janhoy
Date: Tue Sep  6 13:24:08 2011
New Revision: 1165659

URL: http://svn.apache.org/viewvc?rev=1165659&view=rev
Log:
SOLR-2383 Velocity: Generalize range and date facet display
Backport from trunk, slightly adapted for 3.x capabilities

Modified:
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    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/facet_dates.vm
    lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/facet_ranges.vm

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1165659&r1=1165658&r2=1165659&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Tue Sep  6 13:24:08 2011
@@ -51,6 +51,10 @@ Upgrading from Solr 3.3
 New Features
 ----------------------
 
+* SOLR-2383: /browse improvements: generalize range and date facet display
+  Backported from trunk. Removed facet.date support in Velocity, since this is 
+  deprecated in favor of facet.range (gsingers, janhoy)
+
 * SOLR-2458: post.jar enhanced to handle JSON, CSV and <optimize> (janhoy)
 
 * LUCENE-3234: add a new parameter hl.phraseLimit for FastVectorHighlighter speed up.

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=1165659&r1=1165658&r2=1165659&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 Tue Sep  6 13:24:08 2011
@@ -809,11 +809,15 @@
        <str name="facet.query">GB</str>
        <str name="facet.mincount">1</str>
        <str name="facet.pivot">cat,inStock</str>
+       <str name="facet.range.other">after</str>
        <str name="facet.range">price</str>
        <int name="f.price.facet.range.start">0</int>
        <int name="f.price.facet.range.end">600</int>
        <int name="f.price.facet.range.gap">50</int>
-       <str name="f.price.facet.range.other">after</str>
+       <str name="facet.range">popularity</str>
+       <int name="f.popularity.facet.range.start">0</int>
+       <int name="f.popularity.facet.range.end">10</int>
+       <int name="f.popularity.facet.range.gap">3</int>
        <str name="facet.range">manufacturedate_dt</str>
        <str name="f.manufacturedate_dt.facet.range.start">NOW/YEAR-10YEARS</str>
        <str name="f.manufacturedate_dt.facet.range.end">NOW</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=1165659&r1=1165658&r2=1165659&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 Tue Sep  6 13:24:08 2011
@@ -20,7 +20,9 @@
 
 #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#end
+#macro(group)#if($request.params.getBool("group") == true)&group=true#end#if($request.params.get("group.field"))#foreach($grp in $request.params.getParams('group.field'))&group.field=$grp#end#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(lens)#lensNoQ#q#end
         
 
@@ -30,6 +32,7 @@
 
 #macro(url_for_filters $p)#url_for_home?#q#boostPrice#spatial#qOpts#if($list.size($p) > 0)&#fqs($p)#end#debug#end
 
+
 #macro(url_for_nested_facet_query $field)#url_for_home#lens&fq=$esc.url($field)#end
 
 ## TODO: convert to use {!raw f=$field}$value (with escaping of course)
@@ -81,79 +84,31 @@
   #end      
 #end
 
-#macro(display_facet_range_date $field, $display, $fieldName)
-  <span class="facet-field">$display</span>
-    ##Note: even if mincount is 1, you can still get a '0' before & after
-    ##Note: We assume facet.range.include='lower'
-    <ul>
-    #if ($field.before && $field.before > 0)
-      #set($value = "[* TO " + $date.format("yyyy-MM-dd'T'HH:mm:ss'Z'", $field.start) + "-1MILLIS]")
-      #set($facetURL = "#url_for_facet_date_filter($fieldName, $value)")
-      <li><a href="$facetURL">Before</a> ($field.before)</li>
-    #end
-    #foreach ($facet in $field.counts)
-      #set($theDate = $date.toDate("yyyy-MM-dd'T'HH:mm:ss'Z'", $facet.key))
-      #set($value = '["' + $facet.key + '" TO "' + $facet.key + $field.gap + '-1MILLIS"]')
-
-      #set($facetURL = "#url_for_facet_date_filter($fieldName, $value)")
-      #if ($facetURL != '')
-          <li><a href="$facetURL">$date.format('MMM yyyy', $theDate)</a> ($facet.value)</li>
-      #end
-    #end
-    #if ($field.after && $field.after > 0)
-      #set($value = "[" + $date.format("yyyy-MM-dd'T'HH:mm:ss'Z'", $field.after) + " TO *]")
-      #set($facetURL = "#url_for_facet_date_filter($fieldName, $value)")
-      <li><a href="$facetURL">After</a> ($field.after)</li>
-    #end
-    </ul>
-#end
-        
-
 
 #macro(display_facet_range $field, $display, $fieldName, $start, $end, $gap, $before, $after)
   <span class="facet-field">$display</span>
     <ul>
     #if($before && $before != "")
-      #set($value = "[* TO " + $start + "]")
+      #set($value = "[* TO " + "#format_value($start)" + "]")
       #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)")
-      <li><a href="$facetURL">Less than $start</a> ($before)</li>
+      <li><a href="$facetURL">Less than #format_value($start)</a> ($before)</li>
     #end
     #foreach ($facet in $field)
-      #set($rangeEnd = $math.add($facet.key, $gap))
+      #set($rangeEnd = "#range_get_to_value($facet.key, $gap)")
       #set($value = "[" + $facet.key + " TO " + $rangeEnd + "]")
       #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)")
       #if ($facetURL != '')
-        <li><a href="$facetURL">$facet.key</a> ($facet.value)</li>
+        <li><a href="$facetURL">$facet.key - #format_value($rangeEnd)</a> ($facet.value)</li>
       #end
     #end
-    #if($end && $end != "")
-      #set($value = "[" + $end + " TO *]")
+    #if($end && $end != "" && $after > 0)
+      #set($value = "[" + "#format_value($end)" + " TO *]")
       #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)")
-      <li><a href="$facetURL">More than $math.toNumber($end)</a> ($after)</li>
+      <li><a href="$facetURL">More than #format_value($end)</a> ($after)</li>
     #end
     </ul>
 #end
 
-##   <lst name="facet_pivot">
-##     <arr name="cat,inStock">
-##       <lst>
-##         <str name="field">cat</str>
-##         <str name="value">electronics</str>
-##         <int name="count">17</int>
-##         <arr name="pivot">
-##           <lst>
-##             <str name="field">inStock</str>
-##             <str name="value">true</str>
-##             <int name="count">13</int>
-##           </lst>
-##           <lst>
-##           <str name="field">inStock</str>
-##             <str name="value">false</str>
-##             <int name="count">4</int>
-##           </lst>
-##         </arr>
-##       </lst>
-
 ## $pivots is a list of facet_pivot
 #macro(display_facet_pivot $pivots, $display)
   #if($pivots.size() > 0)
@@ -181,4 +136,26 @@
       $v
     #end
   #end
-#end  
\ No newline at end of file
+#end  
+
+#macro(utc_date $theDate)
+$date.format("yyyy-MM-dd'T'HH:mm:ss'Z'",$theDate,$date.getLocale(),$date.getTimeZone().getTimeZone("UTC"))##
+#end
+
+#macro(format_value $val)
+#if(${val.class.name} == "java.util.Date")
+#utc_date($val)##
+#else
+$val##
+#end
+#end
+
+#macro(range_get_to_value $inval, $gapval)
+#if(${gapval.class.name} == "java.lang.String")
+$inval$gapval##
+#elseif(${gapval.class.name} == "java.lang.Float" || ${inval.class.name} == "java.lang.Float")
+$math.toDouble($math.add($inval,$gapval))##
+#else
+$math.add($inval,$gapval)##
+#end
+#end
\ No newline at end of file

Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/facet_ranges.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/facet_ranges.vm?rev=1165659&r1=1165658&r2=1165659&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/facet_ranges.vm (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/velocity/facet_ranges.vm Tue Sep  6 13:24:08 2011
@@ -1,30 +1,12 @@
-<!--
-  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("Facets generated by adding &facet.range= to the request")>Range Facets</h2>
-#set($field = $response.response.facet_counts.facet_ranges.price.counts)
-#set($start = $response.response.facet_counts.facet_ranges.price.start)
-#set($end = $response.response.facet_counts.facet_ranges.price.end)
-#set($gap = $response.response.facet_counts.facet_ranges.price.gap)
-#set($before = $response.response.facet_counts.facet_ranges.price.before)
-#set($after = $response.response.facet_counts.facet_ranges.price.after)
-##TODO: Make this display the "range", not just the lower value
-##TODO: Have a generic way to deal with ranges
-#display_facet_range($field, "Price (in $)", "price", $start, $end, $gap, $before, $after)
-
-#set($field = $response.response.facet_counts.facet_ranges.manufacturedate_dt)
-#display_facet_range_date($field, "Manufacture Date", "manufacturedate_dt")
\ No newline at end of file
+#foreach ($field in $response.response.facet_counts.facet_ranges)
+	#set($name = $field.key)
+	#set($display = "$name")
+	#set($f = $field.value.counts)
+	#set($start = $field.value.start)
+	#set($end = $field.value.end)
+	#set($gap = $field.value.gap)
+	#set($before = $field.value.before)
+	#set($after = $field.value.after)
+	#display_facet_range($f, $display, $name, $start, $end, $gap, $before, $after)
+#end
\ No newline at end of file