Merge pull request #2241 from janmarius/FIX-2240-copying-trajectories…

…-bug FIX-2240 fix copying trajectories bug
equinor · Feb 14, 2024 · a144a70 · a144a70
2 parents 7435f04 + 96d3509
commit a144a70
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/Src/Witsml/Data/Tubular/WitsmlMotor.cs b/Src/Witsml/Data/Tubular/WitsmlMotor.cs
@@ -61,7 +61,7 @@ public string LobesStatorText
         [XmlElement("rotorCatcher")]
         public string RotorCatcherText
         {
-            get => RotorCatcher?.ToString(CultureInfo.InvariantCulture);
+            get => RotorCatcher.HasValue ? XmlConvert.ToString(RotorCatcher.Value) : null;
             set => RotorCatcher = string.IsNullOrEmpty(value) ? default(bool?) : bool.Parse(value);
         }
 
@@ -70,7 +70,7 @@ public string RotorCatcherText
         [XmlElement("dumpValve")]
         public string DumpValveText
         {
-            get => DumpValve?.ToString(CultureInfo.InvariantCulture);
+            get => DumpValve.HasValue ? XmlConvert.ToString(DumpValve.Value) : null;
             set => DumpValve = string.IsNullOrEmpty(value) ? default(bool?) : bool.Parse(value);
         }
 
@@ -82,7 +82,7 @@ public string DumpValveText
         [XmlElement("rotatable")]
         public string RotatableText
         {
-            get => Rotatable?.ToString(CultureInfo.InvariantCulture);
+            get => Rotatable.HasValue ? XmlConvert.ToString(Rotatable.Value) : null;
             set => Rotatable = string.IsNullOrEmpty(value) ? default(bool?) : bool.Parse(value);
         }
 

diff --git a/Src/Witsml/Data/Tubular/WitsmlTubular.cs b/Src/Witsml/Data/Tubular/WitsmlTubular.cs
@@ -26,7 +26,7 @@ public override WitsmlTubulars AsItemInWitsmlList()
         [XmlElement("valveFloat")]
         public string ValveFloatText
         {
-            get => ValveFloat?.ToString(CultureInfo.InvariantCulture);
+            get => ValveFloat.HasValue ? XmlConvert.ToString(ValveFloat.Value) : null;
             set => ValveFloat = string.IsNullOrEmpty(value) ? default(bool?) : bool.Parse(value);
         }
 
@@ -35,7 +35,7 @@ public string ValveFloatText
         [XmlElement("sourceNuclear")]
         public string SourceNuclearText
         {
-            get => SourceNuclear?.ToString(CultureInfo.InvariantCulture);
+            get => SourceNuclear.HasValue ? XmlConvert.ToString(SourceNuclear.Value) : null;
             set => SourceNuclear = string.IsNullOrEmpty(value) ? default(bool?) : bool.Parse(value);
         }
 

diff --git a/Src/Witsml/Data/WitsmlLocation.cs b/Src/Witsml/Data/WitsmlLocation.cs
@@ -25,7 +25,7 @@ public class WitsmlLocation
         [XmlElement("original")]
         public string OriginalText
         {
-            get => Original?.ToString(CultureInfo.InvariantCulture);
+            get => Original.HasValue ? XmlConvert.ToString(Original.Value) : null;
             set => Original = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }
         [XmlElement("description")] public string Description { get; set; }

diff --git a/Src/Witsml/Data/WitsmlTrajectory.cs b/Src/Witsml/Data/WitsmlTrajectory.cs
@@ -23,7 +23,7 @@ public override WitsmlTrajectories AsItemInWitsmlList()
         [XmlElement("objectGrowing")]
         public string ObjectGrowingText
         {
-            get => ObjectGrowing?.ToString(CultureInfo.InvariantCulture);
+            get => ObjectGrowing.HasValue ? XmlConvert.ToString(ObjectGrowing.Value) : null;
             set => ObjectGrowing = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }
 

