Skip to content
Snippets Groups Projects
Commit ee1ac200 authored by felixwelter's avatar felixwelter
Browse files

Update to new request format

parent 394e261b
Branches
Tags
No related merge requests found
...@@ -3,7 +3,7 @@ import sys ...@@ -3,7 +3,7 @@ import sys
from pathlib import Path from pathlib import Path
import pdfplumber import pdfplumber
from flask import Flask, render_template, request, redirect, send_file from flask import Flask, render_template, request, redirect, send_file, jsonify
from werkzeug.utils import secure_filename from werkzeug.utils import secure_filename
from title_focus_search_index import TitleFocusSearchIndex from title_focus_search_index import TitleFocusSearchIndex
...@@ -47,16 +47,22 @@ def upload(): ...@@ -47,16 +47,22 @@ def upload():
return redirect('/') return redirect('/')
@app.route("/search") @app.route("/search", methods=['POST'])
def query(): def query():
try: try:
index = Index() index = Index()
query = request.args.get("term") query = request.form.get("term")
context = request.form.get("context") # TODO: Use context to find better results
result = index.search(query) result = index.search(query)
img_name = result["path"][7:] + "_" + str(result["page"]) + ".jpg" img_name = result["path"][7:] + "_" + str(result["page"]) + ".jpg"
return "slide/" + img_name return jsonify({
except: "type": "image",
return str(sys.exc_info()[0]).replace("<", "-").replace(">", "-") "path": "slide/" + img_name
})
except IndexError:
return jsonify({
"type": "miss"
})
@app.route("/slide/<img_name>") @app.route("/slide/<img_name>")
......
...@@ -8,14 +8,37 @@ ...@@ -8,14 +8,37 @@
<input type="file" name="file"> <input type="file" name="file">
<input type="submit" value="Upload"> <input type="submit" value="Upload">
</form> </form>
{% for item in ll %}<ul> {% for item in ll %}
<ul>
<li>{{ item }}</li> <li>{{ item }}</li>
</ul>{% endfor %} </ul>{% endfor %}
<h1>Query</h1> <h1>Query</h1>
<form action="search" method="get"> <form action="search" method="post">
<input name="term"> <input name="term" placeholder="term"><br>
<input name="context" placeholder="context"><br>
<input type="submit" value="Query"> <input type="submit" value="Query">
</form> </form>
<button onclick="execute();">Execute</button>
<script>
function execute() {
var http = new XMLHttpRequest();
var url = '/search';
var params = 'term=Freedom&Concept Evaluation'
http.open('POST', url, true);
http.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
http.onreadystatechange = function () {
if (http.readyState == 4 && http.status == 200) {
console.log(http.responseText);
console.log(JSON.parse(http.responseText));
}
}
http.send(params);
}
</script>
</body> </body>
</html> </html>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment