Compare commits
3 Commits
bc23a976f9
...
d8d2799145
Author | SHA1 | Date |
---|---|---|
Fred Boniface | d8d2799145 | |
Fred Boniface | dc4c50efc6 | |
Fred Boniface | dac9adf666 |
|
@ -1,3 +1,3 @@
|
||||||
# What to do next:
|
# What to do next:
|
||||||
|
|
||||||
* Ensure existing 'meta' entries are updated and new entries aren't made.
|
* LDB to lookup and validate CRS or convert TIPLOC/STANOX to CRS before fetch.
|
|
@ -35,10 +35,17 @@ http {
|
||||||
}
|
}
|
||||||
|
|
||||||
location /api/ {
|
location /api/ {
|
||||||
proxy_pass http://localhost:8460;
|
proxy_pass http://localhost:8460;
|
||||||
proxy_cache_key $scheme://$host$uri$is_args$query_string;
|
proxy_cache_key $scheme://$host$uri$is_args$query_string;
|
||||||
proxy_ignore_headers Cache-Control;
|
proxy_ignore_headers Cache-Control;
|
||||||
proxy_cache_valid 200 1m;
|
proxy_cache_valid 200 1m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
location /api/v1/list/ {
|
||||||
|
proxy_pass http://localhost:8460;
|
||||||
|
proxy_cache_key $scheme://$host$uri$is_args$query_string;
|
||||||
|
proxy_ignore_headers Cache-Control;
|
||||||
|
proxy_cache_valid 200 1440m;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,9 +75,10 @@ async function updateMeta(type, target, unixTime){
|
||||||
|
|
||||||
async function query(collection, query){
|
async function query(collection, query){
|
||||||
await client.connect();
|
await client.connect();
|
||||||
let qcoll = db.collection(collection);
|
var qcoll = db.collection(collection);
|
||||||
let qcursor = qcoll.find(query)
|
var qcursor = qcoll.find(query)
|
||||||
let qresult = await qcursor.toArray();
|
qcursor.project({_id: 0})
|
||||||
|
var qresult = await qcursor.toArray();
|
||||||
return qresult;
|
return qresult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
// convertTiploc(TIPLOC) : Exported: Looks up CRS, Name & STANOX for Tiploc
|
// convertTiploc(TIPLOC) : Exported: Looks up CRS, Name & STANOX for Tiploc
|
||||||
|
|
||||||
const log = require('../utils/log.utils'); // Log Helper
|
const log = require('../utils/log.utils'); // Log Helper
|
||||||
|
|
||||||
const ldb = require('ldbs-json')
|
const ldb = require('ldbs-json')
|
||||||
const util = require('../utils/ldb.utils')
|
const util = require('../utils/ldb.utils')
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,17 @@
|
||||||
|
const log = require('../utils/log.utils'); // Log Helper
|
||||||
|
const db = require('../services/dbAccess.services')
|
||||||
const corpus = require('../services/corpus.services');
|
const corpus = require('../services/corpus.services');
|
||||||
|
|
||||||
async function getStations(){
|
async function getStations(){
|
||||||
// Databse lookup, get list of all stations as per the Python script output
|
var out = await db.query("stations")
|
||||||
return {state:"No can do, not fully implemented."};
|
log.out(`listServices.getStations: fetched stations list`)
|
||||||
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getCorpus(){
|
async function getCorpus(){
|
||||||
// Raw corpus data, currently fetches from Network Rail each time its called
|
var out = await db.query("corpus")
|
||||||
return corpus.get();
|
log.out(`listServices.getCorpus: fetched CORPUS list`)
|
||||||
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
|
Reference in New Issue