diff --git a/Src/Witsml/Data/WitsmlTrajectoryStation.cs b/Src/Witsml/Data/WitsmlTrajectoryStation.cs
@@ -41,7 +41,7 @@ public class WitsmlTrajectoryStation
         [XmlElement("magXAxialCorUsed")]
         public string MagXAxialCorUsedText
         {
-            get => MagXAxialCorUsed?.ToString(CultureInfo.InvariantCulture);
+            get => MagXAxialCorUsed.HasValue ? XmlConvert.ToString(MagXAxialCorUsed.Value) : null;
             set => MagXAxialCorUsed = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }
 
@@ -50,7 +50,7 @@ public string MagXAxialCorUsedText
         [XmlElement("sagCorUsed")]
         public string SagCorUsedText
         {
-            get => SagCorUsed?.ToString(CultureInfo.InvariantCulture);
+            get => SagCorUsed.HasValue ? XmlConvert.ToString(SagCorUsed.Value) : null;
             set => SagCorUsed = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }
 
@@ -59,7 +59,7 @@ public string SagCorUsedText
         [XmlElement("magDrlstrCorUsed")]
         public string MagDrlstrCorUsedText
         {
-            get => MagDrlstrCorUsed?.ToString(CultureInfo.InvariantCulture);
+            get => MagDrlstrCorUsed.HasValue ? XmlConvert.ToString(MagDrlstrCorUsed.Value) : null;
             set => MagDrlstrCorUsed = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }
 
@@ -68,7 +68,7 @@ public string MagDrlstrCorUsedText
         [XmlElement("infieldRefCorUsed")]
         public string InfieldRefCorUsedText
         {
-            get => InfieldRefCorUsed?.ToString(CultureInfo.InvariantCulture);
+            get => InfieldRefCorUsed.HasValue ? XmlConvert.ToString(InfieldRefCorUsed.Value) : null;
             set => InfieldRefCorUsed = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }
 
@@ -77,7 +77,7 @@ public string InfieldRefCorUsedText
         [XmlElement("interpolatedInfieldRefCorUsed")]
         public string InterpolatedInfieldRefCorUsedText
         {
-            get => InterpolatedInfieldRefCorUsed?.ToString(CultureInfo.InvariantCulture);
+            get => InterpolatedInfieldRefCorUsed.HasValue ? XmlConvert.ToString(InterpolatedInfieldRefCorUsed.Value) : null;
             set => InterpolatedInfieldRefCorUsed = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }
 
@@ -86,7 +86,7 @@ public string InterpolatedInfieldRefCorUsedText
         [XmlElement("inHoleRefCorUsed")]
         public string InHoleRefCorUsedText
         {
-            get => InHoleRefCorUsed?.ToString(CultureInfo.InvariantCulture);
+            get => InHoleRefCorUsed.HasValue ? XmlConvert.ToString(InHoleRefCorUsed.Value) : null;
             set => InHoleRefCorUsed = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }
 
@@ -96,7 +96,7 @@ public string InHoleRefCorUsedText
         [XmlElement("axialMagInterferenceCorUsed")]
         public string AxialMagInterferenceCorUsedText
         {
-            get => AxialMagInterferenceCorUsed?.ToString(CultureInfo.InvariantCulture);
+            get => AxialMagInterferenceCorUsed.HasValue ? XmlConvert.ToString(AxialMagInterferenceCorUsed.Value) : null;
             set => AxialMagInterferenceCorUsed = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }
 
@@ -105,7 +105,7 @@ public string AxialMagInterferenceCorUsedText
         [XmlElement("cosagCorUsed")]
         public string CosagCorUsedText
         {
-            get => CosagCorUsed?.ToString(CultureInfo.InvariantCulture);
+            get => CosagCorUsed.HasValue ? XmlConvert.ToString(CosagCorUsed.Value) : null;
             set => CosagCorUsed = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }
 
@@ -114,7 +114,7 @@ public string CosagCorUsedText
         [XmlElement("MSACorUsed")]
         public string MsaCorUsedText
         {
-            get => MsaCorUsed?.ToString(CultureInfo.InvariantCulture);
+            get => MsaCorUsed.HasValue ? XmlConvert.ToString(MsaCorUsed.Value) : null;
             set => MsaCorUsed = !string.IsNullOrEmpty(value) ? bool.Parse(value) : default(bool?);
         }