Merge pull request 'enrichment_wfs' (#39) from enrichment_wfs into master

LGTM

dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/CommunityConfigurationFactory.java

@@ -110,13 +110,13 @@ public class CommunityConfigurationFactory {
 	}
 
 	private static List<ZenodoCommunity> parseZenodoCommunities(final Node node) {
-		final Node oacommunitynode = node.selectSingleNode("./oacommunity");
-		String oacommunity = null;
-		if (oacommunitynode != null) {
-			String tmp = oacommunitynode.getText();
-			if (StringUtils.isNotBlank(tmp))
-				oacommunity = tmp;
-		}
+//		final Node oacommunitynode = node.selectSingleNode("./oacommunity");
+//		String oacommunity = null;
+//		if (oacommunitynode != null) {
+//			String tmp = oacommunitynode.getText();
+//			if (StringUtils.isNotBlank(tmp))
+//				oacommunity = tmp;
+//		}
 
 		final List<Node> list = node.selectNodes("./zenodocommunities/zenodocommunity");
 		final List<ZenodoCommunity> zenodoCommunityList = new ArrayList<>();
@@ -127,11 +127,11 @@ public class CommunityConfigurationFactory {
 
 			zenodoCommunityList.add(zc);
 		}
-		if (oacommunity != null) {
-			ZenodoCommunity zc = new ZenodoCommunity();
-			zc.setZenodoCommunityId(oacommunity);
-			zenodoCommunityList.add(zc);
-		}
+//		if (oacommunity != null) {
+//			ZenodoCommunity zc = new ZenodoCommunity();
+//			zc.setZenodoCommunityId(oacommunity);
+//			zenodoCommunityList.add(zc);
+//		}
 		log.info("size of the zenodo community list " + zenodoCommunityList.size());
 		return zenodoCommunityList;
 	}

dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/Provider.java

@@ -44,7 +44,7 @@ public class Provider implements Serializable {
 	}
 
 	private void setSelCriteria(String json, VerbResolver resolver) {
-		log.info("Selection constraints for datasource = " + json);
+		log.debug("Selection constraints for datasource = " + json);
 		selectionConstraints = new Gson().fromJson(json, SelectionConstraints.class);
 
 		selectionConstraints.setSelection(resolver);
@@ -54,7 +54,7 @@ public class Provider implements Serializable {
 		try {
 			setSelCriteria(n.getText(), resolver);
 		} catch (Exception e) {
-			log.info("not set selection criteria... ");
+			log.debug("not set selection criteria... ");
 			selectionConstraints = null;
 		}
 	}

dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/QueryInformationSystem.java

@@ -17,6 +17,8 @@ public class QueryInformationSystem {
 		+ "  let $datasources := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::contentproviders')]/concept  "
 		+ "  let $organizations := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::resultorganizations')]/concept  "
 		+ "  let $communities := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::zenodocommunities')]/concept  "
+		+
+		"let $zenodo := $x//param[./@name='zenodoCommunity']/text() "
 		+ "  where $x//CONFIGURATION/context[./@type='community' or ./@type='ri']  "
 		+ "  return  "
 		+ "  <community>  "
@@ -38,8 +40,15 @@ public class QueryInformationSystem {
 		+ "  {$d/param[./@name='selcriteria']/text()}  "
 		+ "  </selcriteria>  "
 		+ "  </datasource> } "
-		+ "  </datasources>  "
-		+ "  <zenodocommunities>  "
+		+ "  </datasources>  " +
+		"  <zenodocommunities>  " +
+		"{for $zc in $zenodo " +
+		"return " +
+		"<zenodocommunity> " +
+		"<zenodoid> " +
+		"{$zc} " +
+		"</zenodoid> " +
+		"</zenodocommunity>}"
 		+ "  {for $zc in $communities  "
 		+ "  return  "
 		+ "  <zenodocommunity>  "

dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/ResultTagger.java

@@ -71,10 +71,9 @@ public class ResultTagger implements Serializable {
 
 		// tagging for Subject
 		final Set<String> subjects = new HashSet<>();
-		Optional<List<StructuredProperty>> oresultsubj = Optional.ofNullable(result.getSubject());
-		if (oresultsubj.isPresent()) {
-			oresultsubj
-				.get()
+
+		if (Objects.nonNull(result.getSubject())){
+			result.getSubject()
 				.stream()
 				.map(subject -> subject.getValue())
 				.filter(StringUtils::isNotBlank)
@@ -90,15 +89,23 @@ public class ResultTagger implements Serializable {
 		final Set<String> datasources = new HashSet<>();
 		final Set<String> tmp = new HashSet<>();
 
-		Optional<List<Instance>> oresultinstance = Optional.ofNullable(result.getInstance());
-		if (oresultinstance.isPresent()) {
-			for (Instance i : oresultinstance.get()) {
-				tmp.add(StringUtils.substringAfter(i.getCollectedfrom().getKey(), "|"));
-				tmp.add(StringUtils.substringAfter(i.getHostedby().getKey(), "|"));
+		if (Objects.nonNull(result.getInstance())) {
+			for (Instance i : result.getInstance()) {
+				if(Objects.nonNull(i.getCollectedfrom())){
+					if(Objects.nonNull(i.getCollectedfrom().getKey())){
+						tmp.add(StringUtils.substringAfter(i.getCollectedfrom().getKey(), "|"));
+					}
+				}
+				if(Objects.nonNull(i.getHostedby())){
+					if(Objects.nonNull(i.getHostedby().getKey())){
+						tmp.add(StringUtils.substringAfter(i.getHostedby().getKey(), "|"));
+					}
+				}
+
 			}
 
-			oresultinstance
-				.get()
+			result
+				.getInstance()
 				.stream()
 				.map(i -> new Pair<>(i.getCollectedfrom().getKey(), i.getHostedby().getKey()))
 				.flatMap(p -> Stream.of(p.getFst(), p.getSnd()))

dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/tagging_conf.xml

@@ -257,6 +257,9 @@
             <zenodoid>bodhgaya</zenodoid>
             <selcriteria/>
         </zenodocommunity>
+        <zenodocommunity>
+            <zenodoid>oac_dh-ch</zenodoid>
+        </zenodocommunity>
     </zenodocommunities>
     <organizations/>
 </community>