orthanc: OrthancServer/Sources/main.cpp comparison

comparison OrthancServer/Sources/main.cpp @ 4232:688435755466

added DELETE in WebDAV, first working virtual filesystem

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 07 Oct 2020 13:00:57 +0200
parents	290ffcb0a147
children	ca2a55a62c81

comparison

equal deleted inserted replaced

-:290ffcb0a147
+:688435755466
 return false;
 }
 }
-virtual bool CreateFolder(const UriComponents& path)
+virtual bool CreateFolder(const UriComponents& path) ORTHANC_OVERRIDE
 {
 if (IsUploadedFolder(path))
 {
 return storage_.CreateFolder(UriComponents(path.begin() + 1, path.end()));
 }
 LOG(WARNING) << "Writing to a read-only location in WebDAV: " << Toolbox::FlattenUri(path);
 return false;
 }
 }
+virtual bool DeleteItem(const std::vector<std::string>& path) ORTHANC_OVERRIDE
+{
+return false;  // read-only
+}
 virtual void Start() ORTHANC_OVERRIDE
 {
 LOG(WARNING) << "Starting WebDAV";
 }
-static const char* const DICOM_IDENTIFIERS = "DicomIdentifiers";
+static const char* const BY_UIDS = "by-uids";
 class DummyBucket2 : public IWebDavBucket  // TODO
 {
 private:
 ServerContext&  context_;
+static void LookupTime(boost::posix_time::ptime& target,
+ServerContext& context,
+const std::string& publicId,
+MetadataType metadata)
+{
+std::string value;
+if (context.GetIndex().LookupMetadata(value, publicId, metadata))
+{
+try
+{
+target = boost::posix_time::from_iso_string(value);
+return;
+}
+catch (std::exception& e)
+{
+}
+}
+target = boost::posix_time::second_clock::universal_time();  // Now
+}
 class DicomIdentifiersVisitor : public ServerContext::ILookupVisitor
 {
 private:
 ServerContext&  context_;
 bool            isComplete_;
 const std::string& instanceId   /* unused     */,
 const DicomMap& mainDicomTags,
 const Json::Value* dicomAsJson  /* unused (*) */)  ORTHANC_OVERRIDE
 {
 DicomTag tag(0, 0);
+MetadataType dateMetadata;
 switch (level_)
 {
 case ResourceType_Study:
 tag = DICOM_TAG_STUDY_INSTANCE_UID;
+dateMetadata = MetadataType_LastUpdate;
 break;
 case ResourceType_Series:
 tag = DICOM_TAG_SERIES_INSTANCE_UID;
+dateMetadata = MetadataType_LastUpdate;
 break;
 case ResourceType_Instance:
 tag = DICOM_TAG_SOP_INSTANCE_UID;
+dateMetadata = MetadataType_Instance_ReceptionDate;
 break;
 default:
 throw OrthancException(ErrorCode_InternalError);
 }
 std::string s;
 if (mainDicomTags.LookupStringValue(s, tag, false) &&
 !s.empty())
 {
+std::unique_ptr<Resource> resource;
 if (level_ == ResourceType_Instance)
 {
 FileInfo info;
 if (context_.GetIndex().LookupAttachment(info, publicId, FileContentType_Dicom))
 {
 std::unique_ptr<File> f(new File(s + ".dcm"));
 f->SetMimeType(MimeType_Dicom);
 f->SetContentLength(info.GetUncompressedSize());
-target_.AddResource(f.release());
+resource.reset(f.release());
 }
 }
 else
 {
-target_.AddResource(new Folder(s));
+resource.reset(new Folder(s));
 }
+boost::posix_time::ptime t;
+LookupTime(t, context_, publicId, dateMetadata);
+resource->SetCreationTime(t);
+target_.AddResource(resource.release());
 }
 }
 };
 class DicomFileVisitor : public ServerContext::ILookupVisitor
 {
 private:
 ServerContext&  context_;
 bool            success_;
 std::string&    target_;
+boost::posix_time::ptime&  modificationTime_;
 public:
 DicomFileVisitor(ServerContext& context,
-std::string& target) :
+std::string& target,
+boost::posix_time::ptime& modificationTime) :
 context_(context),
 success_(false),
