diff --git a/iiify/app.py b/iiify/app.py index 67796d1..85dc308 100755 --- a/iiify/app.py +++ b/iiify/app.py @@ -230,7 +230,7 @@ def manifest2(identifier): identifier, page = identifier.split('$') page = int(page) try: - return ldjsonify(create_manifest(identifier, domain=domain, page=page, version='2/')) + return ldjsonify(create_manifest(identifier, domain=domain, page=page)) except Exception as excpt: print("Exception occurred in manifest2:") print(excpt) diff --git a/iiify/resolver.py b/iiify/resolver.py index 5955949..2e5e529 100644 --- a/iiify/resolver.py +++ b/iiify/resolver.py @@ -236,14 +236,14 @@ def manifest_page(identifier, label='', page='', width='', height='', metadata=N } -def create_manifest(identifier, domain=None, page=None, version=""): +def create_manifest(identifier, domain=None, page=None): path = os.path.join(media_root, identifier) resp = requests.get('%s/metadata/%s' % (ARCHIVE, identifier)).json() metadata = resp.get("metadata", {}) manifest = { '@context': PRZ_CTX, - '@id': '%s%s%s/manifest.json' % (domain, version, identifier), + '@id': '%s2/%s/manifest.json' % (domain,identifier), '@type': 'sc:Manifest', 'description': metadata.get('description', ''), 'logo': 'https://encrypted-tbn2.gstatic.com/images?q=tbn:ANd9GcReMN4l9cgu_qb1OwflFeyfHcjp8aUfVNSJ9ynk2IfuHwW1I4mDSw', diff --git a/tests/test_collections.py b/tests/test_collections.py index 692d5f3..d5a54b8 100644 --- a/tests/test_collections.py +++ b/tests/test_collections.py @@ -6,7 +6,7 @@ class TestCollections(unittest.TestCase): def setUp(self) -> None: - os.environ["FLASK_ENV"] = "testing" + os.environ["FLASK_CACHE_DISABLE"] = "true" self.test_app = FlaskClient(app) def test_v3_collection(self): @@ -24,7 +24,6 @@ def test_v3_collection_pages(self): def test_collections_proxy(self): resp = self.test_app.get("/iiif/frankbford/collection.json") - print(resp.status_code) self.assertEqual(resp.status_code, 200) def test_v3_collection_pages_proxy(self): diff --git a/tests/test_images.py b/tests/test_images.py index 3a6f3c3..8c7b620 100644 --- a/tests/test_images.py +++ b/tests/test_images.py @@ -7,7 +7,7 @@ class TestImages(unittest.TestCase): def setUp(self) -> None: - os.environ["FLASK_ENV"] = "testing" + os.environ["FLASK_CACHE_DISABLE"] = "true" self.test_app = FlaskClient(app) def test_v3_resolving(self):