This commit is contained in:
2018-05-11 12:24:52 +02:00
parent 425d6d230d
commit 8e489a70b1
6 changed files with 13 additions and 53 deletions

View File

@ -13,7 +13,7 @@ function getPageOptions(contentStr: string) : any {
let lines = contentStr.split("\n")
let firstLine = lines[0]
// logger.info(`firstLine: ${firstLine}`)
let pageOptionsStr = firstLine.replace(/^\s*<!-- (\{.+\}) -->.*$/, "\$1")
let pageOptionsStr = firstLine.replace(/^\s*<!-- (\{.+\}) -->[\s\S]*$/, "\$1")
// logger.info(`pageOptionsStr: ${pageOptionsStr}`)
pageOptions = JSON.parse(pageOptionsStr)
// logger.info(JSON.stringify(pageOptions))
@ -88,6 +88,9 @@ app.set('views', './docroot')
app.set('view engine', 'pag')
app.get('/index', (req, res) => {
logger.info(req.url)
logger.info(req.baseUrl)
logger.info(req.originalUrl)
res.render('index', {})
})
@ -109,7 +112,7 @@ app.get('/reload', (req, res) => {
app.use('/files', express.static('files'))
masterTmpl = fs.readFileSync(config.dict.masterTmpl).toString()
masterTmpl = fs.readFileSync('./docroot/master.tmpl').toString()
toc = getToc()
app.listen(config.dict.httpPort, () => {