orthanc: OrthancServer/ServerIndex.cpp comparison

comparison OrthancServer/ServerIndex.cpp @ 80:6212bf978584

status of series

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 20 Sep 2012 15:18:12 +0200
parents	b8dfde8d64e8
children	9eb40cad7935

comparison

equal deleted inserted replaced

-:297bad4e1019
+:6212bf978584
 const std::string& jsonUuid,
 const std::string& distantAet)
 {
 std::string instanceUuid = Toolbox::GenerateUuid();
-SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Instances VALUES(?, ?, ?, ?, ?, ?, ?)");
+SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Instances VALUES(?, ?, ?, ?, ?, ?, ?, ?)");
 s.BindString(0, instanceUuid);
 s.BindString(1, parentSeriesUuid);
 s.BindString(2, dicomInstance);
 s.BindString(3, fileUuid);
 s.BindInt64(4, fileSize);
 s.BindString(5, jsonUuid);
 s.BindString(6, distantAet);
+const DicomValue* indexInSeries;
+if ((indexInSeries = dicomSummary.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL ||
+(indexInSeries = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)
+{
+s.BindInt(7, boost::lexical_cast<unsigned int>(indexInSeries->AsString()));
+}
+else
+{
+s.BindNull(7);
+}
 s.Run();
 RecordChange("instances", instanceUuid);
 DicomMap dicom;
 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Series VALUES(?, ?, ?, ?)");
 s.BindString(0, seriesUuid);
 s.BindString(1, parentStudyUuid);
 s.BindString(2, dicomSeries);
-s.BindNull(3);
+const DicomValue* expectedNumberOfInstances;
+if ((expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_FRAMES)) != NULL ||
+(expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL ||
+(expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL ||
+(expectedNumberOfInstances = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL)
+{
+s.BindInt(3, boost::lexical_cast<unsigned int>(expectedNumberOfInstances->AsString()));
+}
+else
+{
+s.BindNull(3);
+}
 s.Run();
 RecordChange("series", seriesUuid);
 DicomMap dicom;
 std::string ServerIndex::CreatePatient(const std::string& patientId,
 const DicomMap& dicomSummary)
 {
 std::string patientUuid = Toolbox::GenerateUuid();
-std::string dicomPatientId = dicomSummary.GetValue(DicomTag::PATIENT_ID).AsString();
+std::string dicomPatientId = dicomSummary.GetValue(DICOM_TAG_PATIENT_ID).AsString();
 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Patients VALUES(?, ?)");
 s.BindString(0, patientUuid);
 s.BindString(1, dicomPatientId);
 s.Run();
 const std::string& jsonUuid,
 const std::string& distantAet)
 {
 boost::mutex::scoped_lock scoped_lock(mutex_);
-std::string dicomPatientId = dicomSummary.GetValue(DicomTag::PATIENT_ID).AsString();
+std::string dicomPatientId = dicomSummary.GetValue(DICOM_TAG_PATIENT_ID).AsString();
-std::string dicomInstance = dicomSummary.GetValue(DicomTag::SOP_INSTANCE_UID).AsString();
+std::string dicomInstance = dicomSummary.GetValue(DICOM_TAG_SOP_INSTANCE_UID).AsString();
-std::string dicomSeries = dicomSummary.GetValue(DicomTag::SERIES_INSTANCE_UID).AsString();
+std::string dicomSeries = dicomSummary.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).AsString();
-std::string dicomStudy = dicomSummary.GetValue(DicomTag::STUDY_INSTANCE_UID).AsString();
+std::string dicomStudy = dicomSummary.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString();
 try
 {
 SQLite::Transaction t(db_);
 t.Begin();
 }
 SeriesStatus ServerIndex::GetSeriesStatus(const std::string& seriesUuid)
 {
-int numberOfSlices;
+SQLite::Statement s1(db_, SQLITE_FROM_HERE, "SELECT expectedNumberOfInstances FROM Series WHERE uuid=?");
-if (!GetMainDicomIntTag(numberOfSlices, seriesUuid, DicomTag::NUMBER_OF_SLICES) ||
+s1.BindString(0, seriesUuid);
-numberOfSlices < 0)
+if (!s1.Step())
 {
 return SeriesStatus_Unknown;
 }
-// Loop over the instances of the series
+int numberOfInstances = s1.ColumnInt(0);
-//std::set<
+if (numberOfInstances < 0)
+{
-// TODO
+return SeriesStatus_Unknown;
-return SeriesStatus_Unknown;
+}
-}
+std::set<int> instances;
+SQLite::Statement s2(db_, SQLITE_FROM_HERE, "SELECT indexInSeries FROM Instances WHERE parentSeries=?");
+s2.BindString(0, seriesUuid);
+while (s2.Step())
+{
+int index = s2.ColumnInt(0);
+if (index <= 0 || index > numberOfInstances)
+{
+// Out-of-range instance index
+return SeriesStatus_Inconsistent;
+}
+if (instances.find(index) != instances.end())
+{
+// Twice the same instance index
+return SeriesStatus_Inconsistent;
+}
+instances.insert(index);
+}
+for (int i = 1; i <= numberOfInstances; i++)
+{
+if (instances.find(i) == instances.end())
+{
+return SeriesStatus_Missing;
+}
+}
+return SeriesStatus_Complete;
+}
 bool ServerIndex::GetInstance(Json::Value& result,
 const std::string& instanceUuid)
 {
 assert(result.type() == Json::objectValue);
 boost::mutex::scoped_lock scoped_lock(mutex_);
-SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT parentSeries, dicomInstance, fileSize, fileUuid FROM Instances WHERE uuid=?");
+SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT parentSeries, dicomInstance, fileSize, fileUuid, indexInSeries FROM Instances WHERE uuid=?");
 s.BindString(0, instanceUuid);
 if (!s.Step())
 {
 return false;
 }
 result["ID"] = instanceUuid;
 result["ParentSeries"] = s.ColumnString(0);
 result["FileSize"] = s.ColumnInt(2);   // TODO switch to 64bit with JsonCpp 0.6?
 result["FileUuid"] = s.ColumnString(3);
 MainDicomTagsToJson(result, instanceUuid);
+if (s.ColumnIsNull(4))
+{
+result["IndexInSeries"] = -1;
+}
+else
+{
+result["IndexInSeries"] = s.ColumnInt(4);
+}
 return true;
 }
 }
 const std::string& seriesUuid)
 {
 assert(result.type() == Json::objectValue);
 boost::mutex::scoped_lock scoped_lock(mutex_);
-SQLite::Statement s1(db_, SQLITE_FROM_HERE, "SELECT parentStudy, dicomSeries FROM Series WHERE uuid=?");
+SQLite::Statement s1(db_, SQLITE_FROM_HERE, "SELECT parentStudy, dicomSeries, expectedNumberOfInstances FROM Series WHERE uuid=?");
 s1.BindString(0, seriesUuid);
 if (!s1.Step())
 {
 return false;
 }
 {
 instances.append(s2.ColumnString(0));
 }
 result["Instances"] = instances;
+if (s1.ColumnIsNull(2))
+{
+result["ExpectedNumberOfInstances"] = -1;
+}
+else
+{
+result["ExpectedNumberOfInstances"] = s1.ColumnInt(2);
+}
+SeriesStatus status = GetSeriesStatus(seriesUuid);
+switch (status)
+{
+case SeriesStatus_Complete:
+result["Status"] = "Complete";
+break;
+case SeriesStatus_Missing:
+result["Status"] = "Missing";
+break;
+case SeriesStatus_Inconsistent:
+result["Status"] = "Inconsistent";
+break;
+default:
+case SeriesStatus_Unknown:
+result["Status"] = "Unknown";
+break;
+}
 return true;
 }

Mercurial > hg > orthanc

comparison OrthancServer/ServerIndex.cpp @ 80:6212bf978584