diff --git a/modules/server/src/main/scala/es/weso/server/ApiHelper.scala b/modules/server/src/main/scala/es/weso/server/ApiHelper.scala index 6b7b52fd..19ff7aa6 100644 --- a/modules/server/src/main/scala/es/weso/server/ApiHelper.scala +++ b/modules/server/src/main/scala/es/weso/server/ApiHelper.scala @@ -277,7 +277,7 @@ private[server] def validate(rdf: RDFReasoner, for { either <- result.attempt - } yield either.fold(err => SchemaConversionResult.fromMsg(s"convertSchema: error: $err"), identity) + } yield either.fold(err => SchemaConversionResult.fromMsg(s"error converting schema: $err"), identity) } private[server] def shapeInfer(rdf: RDFReasoner, @@ -467,4 +467,4 @@ private[server] def validate(rdf: RDFReasoner, private[server] def mkJsonErr(msg: String) = Json.fromFields(List(("error", Json.fromString(msg)))) -} \ No newline at end of file +} diff --git a/modules/server/src/main/scala/es/weso/server/results/SchemaConversionResult.scala b/modules/server/src/main/scala/es/weso/server/results/SchemaConversionResult.scala index 49538220..18a2e00a 100644 --- a/modules/server/src/main/scala/es/weso/server/results/SchemaConversionResult.scala +++ b/modules/server/src/main/scala/es/weso/server/results/SchemaConversionResult.scala @@ -20,12 +20,12 @@ case class SchemaConversionResult( List( ("msg", Json.fromString(msg)), ) ++ - maybeField(schema,"schema", Json.fromString(_)) ++ - maybeField(schemaFormat,"schemaFormat", Json.fromString(_)) ++ - maybeField(schemaEngine,"schemaEngine", Json.fromString(_)) ++ - maybeField(targetSchemaFormat,"targetSchemaFormat", Json.fromString(_)) ++ - maybeField(targetSchemaEngine,"targetSchemaEngine", Json.fromString(_)) ++ - maybeField(result,"result", Json.fromString(_) ) ++ + maybeField(schema,"schema", Json.fromString) ++ + maybeField(schemaFormat,"schemaFormat", Json.fromString) ++ + maybeField(schemaEngine,"schemaEngine", Json.fromString) ++ + maybeField(targetSchemaFormat,"targetSchemaFormat", Json.fromString) ++ + maybeField(targetSchemaEngine,"targetSchemaEngine", Json.fromString) ++ + maybeField(result,"result", Json.fromString ) ++ maybeField(resultShapeMap,"shapeMap", (sm: ShapeMap) => sm.toString.asJson) ) }