Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resource index revision #1

Merged
merged 16 commits into from
Aug 22, 2014
Merged

Resource index revision #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a1da1eb
No separate ontologies for RI
palexander Aug 7, 2014
935581c
resourceId -> acronym
palexander Aug 7, 2014
cc70e94
resourceDescription -> description
palexander Aug 7, 2014
0b7725f
totalElements -> count
palexander Aug 7, 2014
9a47275
lastUpdateDate -> updated
palexander Aug 7, 2014
8319c85
resourceURL -> homepage
palexander Aug 7, 2014
5e38dd0
resourceName -> name
palexander Aug 7, 2014
ca762d4
Start of UI changes for REST endpoints
palexander Aug 7, 2014
a131d36
Make sure we have a valid submission before getting the download link
palexander Aug 13, 2014
c658070
Basic working RI support in UI
palexander Aug 21, 2014
699c8f9
RI highlighting works
palexander Aug 22, 2014
b86b29c
Update client version
palexander Aug 22, 2014
539a0f1
Silence output from deprecated method
palexander Aug 22, 2014
0d37853
Skip empty fields
palexander Aug 22, 2014
a083345
Remove commented code
palexander Aug 22, 2014
3bdee3c
Not-used constants for RI
palexander Aug 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Not-used constants for RI
  • Loading branch information
@palexander
palexander committed Aug 22, 2014
commit 3bdee3c3f627b7b48fa8f9b6cc655ecb409b0e52
5 changes: 0 additions & 5 deletions app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ class ApplicationController < ActionController::Base
REST_URI_BATCH = REST_URI + '/batch'
REST_URI_RECENT_MAPPINGS = "#{REST_URI}/mappings/recent/"

# Constants used primarily in the resource_index_controller, but also elsewhere.
RESOURCE_INDEX_URI = REST_URI + '/resource_index'
RI_ELEMENT_ANNOTATIONS_URI = RESOURCE_INDEX_URI + '/element_annotations'
RI_RANKED_ELEMENTS_URI = RESOURCE_INDEX_URI + '/ranked_elements'
RI_RESOURCES_URI = RESOURCE_INDEX_URI + '/resources'
# Note that STATS is a DIRECT CONNECTION to the JAVA-REST API
RI_STATS_URI = 'http://rest.bioontology.org/resource_index/statistics/all'

Expand Down
8 changes: 0 additions & 8 deletions app/controllers/resource_index_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ class ResourceIndexController < ApplicationController

layout 'ontology'

# Constants moved to the ApplicationController so they are available elsewhere too.
#RESOURCE_INDEX_URI = REST_URI + "/resource_index"
#RI_ELEMENT_ANNOTATIONS_URI = RESOURCE_INDEX_URI + "/element_annotations"
#RI_ONTOLOGIES_URI = RESOURCE_INDEX_URI + "/ontologies"
#RI_RANKED_ELEMENTS_URI = RESOURCE_INDEX_URI + "/ranked_elements"
#RI_RESOURCES_URI = RESOURCE_INDEX_URI + "/resources"
RI_HIERARCHY_MAX_LEVEL='3'

# Resource Index annotation offsets rely on latin-1 character sets for the count to be right. So we set all responses as latin-1.
before_filter :set_encoding

Expand Down