add check for autometadata

ComPlat · Sep 8, 2023 · 2cd7aa3 · 2cd7aa3
1 parent 37b67dd
commit 2cd7aa3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/dist/helpers/format.js b/dist/helpers/format.js
@@ -60,14 +60,19 @@ const toPeakStr = peaks => {
   const str = arr.join('#');
   return str;
 };
-let fixedWavelength = null;
+let fixedWavelength = '';
 const extractFixedWavelength = source => {
   const jcamp = _jcampconverter.default.convert(source, {
     xy: true,
     keepRecordsRegExp: /(CSAUTOMETADATA)/
   });
-  // eslint-disable-next-line prefer-destructuring
-  fixedWavelength = jcamp.info.$CSAUTOMETADATA.match(/FIXEDWAVELENGTH=([\d.]+)/)[1];
+  if ('$CSAUTOMETADATA' in jcamp.info) {
+    const match = jcamp.info.$CSAUTOMETADATA.match(/FIXEDWAVELENGTH=([\d.]+)/);
+    if (match !== null) {
+      // eslint-disable-next-line prefer-destructuring
+      fixedWavelength = match[1];
+    }
+  }
   return {
     fixedWavelength
   };
@@ -141,6 +146,10 @@ const spectraOps = {
     head: 'SIZE EXCLUSION CHROMATOGRAPHY',
     tail: '.'
   },
+  [_list_layout.LIST_LAYOUT.EMISSIONS]: {
+    head: 'EMISSION',
+    tail: ' nm'
+  },
   [_list_layout.LIST_LAYOUT.DLS_INTENSITY]: {
     head: 'DLS',
     tail: '.'
@@ -412,13 +421,13 @@ const peaksWrapper = function (layout, shift) {
       tail: ''
     };
   }
+  const ops = spectraOps[layout];
   if (layout === _list_layout.LIST_LAYOUT.EMISSIONS) {
     return {
-      head: `EMISSION: λex = ${fixedWavelength} nm,  λem = `,
-      tail: ' nm'
+      head: `${ops.head}${solvTxt}: λex = ${fixedWavelength} nm;  λem = `,
+      tail: ops.tail
     };
   }
-  const ops = spectraOps[layout];
   return {
     head: `${ops.head}${solvTxt} = `,
     tail: ops.tail

diff --git a/src/helpers/format.js b/src/helpers/format.js
@@ -52,7 +52,7 @@ const toPeakStr = (peaks) => {
   return str;
 };
 
-let fixedWavelength = null;
+let fixedWavelength = '';
 
 const extractFixedWavelength = (source) => {
   const jcamp = Jcampconverter.convert(
@@ -62,8 +62,13 @@ const extractFixedWavelength = (source) => {
       keepRecordsRegExp: /(CSAUTOMETADATA)/,
     },
   );
-  // eslint-disable-next-line prefer-destructuring
-  fixedWavelength = jcamp.info.$CSAUTOMETADATA.match(/FIXEDWAVELENGTH=([\d.]+)/)[1];
+  if ('$CSAUTOMETADATA' in jcamp.info) {
+    const match = jcamp.info.$CSAUTOMETADATA.match(/FIXEDWAVELENGTH=([\d.]+)/);
+    if (match !== null) {
+      // eslint-disable-next-line prefer-destructuring
+      fixedWavelength = match[1];
+    }
+  }
 
   return { fixedWavelength };
 };
@@ -86,6 +91,7 @@ const spectraOps = {
   [LIST_LAYOUT.CYCLIC_VOLTAMMETRY]: { head: 'CYCLIC VOLTAMMETRY', tail: '.' },
   [LIST_LAYOUT.CDS]: { head: 'CIRCULAR DICHROISM SPECTROSCOPY', tail: '.' },
   [LIST_LAYOUT.SEC]: { head: 'SIZE EXCLUSION CHROMATOGRAPHY', tail: '.' },
+  [LIST_LAYOUT.EMISSIONS]: { head: 'EMISSION', tail: ' nm' },
   [LIST_LAYOUT.DLS_INTENSITY]: { head: 'DLS', tail: '.' },
 };
 
@@ -340,10 +346,10 @@ const peaksWrapper = (layout, shift, atIndex = 0) => {
     return { head: '', tail: '' };
   }
 
+  const ops = spectraOps[layout];
   if (layout === LIST_LAYOUT.EMISSIONS) {
-    return { head: `EMISSION: λex = ${fixedWavelength} nm,  λem = `, tail: ' nm' };
+    return { head: `${ops.head}${solvTxt}: λex = ${fixedWavelength} nm;  λem = `, tail: ops.tail };
   }
-  const ops = spectraOps[layout];
   return { head: `${ops.head}${solvTxt} = `, tail: ops.tail };
 };