# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1755101738 -7200
# Node ID 785f81400a049da24a1591b19f6b0d7d6a6f7dff
# Parent  bd27c4b181f8db56a366282fe5432e90306cb41c
fix audit-logs export in CSV

diff -r bd27c4b181f8 -r 785f81400a04 NEWS
--- a/NEWS	Tue Aug 12 16:53:29 2025 +0200
+++ b/NEWS	Wed Aug 13 18:15:38 2025 +0200
@@ -1,3 +1,14 @@
+2025-08-13 - v 0.10.1
+=====================
+
+=> Recommended Orthanc version: 1.12.9 <=
+=> Minimum Orthanc version: 1.11.3 <=
+=> Recommended SDK version: 1.12.9 <=
+=> Minimum SDK version: 1.11.3 <=
+
+* Fix audit-logs export in CSV format.
+
+
 2025-08-12 - v 0.10.0
 =====================
 
diff -r bd27c4b181f8 -r 785f81400a04 Plugin/Plugin.cpp
--- a/Plugin/Plugin.cpp	Tue Aug 12 16:53:29 2025 +0200
+++ b/Plugin/Plugin.cpp	Wed Aug 13 18:15:38 2025 +0200
@@ -1472,7 +1472,8 @@
       firstLineColumns.push_back("UserName");
       firstLineColumns.push_back("ResourceId");
       firstLineColumns.push_back("Action");
-      firstLineColumns.push_back("LogData");
+      firstLineColumns.push_back("JsonLogData");
+      firstLineColumns.push_back("Base64LogData");
 
       std::string firstLine;
       Orthanc::Toolbox::JoinStrings(firstLine, firstLineColumns,";");
@@ -1490,10 +1491,26 @@
         lineColumns.push_back(log["ResourceId"].asString());
         lineColumns.push_back(log["Action"].asString());
         
-        std::string logData;
-        Orthanc::Toolbox::WriteFastJson(logData, log["LogData"]);
-        boost::replace_all(logData, "\n", "");
-        lineColumns.push_back(logData);
+        if (log.isMember("JsonLogData"))
+        {
+          std::string logData;
+          Orthanc::Toolbox::WriteFastJson(logData, log["JsonLogData"]);
+          boost::replace_all(logData, "\n", "");
+          lineColumns.push_back(logData);
+        }
+        else
+        {
+          lineColumns.push_back("null");
+        }
+
+        if (log.isMember("Base64LogData"))
+        {
+          lineColumns.push_back(log["Base64LogData"].asString());
+        }
+        else
+        {
+          lineColumns.push_back("null");
+        }
 
         Orthanc::Toolbox::JoinStrings(line, lineColumns,";");
         lines.push_back(line);