settling scores

contextualise.py

@@ -87,13 +87,12 @@ def all():
 @app.route('/description')
 def description():
     #open json file, list filepaths in array and loop with thefile
-    with open("static/"+jsonfiles[4], 'r') as f:
+    textfile=""
+    with open("static/"+jsonfiles[0], 'r') as f:
         data_dict = json.load(f)
         datafromjson = data_dict["files"]
         itemid = data_dict["id"]
-
         for file in datafromjson:
-
             if file.lower().endswith(('.html')):
                 with open("static/"+file,"r", encoding='utf-8') as f:
                     textfile = f.read()
@@ -101,17 +100,14 @@ def description():
                     wordlinked = "<a href='/diverge?search="+word+"'>"+word+"</a>"
                     textfile = re.sub(word, wordlinked, textfile)
 
-
-# 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')
+@app.route('/diverge', methods=['GET'])
 def diverge():
-    return render_template('diverge.html')
+    searchterm=request.args.get('search')
+    return render_template('diverge.html', searchterm=searchterm)
 
 if __name__ == '__main__':
     app.run(debug=True)

static/files/00. Pushing Scores/00.json

@@ -5,9 +5,9 @@
   "friend": "Y",
   "content": "A sound file.",
   "files":[
-  	"static/files/00. Pushing Scores/Participants.txt",
-    "static/files/00. Pushing Scores/PushingScores.txt",
-    "static/files/00. Pushing Scores/events.txt"
+  	"files/00. Pushing Scores/Participants.txt",
+    "files/00. Pushing Scores/PushingScores.html",
+    "files/00. Pushing Scores/events.txt"
 
   ]
 }

static/files/05./05.json → static/files/05. 160909 Wiels ArtbookFair Vaast Colson/05.json

@@ -5,7 +5,7 @@
   "friend": "Y",
   "content": "A sound file.",
   "files": [
-  	"files/05. 160909 Wiels ArtbookFair Vaast Colson/05.metadata.txt",
+  	"files/05. 160909 Wiels ArtbookFair Vaast Colson/05.metadata.html",
   	"files/05. 160909 Wiels ArtbookFair Vaast Colson/Sound/DOB079_VaastColson_CarlsonInvents.mp3",
   	"files/05. 160909 Wiels ArtbookFair Vaast Colson/Photo/DOB079-Vaast-Colson-spread-1600px-web-160913-1.jpg",
   	"files/05. 160909 Wiels ArtbookFair Vaast Colson/Photo/DOB079-Vaast-Colson-1600px-web-160913-11.jpg",

static/files/05./05.metadata.html → static/files/05. 160909 Wiels ArtbookFair Vaast Colson/05.metadata.html

@@ -1,4 +1,4 @@
-Type of object: Event
+<h1>Type of object: Event</h1>
 Project:
 Description: Presented at WIELS Art Book fair 2016 was this live made copy zine named "Carlson invents, Colson presents: 99 spines produced on a modified Canon IR2016 copy machine" by Vaast Colson. Produced on a 'prepared copier'. The copy machine is amplified by several internal microphones by which the sound of every run is recorded. Each copy-run of 99 copies (the maximum run of the machine) on transparent foil will be accompanied by a foil cover with the dub cut audiofile in it. The image copied in the zine is a drawing which is engraved in the glassplate of the copy machine.
 Author: Vaast Colson, De Player

templates/description.html

@@ -32,7 +32,7 @@
         {% endfor %}
 
         {% if textfile is defined %}
-        	<pre>{{ textfile }}</pre>
+        	{{ textfile }}
         {% endif %}
 
 

templates/diverge.html

@@ -1,3 +1,6 @@
-{# page for crossroad selection #}
 {% extends "layout.html" %}
-<p>{{search}}</p>
+{% block content %}
+
+<p>test</p>
+<p>{{searchterm}}</p>
+{% endblock %}