Revision 54755
Added by Konstantina Galouni about 5 years ago
searchDataproviders.service.ts | ||
---|---|---|
146 | 146 |
let link = properties.searchResourcesAPIURL; |
147 | 147 |
var compatibilities = ""; |
148 | 148 |
if(type == "Research Data"){ |
149 |
compatibilities = " and (datasourcecompatibilityid <> UNKNOWN) and (datasourcecompatibilityid = openaire2.0_data)" |
|
149 |
//compatibilities = " and (datasourcecompatibilityid <> UNKNOWN) and (datasourcecompatibilityid = openaire2.0_data)" |
|
150 |
compatibilities = " and (datasourcecompatibilityid = openaire2.0_data)"; |
|
150 | 151 |
}else if(type == "Publications"){ |
151 |
compatibilities = " and (datasourcecompatibilityid <> UNKNOWN) and (datasourcecompatibilityid <> openaire2.0_data)" |
|
152 |
//compatibilities = " and (datasourcecompatibilityid <> UNKNOWN) and (datasourcecompatibilityid <> openaire2.0_data)" |
|
153 |
compatibilities = " and (datasourcecompatibilityid <> openaire2.0_data)"; |
|
152 | 154 |
} |
153 | 155 |
let url = link+"?query=(((deletedbyinference = false) AND (oaftype exact datasource)) "+((compatibilities && compatibilities.length > 0)?" "+compatibilities+" ":"")+") and (relorganizationid exact "+id+")"; |
154 | 156 |
url += "&page="+(page-1)+"&size="+size+"&format=json"; |
... | ... | |
300 | 302 |
result['OAIPMHURL'] = OAIPMHURL; |
301 | 303 |
} |
302 | 304 |
} |
303 |
result['compatibility'] = this.getDataproviderCompatibility(resData); |
|
305 |
let compatibility = this.getDataproviderCompatibility(resData); |
|
306 |
result['compatibility'] = compatibility.classname; |
|
307 |
if(compatibility.classid == "UNKNOWN") { |
|
308 |
result['compatibilityUNKNOWN'] = true; |
|
309 |
} |
|
304 | 310 |
} else { |
305 |
result['compatibility'] = '';
|
|
311 |
result['compatibility'] = "";
|
|
306 | 312 |
} |
307 | 313 |
|
308 | 314 |
result['websiteURL'] = resData.websiteurl; |
... | ... | |
335 | 341 |
} |
336 | 342 |
} |
337 | 343 |
|
338 |
getDataproviderCompatibility(resData: any): string {
|
|
344 |
getDataproviderCompatibility(resData: any): {"classid": string, "classname": string} {
|
|
339 | 345 |
if(resData.hasOwnProperty('openairecompatibility')) { |
340 |
return resData['openairecompatibility'].classname;
|
|
346 |
return {"classid": resData['openairecompatibility'].classid, "classname": resData['openairecompatibility'].classname};
|
|
341 | 347 |
} else { |
342 |
return '';
|
|
348 |
return {"classid": "", "classname": ""};
|
|
343 | 349 |
} |
344 | 350 |
} |
345 | 351 |
|
Also available in: Unified diff
[trunk]: Merging branch 'changeDeposit' into trunk for revisions 54355:54751