From 5629db9509cd1f6b95c68ba9e294603265a81019 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Tue, 23 Oct 2018 13:42:07 +0000
Subject: [PATCH] 1. Add 'openDoarURL' and 'r3DataURL' properties. 2. #3966:
 openDoarURL value updated. 3. dataProvider landing page: parse openDoarId or
 r3DataId and show links according to relevant property.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53545 d315682c-612b-4755-9ff5-7f18f6832af3
---
 landingPages/dataProvider/dataProvider.component.html | 8 ++++----
 landingPages/dataProvider/dataProvider.service.ts     | 4 ++--
 utils/entities/dataProviderInfo.ts                    | 4 ++--
 utils/properties/env-properties.ts                    | 2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html
index 913c7bb5..45e42dab 100644
--- a/landingPages/dataProvider/dataProvider.component.html
+++ b/landingPages/dataProvider/dataProvider.component.html
@@ -55,17 +55,17 @@
                         </span>
 
                 </li>
-                <li *ngIf="dataProviderInfo.openDoarURL">
+                <li *ngIf="dataProviderInfo.openDoarId">
                         <span class="uk-button-text">
-                            <a target="_blank" href="{{dataProviderInfo.openDoarURL}}">
+                            <a target="_blank" href="{{properties.openDoarURL+dataProviderInfo.openDoarId}}">
                                 Detailed content provider information (OpenDOAR)
                             </a>
                         </span>
 
                 </li>
-                <li *ngIf="dataProviderInfo.r3DataURL">
+                <li *ngIf="dataProviderInfo.r3DataId">
                         <span class="uk-button-text">
-                            <a target="_blank" href="{{dataProviderInfo.r3DataURL}}">
+                            <a target="_blank" href="{{properties.r3DataURL+dataProviderInfo.r3DataId}}">
                                 Detailed content provider information (Re3data)
                             </a>
                         </span>
diff --git a/landingPages/dataProvider/dataProvider.service.ts b/landingPages/dataProvider/dataProvider.service.ts
index f0fcfc11..0636a206 100644
--- a/landingPages/dataProvider/dataProvider.service.ts
+++ b/landingPages/dataProvider/dataProvider.service.ts
@@ -73,10 +73,10 @@ export class DataProviderService {
             var originalId =(data[0].originalId)?data[0].originalId:"";
             if(originalId && originalId != ""){
               if(originalId.indexOf("opendoar____::") != -1){
-                this.dataProviderInfo.openDoarURL = "http://www.opendoar.org/find.php?format=full&rID="+originalId.split("opendoar____::")[1];
+                this.dataProviderInfo.openDoarId = originalId.split("opendoar____::")[1];
 
               }else if (originalId.indexOf("re3data_____::") != -1){
-                this.dataProviderInfo.r3DataURL = "http://service.re3data.org/repository/"+originalId.split("re3data_____::")[1];
+                this.dataProviderInfo.r3DataId = originalId.split("re3data_____::")[1];
               }
               this.dataProviderInfo.originalId = originalId;
             }
diff --git a/utils/entities/dataProviderInfo.ts b/utils/entities/dataProviderInfo.ts
index 26f0b225..aefa0623 100644
--- a/utils/entities/dataProviderInfo.ts
+++ b/utils/entities/dataProviderInfo.ts
@@ -5,8 +5,8 @@ export class DataProviderInfo {
     registry: boolean;
     compatibility: { "info": string, "name": string, "id": string };
     oaiPmhURL: string;
-    openDoarURL: string;
-    r3DataURL: string;
+    openDoarId: string;
+    r3DataId: string;
     originalId: string;
     countries: string[];
 
diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts
index 27cf2710..6f6ed1ea 100644
--- a/utils/properties/env-properties.ts
+++ b/utils/properties/env-properties.ts
@@ -35,6 +35,8 @@ export class EnvProperties {
   cordisURL;
   pmcURL;
   handleURL;
+  openDoarURL;
+  r3DataURL;
 
   // Zenodo's url
   zenodo;