diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.vue | 17 | ||||
| -rw-r--r-- | src/components/SearchModal.vue | 12 | ||||
| -rw-r--r-- | src/components/TileInfoModal.vue | 6 | ||||
| -rw-r--r-- | src/lib.ts | 5 |
4 files changed, 20 insertions, 20 deletions
diff --git a/src/App.vue b/src/App.vue index b0aa328..e17acfc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -312,9 +312,9 @@ export default defineComponent({ // Check if data for node-to-expand exists, getting from server if needed let tolNode = this.tolMap.get(layoutNode.name)!; if (!this.tolMap.has(tolNode.children[0])){ - let urlParams = 'name=' + encodeURIComponent(layoutNode.name); - urlParams += this.uiOpts.useReducedTree ? '&tree=reduced' : ''; - let responseObj: {[x: string]: TolNode} = await getServerResponse('/data/node', urlParams); + let urlParams = 'type=node&name=' + encodeURIComponent(layoutNode.name); + urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : ''; + let responseObj: {[x: string]: TolNode} = await getServerResponse(urlParams); if (responseObj == null){ return false; } @@ -406,9 +406,9 @@ export default defineComponent({ // Check if data for node-to-expand exists, getting from server if needed let tolNode = this.tolMap.get(layoutNode.name)!; if (!this.tolMap.has(tolNode.children[0])){ - let urlParams = 'name=' + encodeURIComponent(layoutNode.name); - urlParams += this.uiOpts.useReducedTree ? '&tree=reduced' : ''; - let responseObj: {[x: string]: TolNode} = await getServerResponse('/data/node', urlParams); + let urlParams = 'type=node&name=' + encodeURIComponent(layoutNode.name); + urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : ''; + let responseObj: {[x: string]: TolNode} = await getServerResponse(urlParams); if (responseObj == null){ return false; } @@ -865,8 +865,9 @@ export default defineComponent({ // For initialisation async initTreeFromServer(){ // Query server - let urlParams = this.uiOpts.useReducedTree ? '?tree=reduced' : ''; - let responseObj: {[x: string]: TolNode} = await getServerResponse('/data/node', urlParams); + let urlParams = 'type=node'; + urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : ''; + let responseObj: {[x: string]: TolNode} = await getServerResponse(urlParams); if (responseObj == null){ return; } diff --git a/src/components/SearchModal.vue b/src/components/SearchModal.vue index 39bdbdf..2844f5e 100644 --- a/src/components/SearchModal.vue +++ b/src/components/SearchModal.vue @@ -103,14 +103,14 @@ export default defineComponent({ return; } // Get URL params to use for querying search-suggestions - let urlParams = 'name=' + encodeURIComponent(input.value); + let urlParams = 'type=sugg&name=' + encodeURIComponent(input.value); urlParams += '&limit=' + this.uiOpts.searchSuggLimit; - urlParams += this.uiOpts.useReducedTree ? '&tree=reduced' : ''; + urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : ''; // Query server, delaying/skipping if a request was recently sent this.pendingSuggReqParams = urlParams; let doReq = async () => { let responseObj: SearchSuggResponse = - await getServerResponse('/data/search', this.pendingSuggReqParams); + await getServerResponse(this.pendingSuggReqParams); if (responseObj == null){ return; } @@ -170,9 +170,9 @@ export default defineComponent({ return; } // Ask server for nodes in parent-chain, updates tolMap, then emits search event - let urlParams = 'name=' + encodeURIComponent(tolNodeName); - urlParams += this.uiOpts.useReducedTree ? '&tree=reduced' : ''; - let responseObj: {[x: string]: TolNode} = await getServerResponse('/data/chain', urlParams); + let urlParams = 'type=node&toroot=true&name=' + encodeURIComponent(tolNodeName); + urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : ''; + let responseObj: {[x: string]: TolNode} = await getServerResponse(urlParams); if (responseObj == null){ return; } diff --git a/src/components/TileInfoModal.vue b/src/components/TileInfoModal.vue index 4e65f9d..a85fa72 100644 --- a/src/components/TileInfoModal.vue +++ b/src/components/TileInfoModal.vue @@ -157,9 +157,9 @@ export default defineComponent({ }, async created(){ // Query server for tol-node info - let urlParams = 'name=' + encodeURIComponent(this.nodeName); - urlParams += this.uiOpts.useReducedTree ? '&tree=reduced' : ''; - let responseObj: InfoResponse = await getServerResponse('/data/info', urlParams); + let urlParams = 'type=info&name=' + encodeURIComponent(this.nodeName); + urlParams += this.uiOpts.useReducedTree ? '&rtree=true' : ''; + let responseObj: InfoResponse = await getServerResponse(urlParams); if (responseObj == null){ return; } @@ -26,11 +26,10 @@ export class TolNode { export type TolMap = Map<string, TolNode>; // For server requests -const SERVER_URL = 'http://localhost:8000' -export async function getServerResponse(path: string, params: string){ +const SERVER_URL = 'http://localhost:8000/cgi-bin/data.py' +export async function getServerResponse(params: string){ // Construct URL let url = new URL(SERVER_URL); - url.pathname = path; url.search = params; // Query server let responseObj; |