diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/filterentities/SelectLOT1Entities.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/filterentities/SelectLOT1Entities.java index 4bb901f..e4f8bd8 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/filterentities/SelectLOT1Entities.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/filterentities/SelectLOT1Entities.java @@ -100,15 +100,10 @@ public class SelectLOT1Entities implements Serializable { .where("datainfo.deletedbyinference != true AND datainfo.invisible != true") .select("id", "instance", "pid") .where( - "array_contains(instance.hostedby.key ,'10|re3data_____::c4b2081b224be6b3e79d0e5e5556f631') OR array_contains(instance.hostedby.key, '10|openaire____::dbfd07503aaa1ed31beed7dec942f3f4') " - + - "OR array_contains(pid.qualifier.classid,'doi') OR array_contains(pid.qualifier.classid,'swhid')") // filter - // by - // pid - // type - // and - // hosting - // datasource + "array_contains(instance.hostedby.key ,'10|re3data_____::c4b2081b224be6b3e79d0e5e5556f631') OR " + + "array_contains(instance.hostedby.key, '10|openaire____::dbfd07503aaa1ed31beed7dec942f3f4') OR " + + "array_contains(pid.qualifier.classid,'doi') OR " + + "array_contains(pid.qualifier.classid,'swhid')") // filter // datasource .selectExpr("id", "explode(instance) as instance") .withColumn( "CCL", @@ -130,12 +125,14 @@ public class SelectLOT1Entities implements Serializable { .where("datainfo.deletedbyinference != true AND datainfo.invisible != true") .select("id", "instance", "pid") .where( - "array_contains(pid.qualifier.classid ,'doi') OR array_contains(pid.qualifier.classid ,'handle') OR array_contains(pid.qualifier.classid , 'pdb') array_contains(pid.qualifier.classid , 'ena') array_contains(pid.qualifier.classid , 'uniprot') OR " - + - "array_contains(instance.hostedby.key ,'10|re3data_____::c4b2081b224be6b3e79d0e5e5556f631') OR array_contains(instance.hostedby.key, '10|openaire____::dbfd07503aaa1ed31beed7dec942f3f4') )") // filter - // by - // pid - // type + "array_contains(pid.qualifier.classid ,'doi') OR " + + "array_contains(pid.qualifier.classid ,'handle') OR " + + "array_contains(pid.qualifier.classid , 'pdb') OR " + + "array_contains(pid.qualifier.classid , 'ena') OR " + + "array_contains(pid.qualifier.classid , 'uniprot') OR " + + "array_contains(instance.hostedby.key ,'10|re3data_____::c4b2081b224be6b3e79d0e5e5556f631') OR " + + "array_contains(instance.hostedby.key, '10|openaire____::dbfd07503aaa1ed31beed7dec942f3f4') )") // filter// + // type .selectExpr("id", "explode(instance) as instance") .withColumn( "CCL",