pt/tps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
fleetside72 2018-09-04 15:08:14 -04:00
commit ce4a868be6
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server.js
View File

@ -62,8 +62,8 @@ server.post("/source", bodyParser.json(), function (inReq, inRes)// remove body
//list all regex operations //list all regex operations
server.get("/regex", function (inReq, inRes) server.get("/regex", function (inReq, inRes)
{ {
var sql = "SELECT jsonb_agg(regex) regex FROM tps.map_rm"; var sql = "SELECT jsonb_agg(regex) regex FROM tps.map_rm WHERE srce = $1::text";
Postgres.FirstRow(sql, [], inRes); Postgres.FirstRow(sql, [inReq.query.srce], inRes);
}); });
//set one or more map definitions //set one or more map definitions
@ -86,6 +86,11 @@ server.get("/unmapped_all", function (inReq, inRes)
server.get("/unmapped", function (inReq, inRes) server.get("/unmapped", function (inReq, inRes)
{ {
var sql = "SELECT jsonb_agg(row_to_json(x)::jsonb) regex FROM tps.report_unmapped($1::text) x"; var sql = "SELECT jsonb_agg(row_to_json(x)::jsonb) regex FROM tps.report_unmapped($1::text) x";
server.get("/mapping", function (inReq, inRes)
{
var sql = "SELECT jsonb_agg(row_to_json(x)::jsonb) regex FROM tps.map_rv x WHERE srce = $1::text";
Postgres.FirstRow(sql,[inReq.query.srce], inRes); Postgres.FirstRow(sql,[inReq.query.srce], inRes);
}); });
@ -122,6 +127,14 @@ server.use("/import", upload.single('upload'), function (inReq, inRes) {
} }
); );
//----------------------------------------------------------import_logs--------------------------------------------------------------------------------------------------------------------------------
server.get("/import_log", function (inReq, inRes)
{
var sql = "SELECT jsonb_agg(info) info FROM tps.trans_log WHERE info @> $1::jsonb";
Postgres.FirstRow(sql, [inReq.query], inRes);
});
//-------------------------------------------------------------suggest source def---------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------suggest source def----------------------------------------------------------------------------------------------------------------------
server.use("/csv_suggest", upload.single('upload'), function (inReq, inRes) { server.use("/csv_suggest", upload.single('upload'), function (inReq, inRes) {