Merge branch 'beta' of https://code-repo.d4science.org/D-Net/dnet-hadoop into beta

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/datacite/hostedBy_map.json

@@ -15,7 +15,7 @@
   "official_name": "Aperta TÜBİTAK Open Archive"
  },
  "BL.CAM": {
-  "openaire_id": "re3data_____::r3d100010620",
+  "openaire_id": "opendoar____::109",
   "datacite_name": "Apollo",
   "official_name": "Apollo"
  },
@@ -196,7 +196,7 @@
  },
  "CSIC.DIGITAL": {
   "openaire_id": "re3data_____::r3d100011076",
-  "datacite_name": "DIGITAL.CSIC",
+  "datacite_name": "Digital CSIC",
   "official_name": "DIGITAL.CSIC"
  },
  "BL.DRI": {
@@ -644,6 +644,11 @@
   "datacite_name": "PANGAEA",
   "official_name": "PANGAEA"
  },
+ "TIB.PANGAEA": {
+  "openaire_id": "re3data_____::r3d100010134",
+  "datacite_name": "PANGAEA",
+  "official_name": "PANGAEA"
+ },
  "NASAPDS.NASAPDS": {
   "openaire_id": "re3data_____::r3d100010121",
   "datacite_name": "PDS",
@@ -896,7 +901,7 @@
  },
  "FIGSHARE.UCT": {
   "openaire_id": "re3data_____::r3d100012633",
-  "datacite_name": "ZivaHub",
+  "datacite_name": "University of Cape Town (UCT)",
   "official_name": "ZivaHub"
  },
  "BL.UCLAN": {
@@ -1030,9 +1035,9 @@
   "official_name": "ZBW Journal Data Archive"
  },
  "CERN.ZENODO": {
-  "openaire_id": "re3data_____::r3d100010468",
+  "openaire_id": "opendoar____::2659",
   "datacite_name": "Zenodo",
-  "official_name": "Zenodo"
+  "official_name": "ZENODO"
  },
  "ZBW.ZEW": {
   "openaire_id": "re3data_____::r3d100010399",

dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/group/oozie_app/workflow.xml

@@ -283,7 +283,15 @@
         <error to="Kill"/>
     </action>
 
-    <join name="wait_dispatch" to="copy_relation"/>
+    <join name="wait_dispatch" to="delete_target_relation"/>
+
+    <action name="delete_target_relation">
+        <fs>
+            <delete path="${nameNode}/${graphOutputPath}/relation"/>
+        </fs>
+        <ok to="copy_relation"/>
+        <error to="Kill"/>
+    </action>
 
     <action name="copy_relation">
         <distcp xmlns="uri:oozie:distcp-action:0.2">

dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/sql/queryParentChildRelsOpenOrgs.sql

@@ -10,4 +10,4 @@ SELECT
 	'OpenOrgs Database'                                            AS collectedfromname,
 	'sysimport:crosswalk:entityregistry@@@dnet:provenance_actions' AS provenanceaction
 FROM relationships
-WHERE reltype = 'Child' OR reltype = 'Parent'
+WHERE reltype = 'IsChildOf' OR reltype = 'IsParentOf'

dhp-workflows/dhp-graph-provision/src/main/resources/eu/dnetlib/dhp/sx/provision/scholix_index.json

@@ -41,7 +41,8 @@
         }
       },
       "publicationDate": {
-        "type": "keyword"
+        "type":   "date",
+        "format": "yyyy-MM-dd"
       },
       "relationship": {
         "properties": {