af4b8b45f5
* Adding a better error handling for DICOMWeb getJson method * Adding a better error handling for DICOMWeb getBulkData method * Fixinf some typos. Using console.error to log errors * Better error handling for DIMSE connections * Using meteor error in StudyListSearch to better display same error in the client * Using Meteor.Error for a better pattern. Added an error message in the study list. created connection error types to DICOMWeb connection errors * Changing error types for server connection. Added better errors for DIMSE server on sockets * Improving viewer response to error being throw when not finding server to display studies * OHIF-168: adding catches clauses for retrieveStudyMetada method * OHIF-168: fixing typo in DIMSE.js * OHIF-168: setting the session variable to false when starting a new studylist search * OHIF-168: Using OHIF.log instead of console * OHIF-168: removing parsing into string for OHIF.log in Connection.js * OHIF-168: improving error message visibility in study viewer
111 lines
4.6 KiB
JavaScript
111 lines
4.6 KiB
JavaScript
import { Meteor } from 'meteor/meteor';
|
|
import { OHIF } from 'meteor/ohif:core';
|
|
import 'meteor/ohif:viewerbase';
|
|
|
|
// Define the StudyMetaDataPromises object. This is used as a cache to store study meta data
|
|
// promises and prevent unnecessary subsequent calls to the server
|
|
const StudyMetaDataPromises = new Map();
|
|
|
|
/**
|
|
* Retrieves study metadata using a server call
|
|
*
|
|
* @param {String} studyInstanceUid The UID of the Study to be retrieved
|
|
* @returns {Promise} that will be resolved with the metadata or rejected with the error
|
|
*/
|
|
OHIF.studylist.retrieveStudyMetadata = (studyInstanceUid, seriesInstanceUids) => {
|
|
|
|
// @TODO: Whenever a study metadata request has failed, its related promise will be rejected once and for all
|
|
// and further requests for that metadata will always fail. On failure, we probably need to remove the
|
|
// corresponding promise from the "StudyMetaDataPromises" map...
|
|
|
|
// If the StudyMetaDataPromises cache already has a pending or resolved promise related to the
|
|
// given studyInstanceUid, then that promise is returned
|
|
if (StudyMetaDataPromises.has(studyInstanceUid)) {
|
|
return StudyMetaDataPromises.get(studyInstanceUid);
|
|
}
|
|
|
|
console.time('retrieveStudyMetadata');
|
|
|
|
// Create a promise to handle the data retrieval
|
|
const promise = new Promise((resolve, reject) => {
|
|
// If no study metadata is in the cache variable, we need to retrieve it from
|
|
// the server with a call.
|
|
Meteor.call('GetStudyMetadata', studyInstanceUid, function(error, study) {
|
|
console.timeEnd('retrieveStudyMetadata');
|
|
|
|
if (error) {
|
|
const errorType = error.error;
|
|
let errorMessage = '';
|
|
|
|
if (errorType === 'server-connection-error') {
|
|
errorMessage = 'There was an error connecting to the DICOM server, please verify if it is up and running.'
|
|
} else if (errorType === 'server-internal-error') {
|
|
errorMessage = `There was an internal error with the DICOM server getting metadeta for ${studyInstanceUid}`;
|
|
} else {
|
|
errorMessage = `For some reason we could not retrieve the study\'s metadata for ${studyInstanceUid}.`;
|
|
}
|
|
|
|
OHIF.log.error(errorMessage);
|
|
OHIF.log.error(error.stack);
|
|
reject(`GetStudyMetadata: ${errorMessage}`);
|
|
return;
|
|
}
|
|
|
|
// Filter series if seriesInstanceUid exists
|
|
if (seriesInstanceUids && seriesInstanceUids.length) {
|
|
study.seriesList = study.seriesList.filter(series => seriesInstanceUids.indexOf(series.seriesInstanceUid) > -1);
|
|
}
|
|
|
|
if (!study) {
|
|
reject(`GetStudyMetadata: No study data returned from server: ${studyInstanceUid}`);
|
|
return;
|
|
}
|
|
|
|
if (window.HipaaLogger && Meteor.user && Meteor.user()) {
|
|
window.HipaaLogger.logEvent({
|
|
eventType: 'viewed',
|
|
userId: Meteor.userId(),
|
|
userName: Meteor.user().profile.fullName,
|
|
collectionName: 'Study',
|
|
recordId: studyInstanceUid,
|
|
patientId: study.patientId,
|
|
patientName: study.patientName
|
|
});
|
|
}
|
|
|
|
// Once the data was retrieved, the series are sorted by series and instance number
|
|
OHIF.viewerbase.sortStudy(study);
|
|
|
|
// Updates WADO-RS metaDataManager
|
|
OHIF.viewerbase.updateMetaDataManager(study);
|
|
|
|
// Add additional metadata to our study from the studylist
|
|
const studylistStudy = OHIF.studylist.collections.Studies.findOne({
|
|
studyInstanceUid: study.studyInstanceUid,
|
|
'seriesList.seriesInstanceUid': '123456',
|
|
});
|
|
|
|
if (studylistStudy) {
|
|
Object.assign(study, studylistStudy);
|
|
}
|
|
|
|
// Transform the study in a StudyMetadata object
|
|
const studyMetadata = new OHIF.metadata.StudyMetadata(study);
|
|
|
|
// Add the display sets to the study
|
|
study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
|
|
study.displaySets.forEach(displaySet => {
|
|
OHIF.viewerbase.stackManager.makeAndAddStack(study, displaySet);
|
|
});
|
|
|
|
// Resolve the promise with the final study metadata object
|
|
resolve(study);
|
|
});
|
|
});
|
|
|
|
// Store the promise in cache
|
|
StudyMetaDataPromises.set(studyInstanceUid, promise);
|
|
|
|
return promise;
|
|
};
|