From 7f455de9ae92c6654a2c7388ccdde0c8da8c0fb5 Mon Sep 17 00:00:00 2001
From: Cristina Cochior <clcochior@gmail.com>
Date: Wed, 17 Apr 2019 17:03:38 +0200
Subject: [PATCH] new stuff

---
 __pycache__/contextualise.cpython-36.pyc | Bin 3027 -> 3030 bytes
 contextualise.py                         |  19 ++++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/__pycache__/contextualise.cpython-36.pyc b/__pycache__/contextualise.cpython-36.pyc
index fb862dbdeac2f8bd99670a1d5968dc04ea368d09..c236f3aa9b27672545769adeaea923354926d469 100644
GIT binary patch
delta 1543
zcmZWo&u<$=6rS0g^{zK|;<{;UCr+Bg`Q@aILt8?MLKKN|0u^WwMoYjrc@wi6$8KiV
ztre~1NG>-*gZ2U(+6#x?K|<nR=n;v-Ub!Q|4a9*ro6`Ki)_ybd&3oT`GxO$`%&(ck
z&1BO2Ywf4a9|s8ejhy)<vA>R=>wjH%-mMX962AhUf&obNl*cJ+nkSqYKHa0%Y?%Oi
zpWGuKk@j~y>CEwLkKQ4le7UJwS*vKxw-5O|j@#A(UvRF$r5;U?V=6w3M(LNMq?2{7
z^DJNJDb^y-J0+<@2_JE~CB6ukfqkLmNJPDmL6HP5cs4DEY3E{(>3*V2_Wvo9_Gf3z
z-Fs>7PGoNN)EuflJFnX1|C8mzav^C37kE~d_)VGcC7z26F2SH|ZDPH`2b~*mrAJ{1
zGLO){bu(gcZ;*rGh`ALpBgo`oG-6(jm@#Co!uX@xGHp4cCSbBgp>U+Y6ii2<ukp(;
zv#T5{qKy$NFbi`>xHPa0QY`-PrxK$<KO2f^i;mlD1O>LB{!L54r|k7u7VlSNgD0$#
zd|O_%f<P289GKc$vnP{LgoGSIs8zR`E$?0I{uetEJkY+Sqd_V*u|6i_t|AnbQ1?FP
zJ9eFmaY>$PMKWr&Uf)38H4unmP(xu<Oa=R~;jW3yFn(|1=f)@@9&xCn0PWEZ0mUa7
z0&0dtEz6J&^;FP&ifjzaGTTu+=4ifx(W<Y4o+BNG<w;J;6O4{_F8=spd{-u5BE>e=
zZukuAcBiBJx)bXWM~8Tiio-}kmrH^PeMjo!)sEsTj?p6>4H6v#lD>hn{b*CR186hu
z#U0Z({J5|6R5a0tE$wKh*7gs}1V?vYIQ0^c@|hp=HJ`wxBMt8|eK%BWIEcw(bxR_H
z2Xt_9sRz32RXuyVB(5MCYEgvf$9~}IWy*r*`uJ$bY-lu#NukRaRuwfjRBPM|S@S**
zOk<^MiUpjqhGd;ciJhhZ?rsbFzGpWZA>Fa!Q1z-6u(v%ihoNF#LQz5<A!H9R!!jk-
z?Zz&Lix=N_MsE`{+!+L-B<LVbQD)M#5<D?R=t}Uj@zuxT8qSI95}1Tlgd!Dh$o_?b
z(!qYfMUA&`&XvJZQ><Yd8kNdk)oxTO9~5b*0pDuXinoLB<L}@b_#-|_Zv_M9Ivoq%
zGc${$m|&&rw(HrA8rXtwdre_;R}`d@+Gsu$6WEJtT+9Ve&GFKr94|{)k{~_eF;wfj
zmhQH;P{S2+k0EPR_qezb{BGtqCL=<gVyFpxPh7}?7b6m;B&<k?+^eG1IJ4Pk+tCv;
zR`;6Fs`E8`A;jGZw)#rTOvQs_L)29Aw4ch;OkkVWk)g7erbF_rsmw?-{KwO|tY*@G
E0ZOA_v;Y7A

delta 1600
zcmah|OK&4Z5bmCbJ$@xw$HaEtiSu$2C)vci0XBj~gc|~}i)1tk@;a%GcP7p_=^5`v
z(O5<@9J3oVCnSV8AWoc?16;U7Vh?acLSnA`3r<vbvcbxQ8Ff9rs;;iCs{S+kN4Bt$
zO2v<IKkbb76Y@9d`O+xg$L0R^W#RV@^qbQ#z^1bVZe@w&=`1k|bz;uonq_k^2$`<(
ze88M%Nqd3Kcd1#d5YRp%56CCv<ZG6)7g?@Lx5=l^c2qNGE}6?GpRr}sPs|c4*(;Fl
z(j+;j+>zRA*ILT%<m^?JW2LTQuCY=3wg^NC8$oFehCus5$rFiOg~1>*cwq0Y{7v6;
zdOTCX<Bl^Ga`LDry$9FnZOinw%u?r7ei-=T{{pjNag<00gI~xaUQ`HMXL*_8I%Ea6
zh`E7P%drC1R8%h4Q@JuLLq1Q;sjCWhu!I<3N(RW-ci>i+!Z3_{j<+`NGJ%XDG6v%k
z*_6lxB9kyBk=G?MjYt7zB=UwtW?`;QVg5{k1t?1VO*RON2g<p^U!uo7Sc2s<YEbOt
zLsBgL_?;4=OQv#r^E9$=HJH2l4_!UgS8TWGoDMu~a%fntSADV}k&yD>rMfh58g;#z
zXYH+qy4)1}pv?utS|*am0pt0gtW{GVidj>T5QUEf-)is8UmB%{Aj3#Py|&wIc@I&1
z<vSWA^{?o7@V!3OnGk-HNQz1r^&T^E7@rd0f3aj3wbp1<5O)nEL@}tLXq3;Qe41PZ
z=I(Lp$g`Txo-m6~_zmKE7nl1p5}<A35l}pe?NhOR=WW{Y6kGLam$nsO0WDA3DsmmU
zcH;OdPWpaZ_jOzA5?hBzm-4a*;p-v<M8P;ypKrCPPwhyTv<bx85s3Q{v?j7d@?@5@
zqh8cD{D>d*Nms=rV#qNWoRn>H`Ph!j6`@{fUK~=s>T5oMzBAFp{ttK`-r%|^d<Zq3
zLlP<$1c%WIRfAunld)nV)S5@k34?cxT%Z|ucMQHL+~|H7gPK>Xg0<)I1+l#-$e1u{
zVhYUo<t#V{3~m-b(No|@xWgSqLe$_FV}x!7e;LnqLaoN@Zm8Co$2GL^dq|3uZwdKE
zE2CgNVH`ct<_c$`Bq@Izd1zFthc(NoRzEJ%PzSc#su#C{i`e_L6!gc(=z36!-=`CS
z6VG<Waf6u_!)rNpusGZEn%rV8pAnH%r}>mmqa>&6^2T#QT^8FCM>X$pb6?!pHB*<0
z(>mN`+~rHct1QThAmSoep<3g>jJmB|Jjj)m?}VCDJ7j!K+U=(0gvNfW(GbDHNbLx_
z0K6cLvgUV$sB?S^jE|tqMGfTu^GzYi`>VX=^pr~$PL98^b=ZVfgS|!3*L9EtUSe6v
nsKGah+`@Qth{kD>_R%yQ5^qD*)B!}&_)5|m{;_l>r^o5P5QBP-

diff --git a/contextualise.py b/contextualise.py
index ecfe83c..2a0706c 100644
--- a/contextualise.py
+++ b/contextualise.py
@@ -26,10 +26,6 @@ listofdicts=[] #to be able to import and use json content
 datafromjson = []
 
 
-#test getting json file from id
-id = "17"
-jsonfilefordescription = "files/"+id+"/"+id+".json"
-
 #arrays with the user path of words and numbers
 pathofwords = []
 pathofnumbers = []
@@ -71,10 +67,10 @@ print("-------------------------")
 dict = {} #dict for the form entries
 
 
-with open("static/"+jsonfilefordescription, 'r') as f:
-    data_dict = json.load(f)
-    datafromjson = data_dict["files"]
-print(datafromjson)
+# with open("static/"+jsonfilefordescription, 'r') as f:
+#     data_dict = json.load(f)
+#     datafromjson = data_dict["files"]
+# print(datafromjson)
 
 @app.route("/")
 def home():
@@ -95,6 +91,11 @@ def all():
 
 @app.route('/description')
 def description():
+    idno=request.args.get('id')
+    jsonfilefordescription = "files/"+idno+"/"+idno+".json"
+    with open("static/"+jsonfilefordescription, 'r') as f:
+        data_dict = json.load(f)
+        datafromjson = data_dict["files"]
     #open json file, list filepaths in array and loop with thefile
     textfile=""
     with open("static/"+jsonfilefordescription, 'r') as f:
@@ -111,7 +112,7 @@ def description():
 
                     textfile = Markup(textfile)
 
-    return render_template('description.html', datafromjson=datafromjson, itemid=itemid, textfile=textfile)
+    return render_template('description.html', datafromjson=datafromjson, itemid=itemid, textfile=textfile, idno=idno)
 
 @app.route('/diverge', methods=['GET'])
 def diverge():