From 89782de15e17179ec279d56d36033f5445b24dfa Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Mon, 8 Feb 2016 20:07:58 +0100
Subject: [PATCH] Bug fix for when we have no applicable validation criteria,
 added default Meteor settings for OHIF Viewer

---
 OHIFViewer/.meteor/versions                   |  1 +
 OHIFViewer/defaultSettings.js                 | 30 +++++++++++++++++++
 .../lib/TrialResponseCriteria.js              |  4 +++
 3 files changed, 35 insertions(+)
 create mode 100644 OHIFViewer/defaultSettings.js

diff --git a/OHIFViewer/.meteor/versions b/OHIFViewer/.meteor/versions
index e52681900..6a4f5abaa 100644
--- a/OHIFViewer/.meteor/versions
+++ b/OHIFViewer/.meteor/versions
@@ -25,6 +25,7 @@ ddp-server@1.2.2
 deps@1.0.9
 dicomweb@0.0.1
 diff-sequence@1.0.1
+dimseservice@0.0.1
 ecmascript@0.1.6
 ecmascript-runtime@0.2.6
 ejson@1.0.7
diff --git a/OHIFViewer/defaultSettings.js b/OHIFViewer/defaultSettings.js
new file mode 100644
index 000000000..5fbfdef94
--- /dev/null
+++ b/OHIFViewer/defaultSettings.js
@@ -0,0 +1,30 @@
+Meteor.startup(function() {
+    Meteor.settings = {
+        dicomWeb: {
+            endpoints: [{
+                name: 'Orthanc',
+                wadoUriRootNOTE: 'either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently',
+                wadoUriRoot: 'http://localhost:8043/wado',
+                qidoRoot: 'http://localhost:8042/dicom-web',
+                wadoRoot: 'http://localhost:8042/dicom-web',
+                qidoSupportsIncludeField: false,
+                imageRendering: 'wadouri',
+                requestOptions: {
+                  auth: 'orthanc:orthanc',
+                  logRequests: true,
+                  logResponses: false,
+                  logTiming: true
+              }
+            }]
+        },
+        dimse: {
+            host: 'localhost',
+            port: 4242,
+            hostAE: 'ORTHANC'
+        },
+        defaultServiceType: 'dicomWeb'
+        //defaultServiceType: 'dimse'
+    };
+
+    console.log('Using default OHIF Viewer settings with service: ' + Meteor.settings.defaultServiceType);
+});
diff --git a/Packages/lesiontracker/lib/TrialResponseCriteria.js b/Packages/lesiontracker/lib/TrialResponseCriteria.js
index 4c15ded4d..90cad4c1d 100644
--- a/Packages/lesiontracker/lib/TrialResponseCriteria.js
+++ b/Packages/lesiontracker/lib/TrialResponseCriteria.js
@@ -293,6 +293,10 @@ function validateAll() {
             // - The acquisitionSliceThickness, for example, may be pulled from the image metadata
             // - The organ in question, e.g. Chest X-ray, may determine the exact specifications for the current trial criteria
             var currentConstraints = getTrialCriteriaConstraints(criteriaType, currentMeasurement.imageId);
+            if (!currentConstraints) {
+                log.warn('No relevant contraints could be applied');
+                return;
+            }
 
             // Run the single-measurement-specific conformance checks
             // If any messages exist, add them to the array of messages