# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1656080203 -7200
# Node ID 3444990cf295fd9d1d647be8bca75daeb367275e
# Parent  877bc3b96476dc7ab57a38e3db4f9514f313432f
cleanup

diff -r 877bc3b96476 -r 3444990cf295 OrthancFramework/Sources/Enumerations.cpp
--- a/OrthancFramework/Sources/Enumerations.cpp	Fri Jun 24 15:47:10 2022 +0200
+++ b/OrthancFramework/Sources/Enumerations.cpp	Fri Jun 24 16:16:43 2022 +0200
@@ -1311,7 +1311,7 @@
       return ResourceType_Instance;
     }
 
-    throw OrthancException(ErrorCode_ParameterOutOfRange);
+    throw OrthancException(ErrorCode_ParameterOutOfRange, std::string("Invalid resource type '") + type + "'");
   }
 
   const char* ResourceTypeToDicomQueryRetrieveLevel(ResourceType type)
diff -r 877bc3b96476 -r 3444990cf295 OrthancServer/Sources/OrthancInitialization.cpp
--- a/OrthancServer/Sources/OrthancInitialization.cpp	Fri Jun 24 15:47:10 2022 +0200
+++ b/OrthancServer/Sources/OrthancInitialization.cpp	Fri Jun 24 16:16:43 2022 +0200
@@ -215,27 +215,7 @@
 
     for (Json::Value::ArrayIndex i = 0; i < levels.size(); i++)
     {
-      ResourceType level;
-      if (levels[i] == "Patient")
-      {
-        level = ResourceType_Patient;
-      }
-      else if (levels[i] == "Study")
-      {
-        level = ResourceType_Study;
-      }
-      else if (levels[i] == "Series")
-      {
-        level = ResourceType_Series;
-      }
-      else if (levels[i] == "Instance")
-      {
-        level = ResourceType_Instance;
-      }
-      else
-      {
-        throw OrthancException(ErrorCode_BadFileFormat, "Unknown entry '" + levels[i] + "' in ExtraMainDicomTags.");
-      }
+      ResourceType level = StringToResourceType(levels[i].c_str());
 
       const Json::Value& content = configuration[EXTRA_MAIN_DICOM_TAGS][levels[i]];