wf profiles

dnet-app/apps/dnet-wf-aggregation-postgres/src/main/java/eu/dnetlib/wfs/nodes/MdTransformJobNode.java

@@ -73,6 +73,13 @@ public class MdTransformJobNode extends AbstractJobNode {
 
 		try {
 			final Stream<MetadataRecord> stream = this.mdStoreSqlBackend.streamEntries(inputVersion)
+					.map(input -> {
+						final MetadataRecord output = new MetadataRecord();
+						BeanUtils.copyProperties(input, output);
+						output.setBody(xslt.transform(input.getBody()));
+						output.setDateOfTransformation(LocalDateTime.now());
+						return output;
+					})
 					.filter(record -> {
 						try {
 							final Document doc = DocumentHelper.parseText(record.getBody());
@@ -80,13 +87,6 @@ public class MdTransformJobNode extends AbstractJobNode {
 						} catch (final DocumentException e) {
 							throw new RuntimeException("Invalid record: " + record.getBody());
 						}
-					})
-					.map(input -> {
-						final MetadataRecord output = new MetadataRecord();
-						BeanUtils.copyProperties(input, output);
-						output.setBody(xslt.transform(input.getBody()));
-						output.setDateOfTransformation(LocalDateTime.now());
-						return output;
 					});
 
 			this.mdStoreSqlBackend.saveRecords(outputVersion, stream);

dnet-app/apps/dnet-wf-manager/src/main/resources/wf_templates/collect.json

@@ -17,7 +17,7 @@
 			"required":"false"
 		},
 		{
-			"name":"overrideFromDate",
+			"name":"overrideUntilDate",
 			"description":"Override the default untilDate (now)",
 			"type":"DATE",
 			"required":"false"
@@ -101,19 +101,19 @@
 				},
 				{
 					"name":"mdId",
-					"env":"nativeMdStoreId"
+					"ref":"nativeMdStoreId"
 				},
 				{
 					"name":"filterXpath",
-					"env":"nativeMdStoreFilterXpath"
+					"ref":"nativeMdStoreFilterXpath"
 				},
 				{
 					"name":"overrideFromDate",
-					"env":"overrideFromDate"
+					"ref":"overrideFromDate"
 				},
 				{
 					"name":"overrideUntilDate",
-					"env":"overrideUntilDate"
+					"ref":"overrideUntilDate"
 				}
 			],
 			"output":[],

dnet-app/apps/dnet-wf-manager/src/main/resources/wf_templates/transform.json

@@ -11,6 +11,11 @@
 		{
 			"name":"xsltRuleId",
 			"description":"Transformation Rule ID"
+		},
+		{
+			"name":"cleanedMdStoreFilterXpath",
+			"description":"Filter the cleaned records",
+			"required":"false"
 		}
 	],
 	"graph":[
@@ -61,7 +66,7 @@
 				},
 				{
 					"name":"filterXpath",
-					"ref":"nativeMdStoreFilterXpath"
+					"ref":"cleanedMdStoreFilterXpath"
 				}
 			],
 			"output":[],