c32 parser add text() to xpaths to make it functional in browser

amida-tech · Nov 20, 2014 · d2c5e52 · d2c5e52
1 parent 46c56a5
commit d2c5e52
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "blue-button",
-    "version": "1.3.0-beta.12",
+    "version": "1.3.0-beta.13",
     "license": "Apache-2.0",
     "ignore": ["**/*", "!dist/*", "!bower.json", "!package.json", "!LICENSE"],
     "dependencies": {

diff --git a/dist/blue-button.js b/dist/blue-button.js
@@ -238,7 +238,7 @@ var exportAllergiesSection = function (version) {
     var allergenDescriptor = component.define('allergenDescriptor');
     allergenDescriptor.fields([
 
-        ["name", "0..1", "h:name"],
+        ["name", "0..1", "h:name/text()"],
         ["code", "0..1", "h:code", shared.ConceptDescriptor]
     ]).cleanupStep(function () {
 
@@ -762,7 +762,7 @@ var exportResultsSection = function (version) {
             ["date_time", "1..1", "h:effectiveTime", shared.EffectiveTime],
             //["physicalQuantity.text", "1..1", "h:value[@xsi:type='ST']", shared.PhysicalQuantity],
             ["status", "1..1", "h:statusCode/@code"],
-            ["text", "0..1", "h:value[@xsi:type='ST']"],
+            ["text", "0..1", "h:value[@xsi:type='ST']/text()"],
             ["reference_range", "0..1", "h:referenceRange/h:observationRange", referenceRange],
             //["codedValue", "0..1", "h:value[@xsi:type='CD']", shared.ConceptDescriptor],
             //["freeTextValue", "0..1", "h:text", shared.TextWithReference],
@@ -14148,7 +14148,7 @@ function hasOwnProperty(obj, prop) {
 },{}],90:[function(require,module,exports){
 module.exports={
   "name": "blue-button",
-  "version": "1.3.0-beta.11",
+  "version": "1.3.0-beta.13",
   "description": "Blue Button (CCDA) to JSON Parser.",
   "main": "/index.js",
   "directories": {

diff --git a/lib/parser/c32/sections/allergies.js b/lib/parser/c32/sections/allergies.js
@@ -31,7 +31,7 @@ var exportAllergiesSection = function (version) {
     var allergenDescriptor = component.define('allergenDescriptor');
     allergenDescriptor.fields([
 
-        ["name", "0..1", "h:name"],
+        ["name", "0..1", "h:name/text()"],
         ["code", "0..1", "h:code", shared.ConceptDescriptor]
     ]).cleanupStep(function () {
 

diff --git a/lib/parser/c32/sections/results.js b/lib/parser/c32/sections/results.js
@@ -25,7 +25,7 @@ var exportResultsSection = function (version) {
             ["date_time", "1..1", "h:effectiveTime", shared.EffectiveTime],
             //["physicalQuantity.text", "1..1", "h:value[@xsi:type='ST']", shared.PhysicalQuantity],
             ["status", "1..1", "h:statusCode/@code"],
-            ["text", "0..1", "h:value[@xsi:type='ST']"],
+            ["text", "0..1", "h:value[@xsi:type='ST']/text()"],
             ["reference_range", "0..1", "h:referenceRange/h:observationRange", referenceRange],
             //["codedValue", "0..1", "h:value[@xsi:type='CD']", shared.ConceptDescriptor],
             //["freeTextValue", "0..1", "h:text", shared.TextWithReference],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blue-button",
-  "version": "1.3.0-beta.12",
+  "version": "1.3.0-beta.13",
   "description": "Blue Button (CCDA) to JSON Parser.",
   "main": "/index.js",
   "directories": {

diff --git a/test/fixtures/generated/CCD_1.xml.json b/test/fixtures/generated/CCD_1.xml.json
@@ -1960,7 +1960,7 @@
     ]
   },
   "meta": {
-    "version": "1.3.0-beta.11",
+    "version": "1.3.0-beta.13",
     "identifiers": [
       {
         "identifier": "2.16.840.1.113883.19.5.99999.1",

diff --git a/test/fixtures/generated/SampleCCDDocument.json b/test/fixtures/generated/SampleCCDDocument.json
@@ -519,7 +519,7 @@
     ]
   },
   "meta": {
-    "version": "1.3.0-beta.11",
+    "version": "1.3.0-beta.13",
     "identifiers": [
       {
         "identifier": "db734647-fc99-424c-a864-7e3cda82e703"

diff --git a/test/fixtures/generated/VA_CCD_Sample_File_Version_12_5_1.json b/test/fixtures/generated/VA_CCD_Sample_File_Version_12_5_1.json
@@ -1048,7 +1048,7 @@
     ]
   },
   "meta": {
-    "version": "1.3.0-beta.11",
+    "version": "1.3.0-beta.13",
     "identifiers": [
       {
         "identifier": "2.16.840.1.113883.4.349",