From 87d36dbfd8a263e4c69278fbb0a8f07b0e8dc2bb Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Sun, 13 Aug 2023 19:10:26 -0400
Subject: [PATCH] Fix up erc json a little

---
 common/rc_item.cpp       | 2 +-
 eeschema/erc_report.cpp  | 2 +-
 include/rc_json_schema.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/rc_item.cpp b/common/rc_item.cpp
index 2b54b91f34..423cee7619 100644
--- a/common/rc_item.cpp
+++ b/common/rc_item.cpp
@@ -162,7 +162,7 @@ void RC_ITEM::GetJsonViolation( RC_JSON::VIOLATION& aViolation, UNITS_PROVIDER*
     wxString severity = getSeverityString( aSeverity );
 
     aViolation.severity = severity;
-    aViolation.description = GetViolatingRuleDesc();
+    aViolation.description = GetErrorMessage();
     aViolation.type = GetSettingsKey();
 
     EDA_ITEM* mainItem = nullptr;
diff --git a/eeschema/erc_report.cpp b/eeschema/erc_report.cpp
index 4d248b7938..7c4736c45c 100644
--- a/eeschema/erc_report.cpp
+++ b/eeschema/erc_report.cpp
@@ -129,7 +129,7 @@ bool ERC_REPORT::WriteJsonReport( const wxString& aFullFileName )
     {
         RC_JSON::ERC_SHEET jsonSheet;
         jsonSheet.path = sheetList[i].PathHumanReadable();
-        jsonSheet.uuid = sheetList[i].Path().AsString();
+        jsonSheet.uuid_path = sheetList[i].Path().AsString();
 
         for( SCH_ITEM* aItem : sheetList[i].LastScreen()->Items().OfType( SCH_MARKER_T ) )
         {
diff --git a/include/rc_json_schema.h b/include/rc_json_schema.h
index 7f53020fba..c43cb561ea 100644
--- a/include/rc_json_schema.h
+++ b/include/rc_json_schema.h
@@ -81,12 +81,12 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE( DRC_REPORT, source, date, kicad_version, vio
 
 struct ERC_SHEET
 {
-    wxString               uuid;
+    wxString               uuid_path;
     wxString               path;
     std::vector<VIOLATION> violations;
 };
 
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE( ERC_SHEET, uuid, path, violations )
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE( ERC_SHEET, uuid_path, path, violations )
 
 struct ERC_REPORT : REPORT_BASE
 {