fixing getids

Author: mekarpeles

iiify/app.py

@@ -56,10 +56,11 @@ def mainentry():
 @app.route('/iiif/')
 def index():
     """Lists all available book and image items on Archive.org"""
-    cursor = request.args.get('cursor', '')
     q = request.args.get('q', '')
-    return jsonify(getids(q, cursor=cursor))
-
+    fields = request.args.get('fields', '')
+    sorts = request.args.get('sorts', '')
+    cursor = request.args.get('cursor', '')
+    return jsonify(getids(q, cursor=cursor, fields=fields, sorts=sorts))
 
 
 @app.route('/iiif/collection.json')

iiify/resolver.py

@@ -35,21 +35,13 @@ def purify_domain(domain):
     domain = re.sub('^http:\/\/', "https://", domain)
     return domain if domain.endswith('/iiif/') else domain + 'iiif/'
 
-def getids(q, limit=1000, cursor='', page=1):
-        q = request.args.get('q', '')
+def getids(q, limit=1000, cursor='', sorts='', fields=''):
         query = "(mediatype:(texts) OR mediatype:(image))" + \
                 ((" AND %s" % q) if q else "")
-        fields = request.args.get('fields', '')
-        sorts = request.args.get('sorts', '')
-        cursor = request.args.get('cursor', '')
-        version = 'v2'
-
         # 'all:1' also works
         q = "NOT identifier:..*" + (" AND (%s)" % query if query else "")
-        if version == 'v2':
-            return scrape(query=q, fields=fields, sorts=sorts, count=limit,
-                        cursor=cursor)
-        return search(q, page=page, limit=limit)
+        return scrape(query=q, fields=fields, sorts=sorts, count=limit, cursor=cursor)
+
 
 def scrape(query, fields="", sorts="", count=100, cursor="", security=True):
     """