# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1727172685 -7200
# Node ID 63c025cf6958f10ed0df05624300adab897ef400
# Parent  8279eaab0d1dd800aa7b0643dbcde2c8e5562a69
cleanup

diff -r 8279eaab0d1d -r 63c025cf6958 .hgignore
--- a/.hgignore	Tue Sep 24 11:39:52 2024 +0200
+++ b/.hgignore	Tue Sep 24 12:11:25 2024 +0200
@@ -14,3 +14,4 @@
 .project
 Resources/Testing/Issue32/Java/bin
 Resources/Testing/Issue32/Java/target
+build/
diff -r 8279eaab0d1d -r 63c025cf6958 NEWS
--- a/NEWS	Tue Sep 24 11:39:52 2024 +0200
+++ b/NEWS	Tue Sep 24 12:11:25 2024 +0200
@@ -1,7 +1,6 @@
 Pending changes in the mainline
 ===============================
 
-<<<<<<< working copy
 General
 -------
 
@@ -18,8 +17,6 @@
 * New storage plugin SDK (v3) to handle customData for attachments,
 
 
-version 1.11.2 (2022-08-30)
-=======
 REST API
 -----------
 
@@ -399,7 +396,6 @@
 
 
 Version 1.11.2 (2022-08-30)
->>>>>>> merge rev
 ===========================
 
 General
diff -r 8279eaab0d1d -r 63c025cf6958 OrthancServer/Plugins/Samples/AdvancedStorage/Plugin.cpp
--- a/OrthancServer/Plugins/Samples/AdvancedStorage/Plugin.cpp	Tue Sep 24 11:39:52 2024 +0200
+++ b/OrthancServer/Plugins/Samples/AdvancedStorage/Plugin.cpp	Tue Sep 24 12:11:25 2024 +0200
@@ -154,8 +154,9 @@
   Json::Value customDataJson;
   customDataJson["Version"] = 1;
 
+  // no need to store the path since if we are in the default mode
   if (namingScheme_ != "OrthancDefault")
-  { // no need to store the pathc since we are in the default mode
+  { 
     customDataJson["Path"] = path.string();
   }
 
@@ -164,7 +165,7 @@
     customDataJson["StorageId"] = currentStorageId_;
   }
 
-  return  Orthanc::Toolbox::WriteFastJson(output, customDataJson);
+  return Orthanc::Toolbox::WriteFastJson(output, customDataJson);
 }
 
 void AddSplitDateDicomTagToPath(fs::path& path, const Json::Value& tags, const char* tagName, const char* defaultValue = NULL)