From 82cc3b707d8d927817dda213836edef2cec2377c Mon Sep 17 00:00:00 2001
From: sandro <sandro.labruzzo@isti.cnr.it>
Date: Mon, 20 Apr 2020 14:47:06 +0200
Subject: [PATCH] fixed name of wrong package

---
 .../doiboost/crossref/Crossref2Oaf.scala      |  3 +-
 .../orcid.oozie_app/config-default.xml        | 18 --------
 .../dhp/doiboost/orcid.oozie_app/workflow.xml | 41 -------------------
 3 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 dhp-workflows/dhp-doiboost/src/main/resources/eu/dnetlib/dhp/doiboost/orcid.oozie_app/config-default.xml
 delete mode 100644 dhp-workflows/dhp-doiboost/src/main/resources/eu/dnetlib/dhp/doiboost/orcid.oozie_app/workflow.xml

diff --git a/dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/crossref/Crossref2Oaf.scala b/dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/crossref/Crossref2Oaf.scala
index 83259f5ec..8053a7cbb 100644
--- a/dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/crossref/Crossref2Oaf.scala
+++ b/dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/crossref/Crossref2Oaf.scala
@@ -106,9 +106,10 @@ class Crossref2Oaf {
     result.setDataInfo(generateDataInfo())
 
     result.setLastupdatetimestamp((json \"indexed" \"timestamp").extract[Long])
-
     result.setDateofcollection((json \"indexed" \"date-time").extract[String])
 
+    //result.setCollectedfrom()
+
     result
   }
 
diff --git a/dhp-workflows/dhp-doiboost/src/main/resources/eu/dnetlib/dhp/doiboost/orcid.oozie_app/config-default.xml b/dhp-workflows/dhp-doiboost/src/main/resources/eu/dnetlib/dhp/doiboost/orcid.oozie_app/config-default.xml
deleted file mode 100644
index 9f009a781..000000000
--- a/dhp-workflows/dhp-doiboost/src/main/resources/eu/dnetlib/dhp/doiboost/orcid.oozie_app/config-default.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<configuration>
-    <property>
-        <name>jobTracker</name>
-        <value>yarnRM</value>
-    </property>
-    <property>
-        <name>nameNode</name>
-        <value>hdfs://nameservice1</value>
-    </property>
-    <property>
-        <name>oozie.action.sharelib.for.java</name>
-        <value>spark2</value>
-    </property>
-    <property>
-        <name>oozie.launcher.mapreduce.user.classpath.first</name>
-        <value>true</value>
-    </property>
-</configuration>
\ No newline at end of file
diff --git a/dhp-workflows/dhp-doiboost/src/main/resources/eu/dnetlib/dhp/doiboost/orcid.oozie_app/workflow.xml b/dhp-workflows/dhp-doiboost/src/main/resources/eu/dnetlib/dhp/doiboost/orcid.oozie_app/workflow.xml
deleted file mode 100644
index 36e0cdf1b..000000000
--- a/dhp-workflows/dhp-doiboost/src/main/resources/eu/dnetlib/dhp/doiboost/orcid.oozie_app/workflow.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<workflow-app name="import Crossref from index into HDFS" xmlns="uri:oozie:workflow:0.5">
-    <parameters>
-        <property>
-            <name>workingPath</name>
-            <description>the working dir base path</description>
-        </property>
-    </parameters>
-
-    <start to="ResetWorkingPath"/>
-
-
-    <kill name="Kill">
-        <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
-    </kill>
-
-    <action name="ResetWorkingPath">
-        <fs>
-            <delete path='${workingPath}/input/orcid'/>
-            <mkdir path='${workingPath}/input/orcid'/>
-        </fs>
-        <ok to="ImportOrcidSummary"/>
-        <error to="Kill"/>
-    </action>
-
-
-
-    <action name="ImportOrcidSummary">
-        <java>
-            <job-tracker>${jobTracker}</job-tracker>
-            <name-node>${nameNode}</name-node>
-            <main-class>eu.dnetlib.doiboost.orcid.OrcidDSManager</main-class>
-            <arg>-d</arg><arg>${workingPath}/</arg>
-            <arg>-n</arg><arg>${nameNode}</arg>
-			<arg>-f</arg><arg>ORCID_2019_summaries.tar.gz</arg>
-			<arg>-o</arg><arg>output/</arg>
-        </java>
-        <ok to="End"/>
-        <error to="Kill"/>
-    </action>
-    <end name="End"/>
-</workflow-app>
\ No newline at end of file