fix /iiif & catalog.json

Author: mekarpeles

iiify/app.py

@@ -4,8 +4,6 @@
 import time
 import requests
 from flask import Flask, send_file, jsonify, abort, request, render_template, redirect
-from flask_limiter import Limiter
-from flask_limiter.util import get_remote_address
 from flask.ext.cors import CORS
 from iiif2 import iiif, web
 from resolver import ia_resolver, create_manifest, getids, collection, \
@@ -17,8 +15,7 @@
 
 app = Flask(__name__)
 cors = CORS(app) if cors else None
-#limiter = Limiter(app, key_func=get_remote_address,
-#                  default_limits=['10000 per day', '1000 per hour'])
+
 
 def sprite_concat(imgs):
     from PIL import Image
@@ -39,9 +36,9 @@ def sprite_concat(imgs):
 @app.route('/iiif/')
 def index():
     """Lists all available book and image items on Archive.org"""
-    cursor = request.args.get('cursor', '')
+    page = request.args.get('page', 1)
     q = request.args.get('q', '')
-    return jsonify(getids(q, cursor=cursor))
+    return jsonify(getids(q, page=page))
 
 @app.route('/iiif/url2iiif')
 def url2iiif():
@@ -59,10 +56,13 @@ def url2iiif():
 
 @app.route('/iiif/collection.json')
 def catalog():
-    cursor = request.args.get('cursor', '')
     q = request.args.get('q', '')
+    page = request.args.get('page', 1)
+    limit = request.args.get('limit', 100)
     domain = purify_domain(request.args.get('domain', request.url_root))
-    return ldjsonify(collection(domain, getids(q, limit, cursor)['ids']))
+    docs = getids(q, page=page, limit=limit).get('response', {}).get('docs', [])
+    ids = (doc['identifier'] for doc in docs)
+    return ldjsonify(collection(domain, ids))
 
 @app.route('/iiif/cache')
 def cache():

iiify/resolver.py

@@ -16,14 +16,20 @@
 def purify_domain(domain):
     return domain if domain.endswith('/iiif/') else domain + 'iiif/'
 
-def getids(q, limit=1000, cursor=''):
-    r = requests.get('%s/iiif' % apiurl, params={
-        'q': q,
-        'limit': limit,
-        'cursor': cursor
-    }, allow_redirects=True, timeout=None)
-    return r.json()
-
+def getids(query, page=1, limit=100, security=True, sort='', fields='identifier,title'):
+    limit = min(limit, 1000)
+    params = {
+        'q': query,
+        'rows': limit,
+        'sort': sort,
+        'page': page,
+        'fl[]': fields,
+        'output': 'json',
+    }
+    return requests.get(
+        "%s/advancedsearch.php" % ARCHIVE, params=params,
+        allow_redirects=True, timeout=None
+    ).json()
 
 def collection(domain, identifiers, label='Custom Archive.org IIIF Collection'):
     cs = {