# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1511277234 0
# Node ID d25e09e3b8fe1688765a975e7a9cb9809d394399
# Parent  3299cb22ed2118aa7946cbc56923501ad6971695# Parent  5d8e320df9c783f2e960d65aaefe2027e72e324b
Merge branch 'vnext' into Dev_main

diff -r 3299cb22ed21 -r d25e09e3b8fe interfaces/ABX.js
--- a/interfaces/ABX.js	Thu Nov 02 14:45:02 2017 +0000
+++ b/interfaces/ABX.js	Tue Nov 21 15:13:54 2017 +0000
@@ -393,7 +393,7 @@
     if (typeof element.name == "string") {
         element.name += "-X";
     }
-    page.audioElements.push(element);
+
     // Create the save place-holder for the 'X' element
     var root = testState.currentStore.XMLDOM;
     var aeNode = storage.document.createElement('audioelement');
@@ -410,7 +410,6 @@
     var label;
     var audioObject = audioEngineContext.newTrack(element);
     node = buildElement.call(this, 3, audioObject);
-    audioObject.bindInterface(node);
     this.X = node;
     this.boxHolders.appendChild(node.box);
 }
diff -r 3299cb22ed21 -r d25e09e3b8fe python/comment_parser.py
--- a/python/comment_parser.py	Thu Nov 02 14:45:02 2017 +0000
+++ b/python/comment_parser.py	Tue Nov 21 15:13:54 2017 +0000
@@ -85,7 +85,7 @@
                            valuestr = ''
 
                         # anonymous comments:
-                        #writer.writerow([commentstr])  # .encode("utf-8")
+                        # writer.writerow([commentstr.encode("utf-8")])
                         # comments with (file) name:
                         writer.writerow([file[:-4]] + [valuestr] + [commentstr.encode("utf-8")]) 
 
diff -r 3299cb22ed21 -r d25e09e3b8fe python/survey_parser.py
--- a/python/survey_parser.py	Thu Nov 02 14:45:02 2017 +0000
+++ b/python/survey_parser.py	Tue Nov 21 15:13:54 2017 +0000
@@ -36,7 +36,7 @@
 storage = {"globals":{}, "pages": {}}
 
 def decodeSurveyTree(session_id, surveyroot, store):
-    # Get all the childs
+    # Get all the children
     for survey_entry in list(surveyroot):
         survey_id = survey_entry.get("ref")
         if survey_id not in store.keys():
@@ -142,7 +142,7 @@
                         page_store["post"] = {}
                     page_store["post"] = decodeSurveyTree(subject_id, post_survey, page_store["post"])
 
-#Storage now holds entire survey structure
+# Storage now holds entire survey structure
 # Time to start exporting to files
 
 # Store globals
@@ -153,6 +153,7 @@
             filewriter = csv.writer(f, delimiter=",")
             filewriter.writerow(storage["globals"][position][ref]["header"])
             for row in storage["globals"][position][ref]["responses"]:
+                row = [element.encode("utf-8") for element in row]
                 filewriter.writerow(row)
 for page_name in storage["pages"].keys():
     for position in storage["pages"][page_name].keys():
@@ -163,9 +164,10 @@
                 filewriter = csv.writer(f, delimiter=",")
                 filewriter.writerow(storage["pages"][page_name][position][ref]["header"])
                 for row in storage["pages"][page_name][position][ref]["responses"]:
+                    row = [element.encode("utf-8") for element in row]
                     filewriter.writerow(row)
 
-#Time to plot
+# Time to plot
 
 def plotDurationHistogram(store, plot_id, saveloc):
     x = []
@@ -224,4 +226,4 @@
             if storage["pages"][page_name][position][ref]["type"] == "radio":
                 plotRadio(storage["pages"][page_name][position][ref],ref, saveloc)
             if storage["pages"][page_name][position][ref]["type"] == "checkbox":
-                plotCheckbox(storage["pages"][page_name][position][ref],ref, saveloc)
\ No newline at end of file
+                plotCheckbox(storage["pages"][page_name][position][ref],ref, saveloc)
diff -r 3299cb22ed21 -r d25e09e3b8fe tests/examples/APE_example.xml
--- a/tests/examples/APE_example.xml	Thu Nov 02 14:45:02 2017 +0000
+++ b/tests/examples/APE_example.xml	Tue Nov 21 15:13:54 2017 +0000
@@ -57,7 +57,7 @@
                 <interfaceoption type="show" name="comments" />
             </interface>
         </setup>
-        <page id='test-0' hostURL="media/example/" randomiseOrder='true' repeatCount='0' loop='true' loudness="-12">
+        <page id='test-0' hostURL="media/example/" randomiseOrder='true' repeatCount='0' loop='true' synchronous="true" loudness="-12">
             <commentboxprefix>Comment on fragment</commentboxprefix>
             <interface name="preference">
                 <title>Preference</title>
@@ -93,7 +93,7 @@
                 </surveyentry>
             </survey>
         </page>
-        <page id='test-1' hostURL="media/example/" randomiseOrder='true' repeatCount='0' loop='false' label="letter">
+        <page id='test-1' hostURL="media/example/" randomiseOrder='true' repeatCount='0' loop='false' synchronous="true" label="letter">
             <commentboxprefix>Comment on fragment</commentboxprefix>
             <interface name="preference">
                 <title>Example Test Question</title>