From 0795636bd204502f6174ed0e86883944e7c22c73 Mon Sep 17 00:00:00 2001
From: zeroth <zeroth@free.fr>
Date: Tue, 16 Apr 2019 15:58:52 +0100
Subject: [PATCH] regex link fine

---
 __pycache__/contextualise.cpython-35.pyc | Bin 2787 -> 3079 bytes
 contextualise.py                         |  41 +++++++----------------
 templates/description.html               |   6 ++--
 3 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/__pycache__/contextualise.cpython-35.pyc b/__pycache__/contextualise.cpython-35.pyc
index c54d451b3b5e6e8f11f78a270ff73e711bee55d6..a7ade1b99e43f1989887f57ef049b9b5bd8e1d1f 100644
GIT binary patch
delta 1260
zcmb7DO>7fK6#iz{Kbwu6KgV9%aZH?q*iIk`5TFO3NJXvGLj*yJ(UwXznSpqr1dpAP
zSdOeJMchEqs+S&n>zQ(EkDPkq>H|G+>4gK8dPTgqu_gX4-PL~k-h4CPyf^R7%jCoK
zj1!OBbFZFWKQjcp#5<2o_C@*{y9YBrk4iv>aAyqe7?glY9Q^6bjzf*ZOTtS*#<4FT
z*tg+1P=kRlhYsFkJ2~6}+)RL3)^R7HMj(fwhOrOq8*uZGBXExdbEX0;VCNZB9Nsik
zn$<3S`#Y|iaMN&S;Lc*_SEyMU{RQq(sH5=aAV+y(Og|Mpe~kRj;Q%S6;T2hoNZzvq
zm4jFA$qO|RI3>sg2l>E2Cdla>WxXyqqK|blpIlmB7nS<Oj;QSHevrxL`<bjCX0rNW
zCOU8YpZ!#}7Y4^&&l{DxWmMFSd8kZK4mA%s9#}Oh$O6<c$Rv|8g^VK|K9$E)aF0X9
z;4MNO=gIC8)DmPG8MlB6oy?WBYow$KhniIKW&gD?-Z>Gp!!l%!2{{Rw$4^vUQaIVC
zjs(;cWT8);>QmDJH3K=@r&jtDm5T(ayv06snpzODgxd!6w#jXGW)!jvIZq8Ggbd+o
zdErUR{6~l{{f+SV;_D~R!!aRN{TGpAMT`16LEjhL-~SRcsl5f7v<Vg6k!ElZfA}Y&
zCF?QT1~u73zZzZcT*e;I2D}LO?Oqsi0DBQg8|?@jIS42C$KdQm(Tu{gm}p1Q4rAZs
z1<irL7Hn7OR?%73FQL*in>ODhImCO?^=O-XD|oFiua-ww{lB9t^R9Wny4%W}t4?id
zb@P02N!ET)`j+~<p{jag^L)!FUTB5REmbf03G0*?^uMwelU+lruG!eWp~IA}4iS_s
z|3_>3yKd<ImX@x~c&B#vwvsx_Qv#SEt2-!FV?)>OHEUaUD>Tqx3T9Re3tQMm+(?R?
zh>3_uiDV>i=(EJOtbSPjU!jr}>&58*7A_>CJ?9>48LVaK&-@owN}ToovucJu>3=iu
zd|`zMy~uEypc~d(+fAi&JTS>H$H05h;x&6Aag)pyF+y*Q-W31+NA_AcGZBi3w<9R_
A^8f$<

delta 1038
zcmb7D&rcIU6#izHW!vo*N=xYvS|}6>6|4w_t0ZcSB$5b*k`3BOW`e9i(-jg(N_s$}
z(HLVUT)gScn+f^{c<{i*KY)W5F8&D~IQV9v2GEN;*)Q|n_vZbWdGC4hFrH6@!`A+f
zFH5gGfJ2=6EZR@g|77lMezzeQL=@Zv4}b^3E$|SyjUA>tF^Cx4PPlRKFloS)Y{Bh<
z2>CK^gOk7t;3R!a`Iz>x`;4Bqz{x;Fz}q3(u><UAaIy{X2%H|@wAaTRHorlH;r2l!
zRFG?TKVwN(ah!fQd2D`w$dmRRoB@adxP#yw%Fy;cvJ*M_M<z!JxCP~lI2CgUq8sk;
zvG)eml=h_|@E9n|XBtv|si!=9GfZXlx1;1gkJe^brB-H@&8>5VJUCm(0z^YqGJC!f
zFRJ}dJdrv{L*-qIYL(g%tB4{*(tjk{@lJoYN)L4bVgx*{NZy4;D#7WNHN45e8HKRn
zUW6D`)=mkc1fE37$)Q3wb9-)4In5nArB1j6o>Br&gLmU8Jt>_U^P7gKj8A33dz#ec
zCe`axIq<$4O>Vr&_4`~Ne4t59_#HZkhZ?+DUA15tyZ}B#UBnn~!F+Le@4fz$vFq}s
zvBqxh{W5IEZb`!&ZEK}YrwPDS)$w2D6*I|R$whNGa1V8j?tVeOFvnuO*aqr=+p0Qq
z+rYXhkIZbgITK_`V^P=DWYi7HP@gY`<y2r&?gl1UQ0@mxwr5ZXuZ5u4D(zsuoDOED
z7F5_y0_bVh&ManW;b>gTFq`#+y)x+!0@do;{nba+>Vd(<^2W-Y;-m~&t8&ZwUKl3>
sucTl?nHt{XjdkH=lp?F3pr9<h&`8HJZObe|%cj-EBJxvcPA}Q)H?&o~4FCWD

diff --git a/contextualise.py b/contextualise.py
index 340646b..43f1424 100644
--- a/contextualise.py
+++ b/contextualise.py
@@ -5,6 +5,7 @@ import json
 import os
 from time import gmtime, strftime
 from pprint import pprint
+import re
 
 
 app = Flask(__name__, static_url_path='', static_folder="static", template_folder="templates")
@@ -81,7 +82,7 @@ def all():
     # print(dict)
     counter2=0
     return render_template('all.html', file=thefile, listingfiles=listingfiles, jsonfiles=jsonfiles, listofdicts=listofdicts, counter2=counter2)
-    
+
 
 @app.route('/description')
 def description():
@@ -93,40 +94,24 @@ def description():
 
         for file in datafromjson:
 
-        #   # assigning html tag on the basis of extension, to be finished when all the files have been sent
-        #   if file.lower().endswith(('.png', '.jpg', '.jpeg')):
-        #       file = Markup('<img src="'+file[7:]+'" /> <br />')
-
-        #   #if sound
-        #   elif file.lower().endswith(('.mp3')):
-        #       file = Markup('''<audio controls>
-     #                              <source src="'''+file+'''" type="audio/mpeg">
-        #                       Your browser does not support the audio tag.
-        #                       </audio>''')
-          #if txtfile
-            # if file.lower().endswith(('.txt')):
-            #   # print(thefile)
-            #     with open("static/"+file,"r") as f:
-            #         textfile = f.readlines()
-
             if file.lower().endswith(('.html')):
-              # print(thefile)
                 with open("static/"+file,"r", encoding='utf-8') as f:
                     textfile = f.read()
-                    textfile = Markup(textfile)
-    
+                    word = "way"
+                    wordlinked = "<a href='/diverge?search="+word+"'>"+word+"</a>"
+                    textfile = re.sub(word, wordlinked, textfile)
 
-        #   #ifvid to be added
-        #   elif file.lower().endswith(('.mp4')):
-        #       file = Markup(''' <video width="320" height="240" controls>
-        #               <source src="'''+thefile+'''" type="video/mp4">
-        #               Your browser does not support the video tag.
-        #               </video> ''')
 
+# go into the textfile content, find the words,
+# replace word with <a href="/diverge?search=word">word</a>
+
+                    textfile = Markup(textfile)
 
-    
     return render_template('description.html', datafromjson=datafromjson, itemid=itemid, textfile=textfile)
 
+@app.route('/diverge')
+def diverge():
+    return render_template('diverge.html')
 
 if __name__ == '__main__':
-    app.run(debug=True)
\ No newline at end of file
+    app.run(debug=True)
diff --git a/templates/description.html b/templates/description.html
index fabf6ba..afcca10 100644
--- a/templates/description.html
+++ b/templates/description.html
@@ -15,13 +15,13 @@
             	<div>
             		<img class="img-responsive" src=" ../{{ item }}">
             	</div>
-            		
+
             {% elif item.lower().endswith(('.mp4')) %}
             	<div><video width="320" height="240" controls><source src="../{{ item }}" type="video/mp4">
             		Your browser does not support the video tag.
 				</video>
 			</div>
-            	
+
 			{% elif item.lower().endswith(('.mp3')) %}
 				<div><audio controls><source src="../{{ item }}" type="audio/mpeg">
 	  				Your browser does not support the audio tag.
@@ -32,7 +32,7 @@
         {% endfor %}
 
         {% if textfile is defined %}
-        	<pre>{{ textfile }}</pr>e
+        	<pre>{{ textfile }}</pre>
         {% endif %}