fhirsmith 0.4.2 → 0.5.0

package/tx/workers/subsumes.js

@@ -42,8 +42,9 @@ class SubsumesWorker extends TerminologyWorker {
     try {
       await this.handleTypeLevelSubsumes(req, res);
     } catch (error) {
-      req.logInfo = "error "+(error.msgId || error.className);
       this.log.error(error);
+      this.debugLog(error);
+      req.logInfo = "error "+(error.msgId || error.className);
       if (error instanceof Issue) {
         let oo = new OperationOutcome();
         oo.addIssue(error);
@@ -66,6 +67,7 @@ class SubsumesWorker extends TerminologyWorker {
       await this.handleInstanceLevelSubsumes(req, res);
     } catch (error) {
       this.log.error(error);
+      this.debugLog(error);
       if (error instanceof Issue) {
         let oo = new OperationOutcome();
         oo.addIssue(error);
@@ -167,7 +169,7 @@ class SubsumesWorker extends TerminologyWorker {
     txp.readParams(params.jsonObj);
 
     // Load any supplements
-    const supplements = this.loadSupplements(codeSystem.url, codeSystem.version);
+    const supplements = this.loadSupplements(codeSystem.url, codeSystem.version, txp.supplements);
 
     // Create a FhirCodeSystemProvider for this CodeSystem
     const csProvider = new FhirCodeSystemProvider(this.opContext, codeSystem, supplements);
@@ -298,8 +300,16 @@ class SubsumesWorker extends TerminologyWorker {
       throw error;
     }
 
+    let equal = false;
+    if (csProvider.isCaseSensitive()) {
+      equal = codingA.code == codingB.code;
+    } else {
+      equal = codingA.code === codingB.code;
+    }
+    equal = equal || locateA == locateB;
+
     // Determine the subsumption relationship
-    let outcome = await csProvider.subsumesTest(codingA.code, codingB.code);
+    let outcome = equal ? 'equivalent' : await csProvider.subsumesTest(codingA.code, codingB.code);
 
     return {
       resourceType: 'Parameters',

package/tx/workers/translate.js

@@ -44,6 +44,7 @@ class TranslateWorker extends TerminologyWorker {
       await this.handleTypeLevelTranslate(req, res);
     } catch (error) {
       this.log.error(error);
+      this.debugLog(error);
       if (error instanceof Issue) {
         const oo = new OperationOutcome();
         oo.addIssue(error);
@@ -66,6 +67,7 @@ class TranslateWorker extends TerminologyWorker {
       await this.handleInstanceLevelTranslate(req, res);
     } catch (error) {
       this.log.error(error);
+      this.debugLog(error);
       if (error instanceof Issue) {
         const oo = new OperationOutcome();
         oo.addIssue(error);
@@ -247,7 +249,7 @@ class TranslateWorker extends TerminologyWorker {
 
   checkCode(op, langList, path, code, system, version, display) {
     let result = false;
-    const cp = this.findCodeSystem(system, version, null, ['complete', 'fragment'], true, true, false, null);
+    const cp = this.findCodeSystem(system, version, null, ['complete', 'fragment'], true, true, false, null, this.requiredSupplements);
     if (cp != null) {
       const lct = cp.locate(this.opContext, code);
       if (op.error('InstanceValidator', 'invalid', path, lct != null, 'Unknown Code (' + system + '#' + code + ')')) {
@@ -406,14 +408,16 @@ class TranslateWorker extends TerminologyWorker {
           valueString: 'No translations found'
         });
       }
-    } catch (e) {
+    } catch (error) {
+      this.log.error(error);
+      this.debugLog(error);
       result.push({
         name: 'result',
         valueBoolean: false
       });
       result.push({
         name: 'message',
-        valueString: e.message
+        valueString: error.message
       });
     }