TrizTech/ohif-viewer
17
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring servers configuration structure

Browse Source
This commit is contained in:
Bruno Alves de Faria authored and Erik Ziegler committed 2016-08-04 16:47:10 +02:00
1 parent 624d2aeaf5
commit b33ce54188
20 files changed
+173 -118
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Packages/viewerbase/server/methods/importStudies.js
+6 -5
View File
@@ -37,8 +37,9 @@ Meteor.methods({
* @returns {boolean}
*/
importSupported: function() {
//TODO: Support importing studies into dicomWeb
return (Meteor.settings.dimse && Meteor.settings.defaultServiceType === 'dimse');
if (Meteor.settings.servers.dimse && Meteor.settings.defaultServiceType === 'dimse') {
return true;
}
},
/**
* Imports studies from local into worklist
@@ -50,10 +51,10 @@ Meteor.methods({
return;
}
if (Meteor.settings.dicomWeb && Meteor.settings.defaultServiceType === 'dicomWeb') {
if (Meteor.settings.servers.dicomWeb && Meteor.settings.defaultServiceType === 'dicomWeb') {
//TODO: Support importing studies into dicomWeb
console.log('Importing studies into dicomWeb is currently not supported.');
} else if (Meteor.settings.dimse && Meteor.settings.defaultServiceType === 'dimse') {
} else if (Meteor.settings.servers.dimse && Meteor.settings.defaultServiceType === 'dimse') {
importStudiesDIMSE(studiesToImport, studyImportStatusId);
} else {
throw 'No properly configured server was available over DICOMWeb or DIMSE.';
@@ -140,4 +141,4 @@ function folderExists(folder) {
} catch (err) {
return false;
}
}
}