From e18f63190c133eb3b9de2eccd6767b3ea9497c6d Mon Sep 17 00:00:00 2001
From: moogdo49 <moogdo49@mi.fu-berlin.de>
Date: Wed, 5 Jul 2017 00:13:02 +0200
Subject: [PATCH] =?UTF-8?q?=09ge=C3=A4ndert:=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20api.py=20=09ge=C3=A4ndert:=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20templates/index.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api.py               | 15 +++++++++++----
 templates/index.html |  5 +++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/api.py b/api.py
index 3322cf4..de2ded1 100644
--- a/api.py
+++ b/api.py
@@ -3,6 +3,8 @@ from flask_cors import CORS
 import BaseXClient
 import threading
 import xml.etree.ElementTree as ET
+import xml.dom.minidom as dom
+
 
 app = Flask(__name__)
 CORS(app)
@@ -15,10 +17,15 @@ def main():
     query = session.query("declare namespace lido=\"http://www.lido-schema.org\"; for $x in (/root/object[position() lt 5]) return $x")
     merke = []
     
-    for object in query.iter():
-    	merke.append(object)
-
-    query.close()	
+    for i in range(1,5):
+    	url = session.query("declare namespace lido=\"http://www.lido-schema.org\"; for $x in (/root/object[position() =" + str(i) +" ]/bildLink/text()) return $x" ).execute()
+    	actor = session.query("declare namespace lido=\"http://www.lido-schema.org\"; for $x in (/root/object[position() =" + str(i) +" ]/descriptiveMetadata/actor/text()) return $x" ).execute()
+    	title = session.query("declare namespace lido=\"http://www.lido-schema.org\"; for $x in (/root/object[position() =" + str(i) +" ]/descriptiveMetadata/objectIdentificationWrap/title/text()) return $x" ).execute()
+    	eintrag = {"url" : url, "actor" : actor, "title" : title}
+    	merke.append(eintrag)
+    	query.close()	
+
+    	
     #tree = ET.parse(globvar)
     #root = tree.root()
     #globvar = "ws"
diff --git a/templates/index.html b/templates/index.html
index 25adf98..8964da9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -26,8 +26,9 @@
   <ul>
     {% for object in objects %}
       <li>{{ loop.index }} <br>
-        Künstler: {{ object }} <br>
-       <img src=" {{ object.bildLink }}"  class="hover-shadow" style="width: 350px; height: 260px; padding: 10px;"> </li>
+        Künstler: {{ object.actor }} <br>
+        Titel: {{ object.title }} <br>
+       <img src=" {{ object.url }}"  class="hover-shadow" style="width: 350px; height: 260px; padding: 10px;"> </li>
     {% endfor %}
   </ul>
 	<div id="gallery">
-- 
GitLab