changeset 2442:23e6eb6d416c

Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Mon, 13 Jun 2016 16:20:54 +0100
parents a4e64fec24b3 (current diff) 3b2fe433b06a (diff)
children 8a4ed73cfa4c
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/python/comment_parser.py	Sun Jun 05 16:20:48 2016 +0100
+++ b/python/comment_parser.py	Mon Jun 13 16:20:54 2016 +0100
@@ -74,14 +74,17 @@
                                             dialect="excel",
                                             quoting=csv.QUOTE_ALL)
                         commentstr = audioelement.find("./comment/response").text
+                        valuestr = audioelement.find("./value").text
 
                         if commentstr is None:
                            commentstr = ''
+                        if valuestr is None:
+                           valuestr = ''
 
                         # anonymous comments:
                         #writer.writerow([commentstr])  # .encode("utf-8")
                         # comments with (file) name:
-                        writer.writerow([file[:-4]] + [commentstr]) 
+                        writer.writerow([file[:-4]] + [valuestr] + [commentstr.encode("utf-8")]) 
 
                     #TODO Replace 'new line' in comment with something else?