diff --git a/server.js b/server.js index 555bd5e..2e8b2c9 100644 --- a/server.js +++ b/server.js @@ -17,8 +17,15 @@ app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: true })); app.use(cors(corsOptions)); -function callLoadInitializeData(projectid, construction_id, username, sheetname, filename){ - https.get('https://natnats.mobilous.com/loadInitializeData?projectid=23&construction_id=1&username=1&sheetname=dataSheet&filename=ini_データ入力シート.xlsx', (resp) => { +function callLoadInitializeData(req, res, resdata){ + + _email = req.query.email; + + let url = `https://natnats.mobilous.com/loadInitializeData?projectid=23&construction_id=${resdata.construction_id}&username=${_email}&sheetname=${resdata.file_type}&filename=${resdata.file_name}` + + console.log(url); + + https.get(url, (resp) => { let data = ''; // A chunk of data has been received. @@ -41,7 +48,7 @@ function callLoadInitializeData(projectid, construction_id, username, sheetname, }); } -function callInitFileMover(re) { +function callInitFileMover(req, res) { https.get('https://natnats.mobilous.com/iniFileMover', (resp) => { let data = ''; @@ -61,6 +68,7 @@ function callInitFileMover(re) { if(data !== 'no match'){ resdata = JSON.parse(data); console.log(resdata); + callLoadInitializeData(req, res, resdata); } }); @@ -87,20 +95,20 @@ app.post('/upload', function(req, res, next) { console.log('email is ' + req.query.email); - // upload(req, res, function(err) { - // if (err instanceof multer.MulterError) { - // return res.status(500).json(err) - // } else if (err) { - // return res.status(500).json(err) - // } - // else { - // var FileName = req.file.filename; - // callInitFileMover(res); - // res.status(200).send(FileName); - // } - // //return res.status(200).send(req.file) + upload(req, res, function(err) { + if (err instanceof multer.MulterError) { + return res.status(500).json(err) + } else if (err) { + return res.status(500).json(err) + } + else { + var FileName = req.file.filename; + callInitFileMover(req, res); + res.status(200).send(FileName); + } + //return res.status(200).send(req.file) - // }) + }) });