From 63c9bbee6f1d29e7d967fd2cbcea9be8cd6a6129 Mon Sep 17 00:00:00 2001 From: inocturnis Date: Fri, 27 May 2022 17:39:34 -0700 Subject: [PATCH] Added functionality of creating the index through the html --- .gitignore | 1 + indexer.py | 10 +++++----- launcher.py | 30 ++++++++++++++++++------------ requirements.txt | 2 +- templates/index.html | 5 +++++ 5 files changed, 30 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index d86889b..b66942b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /__pycache__/ /test/ merged* +test* diff --git a/indexer.py b/indexer.py index 22d5204..973d888 100644 --- a/indexer.py +++ b/indexer.py @@ -232,10 +232,10 @@ class Indexer(): load_index_index() def create_index(self): - indexer.get_data_path() - print("We have " + str(len(indexer.data_paths)) + " documents to go through !" ) - indexer.start() - indexer.merge() + self.get_data_path() + print("We have " + str(len(self.data_paths)) + " documents to go through !" ) + self.start() + self.merge() print("Finished merging into 1 big happy family") - indexer.set_weight() + self.set_weight() print("I AM DONE INDEXING !") diff --git a/launcher.py b/launcher.py index 701158c..ecaca4c 100644 --- a/launcher.py +++ b/launcher.py @@ -5,27 +5,33 @@ from flask import render_template from flask import request app = Flask(__name__) -def main(): - indexer = Indexer(False,list(),dict(),list()) - indexer.load_index_index() - search = Search() - +errors = list() +indexer = Indexer(list(),dict(),list()) +search = None @app.route('/',methods=['POST','GET']) def index(): + errors = list() + if not indexer: + errors.append("Error in creating indexer module") + elif not indexer.load_index_index(): + errors.append("Indexer does not exists, please run it first") + if not search: + errors.append("Error in creating search module") + if request.method == 'POST': if request.form.get('start-index') == "start": - print("make the indexer") + print("Making the indexer") + indexer.create_index() return render_template('index.html',ips="Thanks for waiting you are ready to search.") if request.form.get('search_query') != "": - search = request.form['search_query'] + search_query = request.form['search_query'] result = [['lorem','ipsi'],['lores','dolores']] - return render_template('index.html',results=result) - return render_template('index.html') + return render_template('index.html',results=result,errors=errors) + return render_template('index.html',errors=errors) else: - return render_template('index.html') - + return render_template('index.html',errors=errors) if __name__ == "__main__": app.run(debug=True) - main() \ No newline at end of file + \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index fcf393d..4afcc1e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ re shelve json beautifulsoup4 -sklearn \ No newline at end of file +flask diff --git a/templates/index.html b/templates/index.html index ab4c983..43565db 100644 --- a/templates/index.html +++ b/templates/index.html @@ -22,4 +22,9 @@ {% for result in results %}

{{result[0]}} at {{result[1]}}

{% endfor %} + + {% for error in errors %} +

{{error}}

+ {% endfor %} + {% endblock %} \ No newline at end of file