WebCompDev / COMPONENTS

Commit 642c024b50ab5c6fc3c2f6c1aad67baa2fdd402c

Authored by isisadmin
2 parents bcfa69c3 27f1380e

Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS

Inline Side-by-side
Showing 1 changed file with 27 additions and 17 deletions
datalets/base-datalet/base-datalet.html
  View file @642c024
... ... @@ -97,7 +97,7 @@ Example :
97 97 <!--<b>Source:</b><span id="domain"></span>-->
98 98 <!--<b></b><span id="domainPage"></span>-->
99 99  
100   - <b>Source:</b> <a id="base_datalet_source" target="_blank"></a> ( <a id="base_datalet_link" target="_blank">dataset</a> )
  100 + <b>Source:</b> <a id="base_datalet_source" target="_blank"></a> (<a id="base_datalet_link" target="_blank">dataset</a>)
101 101  
102 102 <div id="base_datalet_rtp">
103 103 <div id="rtp">Powered by ROUTE-TO-PA</div>
... ... @@ -140,33 +140,46 @@ Example :
140 140 * @method ready
141 141 */
142 142 ready: function(){
  143 + //cKan organized with or not catalog
  144 + queryInitial = this.dataUrl.substring(0, this.dataUrl.indexOf("api")); //SOURCE
143 145  
  146 + urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
  147 + this.$.base_datalet_source.innerHTML = urlSource;
  148 + this.$.base_datalet_source.setAttribute("href", urlSource);
144 149  
145 150  
146   - var urlDatalet;
147   - if(this.dataUrl != undefined){
  151 + //OpenDataSoft check
  152 + if(this.dataUrl.indexOf("/records/") > -1 )
  153 + {
  154 + //Resourceid of a datalet
  155 + var query = this.dataUrl.substring(this.dataUrl.indexOf("?"), this.dataUrl.length);
  156 + var params = this.decomponeQueryString(query);
  157 + resultIssyIdDatalet = params["dataset"];
  158 + resultIssyAPI = "explore/dataset/";
  159 + urlPageDatasetIssy = queryInitial + resultIssyAPI + resultIssyIdDatalet + "/";
148 160  
  161 + this.$.base_datalet_link.setAttribute("href", urlPageDatasetIssy);
  162 + }
  163 + else
  164 + {
  165 + //CKAN portal
  166 + var urlDatalet;
  167 + if(this.dataUrl != undefined) {
149 168 var apiIdResource = "resource_show?id=";
150 169  
151 170 //Resourceid of a datalet
152 171 var query = this.dataUrl.substring(this.dataUrl.indexOf("?"), this.dataUrl.length);
153   - var params = this.decomponeQueryString(query);
  172 + var params = this.decomponeQueryString(query);
  173 + //CKAN
154 174 resultIdDatalet = params["resource_id"];
155 175  
156 176 //cKan organized with or not catalog
157   - queryInitial = this.dataUrl.substring(0, this.dataUrl.indexOf("api"));
158   - queryFinal = this.dataUrl.substring(this.dataUrl.indexOf("api"), this.dataUrl.indexOf("datastore_search"));
159   -
160   - urlDatalet = queryInitial + queryFinal + apiIdResource + resultIdDatalet;
161   - urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
162   -
163   -// this.$.domainPage.innerHTML = '<a href=' + urlSource + ' target=' + "_blank>" + urlSource + '</a>'+ "." ;
164   -
165   - this.$.base_datalet_source.innerHTML = urlSource;
166   - this.$.base_datalet_source.setAttribute("href", urlSource);
  177 + queryFinal = this.dataUrl.substring(this.dataUrl.indexOf("api"), this.dataUrl.indexOf("datastore_search"));
167 178  
  179 + urlDatalet = queryInitial + queryFinal + apiIdResource + resultIdDatalet;
168 180 this.requestDataletData(urlDatalet);
169 181 }
  182 + }
170 183 },
171 184 /**
172 185 * Set the domain url to show in the footer
... ... @@ -210,7 +223,6 @@ Example :
210 223 */
211 224 handleDataletResponse: function(e) {
212 225 this.objectDatalet.json_resultDatalet.value = e;
213   -
214 226 //packageId of a give datalet
215 227 packageIdDatalet = this.objectDatalet.json_resultDatalet.value.result.package_id;
216 228 resourceId = this.objectDatalet.json_resultDatalet.value.result.id;
... ... @@ -228,8 +240,6 @@ Example :
228 240 urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
229 241  
230 242 this.$.base_datalet_link.setAttribute("href", urlDatalet);
231   -// this.$.domainPage.innerHTML += " (" + ' <a href=' + urlDatalet + ' target=' + "_blank>" + "Dataset's page" + '</a>' + " )";
232   -
233 243 }
234 244 }
235 245 });
... ...