Merge pull request #101 from berezovskyi/result-vr-fix

Fix the Result construction in ShaclexSchema::cnvResult
weso · May 6, 2018 · 706c2f5 · 706c2f5
2 parents 452a890 + bb7b321
commit 706c2f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/schema/src/main/scala/es/weso/schema/ShaclexSchema.scala b/modules/schema/src/main/scala/es/weso/schema/ShaclexSchema.scala
@@ -45,11 +45,11 @@ case class ShaclexSchema(schema: ShaclSchema) extends Schema {
         _.toValidationReport
       )
     Result(
-      isValid = r.isOK,
-      message = if (r.isOK) "Valid" else "Not valid",
+      isValid = vr.conforms,
+      message = if (vr.conforms) "Valid" else "Not valid",
       shapeMaps = r.results.map(cnvShapeTyping(_, rdf)),
       validationReport = vr.toRDF(builder),
-      errors = r.errors.map(cnvViolationError(_)),
+      errors = vr.results.map(cnvViolationError(_)),
       trigger = None,
       nodesPrefixMap = rdf.getPrefixMap(),
       shapesPrefixMap = schema.pm)

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.0.76"
+version in ThisBuild := "0.0.77"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "0.0.76"
		version in ThisBuild := "0.0.77"