QIDO RS: support filter Studies by Storage System #1742

dcm4che · Dec 28, 2018 · 20338a7 · 20338a7
1 parent 62d2ee5
commit 20338a7
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/dcm4chee-arc-conf/src/main/java/org/dcm4chee/arc/conf/ArchiveDeviceExtension.java b/dcm4chee-arc-conf/src/main/java/org/dcm4chee/arc/conf/ArchiveDeviceExtension.java
@@ -1443,19 +1443,18 @@ public List<String> getStudyStorageIDs(
                         : Collections.singletonList(concat(desc.getStorageID(), desc.getExportStorageID()));
         }
 
-        if (storageExported == null) {
-            List<String> studyStorageIDs = addPowerSet(
-                    storageClustered != null, getOtherStorageIDs(desc), desc.getStorageID());
-            if (desc.getExportStorageID() != null)
-                studyStorageIDs.addAll(addPowerSet(
-                        storageClustered != null, getOtherStorageIDs(desc), desc.getStorageID(), desc.getExportStorageID()));
-            return studyStorageIDs;
-        }
+        List<String> studyStorageIDs = addPowerSet(storageClustered != null, getOtherStorageIDs(desc), desc.getStorageID());
+        List<String> exportedStudyStorageIDs = new ArrayList<>();
+
+        if (desc.getExportStorageID() != null)
+            exportedStudyStorageIDs = addPowerSet(storageClustered != null, getOtherStorageIDs(desc), desc.getStorageID(),
+                    desc.getExportStorageID());
+
+        if (storageExported == null && desc.getExportStorageID() != null)
+            studyStorageIDs.addAll(exportedStudyStorageIDs);
 
-        return desc.getExportStorageID() == null || "false".equals(storageExported)
-                ? addPowerSet(storageClustered != null, getOtherStorageIDs(desc), desc.getStorageID())
-                : addPowerSet(
-                        storageClustered != null, getOtherStorageIDs(desc), desc.getStorageID(), desc.getExportStorageID());
+        return desc.getExportStorageID() != null && "true".equals(storageExported)
+                ? exportedStudyStorageIDs : studyStorageIDs;
     }
 
     private static String concat(String... common) {