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

Fix path building

parent 25fa3d42
No related branches found
No related tags found
No related merge requests found
...@@ -36,7 +36,6 @@ def upload(): ...@@ -36,7 +36,6 @@ def upload():
index = Index(index_dir=INDEX_DIR) index = Index(index_dir=INDEX_DIR)
indexer = BasicIndexer(index, IMAGE_DIR, SLIDE_DIR) indexer = BasicIndexer(index, IMAGE_DIR, SLIDE_DIR)
for i, file in enumerate(files): for i, file in enumerate(files):
print(i, file)
if file.filename != '': if file.filename != '':
if file and allowed_file(file.filename): if file and allowed_file(file.filename):
filename = secure_filename(file.filename) filename = secure_filename(file.filename)
...@@ -55,7 +54,7 @@ def query(): ...@@ -55,7 +54,7 @@ def query():
query = request.form.get("term") query = request.form.get("term")
context = request.form.get("context") context = request.form.get("context")
result = index.search(query, context) result = index.search(query, context)
img_name = result["path"][len(SLIDE_DIR):] + "_" + str(result["page"]) + ".jpg" img_name = result["path"].split(os.sep)[-1] + "_" + str(result["page"]) + ".jpg"
return jsonify({ return jsonify({
"type": "image", "type": "image",
"path": os.getenv('EXTERNAL_HOST', '<PLEASE_SET_EXTERNAL_HOST_ENV_VAR>') + "/slide/" + img_name "path": os.getenv('EXTERNAL_HOST', '<PLEASE_SET_EXTERNAL_HOST_ENV_VAR>') + "/slide/" + img_name
......
...@@ -22,6 +22,6 @@ class BasicIndexer(): ...@@ -22,6 +22,6 @@ class BasicIndexer():
text = page.extract_text() text = page.extract_text()
self.index.add(str(file_path), i, text, text.split("\n")[self.title_row]) self.index.add(str(file_path), i, text, text.split("\n")[self.title_row])
if self.process_images: if self.process_images:
img_name = str(file_path)[len(self.slide_dir):] + "_" + str(i) + ".jpg" img_name = file_path.split(os.sep)[-1] + "_" + str(i) + ".jpg"
img_path = os.path.join(self.image_dir, img_name) img_path = os.path.join(self.image_dir, img_name)
page.to_image().save(img_path) page.to_image().save(img_path)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment