Improve StorageInterface, add method get

dicoogle/src/main/java/pt/ua/dicoogle/server/web/dicom/Information.java

@@ -113,20 +113,17 @@ public void onReceive(Task<Iterable<SearchResult>> e) {
                 for (SearchResult r : itResults) {
                     if (uri == null)
                         uri = r.getURI();
-                    System.out.println("URI: " + uri.toString());
                 }
 
                 if (uri != null) {
                     StorageInterface str = PluginController.getInstance().getStorageForSchema(uri);
                     if (str != null) {
-                        Iterable<StorageInputStream> stream = str.at(uri);
-                        for (StorageInputStream r : stream) {
+                        StorageInputStream r = str.get(uri);
+                        if (r != null) {
                             ret = r;
 
                             stopAllTaks();
-
                             latch.countDown();
-
                             return;
                         }
                     }

dicoogle/src/main/java/pt/ua/dicoogle/server/web/servlets/ImageServlet.java

@@ -127,13 +127,13 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
                 // get the image file by the URI
                 URI imgUri = new URI(uri);
                 StorageInterface storageInt = PluginController.getInstance().getStorageForSchema(imgUri);
-                Iterator<StorageInputStream> storages = storageInt.at(imgUri).iterator();
+                StorageInputStream storageItem = storageInt.get(imgUri);
                 // take the first valid storage
-                if (!storages.hasNext()) {
+                if (storageItem == null) {
                     ResponseUtil.sendError(response, 404, "No image file for supplied URI");
                     return;
                 }
-                imgFile = storages.next();
+                imgFile = storageItem;
 
             } catch (URISyntaxException ex) {
                 ResponseUtil.sendError(response, 400, "Bad URI syntax");
@@ -220,7 +220,6 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 
     private static StorageInputStream getFileFromSOPInstanceUID(String sopInstanceUID, List<String> providers)
             throws IOException {
-        // TODO use only DIM sources?
         JointQueryTask qt = new JointQueryTask() {
             @Override
             public void onCompletion() {}
@@ -229,24 +228,32 @@ public void onCompletion() {}
             public void onReceive(Task<Iterable<SearchResult>> e) {}
         };
         try {
+            PluginController pc = PluginController.getInstance();
             if (providers == null) {
-                providers = PluginController.getInstance().getQueryProvidersName(true);
+                // use only DIM sources
+                providers = ServerSettingsManager.getSettings().getArchiveSettings().getDIMProviders();
+                // exclude unknown query providers
+                providers.removeIf(pName -> pc.getQueryProviderByName(pName, true) == null);
+                if (providers.isEmpty()) {
+                    // fallback to all query providers
+                    providers = pc.getQueryProvidersName(true);
+                }
             }
-            Iterator<SearchResult> it = PluginController.getInstance()
-                    .query(qt, providers, "SOPInstanceUID:" + sopInstanceUID).get().iterator();
+            Iterator<SearchResult> it = pc
+                    .query(qt, providers, "SOPInstanceUID:\"" + sopInstanceUID + '"').get().iterator();
             if (!it.hasNext()) {
                 throw new IOException("No such image of SOPInstanceUID " + sopInstanceUID);
             }
             SearchResult res = it.next();
-            StorageInterface storage = PluginController.getInstance().getStorageForSchema(res.getURI());
+            StorageInterface storage = pc.getStorageForSchema(res.getURI());
             if (storage == null) {
                 throw new IOException("Unsupported file scheme");
             }
-            Iterator<StorageInputStream> store = storage.at(res.getURI()).iterator();
-            if (!store.hasNext()) {
+            StorageInputStream item = storage.get(res.getURI());
+            if (item == null) {
                 throw new IOException("No storage item found");
             }
-            return store.next();
+            return item;
         } catch (InterruptedException | ExecutionException ex) {
             throw new IOException(ex);
         }

sdk/src/main/java/pt/ua/dicoogle/sdk/StorageInterface.java

@@ -62,18 +62,56 @@ public default boolean handles(URI location) {
      * 
      * The provided scheme is not relevant at this point, but the developer must avoid calling this method
      * with a path of a different schema.
-     * 
-     * <pre>for(StorageInputStream dicomObj : storagePlugin.at("file://dataset/")){
-     *      System.err.println(dicomObj.getURI());
-     * }</pre>
+     *
+     * <pre>
+     * URI uri = URI.create("file://dataset/");
+     * for (StorageInputStream dicomObj: storagePlugin.at(uri)) {
+     *     System.err.println(dicomObj.getURI());
+     * }
+     * </pre>
      * 
      * @param location the location to read
-     * @param parameters a variable list of extra parameters for the retrieve
+     * @param parameters a variable list of extra retrieval parameters
      * @return an iterable of storage input streams
      * @see StorageInputStream
      */
     public Iterable<StorageInputStream> at(URI location, Object... parameters);
 
+    /**
+     * Obtains an item stored at the exact location specified.
+     *
+     * The provided scheme is not relevant at this point,
+     * but the developer must avoid calling this method
+     * with a path of a different schema.
+     *
+     * <pre>
+     * URI uri = URI.create("file://dataset/CT/001.dcm");
+     * StorageInputStream item = storagePlugin.get(uri);
+     * if (item != null) {
+     *      System.err.println("Item at " + dicomObj.getURI() + " is available");
+     * }
+     * </pre>
+     *
+     * The default implementation calls {@linkplain #at}
+     * and returns the first item if its URI matches the location requested.
+     * Implementations may wish to override this method for performance reasons.
+     *
+     * @param location the URI of the item to retrieve
+     * @param parameters a variable list of extra retrieval parameters
+     * @return a storage item if it was found, <code>null</code> otherwise
+     * @see StorageInputStream
+     */
+    default public StorageInputStream get(URI location, Object... parameters) {
+        for (StorageInputStream sis : this.at(location, parameters)) {
+            if (Objects.equals(sis.getURI(), location)) {
+                return sis;
+            }
+            // don't try any further
+            break;
+        }
+        return null;
+    }
+
     /**
      * Stores a DICOM object into the storage.
      *
@@ -104,6 +142,9 @@ public default boolean handles(URI location) {
      * can yield intermediate URIs representing other directories rather than
      * objects.
      * 
+     * Directories can be distinguished from regular files
+     * by the presence of a trailing forward slash in the URI.
+     * 
      * The provided scheme is not relevant at this point, but the developer
      * must avoid calling this method with a path of a different scheme.
      *