changeset 1242:58e6a89c3ef4

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 05 Dec 2014 17:37:27 +0100
parents 90d2f320862d
children 3a3e7e3e244f
files OrthancServer/DatabaseWrapper.cpp OrthancServer/DatabaseWrapper.h OrthancServer/ExportedResource.h OrthancServer/ServerIndexChange.h
diffstat 4 files changed, 146 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/DatabaseWrapper.cpp	Fri Dec 05 17:22:53 2014 +0100
+++ b/OrthancServer/DatabaseWrapper.cpp	Fri Dec 05 17:37:27 2014 +0100
@@ -694,6 +694,16 @@
       ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(1));
       std::string publicId = s.ColumnString(2);
 
+      ExportedResource resource(seq, 
+                                resourceType,
+                                publicId,
+                                s.ColumnString(3),  // modality
+                                s.ColumnString(8),  // date
+                                s.ColumnString(4),  // patient ID
+                                s.ColumnString(5),  // study instance UID
+                                s.ColumnString(6),  // series instance UID
+                                s.ColumnString(7)); // sop instance UID
+
       Json::Value item = Json::objectValue;
       item["Seq"] = static_cast<int>(seq);
       item["ResourceType"] = EnumerationToString(resourceType);
--- a/OrthancServer/DatabaseWrapper.h	Fri Dec 05 17:22:53 2014 +0100
+++ b/OrthancServer/DatabaseWrapper.h	Fri Dec 05 17:37:27 2014 +0100
@@ -41,6 +41,8 @@
 #include <list>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
+#include "ExportedResource.h"
+
 namespace Orthanc
 {
   namespace Internals
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancServer/ExportedResource.h	Fri Dec 05 17:37:27 2014 +0100
@@ -0,0 +1,134 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege,
+ * Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * In addition, as a special exception, the copyright holders of this
+ * program give permission to link the code of its release with the
+ * OpenSSL project's "OpenSSL" library (or with modified versions of it
+ * that use the same license as the "OpenSSL" library), and distribute
+ * the linked executables. You must obey the GNU General Public License
+ * in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s) with this exception, you may extend this exception to
+ * your version of the file(s), but you are not obligated to do so. If
+ * you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files
+ * in the program, then also delete it here.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#pragma once
+
+#include "ServerEnumerations.h"
+#include "../Core/Toolbox.h"
+
+#include <string>
+#include <json/value.h>
+
+namespace Orthanc
+{
+  struct ExportedResource
+  {
+  private:
+    int64_t      seq_;
+    ResourceType resourceType_;
+    std::string  publicId_;
+    std::string  modality_;
+    std::string  date_;
+    std::string  patientId_;
+    std::string  studyInstanceUid_;
+    std::string  seriesInstanceUid_;
+    std::string  sopInstanceUid_;
+
+  public:
+    ExportedResource(int64_t seq,
+                     ResourceType resourceType,
+                     const std::string& publicId,
+                     const std::string& modality,
+                     const std::string& date,
+                     const std::string& patientId,
+                     const std::string& studyInstanceUid,
+                     const std::string& seriesInstanceUid,
+                     const std::string& sopInstanceUid) :
+      seq_(seq),
+      resourceType_(resourceType),
+      publicId_(publicId),
+      modality_(modality),
+      date_(date),
+      patientId_(patientId),
+      studyInstanceUid_(studyInstanceUid),
+      seriesInstanceUid_(seriesInstanceUid),
+      sopInstanceUid_(sopInstanceUid)
+    {
+    }
+
+    int64_t  GetSeq() const
+    {
+      return seq_;
+    }
+
+    ResourceType  GetResourceType() const
+    {
+      return resourceType_;
+    }
+
+    const std::string&  GetPublicId() const
+    {
+      return publicId_;
+    }
+
+    const std::string& GetModality() const
+    {
+      return modality_;
+    }
+
+    const std::string& GetDate() const
+    {
+      return date_;
+    }
+
+    void Format(Json::Value& item) const
+    {
+      item = Json::objectValue;
+      item["Seq"] = static_cast<int>(seq_);
+      item["ResourceType"] = EnumerationToString(resourceType_);
+      item["ID"] = publicId_;
+      item["Path"] = GetBasePath(resourceType_, publicId_);
+      item["RemoteModality"] = modality_;
+      item["Date"] = date_;
+
+      // WARNING: Do not add "break" below and do not reorder the case items!
+      switch (resourceType_)
+      {
+      case ResourceType_Instance:
+        item["SopInstanceUid"] = sopInstanceUid_;
+
+      case ResourceType_Series:
+        item["SeriesInstanceUid"] = seriesInstanceUid_;
+
+      case ResourceType_Study:
+        item["StudyInstanceUid"] = studyInstanceUid_;
+
+      case ResourceType_Patient:
+        item["PatientId"] = patientId_;
+        break;
+
+      default:
+        throw OrthancException(ErrorCode_InternalError);
+      }
+    }
+  };
+}
--- a/OrthancServer/ServerIndexChange.h	Fri Dec 05 17:22:53 2014 +0100
+++ b/OrthancServer/ServerIndexChange.h	Fri Dec 05 17:37:27 2014 +0100
@@ -79,11 +79,6 @@
       return seq_;
     }
 
-    void  SetSeq(int64_t seq)
-    {
-      seq_ = seq;
-    }
-
     ChangeType  GetChangeType() const
     {
       return changeType_;