ti2-tourplan 1.0.72 → 1.0.74

package/index.js

@@ -87,23 +87,24 @@ class BuyerPlugin {
       data = data.replace(xmlOptions.dtd.name, `Request SYSTEM "${xmlOptions.dtd.name}"`);
       let replyObj;
       let errorStr;
-      if (this.xmlProxyUrl) {
-        // use pyfilematch xmlproxy to avoid passing large payloads back and forth
-        try {
-          replyObj = R.path(['data'], await axios({
-            method: 'post',
-            url: `${this.xmlProxyUrl}/xmlproxy`,
-            data: {
-              url: endpoint,
-              data,
-              headers: getHeaders({ length: `${data.length}` }),
-            },
-          }));
-        } catch (err) {
-          console.log('error in calling pyfilematch xmlproxy', err);
-          errorStr = `error in calling pyfilematch xmlproxy: ${err}`;
-        }
-      }
+      // can't use proxy because of the static IP thing, darn
+      // if (this.xmlProxyUrl) {
+      //   // use pyfilematch xmlproxy
+      //   try {
+      //     replyObj = R.path(['data'], await axios({
+      //       method: 'post',
+      //       url: `${this.xmlProxyUrl}/xmlproxy`,
+      //       data: {
+      //         url: endpoint,
+      //         data,
+      //         headers: getHeaders({ length: `${data.length}` }),
+      //       },
+      //     }));
+      //   } catch (err) {
+      //     console.log('error in calling pyfilematch xmlproxy', err);
+      //     errorStr = `error in calling pyfilematch xmlproxy: ${err}`;
+      //   }
+      // }
       if (!replyObj) {
         // in case of error /xmlproxy, fallback to call tourplan directly
         // and then use pyfilematch xml2json to parse the xml
@@ -231,8 +232,20 @@ class BuyerPlugin {
     this.escapeInvalidXmlChars = str => {
       if (!str) return '';
       const convertAccentedChars = s => {
-        return s.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
-      }
+        // according to TC-143, we will go through one mapping first
+        // for certain accented chars
+        const accentedChars = [
+          ['Ä', 'Ae'],
+          ['Ö', 'Oe'],
+          ['Ü', 'Ue'],
+          ['ä', 'ae'],
+          ['ö', 'oe'],
+          ['ü', 'ue'],
+          ['ß', 'ss'],
+        ];
+        const preprocessed = accentedChars.reduce((acc, [k, v]) => acc.replace(k, v), s);
+        return preprocessed.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+      };
       return convertAccentedChars(str)
         .replace(/’/g, "'")
         .replace(/‘/g, "'")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-tourplan",
-  "version": "1.0.72",
+  "version": "1.0.74",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {