From 7d42456f57dd8ac54abaf3930ee713ea21bb2e2e Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Wed, 10 Feb 2016 10:50:20 +0100
Subject: [PATCH] Still trying to get DIMSE+WADO-URI working

---
 LesionTracker/defaultSettings.js      | 7 ++++---
 Packages/dimseservice/server/DIMSE.js | 9 ++++++---
 config/orthancDIMSE.json              | 9 ++++++++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/LesionTracker/defaultSettings.js b/LesionTracker/defaultSettings.js
index 033d2f0a3..5b1a5af5a 100644
--- a/LesionTracker/defaultSettings.js
+++ b/LesionTracker/defaultSettings.js
@@ -23,11 +23,12 @@ Meteor.startup(function() {
               }
             }]
         },
-        dimse: {
+        dimse: [{
             host: 'localhost',
             port: 4242,
-            hostAE: 'ORTHANC'
-        },
+            aeTitle: 'ORTHANC',
+            default: true
+        }],
         defaultServiceType: 'dicomWeb'
         //defaultServiceType: 'dimse'
     };
diff --git a/Packages/dimseservice/server/DIMSE.js b/Packages/dimseservice/server/DIMSE.js
index bcb9ca157..6bff821ab 100755
--- a/Packages/dimseservice/server/DIMSE.js
+++ b/Packages/dimseservice/server/DIMSE.js
@@ -10,9 +10,12 @@ var conn = new Connection({
 
 Meteor.startup(function(){
     var peers = Meteor.settings.dimse;
-    peers.forEach(function(peer){
-        conn.addPeer(peer);
-    });
+    console.log('Adding DIMSE peers');
+    if (peers && peers.length) {
+        peers.forEach(function(peer){
+            conn.addPeer(peer);
+        });
+    }
 });
 
 DIMSE.associate = function(contexts, callback) {
diff --git a/config/orthancDIMSE.json b/config/orthancDIMSE.json
index 7dba45ecb..9694f2a26 100644
--- a/config/orthancDIMSE.json
+++ b/config/orthancDIMSE.json
@@ -21,7 +21,14 @@
   "dimse" : [{
     "host" : "localhost",
     "port" : 4242,
-    "aeTitle" : "ORTHANCLOCAL"
+    "aeTitle" : "ORTHANC",
+    "default": true
+  },{
+    "host" : "0.0.0.0",
+    "port" : 11112,    
+    "aeTitle" : "OHIFDCM",
+    "default" : true,
+    "server" : true
   }],
   "defaultServiceType": "dimse"
 }