Merge pull request #1862 from hypothesis/1796-add-any-field-handling-for-search-API

1796 add any field handling for search api

h/static/scripts/searchfilters.coffee

@@ -43,6 +43,26 @@ class SearchFilter
 
     tokens
 
+  # Turns string query into object, where the properties are the search terms
+  toObject: (searchtext) ->
+    obj = {}
+
+    addToObj = (key, data) ->
+      if obj[key]?
+        obj[key].push data
+      else
+        obj[key] = [data]
+
+    if searchtext
+      terms = @_tokenize(searchtext)
+      for term in terms
+        [filter, data] = term.split(':')
+        unless data
+          filter = 'any'
+          data = term
+        addToObj(filter, data)
+    obj
+
   # This function will generate the facets from the search-text input
   # It'll first tokenize it and then sorts them into facet lists
   # The output will be a dict with the following structure:

h/static/scripts/streamsearch.coffee

@@ -20,7 +20,8 @@ class StreamSearchController
     queryparser.populateFilter streamfilter, terms
 
     # Perform the search
-    query = angular.extend limit: 10, $scope.search.query
+    searchParams = searchfilter.toObject $scope.search.query
+    query = angular.extend limit: 10, searchParams
     store.SearchResource.get query, ({rows}) ->
       annotator.loadAnnotations(rows)