cleanup

README.md

@@ -49,20 +49,20 @@ run via
 ```
 node main.js --help
 ```
+# []
+![alt example screenshot](jdbcsql_web_client.png)
+
 
 ## Development
 
 The src folder contains both typescript and js files.
 
-All files are compiled to gen  (using tsc or babel)
-Compilation is to ES2015, as the jscoverage parse cannot treat new language
-feature correclty
+All files are compiled to gen  (using tsc/babel)
 
-gulp-instrument (one of the jscoverage gulp integration) is used to generate
-coverage instrumented sources in gen_cov
+tap for testing and coverage
 
 Currently the test folder is not compiled, but contains directly es6 modules
 
-gulp, gulp-watch
+gulp, gulp-watch should work
 
 

app/server/routes.js

@@ -1,61 +1,42 @@
-
-
 var debug = require('debug');
 var debuglog = debug('routes');
 var uuid = require('node-uuid');
 
-var cookieTime = 32*24*60*60; // 32 days in seconds
+//var cookieTime = 32 * 24 * 60 * 60; // 32 days in seconds
 
 var url = require('url');
 
+module.exports = function (app) {
 
-module.exports = function(app) {
-
-// main login page
-  app.get('/', function(req, res){
+  // main login page
+  app.get('/', function (req, res) {
     res.redirect('/home');
   });
 
-  app.get('/home', function(req, res) {
-    if (false && req.session.user == null){
-	// if user is not logged-in redirect back to login page //
-      res.redirect('/');
-    }	else{
-      debuglog('at home ' + JSON.stringify(req.session));
-      res.render('home', {
-        user : (req.session.user && req.session.user.user) || undefined,
-        title : 'jdbcsql_client',
-        conversationid : uuid.v4(),
-        udata : req.session.user,
-        altData : req.session.altData
-      });
-    }
-  });
-
-
-  app.get('/favicon.ico', function(req, res) {
-    var path = require('path');
-    var resp = path.basename(path.basename(__dirname));
-    var iconfile = resp + '/../app/public/css/ui/';
-    console.log('trying to serve ' + iconfile);
-    res.sendfile('droplet.ico', { root: iconfile});
+  app.get('/home', function (req, res) {
+    debuglog('at home ' + JSON.stringify(req.session));
+    res.render('home', {
+      user: (req.session.user && req.session.user.user) || undefined,
+      title: 'jdbcsql_client',
+      conversationid: uuid.v4(),
+      udata: req.session.user,
+      altData: req.session.altData
+    });
   });
 
-
-  app.get('/about', function(req, res) {
+  app.get('/about', function (req, res) {
     res.render('about', {
-      pagetitle : 'about',
-      user : (req.session.user && req.session.user.user) || undefined,
-      title : 'wosap about',
-      udata : req.session.user,
-      altData : req.session.altData
+      pagetitle: 'about',
+      user: (req.session.user && req.session.user.user) || undefined,
+      title: 'wosap about',
+      udata: req.session.user,
+      altData: req.session.altData
     });
   });
 
   var dbconnector = require('../../gen/dbconnector.js');
 
-
-  app.get('/query', function(req, res) {
+  app.get('/query', function (req, res) {
     var url_parts = url.parse(req.url, true);
     var query = url_parts.query;
     var o = query.query;
@@ -64,14 +45,13 @@ module.exports = function(app) {
       res.status(400).send('error');
     }	else {
       dbconnector.runStatements(query.query,
-        function(result) {
+        function (result) {
           res.setHeader('Content-Type', 'text/plain');
-          res.status(200).send(result.replace(/\n/g,'\r\n'));
+          res.status(200).send(result.replace(/\n/g, '\r\n'));
         }
       );
     }
   });
 
-  app.get('*', function(req, res) { res.render('404', { title: 'Page Not Found'}); });
-
+  app.get('*', function (req, res) { res.render('404', { title: 'Page Not Found'}); });
 };

jdbcsql_config.json

@@ -1,13 +1,17 @@
 {
-  "classpath" : ["/home/D026276/localgit/sjdbcsql_throughput/drivers/acmereports.jar"],
+  "port": 42042,
+  "classpath": [
+    "./drivers/hsqldb.jar",
+    "./drivers/derby.jar",
+    "./drivers/derbyclient.jar",
+    "./drivers/derbytools.jar"
+  ],
   "config": {
-          "libpath" : "./drivers/hl-jdbc-2.3.90.jar",
-          "drivername" : "com.sap.vora.jdbc.VoraDriver",
-          "url" : "jdbc:hanalite://127.0.0.1:2202",
-          "user" : "",
-          "logging" : "info",
-          "password": "",
-          "minpoolsize": 2,
-          "maxpoolsize": 500
-        }
-}
+    "url": "jdbc:hsqldb:hsql://localhost/xdb",
+    "user": "SA",
+    "logging": "info",
+    "password": "",
+    "minpoolsize": 2,
+    "maxpoolsize": 50
+  }
+}