From 9592d2a7a4dd6259492b7c957c3af1af98c5045b Mon Sep 17 00:00:00 2001 From: Jose Labra Date: Sun, 6 May 2018 08:30:17 +0200 Subject: [PATCH] Added notes --- .../scala/es/weso/schema/ShaclexSchema.scala | 6 +++--- notes/0.0.77.md | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 notes/0.0.77.md diff --git a/modules/schema/src/main/scala/es/weso/schema/ShaclexSchema.scala b/modules/schema/src/main/scala/es/weso/schema/ShaclexSchema.scala index 4d2e48a52..f0de34cbd 100644 --- a/modules/schema/src/main/scala/es/weso/schema/ShaclexSchema.scala +++ b/modules/schema/src/main/scala/es/weso/schema/ShaclexSchema.scala @@ -1,15 +1,15 @@ package es.weso.schema + import cats.implicits._ import es.weso.rdf._ import es.weso.rdf.nodes._ import es.weso.rdf.jena.RDFAsJenaModel import es.weso.shacl.{Schema => ShaclSchema, _} -import es.weso.shacl._ +// import es.weso.shacl._ import es.weso.shacl.converter.{RDF2Shacl, Shacl2ShEx} import es.weso.shacl.report.{ValidationReport, ValidationResult} import es.weso.shacl.validator.{CheckResult, Evidence, ShapeTyping, Validator} import es.weso.shapeMaps._ -import es.weso.shex.Schema import util._ import es.weso.typing._ @@ -131,7 +131,7 @@ case class ShaclexSchema(schema: ShaclSchema) extends Schema { case Some("SHEX") => for { newSchema <- Shacl2ShEx.shacl2ShEx(schema).toEither.leftMap(es => es.toList.mkString("\n")) builder = RDFAsJenaModel.empty - str <- Schema.serialize(newSchema,targetFormat.getOrElse(DataFormats.defaultFormatName),builder) + str <- es.weso.shex.Schema.serialize(newSchema,targetFormat.getOrElse(DataFormats.defaultFormatName),builder) } yield str case Some(other) => Left(s"Conversion $name -> $other not implemented yet") } diff --git a/notes/0.0.77.md b/notes/0.0.77.md new file mode 100644 index 000000000..d21238501 --- /dev/null +++ b/notes/0.0.77.md @@ -0,0 +1,20 @@ +# New features + +- Repaired [issue 100](https://github.com/labra/shaclex/issues/100) + +TODOs +----- + +- ShEx: Complete UML generation for ShEx schemas + +- ShEx: Complete semantic actions implementation + +- SHACL: support using RDf4j (add SHACL paths to SRDF4j) + +- SHACL: Check test-suite and create report + +- ShEx: test-suite with shape maps and update report + +- Shaclex: Conversion from ShEx to SHACL + +- Shaclex: Conversion from SHACL to ShEx