Revert "Fix #2788 : Audit WADO URI event : Improve spool file naming …

…to contain combination of Study and SOP IUIDs to avoid aggregation of instances of same study in one spool file" This reverts commit 7710374.
dcm4che · Sep 29, 2020 · 3dc7e81 · 3dc7e81
1 parent 7710374
commit 3dc7e81
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditService.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditService.java
@@ -533,16 +533,14 @@ void spoolRetrieveWADO(RetrieveContext ctx) {
             Attributes attrs = ctx.getMatches().get(0).getAttributes();
             String suffix = '-' + req.requesterHost
                     + '-' + ctx.getLocalAETitle()
-                    + '-' + ctx.getStudyInstanceUIDs()[0]
-                    + '-' + ctx.getSopInstanceUIDs()[0];
+                    + '-' + ctx.getStudyInstanceUIDs()[0];
             AuditInfoBuilder info = new AuditInfoBuilder.Builder()
                     .callingHost(req.requesterHost)
                     .callingUserID(req.requesterUserID)
                     .calledUserID(req.requestURI)
                     .studyUIDAccNumDate(attrs, getArchiveDevice())
                     .pIDAndName(attrs, getArchiveDevice())
                     .outcome(null != ctx.getException() ? ctx.getException().getMessage() : null)
-                    .queryString(req.queryString)
                     .build();
             AuditInfoBuilder instanceInfo = new AuditInfoBuilder.Builder()
                     .sopCUID(attrs.getString(Tag.SOPClassUID))

diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/ParticipantObjectID.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/ParticipantObjectID.java
@@ -129,9 +129,6 @@ static ParticipantObjectIdentificationBuilder[] studyPatParticipants(
                 || eventType.eventClass == AuditUtils.EventClass.IMPAX))
             studyPOIBuilder.lifeCycle(AuditMessages.ParticipantObjectDataLifeCycle.OriginationCreation);
 
-        if (eventType.eventClass == AuditUtils.EventClass.STORE_WADOR && auditInfo.getField(AuditInfo.Q_STRING) != null)
-            studyPOIBuilder.query(auditInfo.getField(AuditInfo.Q_STRING).getBytes());
-
         studyPatParticipants[0] = studyPOIBuilder.build();
         studyPatParticipants[1] = patientPOIBuilder(auditInfo).build();
         return studyPatParticipants;