Эх сурвалжийг харах

[search] Smarter number of slots for text range facets

Romain Rigaux 11 жил өмнө
parent
commit
bc7ca8a63f

+ 2 - 6
apps/search/src/search/templates/search2.mako

@@ -485,12 +485,10 @@ ${ commonheader(_('Search'), "search", user, "60px") | n,unicode }
       ${ _('Label') }: <input type="text" data-bind="value: label" />
       ${ _('Field') }: <input type="text" data-bind="value: field" />
       <br/>
-      ${ _('Range') }: <input type="checkbox" data-bind="checked: isRange" />      
-      <br/>
       ${ _('Start') }: <input type="text" data-bind="value: properties.start" />
       ${ _('End') }: <input type="text" data-bind="value: properties.end" />
       ${ _('Gap') }: <input type="text" data-bind="value: properties.gap" />
-    </div>  
+    </div> 
 
     <div data-bind="barChart: {data: counts, field: field, label: label, transformer: barChartDataTransformer, onClick: function(d){viewModel.query.selectFacet({count: d.y,selected: false,value: d.x,cat: field})}}" />
   </div>
@@ -506,9 +504,7 @@ ${ commonheader(_('Search'), "search", user, "60px") | n,unicode }
   <div class="row-fluid" data-bind="with: $root.getFacetFromQuery(id)">
     <div data-bind="visible: $root.isEditing, with: $root.collection.getFacetById($parent.id())" style="margin-bottom: 20px">      
       ${ _('Label') }: <input type="text" data-bind="value: label" />
-      ${ _('Field') }: <input type="text" data-bind="value: field" />
-      <br/>
-      ${ _('Range') }: <input type="checkbox" data-bind="checked: isRange" />      
+      ${ _('Field') }: <input type="text" data-bind="value: field" />    
     </div>  
 
     <div data-bind="pieChart: {data: counts, transformer: pieChartDataTransformer, onClick: function(d){viewModel.query.selectFacet(d.data.obj)}}" />

+ 8 - 9
apps/search/src/search/views.py

@@ -491,7 +491,12 @@ def new_facet(request, collection_id):
     is_range = False
 
     try:
-      SLOTS = 50
+      if widget_type == 'pie-widget':
+        SLOTS = 5
+      elif widget_type == 'facet-widget':
+        SLOTS = 10
+      else:
+        SLOTS = 50
       stats_json = SolrApi(SOLR_URL.get(), request.user).stats(collection['name'], [facet_field])
       stat_facet = stats_json['stats']['stats_fields'][facet_field]
       
@@ -533,14 +538,8 @@ def new_facet(request, collection_id):
         'gap': gap,
         'canRange': True,
       })       
-#    elif widget_type == 'hit-widget':
-#      facet_type = 'query'
-#    elif widget_type == 'histogram-widget':
-#      facet_type = 'range'
-#    elif widget_type == 'bar-widget':
-#      facet_type = 'range'
-#    elif widget_type == 'pie-widget':
-#      facet_type = 'range'      
+    elif widget_type == 'hit-widget':
+      facet_type = 'query'      
     else:
       facet_type = 'field'