diff --git a/.gitignore b/.gitignore index 7c4938e..0d4430a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ npm-debug.log logs.html stat.html *.pem +node.log \ No newline at end of file diff --git a/index.js b/index.js index da6b600..cd609eb 100644 --- a/index.js +++ b/index.js @@ -162,7 +162,6 @@ server.post('/addmonth_v', bodyParser.json(), function (req, res) { sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version); sql = sql.replace(new RegExp("replace_source",'g'),req.body.source); sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body)); - //console.log(sql); console.log(sql) Postgres.FirstRow(sql,[],res) } @@ -196,7 +195,7 @@ server.post('/addmonth_vp', bodyParser.json(), function (req, res) { sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version); sql = sql.replace(new RegExp("replace_source",'g'),req.body.source); sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body)); - //console.log(sql); + console.log(sql); Postgres.FirstRow(sql,[],res) } @@ -236,7 +235,7 @@ server.post('/scale_v', bodyParser.json(), function (req, res) { sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version); sql = sql.replace(new RegExp("replace_source",'g'),req.body.source); sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body)); - //console.log(sql); + console.log(sql); Postgres.FirstRow(sql,[],res) } @@ -276,7 +275,7 @@ server.post('/scale_p', bodyParser.json(), function (req, res) { sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version); sql = sql.replace(new RegExp("replace_source",'g'),req.body.source); sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body)); - //console.log(sql); + console.log(sql); Postgres.FirstRow(sql,[],res) } @@ -317,7 +316,7 @@ server.post('/scale_vp', bodyParser.json(), function (req, res) { sql = sql.replace(new RegExp("replace_version",'g'),req.body.scenario.version); sql = sql.replace(new RegExp("replace_source",'g'),req.body.source); sql = sql.replace(new RegExp("replace_iterdef",'g'),JSON.stringify(req.body)); - //console.log(sql); + console.log(sql); Postgres.FirstRow(sql,[],res) } diff --git a/route_sql/part_list.sql b/route_sql/part_list.sql index d0ce852..33e388c 100644 --- a/route_sql/part_list.sql +++ b/route_sql/part_list.sql @@ -1,23 +1,23 @@ -WITH -act As ( - SELECT DISTINCT - v6part part - FROM - lgdat.stka - WHERE - v6stat = 'A' -) -,stkm AS ( - SELECT - act.part || ' - ' ||rtrim(COALESCE(m.avdes1,p.awdes1)) part - --,COALESCE(m.avgled, p.awgled) glec - FROM - act - LEFT OUTER JOIN lgdat.stkmm m ON - m.avpart = act.part - LEFT OUTER JOIN lgdat.stkmp p ON - p.awpart = act.part - WHERE - substr(COALESCE(m.avgled, p.awgled),1,1) <= '2' -) +WITH +act As ( + SELECT DISTINCT + v6part part + FROM + lgdat.stka + WHERE + v6stat = 'A' +) +,stkm AS ( + SELECT + act.part || ' - ' ||rtrim(COALESCE(m.avdes1,p.awdes1)) part + --,COALESCE(m.avgled, p.awgled) glec + FROM + act + LEFT OUTER JOIN lgdat.stkmm m ON + m.avpart = act.part + LEFT OUTER JOIN lgdat.stkmp p ON + p.awpart = act.part + WHERE + substr(COALESCE(m.avgled, p.awgled),1,1) <= '2' +) select part from stkm \ No newline at end of file