diff --git a/src/services/ldb.services.js b/src/services/ldb.services.js index e72562f..3f48c13 100644 --- a/src/services/ldb.services.js +++ b/src/services/ldb.services.js @@ -39,7 +39,7 @@ async function arrDepBoard(CRS){ return reply } else if (valid == false) { log.out(`ldbService.arrDepBoard: Invalid 3ALPHA for lookup: ${CRS}`) - return {status: false, reason: "Invalid CRS/3alpha code"}; + return {GetStationBoardResult: "not available", Reason: `The CRS code ${CRS} is not valid`, Why: `Sometimes a station will have more than one CRS - for example Filton Abbey Wood has FIT and FAW however schedules are only available when looking up with FIT - this is how the National Rail Enquiries systems work.`}; } }; diff --git a/static/js/ldb.js b/static/js/ldb.js index 2b51c38..e6b4748 100644 --- a/static/js/ldb.js +++ b/static/js/ldb.js @@ -3,20 +3,21 @@ init() /* Supporting Functions */ async function init() { var stn = await getQuery("stn"); - console.log(`Looking up: ${stn}`); + log(`init: Looking up: ${stn}`); var sv = await getQuery("sv"); - console.log(`Staff Verstion: ${sv}`); + log(`init: Staff Version: ${sv}`); if (sv === 'true') { - console.log("Staff Version not supported yet") + log("init: Staff Version not supported yet.") + log("init: Unable to proceed.") } else { try { var data = await publicLdb(stn) - console.log("Fetched LDB Data") + log("init: Fetched LDB Data") } catch (err) { var data = null - console.log("Unable to fetch LDB data") + log("init: Unable to fetch LDB data") } finally { - console.log(data) + log(data) parseLdb(data) } } @@ -42,13 +43,19 @@ async function setHeaders(title,time){ var prefix = `OwlBoard - ` document.title = `${prefix}${title}` document.getElementById("station_name").innerHTML = title - + document.getElementById("fetch_time").innerHTML = time.toLocaleTimeString() } async function parseLdb(data) { var stationName = data.GetStationBoardResult.locationName; - console.log(`Data ready for ${stationName}`); - var generateTime = await data.GetStationBoardResult.generatedAt; - console.log(`Data prepared at ${generateTime}`) + log(`parseLdb: Data ready for ${stationName}`); + var generateTime = new Date(await data.GetStationBoardResult.generatedAt); + log(`parseLdb: Data prepared at ${generateTime.toLocaleString()}`) setHeaders(stationName, generateTime); +} + +// Log Helper +function log(msg) { + var time = new Date().toISOString(); + console.log(`${time} - ${msg}`) } \ No newline at end of file