Updates for Timepoint assocation (LT-60) and Conformance Checks (LT-92, LT-93, LT-94)

Packages/dicomweb/lib/findIndexOfString.js

@@ -1,52 +0,0 @@
-/**
- * Converts a String to a UInt8 array of character codes
- * @param {String} str Input string
- * @returns {Uint8Array} Uint8 Array of character codes
- */
-function stringToUint8Array(str) {
-    var uint = new Uint8Array(str.length);
-    for (var i = 0,j = str.length;i< j;i++){
-        uint[i] = str.charCodeAt(i);
-    }
-
-    return uint;
-}
-
-function checkToken(token, data, dataOffset) {
-    if (dataOffset + token.length > data.length) {
-        //console.log('dataOffset >> ', dataOffset);
-        return false;
-    }
-
-    for (var i = 0; i < token.length; i++) {
-        if (token[i] !== data[endIndex++]) {
-            if (endIndex > 520000) {
-                console.log('token=',uint8ArrayToString(token));
-                console.log('data=', uint8ArrayToString(data, dataOffset, endIndex - dataOffset));
-                console.log('miss at %d %s dataOffset=%d', i, String.fromCharCode(data[endIndex]), endIndex);
-                console.log('miss at %d %s dataOffset=%d', i, String.fromCharCode(token[endIndex]), endIndex);
-            }
-
-            return false;
-        }
-    }
-
-    return true;
-}
-
-findIndexOfString = function(data, str, offset) {
-    offset = offset || 0;
-
-    var token = stringToUint8Array(str);
-
-    for (var i = offset; i < data.length; i++) {
-        if (data[i] === token[0]) {
-            //console.log('match @', i);
-            if (checkToken(token, data, i)) {
-                return i;
-            }
-        }
-    }
-
-    return -1;
-};

Packages/dicomweb/lib/uint8ArrayToString.js

@@ -1,18 +0,0 @@
-/**
- * Converts a Uint8 array to a string
- * @param data
- * @param offset
- * @param length
- * @returns {string}
- */
-uint8ArrayToString = function(data, offset, length) {
-    offset = offset || 0;
-    length = length || data.length - offset;
-    var str = '';
-
-    for (var i = offset; i < offset + length; i++) {
-        str += String.fromCharCode(data[i]);
-    }
-
-    return str;
-};

Packages/dicomweb/package.js

@@ -9,16 +9,11 @@ Package.onUse(function(api) {
 
     // DICOMWeb API functions
     api.addFiles('server/namespace.js', 'server');
-    api.addFiles('server/getImageFrame.js', 'server');
     api.addFiles('server/getJSON.js', 'server');
     api.addFiles('server/getName.js', 'server');
     api.addFiles('server/getNumber.js', 'server');
     api.addFiles('server/getString.js', 'server');
 
-    // Helper functions
-    api.addFiles('lib/findIndexOfString.js', 'server');
-    api.addFiles('lib/uint8ArrayToString.js', 'server');
-
-    api.export('DICOMWeb', 'server');
+    api.export('DICOMWeb', ['client', 'server']);
 });
 

Packages/dicomweb/server/getImageFrame.js

@@ -1,74 +0,0 @@
-function findBoundary(header) {
-    for (var i = 0; i < header.length; i++) {
-        if (header[i].substr(0,2) === '--') {
-            return header[i];
-        }
-    }
-
-    return undefined;
-}
-
-function findContentType(header) {
-    for (var i = 0; i < header.length; i++) {
-        if (header[i].substr(0,13) === 'Content-Type:') {
-            return header[i].substr(13).trim();
-        }
-    }
-
-    return undefined;
-}
-
-DICOMWeb.getImageFrame = function(uri, mediaType) {
-    mediaType = mediaType || 'application/octet-stream';
-
-    return new Promise(function(resolve, reject) {
-        var xhr = new XMLHttpRequest();
-        xhr.responseType = 'arraybuffer';
-        xhr.open('get', uri, true);
-        xhr.setRequestHeader('Accept', 'multipart/related;type=' + mediaType);
-        xhr.onreadystatechange = function(oEvent) {
-            // TODO: consider sending out progress messages here as we receive the pixel data
-            if (xhr.readyState === 4) {
-                if (xhr.status === 200) {
-                    // request succeeded, Parse the multi-part mime response
-                    var imageFrameAsArrayBuffer = xhr.response;
-                    var response = new Uint8Array(xhr.response);
-                    // First look for the multipart mime header
-                    var tokenIndex = findIndexOfString(response, '\n\r\n');
-                    if (tokenIndex === -1) {
-                        reject('invalid response - no multipart mime header');
-                    }
-
-                    var header = uint8ArrayToString(response, 0, tokenIndex);
-                    // Now find the boundary  marker
-                    var split = header.split('\r\n');
-                    var boundary = findBoundary(split);
-                    if (!boundary) {
-                        reject('invalid response - no boundary marker');
-                    }
-
-                    var offset = tokenIndex + 4; // skip over the \n\r\n
-
-                    // find the terminal boundary marker
-                    var endIndex = findIndexOfString(response, boundary, offset);
-                    if (endIndex === -1) {
-                        reject('invalid response - terminating boundary not found');
-                    }
-                    // return the info for this pixel data
-                    var length = endIndex - offset - 1;
-                    resolve({
-                        contentType: findContentType(split),
-                        arrayBuffer: imageFrameAsArrayBuffer,
-                        offset: offset,
-                        length: length
-                    });
-                } else {
-                    // request failed, reject the deferred
-                    reject(xhr.response);
-                }
-            }
-        };
-
-        xhr.send();
-    });
-};

Packages/dicomweb/server/getJSON.js

@@ -1,8 +1,8 @@
 DICOMWeb.getJSON = function(url, options) {
     var getOptions = {
         headers: {
-        Accept: 'application/json'
-    },
+            Accept: 'application/json'
+        }
     };
 
     if (options.auth) {