From a1aff8e229ba6c6c25e51c29f7a05af92252f5d9 Mon Sep 17 00:00:00 2001 From: Kai Labusch Date: Thu, 22 Aug 2019 16:15:21 +0200 Subject: [PATCH] add url parameters --- .../sbb_ner/webapp/static/js/ner-ds-sbb.js | 98 ++++++++++++++----- qurator/sbb_ner/webapp/static/ner-ds-sbb.html | 2 +- 2 files changed, 73 insertions(+), 27 deletions(-) diff --git a/qurator/sbb_ner/webapp/static/js/ner-ds-sbb.js b/qurator/sbb_ner/webapp/static/js/ner-ds-sbb.js index 6287685..6115679 100644 --- a/qurator/sbb_ner/webapp/static/js/ner-ds-sbb.js +++ b/qurator/sbb_ner/webapp/static/js/ner-ds-sbb.js @@ -5,30 +5,7 @@ $(document).ready(function(){ function(e){ e.preventDefault(); - var task = $('#task').val(); - var model_id = $('#model').val(); - - var spinner_html = - `
-
- Loading... -
-
`; - - var ppn = $('#ppn').val() - - $("#resultregion").html(spinner_html); - - $.get( "/digisam-fulltext/" + ppn) - .done(function( data ) { - - do_task(task, model_id, data.text) - }) - .fail( - function() { - console.log('Failed.'); - $("#resultregion").html('Failed.'); - }); + update(); } ); @@ -47,6 +24,41 @@ $(document).ready(function(){ tmp += '' }); $('#model').html(tmp); + + var url_params = new URLSearchParams(window.location.search); + + var do_update=false; + + if (url_params.has('ppn')) { + + var ppn = url_params.get('ppn') + + $('#ppn').val(ppn); + + do_update = true; + } + + if (url_params.has('model_id')) { + + var model_id = url_params.get('model_id') + + $('#model').val(model_id); + + do_update = true; + } + + if (url_params.has('task')) { + + var task = url_params.get('task') + + $('#task').val(task); + + do_update = true; + } + + task_select() + + if (do_update) update(); } ); @@ -62,6 +74,40 @@ $(document).ready(function(){ $('#ppnexamples').html(tmp); } ); - - task_select() }); + + +function update() { + + var spinner_html = + `
+
+ Loading... +
+
`; + + var task = $('#task').val(); + var model_id = $('#model').val(); + var ppn = $('#ppn').val(); + + var url_params = new URLSearchParams(window.location.search); + + url_params.set('ppn', ppn) + url_params.set('model_id', model_id) + url_params.set('task', task) + + window.history.replaceState({}, '', `${location.pathname}?${url_params}`); + + $("#resultregion").html(spinner_html); + + $.get( "/digisam-fulltext/" + ppn) + .done(function( data ) { + + do_task(task, model_id, data.text) + }) + .fail( + function() { + console.log('Failed.'); + $("#resultregion").html('Failed.'); + }); +} \ No newline at end of file diff --git a/qurator/sbb_ner/webapp/static/ner-ds-sbb.html b/qurator/sbb_ner/webapp/static/ner-ds-sbb.html index f1a533d..5e3c0d9 100644 --- a/qurator/sbb_ner/webapp/static/ner-ds-sbb.html +++ b/qurator/sbb_ner/webapp/static/ner-ds-sbb.html @@ -49,7 +49,7 @@
- +