From e27539f373f1b3de91dfdd367632667c6226392e Mon Sep 17 00:00:00 2001 From: manetta Date: Fri, 19 Apr 2019 09:52:45 +0200 Subject: [PATCH] disabled the suggestions --- cross-reader.tfidf/readings.py | 8 ++++---- cross-reader.tfidf/static/css/stylesheet.css | 9 +++++---- cross-reader.tfidf/templates/base.html | 7 ++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/cross-reader.tfidf/readings.py b/cross-reader.tfidf/readings.py index 64e9018..09035f2 100644 --- a/cross-reader.tfidf/readings.py +++ b/cross-reader.tfidf/readings.py @@ -33,12 +33,12 @@ def generate_random_rgb(): b = get_random(0, 255) return r, g, b -def insert_query_highlight(query, sentence, r, g, b): +def insert_query_highlight(query, tfidf, sentence, r, g, b): pattern = r'[\s\W\_]'+query+r'[\s\W\_]|^'+query+'|'+query+'$' match = re.search(pattern, sentence, flags=re.IGNORECASE) if match: - match = match.group() - sentence = re.sub(pattern, ' {match} '.format(match=match, r=r, b=b, g=g), sentence, flags=re.IGNORECASE) + match = match.group().replace(' ', '') + sentence = re.sub(pattern, ' {match} '.format(tfidf=tfidf, match=match, r=r, b=b, g=g), sentence, flags=re.IGNORECASE) return sentence def insert_suggestion_links(query, sentence): @@ -159,7 +159,7 @@ def request_results(query): results[x]['matches'].append(sentence) # Transform sentence into an HTML elements - html = insert_query_highlight(query, sentence, r, g, b) + html = insert_query_highlight(query.strip(), 100 + (tfidf * multiplier), sentence, r, g, b) html = insert_suggestion_links(query, html) html = Markup(html) results[x]['html'].append(html) diff --git a/cross-reader.tfidf/static/css/stylesheet.css b/cross-reader.tfidf/static/css/stylesheet.css index 296909f..050f6e7 100644 --- a/cross-reader.tfidf/static/css/stylesheet.css +++ b/cross-reader.tfidf/static/css/stylesheet.css @@ -154,11 +154,12 @@ a, a:active, a:hover{ margin:0 0 0.7em; } #results strong.query{ - margin:0 0.2em 0 0; - padding:0.15em 0.25em 0.3em 0.5em; + margin:0; + padding:0; height: auto; - border:1px dotted magenta; - border-radius: 25px 15px; + /*padding:0.15em 0.25em 0.3em 0.5em;*/ + /*border:1px dotted black;*/ + /*border-radius: 25px 15px;*/ } } diff --git a/cross-reader.tfidf/templates/base.html b/cross-reader.tfidf/templates/base.html index 124c18a..64fc865 100644 --- a/cross-reader.tfidf/templates/base.html +++ b/cross-reader.tfidf/templates/base.html @@ -37,17 +37,14 @@ {% endfor %}