Skip to content

Commit

Permalink
add phylesystem-api translations (#117)
Browse files Browse the repository at this point in the history
  • Loading branch information
jar398 committed Oct 27, 2016
1 parent e20426b commit f6fba56
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
5 changes: 5 additions & 0 deletions deploy/setup/opentree-shared.conf
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
# ------------------------------------------------------------
# Public v3 API (originally cloned from v2)


# *** ATTENTION! If you edit these directives, also please change
# *** the translations list at the bottom of ws-tests/opentreetesting.py
# *** to match.

# phylesystem-api is provided via web2py
# N.B. that we should match "bare" URLs like '/v3/study' to create a resource!
RewriteEngine on
Expand Down
6 changes: 5 additions & 1 deletion ws-tests/opentreetesting.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,11 @@ def writable_api_host_and_oauth_or_exit(fn):
# Mimic the behavior of apache so that services can be tested without
# having apache running. See deploy/setup/opentree-shared.conf

translations = [('/v2/study/', '/phylesystem/v1/study/'),
translations = [# phylesystem-api
('/v3/study', '/phylesystem/v1/study'),
('/v3/collection', '/phylesystem/v1/collection'),
('/v3/amendment', '/phylesystem/v1/amendment'),
('/v2/study/', '/phylesystem/v1/study/'),
('/cached/', '/phylesystem/default/cached/'),
# treemachine
('/v2/graph/', '/db/data/ext/graph/graphdb/'),
Expand Down

0 comments on commit f6fba56

Please sign in to comment.