TimeSeriesPlatformLibrary: Updated DataSet XML parser to properly pickup columns that have an expression defined in the schema.

J. Ritchie Carroll committed 7 years ago

Commit 52ae5c61 parent a5c76019 files · +44 −20Browse files

Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Data/DataSet.cpp (1 of 9 files). Show all

Unified · Split

Source/Libraries/TimeSeriesPlatformLibrary/Data/DataSet.cpp+21−8

     if (!StartsWith(schemaNode.name(), schemaPrefix, false))
         throw DataSetException("Failed to parse dataset XML: schema node \"" + string(schemaNode.name()) + "\" prefix is not \"" + schemaPrefix + "\"");
-    string extDataTypeAttributeName{};
+    string extDataTypeAttributeName{}, extExpressionAttributeName{};
     if (!extSchemaDataPrefix.empty())
+    {
         extDataTypeAttributeName = extSchemaDataPrefix + "DataType";
+        extExpressionAttributeName = extSchemaDataPrefix + "Expression";
+    }
-    xml_attribute nameAttribute, typeAttribute, extDataTypeAttribute;
+    xml_attribute nameAttribute, typeAttribute, extDataTypeAttribute, extExpressionAttribute;
     // Find element node
     xml_node elementNode;
             if (StartsWith(typeName, schemaPrefix))
                 typeName = typeName.substr(schemaPrefix.size());
-            string extDataTypeName{};
+            string extDataType{};
             if (!extDataTypeAttributeName.empty())
             {
                 extDataTypeAttribute = node.attribute(extDataTypeAttributeName.c_str());
                 if (extDataTypeAttribute)
-                    extDataTypeName = extDataTypeAttribute.value();
+                    extDataType = extDataTypeAttribute.value();
+            }
+            string columnExpression{};
+            if (!extExpressionAttributeName.empty())
+            {
+                extExpressionAttribute = node.attribute(extExpressionAttributeName.c_str());
+                if (extExpressionAttribute)
+                    columnExpression = extExpressionAttribute.value();
             }
             DataType columnDataType;
             if (IsEqual(typeName, "string", false))
             {
-                if (!extDataTypeName.empty() && StartsWith(extDataTypeName, "System.Guid", false))
+                if (!extDataType.empty() && StartsWith(extDataType, "System.Guid", false))
                     columnDataType = DataType::Guid;
                 else
                     columnDataType = DataType::String;
             }
             // Create column
-            const DataColumnPtr dataColumn = dataTable->CreateColumn(columnName, columnDataType);
+            const DataColumnPtr dataColumn = dataTable->CreateColumn(columnName, columnDataType, columnExpression);
             dataTable->AddColumn(dataColumn);
         }
                     break;
                 case DataType::DateTime:
                     if (value.empty())
-                        dataRow->SetNullValue(index);
+                        dataRow->SetDateTimeValue(index, Empty::DateTime);
                     else
                         dataRow->SetDateTimeValue(index, ParseTimestamp(value.as_string()));
                     break;
                     break;
                 case DataType::Guid:
                     if (value.empty())
-                        dataRow->SetNullValue(index);
+                        dataRow->SetGuidValue(index, Empty::Guid);
                     else
                         dataRow->SetGuidValue(index, ParseGuid(value.as_string()));
                     break;

TimeSeriesPlatformLibrary: Updated DataSet XML parser to properly pickup columns that have an expression defined in the schema.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code