switched to a new xml parser

Author: EliDeh

signaturenDruck/js/classes/DataFromSRU.js

@@ -1,5 +1,5 @@
 const { net } = require('electron')
-const parser = require('xml2json')
+const { XMLParser } = require("fast-xml-parser")
 
 const Store = require('electron-store')
 const C = require('./Config')
@@ -32,32 +32,40 @@ class DataFromSRU {
    */
 
   loadData (key, mode) {
-    let queryPart1
-    if (mode === 'PPN') {
-      queryPart1 = config.get('SRU.QueryPart1')
-    } else {
-      queryPart1 = config.get('SRU.QueryPart1EPN')
-    }
-    const url = config.get('SRU.SRUAddress') + queryPart1 + key + config.get('SRU.QueryPart2')
-    const request = net.request(url)
-    let allData = ''
-    let data = ''
-    return new Promise(function (resolve, reject) {
-      request.on('response', (response) => {
-        response.on('data', (chunk) => {
-          allData += chunk
-        })
-        response.on('end', () => {
-          const options = {
-            object: true
-          }
-          data = parser.toJson(allData, options)
-
-          resolve(data)
+    try {
+      let queryPart1
+      if (mode === 'PPN') {
+        queryPart1 = config.get('SRU.QueryPart1')
+      } else {
+        queryPart1 = config.get('SRU.QueryPart1EPN')
+      }
+      const url = config.get('SRU.SRUAddress') + queryPart1 + key + config.get('SRU.QueryPart2')
+      const request = net.request(url)
+      const options = {
+        ignoreAttributes: false,
+        attributeNamePrefix : ""
+      }
+      const parser = new XMLParser(options)
+      let allData = ''
+      let data = ''
+      return new Promise(function (resolve, reject) {
+        request.on('response', (response) => {
+          response.on('data', (chunk) => {
+            allData += chunk
+          })
+          response.on('error', (error) => {
+            console.log('error', error)
+            reject(error)
+          })
+          response.on('end', () => {
+            resolve(parser.parse(allData))
+          })
         })
+        request.end()
       })
-      request.end()
-    })
+    } catch (error) {
+      throw(error)
+    }
   }
 }
 

signaturenDruck/js/classes/ShelfmarksFromSRUData.js

@@ -101,12 +101,12 @@ function getOccurrence (object, barcode) {
     if (o.subfield.length > 1) {
       // return the subield entry with the matching barcode
       return _.forEach(o.subfield, function (data) {
-        if (data.$t === barcode) {
+        if (data['#text'] === barcode) {
           return o
         }
       })
     } else { // if there is just one subfield entry
-      if (o.subfield.$t === barcode) {
+      if (o.subfield['#text'] === barcode) {
         return o
       }
     }
@@ -125,7 +125,7 @@ function getOccurrence (object, barcode) {
 function getPPN (object) {
   const data = _.find(object['zs:searchRetrieveResponse']['zs:records']['zs:record']['zs:recordData'].record.datafield, { tag: '003@' })
   if (data !== undefined) {
-    return data.subfield.$t
+    return data.subfield['#text']
   } else {
     return ''
   }
@@ -134,7 +134,7 @@ function getPPN (object) {
 function getEPN (object) {
   const data = _.find(object['zs:searchRetrieveResponse']['zs:records']['zs:record']['zs:recordData'].record.datafield, { tag: '203@' })
   if (data !== undefined) {
-    return data.subfield.$t
+    return data.subfield['#text']
   } else {
     return ''
   }
@@ -144,7 +144,7 @@ function getDate (object, occ) {
   const parent = _.find(object['zs:searchRetrieveResponse']['zs:records']['zs:record']['zs:recordData'].record.datafield, { tag: '201B', occurrence: occ })
   const data = _.find(parent.subfield, { code: '0' })
   if (data !== undefined) {
-    return data.$t
+    return data['#text']
   } else {
     return ''
   }
@@ -154,7 +154,7 @@ function getTxt (object, occ) {
   const parent = _.find(object['zs:searchRetrieveResponse']['zs:records']['zs:record']['zs:recordData'].record.datafield, { tag: '209A', occurrence: occ })
   const data = _.find(parent.subfield, { code: 'a' })
   if (data !== undefined) {
-    return data.$t
+    return data['#text']
   } else {
     return ''
   }
@@ -173,7 +173,7 @@ function getLocation (object, occ) {
   const parent = _.find(object['zs:searchRetrieveResponse']['zs:records']['zs:record']['zs:recordData'].record.datafield, { tag: '209A', occurrence: occ })
   const data = _.find(parent.subfield, { code: 'f' })
   if (data !== undefined) {
-    return data.$t
+    return data['#text']
   } else {
     return ''
   }
@@ -183,7 +183,7 @@ function getLoanIndication (object, occ) {
   const parent = _.find(object['zs:searchRetrieveResponse']['zs:records']['zs:record']['zs:recordData'].record.datafield, { tag: '209A', occurrence: occ })
   const data = _.find(parent.subfield, { code: 'd' })
   if (data !== undefined) {
-    return data.$t
+    return data['#text']
   } else {
     return ''
   }

signaturenDruck/main.js

@@ -53,7 +53,7 @@ const configNew = {
   SRU: {
     useSRU: false,
     printImmediately: false,
-    SRUAddress: 'http://sru.k10plus.de/opac-de-27',
+    SRUAddress: 'https://sru.k10plus.de/opac-de-27',
     QueryPart1: '?version=1.1&operation=searchRetrieve&query=pica.bar=',
     QueryPart1EPN: '?version=1.1&operation=searchRetrieve&query=pica.epn=',
     QueryPart2: '&maximumRecords=1&recordSchema=picaxml'
@@ -215,9 +215,15 @@ ipcMain.on('saveManualSignatures', function (event, data) {
 // listens on loadFromSRU, invokes the loadAndAddFromSRU function with the provided barcode
 ipcMain.on('loadFromSRU', function (event, key, mode) {
   if (key !== '') {
-    sruData.loadData(key, mode).then(function (data) {
-      mainWindow.webContents.send('addSRUdata', data, key, mode)
-    })
+    try {
+      sruData.loadData(key, mode).then(function (data) {
+        mainWindow.webContents.send('addSRUdata', data, key, mode)
+      })
+    } catch (err) {
+      console.log('error occured')
+      console.log(err)
+    }
+    
   }
 })
 

signaturenDruck/package-lock.json

@@ -1,20 +1,20 @@
 {
   "name": "SignaturenDruck",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "SignaturenDruck der ThULB",
   "main": "main.js",
   "dependencies": {
     "electron-context-menu": "^3.1.1",
     "electron-squirrel-startup": "^1.0.0",
     "electron-store": "^8.0.1",
+    "fast-xml-parser": "^4.3.5",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "pdf-to-printer": "^5.0.0",
     "serialijse": "^0.3.0",
     "sweetalert2": "^11.1.9",
     "system-font-families": "^0.4.1",
     "username": "^5.1.0",
-    "xml2json": "^0.12.0",
     "xregexp": "^5.1.0"
   },
   "devDependencies": {