#2652 - Skip Name and/or Reaction Conditions metadata fields on save …

…to RDF if no data is available (#2656)
epam · Nov 27, 2024 · 993a320 · 993a320
1 parent e79b727
commit 993a320
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 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
@@ -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
@@ -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
diff --git 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)