Change from XML to CSV

1 files changed, 15 insertions, 12 deletions

diff --git a/webopac.py b/webopac.py
index 4f4c41a..50b2aba 100644
--- a/webopac.py
+++ b/webopac.py
@@ -3,11 +3,12 @@
 import http.cookiejar
 import urllib.request
 import urllib.parse
-import lxml.etree
+import csv
 import logging
 import optparse
+import io
 
-def get_webopac_xml(query, baseurl):
+def get_webopac_data(query, baseurl):
 	cj = http.cookiejar.CookieJar()
 	opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cj))
 	assert(isinstance(query, str))
@@ -15,20 +16,21 @@ def get_webopac_xml(query, baseurl):
 
 	postdata = {
 		'methodToCall': 'submit',
-		'listFormat':   'xml',
+		'listFormat':   'csv',
 		'save':         'Speichern',
 		'hitPart':      'pages',
 		'hitFrom':      1,
 		'hitTo':        200,
 	}
 
-	f = opener.open(baseurl + "hitOutput.do?" + urllib.parse.urlencode(postdata))
+	fb = opener.open(baseurl + "hitOutput.do?" + urllib.parse.urlencode(postdata))
+	f = io.TextIOWrapper(io.BytesIO(fb.read()), encoding='UTF-8')
+
 	return(f)
 
-def decode_xml(f):
-	data = f.read()
-	root = lxml.etree.XML(data)
-	return(root)
+def decode_csv(f):
+	data = csv.DictReader(f)
+	return(data)
 
 def initlog(options):
 	""" Initialisation of the log """
@@ -66,10 +68,11 @@ def init():
 
 def main():
 	(options, args) = init()
-	f = get_webopac_xml(args[0], baseurl=options.baseurl)
-	root = decode_xml(f)
-	f.close()
-	print(root)
+	f = get_webopac_data(args[0], baseurl=options.baseurl)
+	data = decode_csv(f)
+	for row in data:
+		print(row)
+		print()
 
 if __name__ == '__main__':
 	main()