First attempts at a get_favored_results method to find what people are generally...

diff --git a/contrib/sobol/admin.py b/contrib/sobol/admin.py
index eb6fd03..5407796 100644 (file)
--- a/contrib/sobol/admin.py
+++ b/contrib/sobol/admin.py
@@ -33,7 +33,8 @@ class SearchAdmin(admin.ModelAdmin):
 
 
 class SearchViewAdmin(EntityAdmin):
-       pass
+       raw_id_fields = ('results_page',)
+       related_lookup_fields = {'fk': raw_id_fields}
 
 
 admin.site.register(Search, SearchAdmin)

diff --git a/contrib/sobol/models.py b/contrib/sobol/models.py
index 8113750..cd9b698 100644 (file)
--- a/contrib/sobol/models.py
+++ b/contrib/sobol/models.py
@@ -7,7 +7,8 @@ from philo.contrib.sobol import registry
 from philo.contrib.sobol.forms import SearchForm
 from philo.contrib.sobol.utils import HASH_REDIRECT_GET_KEY, URL_REDIRECT_GET_KEY, SEARCH_ARG_GET_KEY, check_redirect_hash
 from philo.exceptions import ViewCanNotProvideSubpath
-from philo.models import MultiView, Page, SlugMultipleChoiceField
+from philo.models import MultiView, Page
+from philo.models.fields import SlugMultipleChoiceField
 from philo.validators import RedirectValidator
 import datetime
 try:
@@ -20,7 +21,53 @@ class Search(models.Model):
        string = models.TextField()
        
        def __unicode__(self):
-               return self.search_string
+               return self.string
+       
+       def get_favored_results(self, error=5):
+               """Calculate the set of most-favored results. A higher error
+               will cause this method to be more reticent about adding new
+               items."""
+               results = self.result_urls.values_list('pk', 'url',)
+               
+               result_dict = {}
+               for pk, url in results:
+                       result_dict[pk] = {'url': url, 'value': 0}
+               
+               clicks = Click.objects.filter(result__pk__in=result_dict.keys()).values_list('result__pk', 'datetime')
+               
+               now = datetime.datetime.now()
+               
+               def datetime_value(dt):
+                       days = (now - dt).days
+                       if days < 0:
+                               raise ValueError("Click dates must be in the past.")
+                       if days == 0:
+                               value = 1.0
+                       else:
+                               value = 1.0/days**2
+                       return value
+               
+               for pk, dt in clicks:
+                       value = datetime_value(dt)
+                       result_dict[pk]['value'] += value
+               
+               #TODO: is there a reasonable minimum value for consideration?
+               subsets = {}
+               for d in result_dict.values():
+                       subsets.setdefault(d['value'], []).append(d)
+               
+               # Now calculate the result set.
+               results = []
+               
+               def cost(value):
+                       return error*sum([(value - item['value'])**2 for item in results])
+               
+               for value, subset in sorted(subsets.items(), cmp=lambda x,y: cmp(y[0], x[0])):
+                       if value > cost(value):
+                               results += subset
+                       else:
+                               break
+               return results
        
        class Meta:
                ordering = ['string']
@@ -53,9 +100,12 @@ class Click(models.Model):
 class SearchView(MultiView):
        results_page = models.ForeignKey(Page, related_name='search_results_related')
        searches = SlugMultipleChoiceField(choices=registry.iterchoices())
-       allow_partial_loading = models.BooleanField(default=True)
+       enable_ajax_api = models.BooleanField("Enable AJAX API", default=True)
        placeholder_text = models.CharField(max_length=75, default="Search")
        
+       def __unicode__(self):
+               return u"%s (%s)" % (self.placeholder_text, u", ".join([display for slug, display in registry.iterchoices()]))
+       
        def get_reverse_params(self, obj):
                raise ViewCanNotProvideSubpath
        
@@ -64,12 +114,15 @@ class SearchView(MultiView):
                urlpatterns = patterns('',
                        url(r'^$', self.results_view, name='results'),
                )
-               if self.allow_partial_loading:
+               if self.enable_ajax_api:
                        urlpatterns += patterns('',
-                               url(r'^(?P<slug>[\w-]+)/?', self.partial_ajax_results_view, name='partial_ajax_results_view')
+                               url(r'^(?P<slug>[\w-]+)', self.ajax_api_view, name='ajax_api_view')
                        )
                return urlpatterns
        
+       def get_search_instance(self, slug, search_string):
+               return registry[slug](search_string.lower())
+       
        def results_view(self, request, extra_context=None):
                results = None
                
@@ -95,13 +148,12 @@ class SearchView(MultiView):
                                                messages.add_message(request, messages.INFO, "The link you followed had been tampered with. Here are all the results for your search term instead!")
                                                # TODO: Should search_string be escaped here?
                                                return HttpResponseRedirect("%s?%s=%s" % (request.path, SEARCH_ARG_GET_KEY, search_string))
-                               if not self.allow_partial_loading:
+                               if not self.enable_ajax_api:
                                        search_instances = []
                                        if eventlet:
                                                pool = eventlet.GreenPool()
                                        for slug in self.searches:
-                                               search = registry[slug]
-                                               search_instance = search(search_string)
+                                               search_instance = self.get_search_instance(slug, search_string)
                                                search_instances.append(search_instance)
                                                if eventlet:
                                                        pool.spawn_n(self.make_result_cache, search_instance)
@@ -114,6 +166,7 @@ class SearchView(MultiView):
                                        })
                else:
                        form = SearchForm()
+               
                context.update({
                        'form': form
                })
@@ -122,17 +175,15 @@ class SearchView(MultiView):
        def make_result_cache(self, search_instance):
                search_instance.results
        
-       def partial_ajax_results_view(self, request, slug, extra_context=None):
+       def ajax_api_view(self, request, slug, extra_context=None):
                search_string = request.GET.get(SEARCH_ARG_GET_KEY)
                
-               if not request.is_ajax() or not self.allow_partial_loading or slug not in self.searches or search_string is None:
+               if not request.is_ajax() or not self.enable_ajax_api or slug not in self.searches or search_string is None:
                        raise Http404
                
-               search = registry[slug]
-               search_instance = search(search_string.lower())
-               results = search_instance.results
+               search_instance = self.get_search_instance(slug, search_string)
                response = json.dumps({
-                       'results': results,
-                       'template': search_instance.get_ajax_result_template()
+                       'results': search_instance.results,
+                       'template': search_instance.get_template()
                })
                return response
\ No newline at end of file