orthanc: OrthancServer/Sources/ServerToolbox.cpp comparison

Housekeeper plugin: finalizing + integration tests ok

comparison

equal deleted inserted replaced

-:a25e74fad379
+:8fba26292a9f
 return false;
 }
 void ReconstructResource(ServerContext& context,
-const std::string& resource)
+const std::string& resource,
+bool reconstructFiles)
 {
 LOG(WARNING) << "Reconstructing resource " << resource;
 std::list<std::string> instances;
 context.GetIndex().GetChildInstances(instances, resource);
 // Delay the reconstruction of DICOM-as-JSON to its next access through "ServerContext"
 context.GetIndex().DeleteAttachment(*it, FileContentType_DicomAsJson, false /* no revision */,
 -1 /* dummy revision */, "" /* dummy MD5 */);
 context.GetIndex().ReconstructInstance(locker.GetDicom());
+if (reconstructFiles)
+{
+// preserve metadata from old resource
+typedef std::map<MetadataType, std::string>  InstanceMetadata;
+InstanceMetadata  instanceMetadata;
+std::string resultPublicId;  // ignored
+std::unique_ptr<DicomInstanceToStore> dicomInstancetoStore(DicomInstanceToStore::CreateFromParsedDicomFile(locker.GetDicom()));
+context.GetIndex().GetAllMetadata(instanceMetadata, *it, ResourceType_Instance);
+for (InstanceMetadata::const_iterator itm = instanceMetadata.begin();
+itm != instanceMetadata.end(); ++itm)
+{
+dicomInstancetoStore->AddMetadata(ResourceType_Instance, itm->first, itm->second);
+}
+context.TranscodeAndStore(resultPublicId, dicomInstancetoStore.get(), StoreInstanceMode_OverwriteDuplicate, true);
+}
 }
 }
 }
 }
+todo: add a status route for the plugin !!!

Mercurial > hg > orthanc