changeset 1175:6fa65ccf312d db-changes

merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 22 Sep 2014 13:57:04 +0200
parents c200a92734c9 (current diff) 3b372ab992ec (diff)
children f24e04838054
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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));
       }
     }
--- 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