From 2cf666f7a56b9b546a49b58cf5a2ad4ee7c118a8 Mon Sep 17 00:00:00 2001
From: weiwei <weiwei@toca.com>
Date: Mon, 24 Oct 2016 22:17:22 +0800
Subject: [PATCH] Revert "Merge branch 'master' of github.com:OHIF/Viewers"

This reverts commit 137007c2205ea2819157893d50cf7b9409c9b683, reversing
changes made to af639b4de276e15b826b3a7d95d7b8d79bbc1fef.
---
 Packages/dicomweb/server/getJSON.js | 49 +++++++----------------------
 1 file changed, 11 insertions(+), 38 deletions(-)

diff --git a/Packages/dicomweb/server/getJSON.js b/Packages/dicomweb/server/getJSON.js
index 839ab6888..f02c38418 100644
--- a/Packages/dicomweb/server/getJSON.js
+++ b/Packages/dicomweb/server/getJSON.js
@@ -1,57 +1,30 @@
-var http = Npm.require('http'), url = Npm.require('url');
-
-function makeRequest(geturl, options, callback) {
-    var parsed = url.parse(geturl), jsonHeaders = ['application/json', 'application/dicom+json'];
-    
-    var requestOpt = {
-        hostname: parsed.hostname,
-        port: parsed.port,
+DICOMWeb.getJSON = function(url, options) {
+    var getOptions = {
         headers: {
             Accept: 'application/json'
-        },
-        path: parsed.path,
-        method: 'GET'
-    };
-    if (options.auth) {
-        requestOpt.auth = options.auth;
-    }
-
-    var req = http.request(requestOpt, function(resp) {
-        if (jsonHeaders.indexOf(resp.headers['content-type']) == -1) {
-            callback('We only support json', null);
-            return;
         }
+    };
 
-        var output = '';
-        resp.setEncoding('utf8');
-        resp.on('data', function(chunk){
-          output += chunk;
-        });
-        resp.on('end', function(){
-          callback(null, {data: JSON.parse(output)});
-        });
-    });
-    req.end();
-}
-var makeRequestSync = Meteor.wrapAsync(makeRequest);
+    if (options.auth) {
+        getOptions.auth = options.auth;
+    }
 
-DICOMWeb.getJSON = function(geturl, options) {
     if (options.logRequests) {
-        console.log(geturl);
+        console.log(url);
     }
 
     if (options.logTiming) {
-        console.time(geturl);
+        console.time(url);
     }
 
-    var result = makeRequestSync(geturl, options);
+    var result = HTTP.get(url, getOptions);
 
     if (options.logTiming) {
-        console.timeEnd(geturl);
+        console.timeEnd(url);
     }
 
     if (options.logResponses) {
-        console.log(result);
+        console.log(result.data);
     }
 
     return result;