Skip to content

Commit

Permalink
fixed as WebStorm suggest
Browse files Browse the repository at this point in the history
  • Loading branch information
kaven276 committed May 9, 2012
1 parent 2843666 commit 5d443ac
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 19 deletions.
6 changes: 3 additions & 3 deletions lib/combined.js
Expand Up @@ -2,8 +2,8 @@ try {
var e = require('connect');
} catch (e) {
console.error('You should install connect first.');
console.info('npm -g install connect --production')
return;
console.info('npm -g install connect --production');
process.exit(1);
}
var app = e.createServer();
var cfg = require('./cfg.js');
Expand Down Expand Up @@ -39,7 +39,7 @@ app.use(cfg.file_mount_point, e.static(dir, {
app.use(cfg.plsql_mount_point || '/', require('./psp.web.js'));

console.log('usage: node combined_server <oracle_port> <client_port> <client_port_ssl>');
console.log('This is combined/integrated server (service both dynamic PL/SQL page and static file) ')
console.log('This is combined/integrated server (service both dynamic PL/SQL page and static file) ');

var http_port = process.argv[3] || cfg.http_port;
var https_port = process.argv[4] || cfg.https_port;
Expand Down
24 changes: 8 additions & 16 deletions lib/psp.web.js
@@ -1,6 +1,4 @@
var Url = require('url');
var Qstr = require('querystring');
var Path = require('path');
var cfg = require('./cfg.js');
var fs = require('fs');
var findFreeOraLink = require('./db.js');
Expand All @@ -11,7 +9,7 @@ var feedback_seq = 0;
var fbSock = [];
var cssSocks = {};
var util = require('./util');
var favicon = require('./favicon.js')
var favicon = require('./favicon.js');

try {
var formidable = require('formidable');
Expand All @@ -25,13 +23,11 @@ try {
// parsing request line
// fixed part from request line, use to find the plsql stored procedure called
function ReqBase(){
return;
}
ReqBase.prototype.toOraLines = function(){
var a = this;
var r = [a.method, a.url, a.host, a.hostp, a.port, a.base, a.dad, a.prog, a.pack, a.proc, a.path, a.search, a.caddr, a.cport].join(CRLF);
return r;
}
return [a.method, a.url, a.host, a.hostp, a.port, a.base, a.dad, a.prog, a.pack, a.proc, a.path, a.search, a.caddr, a.cport].join(CRLF);
};
ReqBase.parse = function(req, method, url){
var r = new ReqBase();
var host = req.headers.host;
Expand Down Expand Up @@ -82,7 +78,7 @@ ReqBase.parse = function(req, method, url){
r.caddr = req.connection.remoteAddress;
r.cport = req.connection.remotePort;
return r;
}
};

function parse_send_qstr(body, oraSock){
if (!body) {
Expand All @@ -108,8 +104,7 @@ function parse_send_qstr(body, oraSock){
})(body, '&', '=');

var ora_qstr = [];
for (n in qstr) {
var val = qstr[n];
for (var n in qstr) {
ora_qstr.push(n, qstr[n]);
}
if (ora_qstr.length) {
Expand All @@ -129,7 +124,6 @@ function pspdweb(req, res){
'x-powered-by':cfg.server_name || 'PSP.WEB'
};
var url = Url.parse(req.url, false);
var gzip = false;
var body = '';
var bytesRead = 0;
var cLen;
Expand Down Expand Up @@ -172,7 +166,7 @@ function pspdweb(req, res){
resHeaders['ETag'] = '"' + cssmd5 + '"';
resHeaders['Cache-Control'] = 'max-age=60000';
} else {
var oraSock = findFreeOraLink();
oraSock = findFreeOraLink();
if (!oraSock) {
// console.log('no database server connection/process available');
var errmsg = 'no database connection available';
Expand Down Expand Up @@ -240,7 +234,7 @@ function pspdweb(req, res){
// console.error(url + ' has file upload that is not support without formidable module');
return;
}
var form = new formidable.IncomingForm()
var form = new formidable.IncomingForm();
var fields = {};
var dirs = {};
form.uploadDir = cfg.upload_dir;
Expand Down Expand Up @@ -325,7 +319,7 @@ function pspdweb(req, res){
.on('end',
function(){
var ora_post = [];
for (n in fields) {
for (var n in fields) {
var val = fields[n];
ora_post.push(n, val.join(','));
}
Expand All @@ -350,8 +344,6 @@ function pspdweb(req, res){
}
}

var rcv_cnt = 0;

function accept_oracle_data(data){
// console.log('received count = ' + (++rcv_cnt));
if (oraHeaderEnd) {
Expand Down

0 comments on commit 5d443ac

Please sign in to comment.