-target_(target)
+target_(target),
+modificationTime_(modificationTime)
 {
 }
 bool IsSuccess() const
 {
 return success_;
 }
 virtual bool IsDicomAsJsonNeeded() const ORTHANC_OVERRIDE
 {
 return false;   // (*)
 }
 virtual void Visit(const std::string& publicId,
 const std::string& instanceId   /* unused     */,
 const DicomMap& mainDicomTags,
 const Json::Value* dicomAsJson  /* unused (*) */)  ORTHANC_OVERRIDE
 {
-context_.ReadDicom(target_, publicId);
+if (success_)
-success_ = true;
+{
+success_ = false;  // Two matches => Error
+}
+else
+{
+LookupTime(modificationTime_, context_, publicId, MetadataType_Instance_ReceptionDate);
+context_.ReadDicom(target_, publicId);
+success_ = true;
+}
 }
 };
+class OrthancJsonVisitor : public ServerContext::ILookupVisitor
+{
+private:
+ServerContext&  context_;
+bool            success_;
+std::string&    target_;
+ResourceType    level_;
+public:
+OrthancJsonVisitor(ServerContext& context,
+std::string& target,
+ResourceType level) :
+context_(context),
+success_(false),
+target_(target),
+level_(level)
+{
+}
+bool IsSuccess() const
+{
+return success_;
+}
+virtual bool IsDicomAsJsonNeeded() const ORTHANC_OVERRIDE
+{
+return false;   // (*)
+}
+virtual void MarkAsComplete() ORTHANC_OVERRIDE
+{
+}
+virtual void Visit(const std::string& publicId,
+const std::string& instanceId   /* unused     */,
+const DicomMap& mainDicomTags,
+const Json::Value* dicomAsJson  /* unused (*) */)  ORTHANC_OVERRIDE
+{
+Json::Value info;
+if (context_.GetIndex().LookupResource(info, publicId, level_))
+{
+if (success_)
+{
+success_ = false;  // Two matches => Error
+}
+else
+{
+target_ = info.toStyledString();
+// Replace UNIX newlines with DOS newlines
+boost::replace_all(target_, "\n", "\r\n");
+success_ = true;
+}
+}
+}
+};
+void AddVirtualFile(Collection& collection,
+const UriComponents& path,
+const std::string& filename)
+{
+MimeType mime;
+std::string content;
+boost::posix_time::ptime modification;
+UriComponents p = path;
+p.push_back(filename);
+if (GetFileContent(mime, content, modification, p))
+{
+std::unique_ptr<File> f(new File(filename));
+f->SetMimeType(mime);
+f->SetContentLength(content.size());
+f->SetCreationTime(modification);
+collection.AddResource(f.release());
+}
+}
 public:
 DummyBucket2(ServerContext& context) :
 context_(context)
 {
 {
 if (path.empty())
 {
 return true;
 }
-else if (path.front() == DICOM_IDENTIFIERS &&
+else if (path.front() == BY_UIDS)
-path.size() <= 3)
+{
-{
+return (path.size() <= 3 &&
-return true;
+(path.size() != 3 || path[2] != "study.json"));
 }
 else
 {
 return false;
 }
 virtual bool ListCollection(Collection& collection,
 const UriComponents& path) ORTHANC_OVERRIDE
 {
 if (path.empty())
 {
-collection.AddResource(new Folder(DICOM_IDENTIFIERS));
+collection.AddResource(new Folder(BY_UIDS));
 return true;
 }
-else if (path.front() == DICOM_IDENTIFIERS)
+else if (path.front() == BY_UIDS)
 {
 DatabaseLookup query;
 ResourceType level;
+size_t limit = 0;  // By default, no limits
 if (path.size() == 1)
 {
 level = ResourceType_Study;
+limit = 100;  // TODO
 }
 else if (path.size() == 2)
 {
+AddVirtualFile(collection, path, "study.json");
 level = ResourceType_Series;
 query.AddRestConstraint(DICOM_TAG_STUDY_INSTANCE_UID, path[1],
 true /* case sensitive */, true /* mandatory tag */);
 }
 else if (path.size() == 3)
 {
+AddVirtualFile(collection, path, "series.json");
 level = ResourceType_Instance;
 query.AddRestConstraint(DICOM_TAG_STUDY_INSTANCE_UID, path[1],
 true /* case sensitive */, true /* mandatory tag */);
 query.AddRestConstraint(DICOM_TAG_SERIES_INSTANCE_UID, path[2],
 true /* case sensitive */, true /* mandatory tag */);
 {
 return false;
 }
 DicomIdentifiersVisitor visitor(context_, collection, level);
-context_.Apply(visitor, query, level, 0 /* since */, 100 /* limit */);
+context_.Apply(visitor, query, level, 0 /* since */, limit);
 return true;
 }
 else
 {
 virtual bool GetFileContent(MimeType& mime,
 std::string& content,
 boost::posix_time::ptime& modificationTime,
 const UriComponents& path) ORTHANC_OVERRIDE
 {
-if (path.size() == 4 &&
+if (!path.empty() &&
-path[0] == DICOM_IDENTIFIERS &&
+path[0] == BY_UIDS)
-boost::ends_with(path[3], ".dcm"))
+{
-{
+if (path.size() == 3 &&
-std::string sopInstanceUid = path[3];
+path[2] == "study.json")
-sopInstanceUid.resize(sopInstanceUid.size() - 4);
+{
+DatabaseLookup query;
+query.AddRestConstraint(DICOM_TAG_STUDY_INSTANCE_UID, path[1],
+true /* case sensitive */, true /* mandatory tag */);
-mime = MimeType_Dicom;
+OrthancJsonVisitor visitor(context_, content, ResourceType_Study);
+context_.Apply(visitor, query, ResourceType_Study, 0 /* since */, 0 /* no limit */);
-DatabaseLookup query;
-query.AddRestConstraint(DICOM_TAG_STUDY_INSTANCE_UID, path[1],
+mime = MimeType_Json;
+return visitor.IsSuccess();
+}
+else if (path.size() == 4 &&
+path[3] == "series.json")
+{
+DatabaseLookup query;
+query.AddRestConstraint(DICOM_TAG_STUDY_INSTANCE_UID, path[1],
 true /* case sensitive */, true /* mandatory tag */);
 query.AddRestConstraint(DICOM_TAG_SERIES_INSTANCE_UID, path[2],
 true /* case sensitive */, true /* mandatory tag */);
-query.AddRestConstraint(DICOM_TAG_SOP_INSTANCE_UID, sopInstanceUid,
-true /* case sensitive */, true /* mandatory tag */);
-DicomFileVisitor visitor(context_, content);
+OrthancJsonVisitor visitor(context_, content, ResourceType_Series);
-context_.Apply(visitor, query, ResourceType_Instance, 0 /* since */, 100 /* limit */);
+context_.Apply(visitor, query, ResourceType_Series, 0 /* since */, 0 /* no limit */);
-return visitor.IsSuccess();
+mime = MimeType_Json;
-}
+return visitor.IsSuccess();
-else
+}
-{
+else if (path.size() == 4 &&
-return false;
+boost::ends_with(path[3], ".dcm"))
-}
+{
+std::string sopInstanceUid = path[3];
+sopInstanceUid.resize(sopInstanceUid.size() - 4);
+DatabaseLookup query;
+query.AddRestConstraint(DICOM_TAG_STUDY_INSTANCE_UID, path[1],
+true /* case sensitive */, true /* mandatory tag */);
+query.AddRestConstraint(DICOM_TAG_SERIES_INSTANCE_UID, path[2],
+true /* case sensitive */, true /* mandatory tag */);
+query.AddRestConstraint(DICOM_TAG_SOP_INSTANCE_UID, sopInstanceUid,
+true /* case sensitive */, true /* mandatory tag */);
+DicomFileVisitor visitor(context_, content, modificationTime);
+context_.Apply(visitor, query, ResourceType_Instance, 0 /* since */, 0 /* no limit */);
+mime = MimeType_Dicom;
+return visitor.IsSuccess();
+}
+}
+return false;
 }
 virtual bool StoreFile(const std::string& content,
 const UriComponents& path) ORTHANC_OVERRIDE
 virtual bool CreateFolder(const UriComponents& path)
 {
 return false;
+}
+virtual bool DeleteItem(const std::vector<std::string>& path) ORTHANC_OVERRIDE
+{
+LOG(WARNING) << "DELETE: " << Toolbox::FlattenUri(path);
+return false;  // read-only
 }
 virtual void Start() ORTHANC_OVERRIDE
 {
 }

Mercurial > hg > orthanc

comparison OrthancServer/Sources/main.cpp @ 4232:688435755466