From 79cdd6a5c0254a53eb8dd3975573a251a962844b Mon Sep 17 00:00:00 2001 From: even1024 Date: Tue, 26 Nov 2024 21:01:15 +0100 Subject: [PATCH 1/2] skip NA --- .../reaction/src/reaction_multistep_detector.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/indigo-core/reaction/src/reaction_multistep_detector.cpp b/core/indigo-core/reaction/src/reaction_multistep_detector.cpp index d38e45ad80..bf6b7d41a1 100644 --- a/core/indigo-core/reaction/src/reaction_multistep_detector.cpp +++ b/core/indigo-core/reaction/src/reaction_multistep_detector.cpp @@ -733,11 +733,17 @@ void ReactionMultistepDetector::collectProperties(PathwayReaction::SimpleReactio is_condition = true; } - int id = sr.properties.insert(PathwayLayout::REACTION_NAME); - sr.properties.value(id).readString(name.empty() ? PathwayLayout::REACTION_PROPERTY_NA : name.c_str(), true); + if (name.size()) + { + int id = sr.properties.insert(PathwayLayout::REACTION_NAME); + sr.properties.value(id).readString(name.c_str(), true); + } - id = sr.properties.insert(PathwayLayout::REACTION_CONDITIONS); - sr.properties.value(id).readString(condition.empty() ? PathwayLayout::REACTION_PROPERTY_NA : condition.c_str(), true); + if (condition.size()) + { + int id = sr.properties.insert(PathwayLayout::REACTION_CONDITIONS); + sr.properties.value(id).readString(condition.c_str(), true); + } } void ReactionMultistepDetector::constructMultipleArrowReaction(BaseReaction& rxn) From e301001e4f04ac7af772613aac5939cf17cdb194 Mon Sep 17 00:00:00 2001 From: even1024 Date: Tue, 26 Nov 2024 21:52:31 +0100 Subject: [PATCH 2/2] skip NA --- .../tests/formats/ref/2404-metadata_detect.rdf | 2 -- api/tests/integration/tests/formats/ref/pathway12.rdf | 8 -------- 2 files changed, 10 deletions(-) diff --git a/api/tests/integration/tests/formats/ref/2404-metadata_detect.rdf b/api/tests/integration/tests/formats/ref/2404-metadata_detect.rdf index 70f90aa779..6a8c162b1a 100644 --- a/api/tests/integration/tests/formats/ref/2404-metadata_detect.rdf +++ b/api/tests/integration/tests/formats/ref/2404-metadata_detect.rdf @@ -256,8 +256,6 @@ $MOL M END $DTYPE Name $DATUM Published reaction -$DTYPE Reaction Conditions -$DATUM Not available $RFMT $RXN diff --git a/api/tests/integration/tests/formats/ref/pathway12.rdf b/api/tests/integration/tests/formats/ref/pathway12.rdf index c4d1a2765e..d375b8b979 100644 --- a/api/tests/integration/tests/formats/ref/pathway12.rdf +++ b/api/tests/integration/tests/formats/ref/pathway12.rdf @@ -97,8 +97,6 @@ $DATUM 123456789012345678901234567890 123456789012345678901234567890 123456789012345678901234567890 123456789012345678901234567890... -$DTYPE Reaction Conditions -$DATUM Not available $RFMT $RXN @@ -152,8 +150,6 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZABCD ABCDEFGHIJKLMNOPQRSTUVWXYZABCD ABCDEFGHIJKLMNOPQRSTUVWXYZABCD ABCDEFGHIJKLMNOPQRSTUVWXYZABCD -$DTYPE Reaction Conditions -$DATUM Not available $RFMT $RXN @@ -340,8 +336,6 @@ M END $DTYPE Name $DATUM 123456789012345678901234567890 12 -$DTYPE Reaction Conditions -$DATUM Not available $RFMT $RXN @@ -466,5 +460,3 @@ $DATUM 123456789012345678901234567890 123456789012345678901234567890 123456789012345678901234567890 123456789012345678901234567890... -$DTYPE Reaction Conditions -$DATUM Not available