diff --git a/guidelines/diagrams/mig-export.png b/guidelines/diagrams/mig-export.png index 41a8e4319..b53806590 100644 Binary files a/guidelines/diagrams/mig-export.png and b/guidelines/diagrams/mig-export.png differ diff --git a/guidelines/diagrams/mig-export.txt b/guidelines/diagrams/mig-export.txt index d23e6cb90..a49730c2b 100644 --- a/guidelines/diagrams/mig-export.txt +++ b/guidelines/diagrams/mig-export.txt @@ -6,6 +6,7 @@ title Export Results participantgroup #00CC66 Informatics\nGateway participant "SCU Export Watcher" as EW +participant "Data Export Plugin Engine" as DEPE participant "SCU Export" as SCU participant "FHIR Export" as FHIR participant "DICOMweb Export" as DICOMWEB @@ -36,6 +37,16 @@ PS->EW: Notify new export task event activate EW EW->DISK: Load results +EW->DEPE: Execute plugins (DicomFile, ExportRequestEventDetails) +activate DEPE +loop plugin in plugins +DEPE->DEPE: execute plugin +activate DEPE +DEPE<<--DEPE: return DicomFile +deactivate DEPE +end +EW<--DEPE: return DicomFile +deactivate DEPE alt case DICOM EW->SCU: Queue DICOM export task @@ -62,6 +73,3 @@ EA->DB: Update task state EW<--EA: Response deactivate EA deactivate EW - - - diff --git a/guidelines/diagrams/mig-scp.png b/guidelines/diagrams/mig-scp.png index 2cdd1845b..4fe93903b 100644 Binary files a/guidelines/diagrams/mig-scp.png and b/guidelines/diagrams/mig-scp.png differ diff --git a/guidelines/diagrams/mig-scp.txt b/guidelines/diagrams/mig-scp.txt index a29be6cad..21cbbf697 100644 --- a/guidelines/diagrams/mig-scp.txt +++ b/guidelines/diagrams/mig-scp.txt @@ -8,6 +8,7 @@ fontawesome f0f8 "Hospital\nDICOM Devices" as DICOM participantgroup #00CC66 Informatics\nGateway participant "DICOM SCP" as SCP +participant "Input Data Plugin Engine" as IDPE participant "Payload Assembler Service" as PA participant "Payload Notification Service" as PN participant "Object Upload Service" as OUS @@ -45,6 +46,17 @@ SCP->DB: Query for \nconfigured\nsources SCP<--DB: Response SCP->SCP: Validate SCP->SCP: Extract DICOM headers +SCP->IDPE: Execute Plugins (DicomFile, DicomFileStorageMetadata) +activate IDPE +loop plugin in plugins +IDPE->IDPE: execute plugin +activate IDPE +IDPE<<--IDPE: return DicomFileStorageMetadata +deactivate IDPE +end +SCP<<--IDPE: return DicomFileStorageMetadata +deactivate IDPE + SCP->OUS: Queue for upload activate OUS OUS->DISK: Upload to temporary bucket path @@ -67,4 +79,4 @@ deactivate PA PN->DISK: Move files associated with the payload to payload directory PN->PS: Publish new workflow request PN<--PS: Response -end \ No newline at end of file +end