From f8b5bbd76d0531aaa416b5fc3870de7556b2dc4c Mon Sep 17 00:00:00 2001
From: wes <wjak56@gmail.com>
Date: Tue, 17 Jan 2017 18:55:54 -0500
Subject: [PATCH] remove join function for operator.and_

---
 src/search.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/search.py b/src/search.py
index 7062600..a18bef9 100755
--- a/src/search.py
+++ b/src/search.py
@@ -1,6 +1,6 @@
 #! /usr/bin/python3
 from functools import reduce
-from operator import or_
+from operator import or_, and_
 from hashlib import sha1
 from sys import exit, stderr
 from json import loads
@@ -142,12 +142,6 @@ def filterSem(term):
                 "sections.sem" : [term]
                 })
 
-def join(x, y):
-    """
-    Join two queries
-    """
-    return x & y
-
 def filterSections(secs):
     """
     Get rid of tutorial sections
@@ -178,7 +172,7 @@ def search_courses(terms):
     # Reduce joins all of the queries into one query
     # It will search for the conjunction of all of them
     # So that means it cares about each query equally
-    q = reduce(join, qs)
+    q = reduce(and_, qs)
 
     s = (Search(using=es, index="oersearch")
         .query(q))[0:100] # only return up to 100 results for now