Merge remote-tracking branch 'upstream/master'

dhp-common/pom.xml

@@ -46,6 +46,18 @@
 			<groupId>net.sf.saxon</groupId>
 			<artifactId>Saxon-HE</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>cnr-rmi-api</artifactId>
+		</dependency>
 	</dependencies>
 
 </project>

dhp-common/src/main/java/eu/dnetlib/dhp/utils/ISLookupClientFactory.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.dhp.graph.utils;
+package eu.dnetlib.dhp.utils;
 
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
 import org.apache.commons.logging.Log;

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/migration/oozie_app/workflow.xml

@@ -43,7 +43,7 @@
         </property>
     </parameters>
 
-    <start to="ResetWorkingPath"/>
+    <start to="ImportODFEntitiesFromMongoDB"/>
 
 
     <kill name="Kill">

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/migration/sql/queryProjects.sql

@@ -31,12 +31,14 @@ SELECT
                 p.fundedamount                                                                                             AS fundedamount,
                 dc.id                                                                                                      AS collectedfromid,
                 dc.officialname                                                                                            AS collectedfromname,
-                ctc.code || '@@@' || ctc.name || '@@@' || cts.code || '@@@' || cts.name                                    AS contracttype,
+                p.contracttype || '@@@' || p.contracttypename || '@@@' || p.contracttypescheme || '@@@' || p.contracttypescheme     AS contracttype,
                 pac.code || '@@@' || pac.name || '@@@' || pas.code || '@@@' || pas.name                                             AS provenanceaction,
                 array_agg(DISTINCT i.pid || '###' || i.issuertype)                                                                  AS pid,
                 array_agg(DISTINCT s.name || '###' || sc.code || '@@@' || sc.name || '@@@' || ss.code || '@@@' || ss.name)          AS subjects,
                 array_agg(DISTINCT fp.path)                                                                                         AS fundingtree
+
         FROM projects p
+
                 LEFT OUTER JOIN class pac ON (pac.code = p.provenanceactionclass)
                 LEFT OUTER JOIN scheme pas ON (pas.code = p.provenanceactionscheme)
 
@@ -54,9 +56,6 @@ SELECT
                 LEFT OUTER JOIN class sc ON (sc.code = s.semanticclass)
                 LEFT OUTER JOIN scheme ss ON (ss.code = s.semanticscheme)
 
-                LEFT OUTER JOIN class ctc ON (ctc.code = p.contracttypeclass)
-                LEFT OUTER JOIN scheme cts ON (cts.code = p.contracttypescheme)
-
         GROUP BY
                 p.id,
                 p.code,
@@ -87,4 +86,4 @@ SELECT
                 dc.id,
                 dc.officialname,
                 pac.code, pac.name, pas.code, pas.name,
-                ctc.code, ctc.name, cts.code, cts.name;
+                p.contracttype , p.contracttypename, p.contracttypescheme;

dhp-workflows/dhp-graph-provision/pom.xml

@@ -66,14 +66,6 @@
             <artifactId>zookeeper</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib</groupId>
-            <artifactId>cnr-rmi-api</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>eu.dnetlib.dhp</groupId>

dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/graph/SparkXmlIndexingJob.java

@@ -2,8 +2,8 @@ package eu.dnetlib.dhp.graph;
 
 import com.lucidworks.spark.util.SolrSupport;
 import eu.dnetlib.dhp.application.ArgumentApplicationParser;
-import eu.dnetlib.dhp.graph.utils.ISLookupClientFactory;
 import eu.dnetlib.dhp.graph.utils.StreamingInputDocumentFactory;
+import eu.dnetlib.dhp.utils.ISLookupClientFactory;
 import eu.dnetlib.dhp.utils.saxon.SaxonTransformerFactory;
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpDocumentNotFoundException;
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;

dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/graph/utils/ContextMapper.java

@@ -1,6 +1,7 @@
 package eu.dnetlib.dhp.graph.utils;
 
 import com.google.common.base.Joiner;
+import eu.dnetlib.dhp.utils.ISLookupClientFactory;
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
 import org.dom4j.Document;

dhp-workflows/dhp-graph-provision/src/test/resources/eu/dnetlib/dhp/graph/related_entity.json

@@ -1,5 +0,0 @@
-{
-  "id": "20|nih_________::6b8108b6d6399f7163a6a7ccdd0efc2d",
-  "type": "organization",
-  "legalname": "MCGILL UNIVERSITY"
-}

pom.xml

@@ -129,6 +129,13 @@
 				<scope>provided</scope>
 			</dependency>
 
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>jcl-over-slf4j</artifactId>
+				<version>1.7.25</version>
+				<scope>provided</scope>
+			</dependency>
+
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>