Merge branch 'master' into production

README.md

@@ -76,6 +76,9 @@ echo '{"Action":"LaTeX","Source":"\\documentclass{article}\\begin{document}
 
 echo '{"Action":"_version","PostProcessing":"Result=\"Hugo\""}' | \
   curl -T - -X PUT http://localhost:55555
+
+echo "{\"Action\":\"XLSX-IN\",\"Value\":\"$(base64 -w 0 foo.xlsx)\"}" | \
+  curl -T - -X PUT http://localhost:55555
 ```
 
 ## Test

add/relay-add-PM2535.js

-
 var x = require('./relay-add-MISC.js');
-
 /**
  * Extrahiert Float-Zahl aus String welcher vom Phillips
  * 2535 geliefert wird
@@ -9,10 +7,8 @@ var x = require('./relay-add-MISC.js');
  * @param  String str String mit enthaltener Zahl.
  * @return Number Zahl.
  */
-function extractPhillipsTemp(s) {
-  // TODO: Richtig: PHILIPS; besserer Name "extractPM2535Temp"
-  var regex = /^(TDC\s*)([-+]{1}[0-3]{3}\.?[0-9]{2}[E]{1}[-+]{1}[0-1]{2})(\n)$/;
-
-  return x.strToNum(regex.exec(s),2);
+function extractPM2535Temp(s) {
+    var regex = /([+][0-9]{3}\.?[0-9]{2}[E]{1}[-+]{1}[0-1]{2})(\n)$/;
+    return x.strToNum(regex.exec(s),1);
 }
-exports.extractPhillipsTemp= extractPhillipsTemp;
+exports.extractPM2535Temp = extractPM2535Temp;

config.js

@@ -40,6 +40,7 @@ var cfg = {
     '/etc/release'],
   bin: {
     RSCRIPT: '/usr/bin/Rscript',
+    PYTHON: '/usr/bin/python',
     DATE: '/bin/date',
     SLEEP: '/bin/sleep',
     ECHO: '/bin/echo',

excel.js

 /**
  * @author Rolf Niepraschk (Rolf.Niepraschk@ptb.de)
- * version: 2015-02-24
+ * version: 2016-10-06
  */
 
 var cfg = require('./config.js');
 var tools = require('./tools.js');
 var utils = require('./utils.js');
 var response = require('./response.js');
-var xlsx = require('node-xlsx');
-//TODO: deprecated node-xlsx@0.4.0: please use the xlsx package instead
-// ==> https://github.com/SheetJS/js-xlsx
-
+var xlsx = require('node-xlsx'); // ==> https://github.com/mgcrea/node-xlsx
 var logger = cfg.logger;
 
 /**
@@ -19,7 +16,7 @@ var logger = cfg.logger;
  * @param {object} d
  * @return d
  */
-function simplify(d) {
+function simplify(d) {// TODO: Beseitigen, da wohl sinnlos
   for (var i=0; i<d.worksheets.length; i++) {
     for (var j=0; j<d.worksheets[i].data.length; j++) {
       for (var k=0; k<d.worksheets[i].data[j].length; k++) {
@@ -39,11 +36,8 @@ function simplify(d) {
  * @param {object} js empfangene JSON-Struktur um weitere Daten ergänzt
  */
 function toXLSX(pRef, js) {
-  var params = {};
-  params.worksheets = js.Value;
-  logger.debug('params: ', params);
   try {
-    var buf = xlsx.build(params);
+    var buf = xlsx.build(js.Value);
     var filename = js.Filename ? js.Filename : cfg.DEFAULT_XLSX_NAME;
     js.OutputType = 'stream';
     js.Head = {};
@@ -71,7 +65,8 @@ function fromXLSX(pRef, js) {
     var data = xlsx.parse(new Buffer(js.Value, 'base64'));
     utils.addStopTime(js);
     var short = (typeof js.ShortFormat == 'boolean') ? js.ShortFormat : true;
-    response.prepareResult(pRef, js, short ? simplify(data) : data);
+    //response.prepareResult(pRef, js, short ? simplify(data) : data);
+    response.prepareResult(pRef, js, data);
   } catch(e) {
     logger.error(e.toString());
     response.prepareError(pRef, js, 'xlsx conversion error');

external.js

@@ -36,6 +36,7 @@ function call(pRef, js, postFunc) {
           return;
         }
         // TODO: LaTeX ähnlich wie RSCRIPT handhaben. (???)
+        // TODO: RSCRIPT ergänzen und dazu Script-Behandlung generalisieren.
         break;
       default:
         break;

modbus.js

@@ -207,6 +207,7 @@ function call(pRef, js) {
             break;
           case 'Uint16': // Array of 16-Bit-Integers
             result = Array.from(view16);
+            break;
           default: // 'Buffer'; raw data
             result = values;
         }

package.json

 {
   "name": "relayServer",
-  "version": "12.7.3",
+  "version": "12.7.4",
   "description": "Nodejs-basierter http-Server für Messaufgaben",
   "author": {
     "name": "Rolf Niepraschk",

relayServer.service

-[Unit]
-Description=The relayServer daemon.
-After=network.target
-
-[Service]
-User=wwwrun
-Group=www
-Type=simple
-StandardOutput=null
-StandardError=null
-Restart=always
-# Run ExecStartPre/ExecStartPost with root-permissions
-PermissionsStartOnly=true
-# Remove PIDFile at Stop
-PIDFile=/var/run/relayServer/relayServerd.pid
-ExecStartPre=/usr/bin/mkdir -p /var/run/relayServer
-ExecStartPost=/bin/sh -c '/usr/bin/echo $MAINPID > /var/run/relayServer/relayServerd.pid'
-ExecStart=/bin/bash -l -c "/usr/bin/node --expose_gc  /usr/local/share/relayServer/relayServer.js"
-
-[Install]
-WantedBy=multi-user.target

relayServer.service

+relayServer.service.opensuse
\ No newline at end of file

relayServer.service.opensuse

+[Unit]
+Description=The relayServer daemon.
+After=network.target
+
+[Service]
+User=wwwrun
+Group=www
+Type=simple
+StandardOutput=null
+StandardError=null
+Restart=always
+# Run ExecStartPre/ExecStartPost with root-permissions
+PermissionsStartOnly=true
+# Remove PIDFile at Stop
+PIDFile=/var/run/relayServer/relayServerd.pid
+ExecStartPre=/usr/bin/mkdir -p /var/run/relayServer
+ExecStartPost=/bin/sh -c '/usr/bin/echo $MAINPID > /var/run/relayServer/relayServerd.pid'
+ExecStart=/bin/bash -l -c "/usr/bin/node --expose_gc  /usr/local/share/relayServer/relayServer.js"
+
+[Install]
+WantedBy=multi-user.target

relayServer.service.ubuntu

+# Ubuntu 16.04-Version, RN, 2016-10-04
+[Unit]
+Description=The relayServer daemon.
+Wants=gitlabhook.service
+After=network.target gitlabhook.service
+
+[Service]
+User=www-data
+Group=www-data
+Type=simple
+StandardOutput=null
+StandardError=null
+Restart=always
+# Run ExecStartPre with root-permissions
+PermissionsStartOnly=true
+# Remove PIDFile at Stop
+PIDFile=/var/run/relayServer/relayServerd.pid
+ExecStartPre=/bin/mkdir -p /var/run/relayServer
+ExecStartPre=/bin/bash -c '/usr/bin/node /usr/local/share/getGitLabFiles/getGitLabFiles.js relayServer'
+ExecStartPost=/bin/bash -c '/bin/echo $MAINPID > /var/run/relayServer/relayServerd.pid'
+ExecStart=/bin/bash -l -c '/usr/bin/node --expose_gc  /usr/local/share/relayServer/relayServer.js'
+
+[Install]
+WantedBy=multi-user.target

test/relay-add.device.test.js

@@ -65,14 +65,13 @@ describe('relay-add.Device', function(){
 
     });
   });
- describe('#extractPhillipsTemp', function(){
-    it('should return clean numbers or NaN', function(){
-
-      assert.equal( _.isNaN(add.extractPhillipsTemp("VDC    0.0001\n")),true);
-
-      assert.equal( add.extractPhillipsTemp("TDC     +022.80E+00\n"), 22.8);
-
-    });
+    
+  describe('#extractPM2535Temp', function(){
+      it('should return clean numbers or NaN', function(){
+	  assert.equal( _.isNaN(add.extractPM2535Temp("VDC    0.0001\n")),true);
+	  assert.equal( add.extractPM2535Temp("TDC     +022.80E+00\n"), 22.8);
+	  assert.equal( add.extractPM2535Temp("+026.80E+00\n"), 26.8);
+      });
   });
 
   describe('#extractAtmion', function(){