orthanc: OrthancServer/Sources/OrthancWebDav.cpp comparison

comparison OrthancServer/Sources/OrthancWebDav.cpp @ 4243:64f57c9d5f79

configuration options for webdav

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 09 Oct 2020 18:10:24 +0200
parents	5cfa6ba75dfc
children	416c35da7d25

comparison

equal deleted inserted replaced

-:5cfa6ba75dfc
+:64f57c9d5f79
 {
 assert(that != NULL);
 boost::posix_time::ptime lastModification = GetNow();
-while (that->running_)
+while (that->uploadRunning_)
 {
 std::unique_ptr<IDynamicObject> obj(that->uploadQueue_.Dequeue(100));
 if (obj.get() != NULL)
 {
 that->Upload(reinterpret_cast<const SingleValueObject<std::string>&>(*obj).GetValue());
 std::string content;
 boost::posix_time::ptime time;
 if (uploads_.GetFileContent(mime, content, time, uri))
 {
 DicomInstanceToStore instance;
-// instance.SetOrigin(DicomInstanceOrigin_WebDav);
+// instance.SetOrigin(DicomInstanceOrigin_WebDav);   // TODO
 instance.SetBuffer(content.c_str(), content.size());
 std::string publicId;
 StoreStatus status = context_.Store(publicId, instance, StoreInstanceMode_Default);
 if (status == StoreStatus_Success ||
 }
 }
 OrthancWebDav::OrthancWebDav(ServerContext& context,
-bool allowDicomDelete) :
+bool allowDicomDelete,
+bool allowUpload) :
 context_(context),
 allowDicomDelete_(allowDicomDelete),
+allowUpload_(allowUpload),
 uploads_(false /* store uploads as temporary files */),
-running_(false)
+uploadRunning_(false)
 {
 patientsTemplates_[ResourceType_Patient] = "{{PatientID}} - {{PatientName}}";
 patientsTemplates_[ResourceType_Study] = "{{StudyDate}} - {{StudyDescription}}";
 patientsTemplates_[ResourceType_Series] = "{{Modality}} - {{SeriesDescription}}";
 path[0] == BY_DATES)
 {
 IWebDavBucket::Collection tmp;
 return GetRootNode(path[0]).ListCollection(tmp, UriComponents(path.begin() + 1, path.end()));
 }
-else if (path[0] == UPLOADS)
+else if (allowUpload_ &&
+path[0] == UPLOADS)
 {
 return uploads_.IsExistingFolder(UriComponents(path.begin() + 1, path.end()));
 }
 else
 {
 {
 collection.AddResource(new Folder(BY_DATES));
 collection.AddResource(new Folder(BY_PATIENTS));
 collection.AddResource(new Folder(BY_STUDIES));
 collection.AddResource(new Folder(BY_UIDS));
-collection.AddResource(new Folder(UPLOADS));
+if (allowUpload_)
+{
+collection.AddResource(new Folder(UPLOADS));
+}
 return true;
 }
 else if (path[0] == BY_UIDS)
 {
 DatabaseLookup query;
 size_t limit = 0;  // By default, no limits
 if (path.size() == 1)
 {
 level = ResourceType_Study;
-limit = 100;  // TODO
+limit = 0;  // TODO - Should we limit here?
 }
 else if (path.size() == 2)
 {
 AddVirtualFile(collection, path, STUDY_INFO);
 path[0] == BY_STUDIES ||
 path[0] == BY_DATES)
 {
 return GetRootNode(path[0]).ListCollection(collection, UriComponents(path.begin() + 1, path.end()));
 }
-else if (path[0] == UPLOADS)
+else if (allowUpload_ &&
+path[0] == UPLOADS)
 {
 return uploads_.ListCollection(collection, UriComponents(path.begin() + 1, path.end()));
 }
 else
 {
 path[0] == BY_STUDIES ||
 path[0] == BY_DATES)
 {
 return GetRootNode(path[0]).GetFileContent(mime, content, modificationTime, UriComponents(path.begin() + 1, path.end()));
 }
-else if (path[0] == UPLOADS)
+else if (allowUpload_ &&
+path[0] == UPLOADS)
 {
 return uploads_.GetFileContent(mime, content, modificationTime, UriComponents(path.begin() + 1, path.end()));
 }
 else
 {
 bool OrthancWebDav::StoreFile(const std::string& content,
 const UriComponents& path)
 {
-if (path.size() >= 1 &&
+if (allowUpload_ &&
+path.size() >= 1 &&
 path[0] == UPLOADS)
 {
 UriComponents subpath(UriComponents(path.begin() + 1, path.end()));
 if (uploads_.StoreFile(content, subpath))
 }
 bool OrthancWebDav::CreateFolder(const UriComponents& path)
 {
-if (path.size() >= 1 &&
+if (allowUpload_ &&
+path.size() >= 1 &&
 path[0] == UPLOADS)
 {
 return uploads_.CreateFolder(UriComponents(path.begin() + 1, path.end()));
 }
 else
 {
 return false;
 }
 }
-std::cout << "\n\n" << query.Format() << "\n\n";
 DicomDeleteVisitor visitor(context_, level);
 context_.Apply(visitor, query, ResourceType_Instance, 0 /* since */, 0 /* no limit */);
 return true;
 }
 else
 else
 {
 return false;  // read-only
 }
 }
-else if (path[0] == UPLOADS)
+else if (allowUpload_ &&
+path[0] == UPLOADS)
 {
 return uploads_.DeleteItem(UriComponents(path.begin() + 1, path.end()));
 }
 else
 {
 }
 void OrthancWebDav::Start()
 {
-if (running_)
+if (uploadRunning_)
 {
 throw OrthancException(ErrorCode_BadSequenceOfCalls);
 }
-else
+else if (allowUpload_)
 {
 LOG(INFO) << "Starting the WebDAV upload thread";
-running_ = true;
+uploadRunning_ = true;
 uploadThread_ = boost::thread(UploadWorker, this);
 }
 }
 void OrthancWebDav::Stop()
 {
-if (running_)
+if (uploadRunning_)
 {
 LOG(INFO) << "Stopping the WebDAV upload thread";
-running_ = false;
+uploadRunning_ = false;
 if (uploadThread_.joinable())
 {
 uploadThread_.join();
 }
 }

Mercurial > hg > orthanc

comparison OrthancServer/Sources/OrthancWebDav.cpp @ 4243:64f57c9d5f79