Commit a9d623f2 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch...

Merge branch '1281-celldesigner-ignores-all-rdf-description-block-in-case-it-contains-not-supported-bqmodel' into 'devel_15.0.x'

Resolve "CellDesigner ignores all rdf description block in case it contains not-supported bqmodel:isDerivedFrom"

See merge request !1214
parents a90b2151 c3e549fa
Pipeline #29197 failed with stage
in 60 minutes and 1 second
......@@ -14,6 +14,12 @@ minerva (15.0.2) stable; urgency=medium
* Bug fix: text area were not converted to GPML using conversion API (#1306)
* Bug fix: name provided by user in comment dialog was not visible in admin
panel (#1245)
* Bug fix: bqmodel:isInstanceOf and bqmodel:hasInstance relation types were
not handled properly (#1281)
* Bug fix: "bqmodel:isInstanceOf", "bqmodel:hasInstance",
"bqbiol:hasProperty", "bqbiol:isPropertyOf" and "bqbiol:hasTaxon" relation
types are not supported by CellDedigner and are now transformed during
export into something readable by CellDesigner (#1281)
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 29 Jun 2020 11:00:00 +0200
......
......@@ -54,6 +54,10 @@ public class CommonXmlParser {
RELATION_TYPES_SUPPORTED_BY_CELL_DESIGNER = new HashSet<>();
RELATION_TYPES_SUPPORTED_BY_CELL_DESIGNER.addAll(Arrays.asList(MiriamRelationType.values()));
RELATION_TYPES_SUPPORTED_BY_CELL_DESIGNER.remove(MiriamRelationType.BQ_MODEL_IS_DERIVED_FROM);
RELATION_TYPES_SUPPORTED_BY_CELL_DESIGNER.remove(MiriamRelationType.BQ_BIOL_HAS_PROPERTY);
RELATION_TYPES_SUPPORTED_BY_CELL_DESIGNER.remove(MiriamRelationType.BQ_BIOL_IS_PROPERTY_OF);
RELATION_TYPES_SUPPORTED_BY_CELL_DESIGNER.remove(MiriamRelationType.BQ_MODEL_IS_INSTANCE_OF);
RELATION_TYPES_SUPPORTED_BY_CELL_DESIGNER.remove(MiriamRelationType.BQ_MODEL_HAS_INSTANCE);
}
private DocumentBuilderFactory dbFactory;
......
......@@ -79,6 +79,10 @@ public enum MiriamRelationType {
BQ_BIOL_OCCURS_IN("bqbiol:occursIn"),
BQ_MODEL_IS_DERIVED_FROM("bqmodel:isDerivedFrom"),
BQ_MODEL_IS_INSTANCE_OF("bqmodel:isInstanceOf"),
BQ_MODEL_HAS_INSTANCE("bqmodel:hasInstance"),
;
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment