# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1411387024 -7200
# Node ID 6fa65ccf312d142171cca99aefc1e74a3be5f677
# Parent  c200a92734c95f111576438feb07fac178a243ad# Parent  3b372ab992ec36f8bb9d6ed363b4a389450076a6
merge

diff -r c200a92734c9 -r 6fa65ccf312d OrthancServer/DatabaseWrapper.cpp
--- a/OrthancServer/DatabaseWrapper.cpp	Fri Sep 19 18:24:34 2014 +0200
+++ b/OrthancServer/DatabaseWrapper.cpp	Mon Sep 22 13:57:04 2014 +0200
@@ -560,12 +560,12 @@
     {
       if (flattened.GetElement(i).GetTag().IsIdentifier())
       {
-        SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO MainDicomTags VALUES(?, ?, ?, ?)");
+        SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO DicomIdentifiers VALUES(?, ?, ?, ?)");
         SetMainDicomTagsInternal(s, id, flattened.GetElement(i));
       }
       else
       {
-        SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO DicomIdentifier VALUES(?, ?, ?, ?)");
+        SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO MainDicomTags VALUES(?, ?, ?, ?)");
         SetMainDicomTagsInternal(s, id, flattened.GetElement(i));
       }
     }
diff -r c200a92734c9 -r 6fa65ccf312d OrthancServer/main.cpp
--- a/OrthancServer/main.cpp	Fri Sep 19 18:24:34 2014 +0200
+++ b/OrthancServer/main.cpp	Mon Sep 22 13:57:04 2014 +0200
@@ -658,6 +658,7 @@
     }
   }
 
+  LOG(WARNING) << "Orthanc version: " << ORTHANC_VERSION;
 
   int status = 0;
   try