bugfix #57

Author: trojanobelix

libEDSsharp/CanOpenNodeExporter.cs

@@ -1166,9 +1166,9 @@ string formatvaluewithdatatype(string defaultvalue, DataType dt, bool fixstring=
                     defaultvalue = "0";
                 }
 
-                if (defaultvalue.Contains("$NODEID"))
+                if (defaultvalue.Contains("$NODEID", StringComparison.OrdinalIgnoreCase)) // fetch different case of "NODeID" (allowed according DS301)
                 {
-                    defaultvalue = defaultvalue.Replace("$NODEID", "");
+                    defaultvalue = defaultvalue.ToUpper().Replace("$NODEID", "");
                     defaultvalue = defaultvalue.Replace("+", "");
                     defaultvalue = defaultvalue.Trim();
                     nodeidreplace = true;

libEDSsharp/CanOpenNodeExporter_V4.cs

@@ -735,11 +735,11 @@ private DataProperties Get_dataProperties(DataType dataType, string defaultvalue
                 valueDefined = false;
             else if (dataType != DataType.VISIBLE_STRING && dataType != DataType.UNICODE_STRING && dataType != DataType.OCTET_STRING)
             {
-                defaultvalue = defaultvalue.Trim().ToUpper();       // TOUPPER to fetch different case of "NODeID" (allowed acording DS301)
+                defaultvalue = defaultvalue.Trim();       
 
-                if (defaultvalue.Contains("$NODEID"))
+                if (defaultvalue.Contains("$NODEID",StringComparison.OrdinalIgnoreCase)) // fetch different case of "NODeID" (allowed according DS301)
                 {
-                    defaultvalue = defaultvalue.Replace("$NODEID", "");
+                    defaultvalue = defaultvalue.ToUpper().Replace("$NODEID", "");
                     defaultvalue = defaultvalue.Replace("+", "");
                     defaultvalue = defaultvalue.Trim();
                     if (defaultvalue == "")

libEDSsharp/extensions.cs

@@ -24,4 +24,20 @@ public static string ToHexString(this UInt32 val)
         }
 
     }
+
+    public static class StringExtensions
+    {
+        public static bool Contains(this String str, String substring,
+                                    StringComparison comp)
+        {
+            if (substring == null)
+                throw new ArgumentNullException("substring",
+                                             "substring cannot be null.");
+            else if (!Enum.IsDefined(typeof(StringComparison), comp))
+                throw new ArgumentException("comp is not a member of StringComparison",
+                                         "comp");
+
+            return str.IndexOf(substring, comp) >= 0;
+        }
+    }
 }