From 8c972fd7c652da42d6044162764e2411858706ce Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 10 Jul 2017 08:19:10 +0200
Subject: [PATCH] renaming tag
---
.../OutputData/XML/XMLCustomerReport.cs | 30 +++++++++----------
.../VectoCore/OutputData/XML/XMLFullReport.cs | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
index 49a9821d45..e430fd5315 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
@@ -74,7 +74,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Component_Manufacturer, modelData.VehicleData.Manufacturer),
new XElement(tns + XMLNames.Component_ManufacturerAddress, modelData.VehicleData.ManufacturerAddress),
new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
- new XElement(tns + XMLNames.Vehicle_VehicleCategory, modelData.VehicleData.LegislativeClass.ToXMLFormat()),
+ new XElement(tns + XMLNames.Vehicle_LegislativeClass, modelData.VehicleData.LegislativeClass.ToXMLFormat()),
new XElement(tns + "VehicleGroup", segment.VehicleClass.GetClassNumber()),
new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
new XElement(tns + XMLNames.Vehicle_GrossVehicleMass, modelData.VehicleData.GrossVehicleWeight.ToXMLFormat(0)),
@@ -88,7 +88,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + "GearsCount", modelData.GearboxData.Gears.Count),
new XElement(tns + "Retarder", modelData.Retarder.Type.IsDedicatedComponent()),
new XElement(tns + "AxleRatio", modelData.AxleGearData.AxleGear.Ratio.ToXMLFormat(3))
- );
+ );
InputDataIntegrity = new XElement(tns + "InputDataSignature",
modelData.InputDataHash == null ? CreateDummySig() : new XElement(modelData.InputDataHash));
}
@@ -99,7 +99,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(di + XMLNames.DI_Signature_Reference_DigestMethod,
new XAttribute(XMLNames.DI_Signature_Algorithm_Attr, "null")),
new XElement(di + XMLNames.DI_Signature_Reference_DigestValue, "NOT AVAILABLE")
- );
+ );
}
public void AddResult(
@@ -159,19 +159,19 @@ namespace TUGraz.VectoCore.OutputData.XML
var vehicle = new XElement(VehiclePart);
vehicle.Add(InputDataIntegrity);
retVal.Add(new XElement(tns + "VectoCustomerInformation",
- new XAttribute("schemaVersion", "0.4"),
- new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),
- new XAttribute("xmlns", tns),
- new XAttribute(XNamespace.Xmlns + "di", di),
- new XAttribute(xsi + "schemaLocation",
- string.Format("{0} {1}VectoCOC.xsd", tns, AbstractXMLWriter.SchemaLocationBaseUrl)),
- new XElement(tns + "Data",
- vehicle,
- new XElement(tns + "ResultDataSignature", resultSignature),
- results,
- GetApplicationInfo())
+ new XAttribute("schemaVersion", "0.4"),
+ new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),
+ new XAttribute("xmlns", tns),
+ new XAttribute(XNamespace.Xmlns + "di", di),
+ new XAttribute(xsi + "schemaLocation",
+ string.Format("{0} {1}VectoCOC.xsd", tns, AbstractXMLWriter.SchemaLocationBaseUrl)),
+ new XElement(tns + "Data",
+ vehicle,
+ new XElement(tns + "ResultDataSignature", resultSignature),
+ results,
+ GetApplicationInfo())
)
- );
+ );
var stream = new MemoryStream();
var writer = new StreamWriter(stream);
writer.Write(retVal);
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLFullReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLFullReport.cs
index 2a1503b998..18f336a58d 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLFullReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLFullReport.cs
@@ -73,7 +73,7 @@ namespace TUGraz.VectoCore.OutputData.XML
{
VehiclePart.Add(
new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
- new XElement(tns + XMLNames.Vehicle_VehicleCategory, modelData.VehicleData.LegislativeClass.ToXMLFormat()),
+ new XElement(tns + XMLNames.Vehicle_LegislativeClass, modelData.VehicleData.LegislativeClass.ToXMLFormat()),
new XElement(tns + "VehicleGroup", segment.VehicleClass.GetClassNumber()),
new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
new XElement(tns + XMLNames.Vehicle_GrossVehicleMass, modelData.VehicleData.GrossVehicleWeight.ToXMLFormat(0)),
--
GitLab