@@ -78,6 +78,7 @@ export class LandingHeaderComponent {
@Input() modal: AlertModal;
@Input() titleClass: string = null;
@Input() isTitleH1:boolean =true;
+ @Input() isSticky: boolean = false;
public removeUnknown(array: string[], type: boolean = false): string[] {
if (type) {
return this.removeDuplicates(array).filter(value => value.toLowerCase() !== 'unknown');
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index c7424b7e..f5980b18 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -173,7 +173,16 @@
uk-sticky="bottom: true; media: @m" [attr.offset]="offset"
cls-active="active">
-
+
+
+
0"
diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts
index 2088c441..f18a3327 100644
--- a/landingPages/result/resultLanding.component.ts
+++ b/landingPages/result/resultLanding.component.ts
@@ -450,7 +450,7 @@ export class ResultLandingComponent {
this.viewsFrameUrl = this.properties.statisticsFrameNewAPIURL + 'chart?json=' + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Monthly views","type":"column","query":{"name":"usagestats.results.views.monthly", "parameters":["' + this.id + '"], "profile":"OpenAIRE All-inclusive" }}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Monthly views"},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":true,"text":""}}}');
this.downloadsFrameUrl = this.properties.statisticsFrameNewAPIURL + 'chart?json=' +
encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Monthly downloads","type":"column","query":{"name":"usagestats.results.downloads.monthly", "parameters":["' + this.id + '"], "profile":"OpenAIRE All-inclusive" }}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Monthly downloads"},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":true,"text":""}}}');
- let pid:Identifier = Identifier.getResultPIDFromIdentifiers(this.resultLandingInfo.identifiers);
+ let pid:Identifier = Identifier.getPIDFromIdentifiers(this.resultLandingInfo.identifiers);
if (this.type == "result") { // no type was specified - update URL based this.resultLandingInfo.resultType
this.updateUrlWithType(pid);
}
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts
index 2c39afc7..71264777 100644
--- a/searchPages/searchUtils/newSearchPage.component.ts
+++ b/searchPages/searchUtils/newSearchPage.component.ts
@@ -957,7 +957,7 @@ export class NewSearchPageComponent {
let params = "";
let doisParams = "";
var DOIs: Identifier[] = Identifier.getIdentifiersFromString(value);
- if ((entityType == 'publication' || entityType == 'dataset' || entityType == 'software' || entityType == 'other' || entityType == "result" || entityType == "datasource" || entityType == "service")) {
+ if ((entityType == 'publication' || entityType == 'dataset' || entityType == 'software' || entityType == 'other' || entityType == "result" || entityType == "dataprovider" || entityType == "service")) {
for (let identifier of DOIs) {
// console.log(identifier)
// pidclassid exact \"doi\" and pid exact \"10.1016/j.nima.2015.11.134\"
@@ -1374,7 +1374,7 @@ export class NewSearchPageComponent {
(
(this.entityType == 'publication' || this.entityType == 'dataset' || this.entityType == 'software' || this.entityType == 'other' || this.entityType == "result")
||
- (this.entityType == "datasource" || this.entityType == "service")
+ (this.entityType == "service")
)
) {
let values = [];
@@ -1504,7 +1504,7 @@ export class NewSearchPageComponent {
let options = null;
if ((this.entityType == 'publication' || this.entityType == 'dataset' || this.entityType == 'software' || this.entityType == 'other' || this.entityType == "result")) {
options = this.resultTypeOptions;
- } else if (this.entityType == "datasource" || this.entityType == "service") {
+ } else if (this.entityType == "service") {
options = this.serviceTypeOptions;
}
if (options) {
diff --git a/services/metrics.service.ts b/services/metrics.service.ts
index e5be196c..97703c49 100644
--- a/services/metrics.service.ts
+++ b/services/metrics.service.ts
@@ -78,7 +78,6 @@ export class MetricsService {
}catch(e){
console.error(e)
}
- console.log(map)
return map;
}
diff --git a/services/searchDataproviders.service.ts b/services/searchDataproviders.service.ts
index 7d54195f..49b49462 100644
--- a/services/searchDataproviders.service.ts
+++ b/services/searchDataproviders.service.ts
@@ -301,6 +301,11 @@ export class SearchDataprovidersService {
//result['title'].url = OpenaireProperties.getsearchLinkToDataProvider();
//result['title'].url += Array.isArray(data) ? data[i]['result']['header']['dri:objIdentifier'] : data['result']['header']['dri:objIdentifier'];
result['id'] = Array.isArray(data) ? data[i]['result']['header']['dri:objIdentifier'] : data['result']['header']['dri:objIdentifier'];
+ let canId = ParsingFunctions.parseRelCanonicalId(Array.isArray(data) ? data[i] : data, "datasource");
+ if (canId) {
+ result['id'] = canId;
+ }
+ result['relcanId'] = result['id'];
result['type'] = this.getDataproviderType(resData);
if (resData['eosctype']) {
diff --git a/utils/entities/dataProviderInfo.ts b/utils/entities/dataProviderInfo.ts
index 8688fe3f..0f329175 100644
--- a/utils/entities/dataProviderInfo.ts
+++ b/utils/entities/dataProviderInfo.ts
@@ -13,6 +13,9 @@ export class DataproviderProvenance {
}
export class DataProviderInfo {
+ relcanId;
+ objIdentifier: string;
+ record;
title: { "name": string, "url": string };
officialName: string;
type: string;
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts
index d820992e..35a72301 100644
--- a/utils/result-preview/result-preview.component.ts
+++ b/utils/result-preview/result-preview.component.ts
@@ -99,7 +99,7 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
}
}
getPID() {
- return Identifier.getResultPIDFromIdentifiers(this.result.identifiers);
+ return Identifier.getPIDFromIdentifiers(this.result.identifiers);
}
public initBeforeTitle() {
diff --git a/utils/string-utils.class.ts b/utils/string-utils.class.ts
index 15ab8fa6..fd496ad6 100644
--- a/utils/string-utils.class.ts
+++ b/utils/string-utils.class.ts
@@ -207,8 +207,8 @@ export class Identifier {
return (strict?null:{"class": "doi", "id": pid});
}
- public static getResultPIDFromIdentifiers(identifiers: Map): Identifier {
- let classes:string [] = ["doi", "handle", "pmc", "pmid"];
+ public static getPIDFromIdentifiers(identifiers: Map): Identifier {
+ let classes:string [] = ["doi", "handle", "pmc", "pmid", "re3data"];
if(identifiers) {
for (let cl of classes){
if(identifiers.get(cl)){