diff OrthancServer/ServerIndex.cpp @ 188:090cefdab1d1

fix because of Windows macros
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 12 Nov 2012 17:43:12 +0100
parents 8e673a65564d
children ccbc2cf64a0d
line wrap: on
line diff
--- a/OrthancServer/ServerIndex.cpp	Mon Nov 12 17:29:11 2012 +0100
+++ b/OrthancServer/ServerIndex.cpp	Mon Nov 12 17:43:12 2012 +0100
@@ -531,29 +531,29 @@
       bool isNewSeries = false;
 
       // Do nothing if the instance already exists
-      if (db2_->FindResource(hasher.HashInstance(), patient, type))
+      if (db2_->LookupResource(hasher.HashInstance(), patient, type))
       {
-        assert(type == ResourceType_Patient);
+        assert(type == ResourceType_Instance);
         return StoreStatus_AlreadyStored;
       }
 
       // Create the patient/study/series/instance hierarchy
       instance = db2_->CreateResource(hasher.HashInstance(), ResourceType_Instance);
 
-      if (!db2_->FindResource(hasher.HashSeries(), series, type))
+      if (!db2_->LookupResource(hasher.HashSeries(), series, type))
       {
         // This is a new series
         isNewSeries = true;
         series = db2_->CreateResource(hasher.HashSeries(), ResourceType_Series);
         db2_->AttachChild(series, instance);
 
-        if (!db2_->FindResource(hasher.HashStudy(), study, type))
+        if (!db2_->LookupResource(hasher.HashStudy(), study, type))
         {
           // This is a new study
           study = db2_->CreateResource(hasher.HashStudy(), ResourceType_Study);
           db2_->AttachChild(study, series);
 
-          if (!db2_->FindResource(hasher.HashPatient(), patient, type))
+          if (!db2_->LookupResource(hasher.HashPatient(), patient, type))
           {
             // This is a new patient
             patient = db2_->CreateResource(hasher.HashPatient(), ResourceType_Patient);