From d45b4c0b89cd4b774f639fc6b24025725c19d9dc Mon Sep 17 00:00:00 2001
From: Mathias Rav <m@git.strova.dk>
Date: Sun, 5 Aug 2018 14:56:17 +0200
Subject: [PATCH] Show first match instead of last in search results

---
 src/wiki/templatetags/wiki_tags.py  |  2 +-
 tests/core/test_template_filters.py | 26 ++++++--------------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/wiki/templatetags/wiki_tags.py b/src/wiki/templatetags/wiki_tags.py
index c9cd8c81..560f1355 100644
--- a/src/wiki/templatetags/wiki_tags.py
+++ b/src/wiki/templatetags/wiki_tags.py
@@ -116,7 +116,7 @@ def get_content_snippet(content, keyword, max_words=30):
 
     max_words = int(max_words)
 
-    match_position = content.lower().rfind(keyword.lower())
+    match_position = content.lower().find(keyword.lower())
 
     if match_position != -1:
         try:
diff --git a/tests/core/test_template_filters.py b/tests/core/test_template_filters.py
index 207b6108..6e76855c 100644
--- a/tests/core/test_template_filters.py
+++ b/tests/core/test_template_filters.py
@@ -40,18 +40,9 @@ class GetContentSnippet(TemplateTestCase):
 
         self.assertEqual(output, expected)
 
-    def test_whole_content_is_consist_from_keywords(self):
+    def test_whole_content_consists_of_keywords(self):
         content = 'lorem ' * 80
-        expected = (
-            '<strong>lorem</strong> <strong>lorem</strong> '
-            '<strong>lorem</strong> <strong>lorem</strong> '
-            '<strong>lorem</strong> <strong>lorem</strong> '
-            '<strong>lorem</strong> <strong>lorem</strong> '
-            '<strong>lorem</strong> <strong>lorem</strong> '
-            '<strong>lorem</strong> <strong>lorem</strong> '
-            '<strong>lorem</strong> <strong>lorem</strong> '
-            '<strong>lorem</strong> <strong>lorem</strong>'
-        )
+        expected = '<strong>lorem</strong>' + 30 * ' <strong>lorem</strong>'
 
         output = get_content_snippet(content, 'lorem')
 
@@ -79,11 +70,7 @@ class GetContentSnippet(TemplateTestCase):
         text = 'dolorum ' * 80
         content += text + ' list'
 
-        expected = (
-            'dolorum dolorum dolorum dolorum dolorum dolorum dolorum '
-            'dolorum dolorum dolorum dolorum dolorum dolorum dolorum dolorum '
-            '<strong>list</strong>'
-        )
+        expected = '<strong>list</strong>' + 30 * ' lorem'
 
         output = get_content_snippet(content, 'list')
 
@@ -145,8 +132,7 @@ class GetContentSnippet(TemplateTestCase):
         keyword = 'maybe'
 
         content = """
-        <h1>Some dummy</h1> text. <div>Actually</div> I don't what to write,
-        heh. Don't now, <b>maybe</b> I should citate Shakespeare or Byron.
+        I should citate Shakespeare or Byron.
         Or <a>maybe</a> copy paste from <a href="http://python.org">python</a>
         or django documentation. Maybe.
         """
@@ -168,8 +154,8 @@ class GetContentSnippet(TemplateTestCase):
         content = """
         knight eggs spam ham eggs guido python eggs circus
         """
-        expected = ('<strong>eggs</strong> guido python '
-                    '<strong>eggs</strong> circus')
+        expected = ('knight <strong>eggs</strong> spam ham '
+                    '<strong>eggs</strong> guido')
 
         output = get_content_snippet(content, keyword, 5)
 
-- 
2.45.2