Commit fa81046366c4baecc0932b0fa1ac8ad6f4285673
1 parent
0d080e7d
Fixed CKAN url generation
Showing
1 changed file
with
4 additions
and
3 deletions
datalets/datasetexplorer-datalet/js/buildtreemap.js
... | ... | @@ -179,6 +179,7 @@ function build(root, place_holder, select_listener) { |
179 | 179 | if (!d._children[0]._children) { |
180 | 180 | if (select_listener) { |
181 | 181 | var url = d._children[0].name; |
182 | + var ret = "Data provider not supported yet." | |
182 | 183 | |
183 | 184 | // Check if CKAN |
184 | 185 | var strDatasetPos = url.indexOf('/dataset/'); |
... | ... | @@ -187,7 +188,7 @@ function build(root, place_holder, select_listener) { |
187 | 188 | var urlSegment1 = url.substring(0, strDatasetPos); |
188 | 189 | var urlResourceEnd = url.indexOf('/', strResourcePos + 10); |
189 | 190 | var resourceId = url.substring(strResourcePos + 10, urlResourceEnd); |
190 | - url = urlSegment1 + "/api/action/datastore_search?resourceid=" + resourceId; | |
191 | + ret = urlSegment1 + "/api/action/datastore_search?resource_id=" + resourceId; | |
191 | 192 | } |
192 | 193 | |
193 | 194 | // Check if OPENDATASOFT |
... | ... | @@ -196,10 +197,10 @@ function build(root, place_holder, select_listener) { |
196 | 197 | var urlSegment1 = url.substring(0, strExploreDatasetPos); |
197 | 198 | var datasetEnd = url.indexOf(strExploreDatasetPos + 17, '/'); |
198 | 199 | var datasetId = url.substring(strExploreDatasetPos + 17, datasetEnd >= 0 ? datasetEnd : url.length); |
199 | - url = urlSegment1 + '/api/records/1.0/search?dataset=' + datasetId; | |
200 | + ret = urlSegment1 + '/api/records/1.0/search?dataset=' + datasetId; | |
200 | 201 | } |
201 | 202 | |
202 | - select_listener(url); | |
203 | + select_listener(ret); | |
203 | 204 | } |
204 | 205 | |
205 | 206 | var dataurl = d._children[0].name; | ... | ... |