Compare commits

...

2 Commits

5 changed files with 14 additions and 15 deletions

View File

@ -208,10 +208,6 @@ public class ValidationController {
validationJob.guidelines = profile.name();
validationJobRepository.save(validationJob);
log.info("Initial validation job id "+ validationJob.id);
log.info("\n\n\n\n\n" + numberOfRecords + "\n\n\n\n");
int record = 0;
double resultSum = 0;

View File

@ -51,12 +51,10 @@ public class SumUpNCleanProcessor implements Processor {
validationJob.endDate = new Date();
List<SummaryResult> summaryResults = validationResultRepository.getFullSummaryResult
((Integer) exchange.getIn().getHeader("validationId"));
((Integer) exchange.getIn().getHeader("validationId"), profile.name());
log.info("Summary results returned: " + summaryResults.size());
for(SummaryResult sr: summaryResults) {
sr.validationJobId = validationJob.id;
log.info("Saving in DB " + sr.ruleName + " for " + sr.getValidationJobId() + " and profile " + sr.fair_principles);
summaryValidationJobRepository.save(sr);
}

View File

@ -8,6 +8,7 @@ import org.apache.camel.Processor;
import java.util.List;
//TODO:delete
public class SummaryValidationJobProcessor implements Processor {
private final ValidationResultRepository validationResultRepository;

View File

@ -8,6 +8,8 @@ import eu.dnetlib.validatorapi.entities.ValidationJob;
import eu.dnetlib.validatorapi.entities.ValidationRuleResult;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@ -22,13 +24,15 @@ import java.util.List;
import java.util.Map;
public class XmlProcessor implements Processor {
private static final Logger log = LoggerFactory.getLogger(XmlProcessor.class);
private final AbstractOpenAireProfile profile;
private ValidationJob validationJob;
// private final ValidationIssueRepository validationIssueRepository;
private final long maxNumberOfRecords;
private int processedRecords;
private String status = "SUCCESS";
// private int resultSum;
private int scoreSum;
@ -44,11 +48,12 @@ public class XmlProcessor implements Processor {
@Override
public void process(Exchange exchange) throws Exception {
String recordXml = exchange.getIn().getBody(String.class);
final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
final DocumentBuilder documentBuilder = dbf.newDocumentBuilder();
Document doc = documentBuilder.parse(new InputSource(new StringReader(recordXml)));
String recordUrl = extractRecordUrl(doc, "identifier");
System.out.println("Record url: " + recordUrl);
List<ValidationRuleResult> validationRuleResults = new ArrayList<>();
List<ValidationIssue> validationIssues = new ArrayList<>();
@ -96,9 +101,6 @@ public class XmlProcessor implements Processor {
resultsMap.put("issues", validationIssues);
exchange.getIn().setBody(resultsMap, Map.class);
// System.out.println("Validation Issues: " + validationIssues);
System.out.println("processed records: " + processedRecords);
if (processedRecords > maxNumberOfRecords) {
exchange.getIn().setHeader("MyHeader", "stop");
exchange.getIn().setHeader("validationId", validationJob.id);
@ -125,8 +127,9 @@ public class XmlProcessor implements Processor {
}
private void constructValidationRuleResult(ValidationRuleResult validationRuleResult, int validationJobId, String guidelines, String recordUrl, String ruleName,
AbstractOpenAireProfile profile, Guideline.Result engineResult) {
private void constructValidationRuleResult(ValidationRuleResult validationRuleResult, int validationJobId,
String guidelines, String recordUrl, String ruleName,
AbstractOpenAireProfile profile, Guideline.Result engineResult) {
validationRuleResult.validationJobId = validationJobId;
validationRuleResult.guidelines = guidelines;

View File

@ -72,7 +72,8 @@ public interface ValidationResultRepository extends JpaRepository<ValidationRule
"CASE WHEN COUNT(CASE WHEN has_warnings IS TRUE THEN 1 END) > 0 THEN TRUE ELSE FALSE END AS hasWarnings)" +
"FROM eu.dnetlib.validatorapi.entities.ValidationRuleResult sr " +
"WHERE sr.validationJobId = :id AND sr.guidelines = :guidelines " +
"GROUP BY sr.ruleName, sr.ruleWeight, sr.requirement_level, sr.description, sr.fair_principles, sr.link, sr.description, sr.internalError, sr.validationJobId")
"GROUP BY sr.ruleName, sr.ruleWeight, sr.requirement_level, sr.description, sr.fair_principles, sr.link, " +
"sr.description, sr.internalError, sr.validationJobId, sr.guidelines")
List<SummaryResult> getFullSummaryResult(@Param("id") int validationJobId, @Param("guidelines") String guidelines);