Updates for Timepoint assocation (LT-60) and Conformance Checks (LT-92, LT-93, LT-94)

Packages/viewerbase/server/methods/getStudyMetadata.js

@@ -3,13 +3,17 @@ Meteor.methods({
      * Retrieves Study metadata given a Study Instance UID
      * This Meteor method is available from both the client and the server
      */
-    'GetStudyMetadata' : function(studyInstanceUid) {
+    GetStudyMetadata: function(studyInstanceUid) {
         log.info('GetStudyMetadata(%s)', studyInstanceUid);
 
+        if (!Meteor.settings.dicomWeb) {
+            throw 'No properly configured server was available over DICOMWeb';
+        }
+
         // Get the server data. This is user-defined in the
         // config.json files used to run the Meteor server
         var server = Meteor.settings.dicomWeb.endpoints[0];
 
         return Services.WADO.RetrieveMetadata(server, studyInstanceUid);
     }
-});
+});

Packages/viewerbase/server/methods/worklistSearch.js

@@ -3,16 +3,17 @@ Meteor.methods({
      * Use the specified filter to conduct a search from the DICOM server
      * @param filter
      */
-    'WorklistSearch': function(filter) {
-        if (!Meteor.settings.dicomWeb) {
-            console.warn('No dicomWeb settings provided! Worklist search is not possible!')
-            return;
-        }
-        
-        // Get the server data. This is user-defined in the
-        // config.json files used to run the Meteor server
-        var server = Meteor.settings.dicomWeb.endpoints[0];
+    WorklistSearch: function(filter) {
+        if (Meteor.settings.dicomWeb && Meteor.settings.defaultServiceType === 'dicomWeb') {
+            // Get the server data. This is user-defined in the
+            // config.json files used to run the Meteor server
+            var server = Meteor.settings.dicomWeb.endpoints[0];
 
-        return Services.QIDO.Studies(server, filter);
+            return Services.QIDO.Studies(server, filter);
+        } else if (Meteor.settings.dimse && Meteor.settings.defaultServiceType === 'dimse') {
+            return Services.DIMSE.Studies(filter);
+        } else {
+            throw 'No properly configured server was available over DICOMWeb or DIMSE.';
+        }
     }
-});
+});