|
|
@@ -32,54 +32,51 @@ import notebook.monkey_patches
|
|
|
# Views
|
|
|
urlpatterns = patterns('notebook.views',
|
|
|
url(r'^$', 'notebook', name='index'),
|
|
|
- url(r'^notebook$', 'notebook', name='notebook'),
|
|
|
- url(r'^notebooks$', 'notebooks', name='notebooks'),
|
|
|
- url(r'^new$', 'new', name='new'),
|
|
|
- url(r'^download$', 'download', name='download'),
|
|
|
- url(r'^install_examples$', 'install_examples', name='install_examples'),
|
|
|
- url(r'^delete$', 'delete', name='delete'),
|
|
|
- url(r'^copy$', 'copy', name='copy'),
|
|
|
+ url(r'^notebook/?$', 'notebook', name='notebook'),
|
|
|
+ url(r'^notebooks/?$', 'notebooks', name='notebooks'),
|
|
|
+ url(r'^new/?$', 'new', name='new'),
|
|
|
+ url(r'^download/?$', 'download', name='download'),
|
|
|
+ url(r'^install_examples/?$', 'install_examples', name='install_examples'),
|
|
|
+ url(r'^delete/?$', 'delete', name='delete'),
|
|
|
+ url(r'^copy/?$', 'copy', name='copy'),
|
|
|
|
|
|
- url(r'^editor$', 'editor', name='editor'),
|
|
|
- url(r'^browse/(?P<database>\w+)/(?P<table>\w+)$', 'browse', name='browse'),
|
|
|
+ url(r'^editor/?$', 'editor', name='editor'),
|
|
|
+ url(r'^browse/(?P<database>\w+)/(?P<table>\w+)/?$', 'browse', name='browse'),
|
|
|
)
|
|
|
|
|
|
# APIs
|
|
|
urlpatterns += patterns('notebook.api',
|
|
|
- url(r'^api/create_session$', 'create_session', name='create_session'),
|
|
|
- url(r'^api/close_session$', 'close_session', name='close_session'),
|
|
|
- url(r'^api/execute$', 'execute', name='execute'),
|
|
|
- url(r'^api/check_status$', 'check_status', name='check_status'),
|
|
|
- url(r'^api/fetch_result_data$', 'fetch_result_data', name='fetch_result_data'),
|
|
|
- url(r'^api/fetch_result_metadata$', 'fetch_result_metadata', name='fetch_result_metadata'),
|
|
|
- url(r'^api/cancel_statement$', 'cancel_statement', name='cancel_statement'),
|
|
|
- url(r'^api/close_statement$', 'close_statement', name='close_statement'),
|
|
|
- url(r'^api/get_logs$', 'get_logs', name='get_logs'),
|
|
|
+ url(r'^api/create_session/?$', 'create_session', name='create_session'),
|
|
|
+ url(r'^api/close_session/?$', 'close_session', name='close_session'),
|
|
|
+ url(r'^api/execute/?$', 'execute', name='execute'),
|
|
|
+ url(r'^api/check_status/?$', 'check_status', name='check_status'),
|
|
|
+ url(r'^api/fetch_result_data/?$', 'fetch_result_data', name='fetch_result_data'),
|
|
|
+ url(r'^api/fetch_result_metadata/?$', 'fetch_result_metadata', name='fetch_result_metadata'),
|
|
|
+ url(r'^api/cancel_statement/?$', 'cancel_statement', name='cancel_statement'),
|
|
|
+ url(r'^api/close_statement/?$', 'close_statement', name='close_statement'),
|
|
|
+ url(r'^api/get_logs/?$', 'get_logs', name='get_logs'),
|
|
|
|
|
|
- url(r'^api/historify$', 'historify', name='historify'),
|
|
|
- url(r'^api/get_history', 'get_history', name='get_history'),
|
|
|
- url(r'^api/clear_history', 'clear_history', name='clear_history'),
|
|
|
+ url(r'^api/historify/?$', 'historify', name='historify'),
|
|
|
+ url(r'^api/get_history/?', 'get_history', name='get_history'),
|
|
|
+ url(r'^api/clear_history/?', 'clear_history', name='clear_history'),
|
|
|
|
|
|
- url(r'^api/notebook/save$', 'save_notebook', name='save_notebook'),
|
|
|
- url(r'^api/notebook/open$', 'open_notebook', name='open_notebook'),
|
|
|
- url(r'^api/notebook/close$', 'close_notebook', name='close_notebook'),
|
|
|
+ url(r'^api/notebook/save/?$', 'save_notebook', name='save_notebook'),
|
|
|
+ url(r'^api/notebook/open/?$', 'open_notebook', name='open_notebook'),
|
|
|
+ url(r'^api/notebook/close/?$', 'close_notebook', name='close_notebook'),
|
|
|
)
|
|
|
|
|
|
# Github
|
|
|
urlpatterns += patterns('notebook.api',
|
|
|
- url(r'^api/github/fetch$', 'github_fetch', name='github_fetch'),
|
|
|
- url(r'^api/github/authorize', 'github_authorize', name='github_authorize'),
|
|
|
- url(r'^api/github/callback', 'github_callback', name='github_callback'),
|
|
|
+ url(r'^api/github/fetch/?$', 'github_fetch', name='github_fetch'),
|
|
|
+ url(r'^api/github/authorize/?$', 'github_authorize', name='github_authorize'),
|
|
|
+ url(r'^api/github/callback/?$', 'github_callback', name='github_callback'),
|
|
|
)
|
|
|
|
|
|
# Assist API
|
|
|
urlpatterns += patterns('notebook.api',
|
|
|
- url(r'^api/autocomplete/$', 'autocomplete', name='api_autocomplete_databases'),
|
|
|
- url(r'^api/autocomplete/(?P<database>\w+)$', 'autocomplete', name='api_autocomplete_tables'),
|
|
|
- url(r'^api/autocomplete/(?P<database>\w+)/$', 'autocomplete', name='api_autocomplete_tables'),
|
|
|
- url(r'^api/autocomplete/(?P<database>\w+)/(?P<table>\w+)$', 'autocomplete', name='api_autocomplete_columns'),
|
|
|
- url(r'^api/autocomplete/(?P<database>\w+)/(?P<table>\w+)/$', 'autocomplete', name='api_autocomplete_columns'),
|
|
|
- url(r'^api/autocomplete/(?P<database>\w+)/(?P<table>\w+)/(?P<column>\w+)$', 'autocomplete', name='api_autocomplete_column'),
|
|
|
- url(r'^api/autocomplete/(?P<database>\w+)/(?P<table>\w+)/(?P<column>\w+)/$', 'autocomplete', name='api_autocomplete_column'),
|
|
|
- url(r'^api/autocomplete/(?P<database>\w+)/(?P<table>\w+)/(?P<column>\w+)/(?P<nested>.+)$', 'autocomplete', name='api_autocomplete_nested'),
|
|
|
+ url(r'^api/autocomplete/?$', 'autocomplete', name='api_autocomplete_databases'),
|
|
|
+ url(r'^api/autocomplete/(?P<database>\w+)/?$', 'autocomplete', name='api_autocomplete_tables'),
|
|
|
+ url(r'^api/autocomplete/(?P<database>\w+)/(?P<table>\w+)/?$', 'autocomplete', name='api_autocomplete_columns'),
|
|
|
+ url(r'^api/autocomplete/(?P<database>\w+)/(?P<table>\w+)/(?P<column>\w+)/?$', 'autocomplete', name='api_autocomplete_column'),
|
|
|
+ url(r'^api/autocomplete/(?P<database>\w+)/(?P<table>\w+)/(?P<column>\w+)/(?P<nested>.+)/?$', 'autocomplete', name='api_autocomplete_nested'),
|
|
|
)
|