# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1549457480 -3600
# Node ID 1f4a2c58e7fa436566d7882e786533ed7ebf8da2
# Parent  9316f341e40f729270736309ec9f506ba51111df
set encoding to UTF-8, IBinaryFormatter

diff -r 9316f341e40f -r 1f4a2c58e7fa UnitTestsSources/DicomMapTests.cpp
--- a/UnitTestsSources/DicomMapTests.cpp	Wed Feb 06 10:37:03 2019 +0100
+++ b/UnitTestsSources/DicomMapTests.cpp	Wed Feb 06 13:51:20 2019 +0100
@@ -560,18 +560,42 @@
 
 
 static const char* const KEY_ALPHABETIC = "Alphabetic";
+static const char* const KEY_BULK_DATA_URI = "BulkDataURI";
 static const char* const KEY_INLINE_BINARY = "InlineBinary";
 static const char* const KEY_SQ = "SQ";
 static const char* const KEY_VALUE = "Value";
 static const char* const KEY_VR = "vr";
 
 namespace Orthanc
-{
-  class DicomJsonVisitor : public ITagVisitor
+{  
+  class DicomWebJsonVisitor : public ITagVisitor
   {
+  public:
+    enum BinaryMode
+    {
+      BinaryMode_Ignore,
+      BinaryMode_BulkDataUri,
+      BinaryMode_InlineBinary
+    };
+    
+    class IBinaryFormatter : public boost::noncopyable
+    {
+    public:
+      virtual ~IBinaryFormatter()
+      {
+      }
+
+      virtual BinaryMode Format(std::string& bulkDataUri,
+                                const std::vector<DicomTag>& parentTags,
+                                const std::vector<size_t>& parentIndexes,
+                                const DicomTag& tag,
+                                ValueRepresentation vr) = 0;
+    };
+  
+    
   private:
-    Json::Value  result_;
-    std::string  bulkUriRoot_;
+    Json::Value        result_;
+    IBinaryFormatter  *formatter_;
 
     static std::string FormatTag(const DicomTag& tag)
     {
@@ -675,14 +699,15 @@
     }
 
   public:
-    DicomJsonVisitor()
+    DicomWebJsonVisitor() :
+      formatter_(NULL)
     {
       Clear();
     }
 
-    void SetBulkUriRoot(const std::string& root)
+    void SetFormatter(IBinaryFormatter& formatter)
     {
-      bulkUriRoot_ = root;
+      formatter_ = &formatter;
     }
     
     void Clear()
@@ -727,18 +752,46 @@
              vr == ValueRepresentation_OtherWord ||
              vr == ValueRepresentation_Unknown);
 
-      if (tag.GetElement() != 0x0000  /*&&
-                                        !bulkUriRoot_.empty()*/)
+      if (tag.GetElement() != 0x0000)
       {
-        Json::Value& node = CreateNode(parentTags, parentIndexes, tag);
-        node[KEY_VR] = EnumerationToString(vr);
+        BinaryMode mode;
+        std::string bulkDataUri;
+        
+        if (formatter_ == NULL)
+        {
+          mode = BinaryMode_InlineBinary;
+        }
+        else
+        {
+          mode = formatter_->Format(bulkDataUri, parentTags, parentIndexes, tag, vr);
+        }
+
+        if (mode != BinaryMode_Ignore)
+        {
+          Json::Value& node = CreateNode(parentTags, parentIndexes, tag);
+          node[KEY_VR] = EnumerationToString(vr);
 
-        std::string tmp(static_cast<const char*>(data), size);
-        
-        std::string base64;
-        Toolbox::EncodeBase64(base64, tmp);
+          switch (mode)
+          {
+            case BinaryMode_BulkDataUri:
+              node[KEY_BULK_DATA_URI] = bulkDataUri;
+              break;
 
-        node[KEY_INLINE_BINARY] = base64;
+            case BinaryMode_InlineBinary:
+            {
+              std::string tmp(static_cast<const char*>(data), size);
+          
+              std::string base64;
+              Toolbox::EncodeBase64(base64, tmp);
+
+              node[KEY_INLINE_BINARY] = base64;
+              break;
+            }
+
+            default:
+              throw OrthancException(ErrorCode_ParameterOutOfRange);
+          }
+        }
       }
     }
 
@@ -820,7 +873,7 @@
                                const std::vector<size_t>& parentIndexes,
                                const DicomTag& tag,
                                ValueRepresentation vr,
-                               const std::string& tutu) ORTHANC_OVERRIDE
+                               const std::string& value) ORTHANC_OVERRIDE
     {
       if (tag.GetElement() == 0x0000 ||
           vr == ValueRepresentation_NotSupported)
@@ -832,82 +885,93 @@
         Json::Value& node = CreateNode(parentTags, parentIndexes, tag);
         node[KEY_VR] = EnumerationToString(vr);
 
-        std::string truncated;
-        
-        if (!tutu.empty() &&
-            tutu[tutu.size() - 1] == '\0')
+        if (tag == DICOM_TAG_SPECIFIC_CHARACTER_SET)
         {
-          truncated = tutu.substr(0, tutu.size() - 1);
+          // TODO - The JSON file has an UTF-8 encoding, thus DCMTK
+          // replaces the specific character set with "ISO_IR 192"
+          // (UNICODE UTF-8). It is unclear whether the source
+          // character set should be kept: We thus mimic DCMTK.
+          node[KEY_VALUE].append("ISO_IR 192");
         }
         else
         {
-          truncated = tutu;
-        }
+          std::string truncated;
         
-        if (!truncated.empty())
-        {
-          std::vector<std::string> tokens;
-          Toolbox::TokenizeString(tokens, truncated, '\\');
+          if (!value.empty() &&
+              value[value.size() - 1] == '\0')
+          {
+            truncated = value.substr(0, value.size() - 1);
+          }
+          else
+          {
+            truncated = value;
+          }
+        
+          if (!truncated.empty())
+          {
+            std::vector<std::string> tokens;
+            Toolbox::TokenizeString(tokens, truncated, '\\');
 
-          node[KEY_VALUE] = Json::arrayValue;
-          for (size_t i = 0; i < tokens.size(); i++)
-          {
-            try
+            node[KEY_VALUE] = Json::arrayValue;
+            for (size_t i = 0; i < tokens.size(); i++)
             {
-              switch (vr)
+              try
               {
-                case ValueRepresentation_PersonName:
+                switch (vr)
                 {
-                  Json::Value value = Json::objectValue;
-                  if (!tokens[i].empty())
+                  case ValueRepresentation_PersonName:
                   {
-                    value[KEY_ALPHABETIC] = tokens[i];
-                  }
-                  node[KEY_VALUE].append(value);
-                  break;
-                }
-                  
-                case ValueRepresentation_IntegerString:
-                  if (tokens[i].empty())
-                  {
-                    node[KEY_VALUE].append(Json::nullValue);
-                  }
-                  else
-                  {
-                    int64_t value = boost::lexical_cast<int64_t>(tokens[i]);
-                    node[KEY_VALUE].append(FormatInteger(value));
+                    Json::Value value = Json::objectValue;
+                    if (!tokens[i].empty())
+                    {
+                      value[KEY_ALPHABETIC] = tokens[i];
+                    }
+                    node[KEY_VALUE].append(value);
+                    break;
                   }
                   
-                  break;
-              
-                case ValueRepresentation_DecimalString:
-                  if (tokens[i].empty())
-                  {
-                    node[KEY_VALUE].append(Json::nullValue);
-                  }
-                  else
-                  {
-                    double value = boost::lexical_cast<double>(tokens[i]);
-                    node[KEY_VALUE].append(FormatDouble(value));
-                  }
-                  break;
+                  case ValueRepresentation_IntegerString:
+                    if (tokens[i].empty())
+                    {
+                      node[KEY_VALUE].append(Json::nullValue);
+                    }
+                    else
+                    {
+                      int64_t value = boost::lexical_cast<int64_t>(tokens[i]);
+                      node[KEY_VALUE].append(FormatInteger(value));
+                    }
+                  
+                    break;
               
-                default:
-                  if (tokens[i].empty())
-                  {
-                    node[KEY_VALUE].append(Json::nullValue);
-                  }
-                  else
-                  {
-                    node[KEY_VALUE].append(tokens[i]);
-                  }
+                  case ValueRepresentation_DecimalString:
+                    if (tokens[i].empty())
+                    {
+                      node[KEY_VALUE].append(Json::nullValue);
+                    }
+                    else
+                    {
+                      double value = boost::lexical_cast<double>(tokens[i]);
+                      node[KEY_VALUE].append(FormatDouble(value));
+                    }
+                    break;
+              
+                  default:
+                    if (tokens[i].empty())
+                    {
+                      node[KEY_VALUE].append(Json::nullValue);
+                    }
+                    else
+                    {
+                      node[KEY_VALUE].append(tokens[i]);
+                    }
                   
-                  break;
+                    break;
+                }
               }
-            }
-            catch (boost::bad_lexical_cast&)
-            {
-              throw OrthancException(ErrorCode_BadFileFormat);
+              catch (boost::bad_lexical_cast&)
+              {
+                throw OrthancException(ErrorCode_BadFileFormat);
+              }
             }
           }
         }
@@ -950,7 +1014,7 @@
 
   Orthanc::ParsedDicomFile dicom(content);
 
-  Orthanc::DicomJsonVisitor visitor;
+  Orthanc::DicomWebJsonVisitor visitor;
   dicom.Apply(visitor);
 
   Orthanc::SystemToolbox::WriteFile(visitor.GetResult().toStyledString(), "tutu.json");
@@ -965,7 +1029,7 @@
   dicom.ReplacePlainString(DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "1\\2.3\\4");
   dicom.ReplacePlainString(DICOM_TAG_IMAGE_POSITION_PATIENT, "");
 
-  Orthanc::DicomJsonVisitor visitor;
+  Orthanc::DicomWebJsonVisitor visitor;
   dicom.Apply(visitor);
 
   {
@@ -996,7 +1060,7 @@
   ParsedDicomFile dicom(false);
   dicom.ReplacePlainString(DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "1.5\\\\\\2.5");
 
-  Orthanc::DicomJsonVisitor visitor;
+  Orthanc::DicomWebJsonVisitor visitor;
   dicom.Apply(visitor);
 
   {
@@ -1060,7 +1124,7 @@
   dicom.ReplacePlainString(DicomTag(0x0040, 0x0031), "UT");
   
   
-  Orthanc::DicomJsonVisitor visitor;
+  Orthanc::DicomWebJsonVisitor visitor;
   dicom.Apply(visitor);
 
   std::string s;
@@ -1172,7 +1236,7 @@
     ASSERT_TRUE(dicom.GetDcmtkObject().getDataset()->insert(sequence.release(), false, false).good());
   }
 
-  Orthanc::DicomJsonVisitor visitor;
+  Orthanc::DicomWebJsonVisitor visitor;
   dicom.Apply(visitor);
 
   ASSERT_EQ("SQ", visitor.GetResult() ["00081115"]["vr"].asString());