# HG changeset patch # User Giulio Moro # Date 1462900805 -3600 # Node ID 01608b20a12d982aea6dbb7f6925dc2540e95d4c # Parent 853caf8cd74b6de39823506d723897e4c7990ce5 update diff -r 853caf8cd74b -r 01608b20a12d .hgignore --- a/.hgignore Wed May 04 17:25:19 2016 +0100 +++ b/.hgignore Tue May 10 18:20:05 2016 +0100 @@ -55,3 +55,6 @@ .hgrc *.orig *.wav +*.swo +*.swp + diff -r 853caf8cd74b -r 01608b20a12d .test_list.php.swp Binary file .test_list.php.swp has changed diff -r 853caf8cd74b -r 01608b20a12d hammond/.training.xml.swp Binary file hammond/.training.xml.swp has changed diff -r 853caf8cd74b -r 01608b20a12d hammond/tests/post_survey.xml --- a/hammond/tests/post_survey.xml Wed May 04 17:25:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ - - - - - - Please enter your location. (example mandatory text question) - - - Please enter your age (example non-mandatory number question) - - - Please rate this interface (example radio button question) - - - - - - - Thank you for taking this listening test. May God be with you. - - - - testTimer - elementTimer - elementInitialPosition - elementTracker - elementFlagListenedTo - elementFlagMoved - elementListenTracker - - - - - - - - - - - - \ No newline at end of file diff -r 853caf8cd74b -r 01608b20a12d new/.git/COMMIT_EDITMSG --- a/new/.git/COMMIT_EDITMSG Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/COMMIT_EDITMSG Tue May 10 18:20:05 2016 +0100 @@ -1,1 +1,1 @@ -Improved querystring parsing +Added support for saveFilenamePrefix= querystring , closed #56 diff -r 853caf8cd74b -r 01608b20a12d new/.git/FETCH_HEAD --- a/new/.git/FETCH_HEAD Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/FETCH_HEAD Tue May 10 18:20:05 2016 +0100 @@ -1,1 +1,1 @@ -62b1a15edb353fcbd7a2f014d35cfa31292f9f41 branch 'master' of github.com:BrechtDeMan/WebAudioEvaluationTool +dfdf68be757c8a5513d466495eee50965100d232 branch 'master' of github.com:BrechtDeMan/WebAudioEvaluationTool diff -r 853caf8cd74b -r 01608b20a12d new/.git/HEAD --- a/new/.git/HEAD Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/HEAD Tue May 10 18:20:05 2016 +0100 @@ -1,1 +1,1 @@ -ref: refs/heads/master +ref: refs/heads/giulio diff -r 853caf8cd74b -r 01608b20a12d new/.git/ORIG_HEAD --- a/new/.git/ORIG_HEAD Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/ORIG_HEAD Tue May 10 18:20:05 2016 +0100 @@ -1,1 +1,1 @@ -62b1a15edb353fcbd7a2f014d35cfa31292f9f41 +6f416ff9b142b8ac27230fc032344bf4ca84c8f8 diff -r 853caf8cd74b -r 01608b20a12d new/.git/index Binary file new/.git/index has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/logs/HEAD --- a/new/.git/logs/HEAD Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/logs/HEAD Tue May 10 18:20:05 2016 +0100 @@ -59,3 +59,22 @@ 62b1a15edb353fcbd7a2f014d35cfa31292f9f41 9200a014c8ad4755bec2e2eb9405719ac7156310 Giulio Moro 1462377198 +0100 checkout: moving from master to giulio 9200a014c8ad4755bec2e2eb9405719ac7156310 62b1a15edb353fcbd7a2f014d35cfa31292f9f41 Giulio Moro 1462377236 +0100 checkout: moving from giulio to master 62b1a15edb353fcbd7a2f014d35cfa31292f9f41 cf1029f56ea4dd477769e149a788e049d14c5ce7 Giulio Moro 1462379078 +0100 commit: Improved querystring parsing +cf1029f56ea4dd477769e149a788e049d14c5ce7 9200a014c8ad4755bec2e2eb9405719ac7156310 Giulio Moro 1462384171 +0100 checkout: moving from master to giulio +9200a014c8ad4755bec2e2eb9405719ac7156310 ddb1b03a77d924b233edadc836224b150a20595d Giulio Moro 1462384307 +0100 commit: Merged new returnURL from master +ddb1b03a77d924b233edadc836224b150a20595d 78f7225282f2f337a9d0d44972cea188dd1bad5e Giulio Moro 1462384453 +0100 commit: Removed 'hidden' workarond which allowed to have zero-pages tests +78f7225282f2f337a9d0d44972cea188dd1bad5e ddb1b03a77d924b233edadc836224b150a20595d Giulio Moro 1462830071 +0100 reset: moving to HEAD~ +ddb1b03a77d924b233edadc836224b150a20595d ddb1b03a77d924b233edadc836224b150a20595d Giulio Moro 1462830168 +0100 checkout: moving from giulio to giulio +ddb1b03a77d924b233edadc836224b150a20595d cf1029f56ea4dd477769e149a788e049d14c5ce7 Giulio Moro 1462877468 +0100 checkout: moving from giulio to master +cf1029f56ea4dd477769e149a788e049d14c5ce7 dfdf68be757c8a5513d466495eee50965100d232 Giulio Moro 1462877508 +0100 commit: gitignore +dfdf68be757c8a5513d466495eee50965100d232 ddb1b03a77d924b233edadc836224b150a20595d Giulio Moro 1462889933 +0100 checkout: moving from master to giulio +ddb1b03a77d924b233edadc836224b150a20595d f98bc6e2841e8eb68878c5c9f28bee7e7291f452 Giulio Moro 1462895164 +0100 commit: fixed returnURL for savefilenameprefix +f98bc6e2841e8eb68878c5c9f28bee7e7291f452 dfdf68be757c8a5513d466495eee50965100d232 Giulio Moro 1462895417 +0100 checkout: moving from giulio to master +dfdf68be757c8a5513d466495eee50965100d232 156d3d2316cf8d6fffc72327b95daaff29974430 Giulio Moro 1462895706 +0100 commit: If returnURL is not provided now the correct message is displayed #60 +156d3d2316cf8d6fffc72327b95daaff29974430 f98bc6e2841e8eb68878c5c9f28bee7e7291f452 Giulio Moro 1462895745 +0100 checkout: moving from master to giulio +f98bc6e2841e8eb68878c5c9f28bee7e7291f452 bec6f2b297fe5b0265be3101f5a0426ff683d0af Giulio Moro 1462895996 +0100 commit: partially merged in master +bec6f2b297fe5b0265be3101f5a0426ff683d0af 8e33f51fb451eef9d0d43b7d532446d68590478b Giulio Moro 1462898231 +0100 commit: Added support for saveFilenamePrefix= #56 +8e33f51fb451eef9d0d43b7d532446d68590478b 156d3d2316cf8d6fffc72327b95daaff29974430 Giulio Moro 1462898247 +0100 checkout: moving from giulio to master +156d3d2316cf8d6fffc72327b95daaff29974430 6f416ff9b142b8ac27230fc032344bf4ca84c8f8 Giulio Moro 1462898496 +0100 commit: Added support for saveFilenamePrefix= querystring , closed #56 +6f416ff9b142b8ac27230fc032344bf4ca84c8f8 156d3d2316cf8d6fffc72327b95daaff29974430 Giulio Moro 1462898599 +0100 reset: moving to HEAD~ +156d3d2316cf8d6fffc72327b95daaff29974430 7042107c78dac12cdcba2229a866bd8ee71582b6 Giulio Moro 1462898661 +0100 commit: Added support for saveFilenamePrefix= querystring , closed #56 +7042107c78dac12cdcba2229a866bd8ee71582b6 8e33f51fb451eef9d0d43b7d532446d68590478b Giulio Moro 1462899378 +0100 checkout: moving from master to giulio diff -r 853caf8cd74b -r 01608b20a12d new/.git/logs/refs/heads/giulio --- a/new/.git/logs/refs/heads/giulio Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/logs/refs/heads/giulio Tue May 10 18:20:05 2016 +0100 @@ -16,3 +16,9 @@ 6630b4234c6e3db121bc869524672d66509f4b79 27623225961bc492afd2b876ef27e9aa2cee92b3 Giulio Moro 1462194367 +0100 commit: Removed .hgignore 27623225961bc492afd2b876ef27e9aa2cee92b3 1cb124d90299eee74b5857a354bfe88dc9dcc30c Giulio Moro 1462195259 +0100 commit: Partial merge from master 1cb124d90299eee74b5857a354bfe88dc9dcc30c 9200a014c8ad4755bec2e2eb9405719ac7156310 Giulio Moro 1462285134 +0100 commit: gitignore +9200a014c8ad4755bec2e2eb9405719ac7156310 ddb1b03a77d924b233edadc836224b150a20595d Giulio Moro 1462384307 +0100 commit: Merged new returnURL from master +ddb1b03a77d924b233edadc836224b150a20595d 78f7225282f2f337a9d0d44972cea188dd1bad5e Giulio Moro 1462384453 +0100 commit: Removed 'hidden' workarond which allowed to have zero-pages tests +78f7225282f2f337a9d0d44972cea188dd1bad5e ddb1b03a77d924b233edadc836224b150a20595d Giulio Moro 1462830071 +0100 reset: moving to HEAD~ +ddb1b03a77d924b233edadc836224b150a20595d f98bc6e2841e8eb68878c5c9f28bee7e7291f452 Giulio Moro 1462895164 +0100 commit: fixed returnURL for savefilenameprefix +f98bc6e2841e8eb68878c5c9f28bee7e7291f452 bec6f2b297fe5b0265be3101f5a0426ff683d0af Giulio Moro 1462895996 +0100 commit: partially merged in master +bec6f2b297fe5b0265be3101f5a0426ff683d0af 8e33f51fb451eef9d0d43b7d532446d68590478b Giulio Moro 1462898231 +0100 commit: Added support for saveFilenamePrefix= #56 diff -r 853caf8cd74b -r 01608b20a12d new/.git/logs/refs/heads/master --- a/new/.git/logs/refs/heads/master Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/logs/refs/heads/master Tue May 10 18:20:05 2016 +0100 @@ -15,3 +15,8 @@ 4197183dc59190ef5789ba989e1d1b1c73d0fcae b6cf0e3c8e5b4d1e5ae0e765d63a571b843522a4 Giulio Moro 1462285093 +0100 commit: gitignore b6cf0e3c8e5b4d1e5ae0e765d63a571b843522a4 62b1a15edb353fcbd7a2f014d35cfa31292f9f41 Giulio Moro 1462368761 +0100 pull origin master: Fast-forward 62b1a15edb353fcbd7a2f014d35cfa31292f9f41 cf1029f56ea4dd477769e149a788e049d14c5ce7 Giulio Moro 1462379078 +0100 commit: Improved querystring parsing +cf1029f56ea4dd477769e149a788e049d14c5ce7 dfdf68be757c8a5513d466495eee50965100d232 Giulio Moro 1462877508 +0100 commit: gitignore +dfdf68be757c8a5513d466495eee50965100d232 156d3d2316cf8d6fffc72327b95daaff29974430 Giulio Moro 1462895706 +0100 commit: If returnURL is not provided now the correct message is displayed #60 +156d3d2316cf8d6fffc72327b95daaff29974430 6f416ff9b142b8ac27230fc032344bf4ca84c8f8 Giulio Moro 1462898496 +0100 commit: Added support for saveFilenamePrefix= querystring , closed #56 +6f416ff9b142b8ac27230fc032344bf4ca84c8f8 156d3d2316cf8d6fffc72327b95daaff29974430 Giulio Moro 1462898599 +0100 reset: moving to HEAD~ +156d3d2316cf8d6fffc72327b95daaff29974430 7042107c78dac12cdcba2229a866bd8ee71582b6 Giulio Moro 1462898661 +0100 commit: Added support for saveFilenamePrefix= querystring , closed #56 diff -r 853caf8cd74b -r 01608b20a12d new/.git/logs/refs/remotes/origin/Dev_main --- a/new/.git/logs/refs/remotes/origin/Dev_main Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/logs/refs/remotes/origin/Dev_main Tue May 10 18:20:05 2016 +0100 @@ -1,2 +1,3 @@ 4b216347f17d0f13d306206dd1fb8964634c6cb5 5ea52217f12a83d8d8f3fa46da55d766db54cd0a Giulio Moro 1461753396 +0100 pull: fast-forward 5ea52217f12a83d8d8f3fa46da55d766db54cd0a 1a7f95b87e707349807e750ad3c5cadb9ce6e552 Giulio Moro 1461944540 +0100 pull: fast-forward +1a7f95b87e707349807e750ad3c5cadb9ce6e552 b6cf0e3c8e5b4d1e5ae0e765d63a571b843522a4 Giulio Moro 1462379233 +0100 pull: fast-forward diff -r 853caf8cd74b -r 01608b20a12d new/.git/logs/refs/remotes/origin/giulio --- a/new/.git/logs/refs/remotes/origin/giulio Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/logs/refs/remotes/origin/giulio Tue May 10 18:20:05 2016 +0100 @@ -10,3 +10,7 @@ 79f72e716aa7744a3a1282dfb8ffaead09ec89b5 55e7f97b9b1011e30e6f4c4ea3a86e27d68fa2d0 Giulio Moro 1461954268 +0100 update by push 55e7f97b9b1011e30e6f4c4ea3a86e27d68fa2d0 6630b4234c6e3db121bc869524672d66509f4b79 Giulio Moro 1462194330 +0100 update by push 6630b4234c6e3db121bc869524672d66509f4b79 1cb124d90299eee74b5857a354bfe88dc9dcc30c Giulio Moro 1462236162 +0100 update by push +1cb124d90299eee74b5857a354bfe88dc9dcc30c ddb1b03a77d924b233edadc836224b150a20595d Giulio Moro 1462830337 +0100 update by push +ddb1b03a77d924b233edadc836224b150a20595d f98bc6e2841e8eb68878c5c9f28bee7e7291f452 Giulio Moro 1462895172 +0100 update by push +f98bc6e2841e8eb68878c5c9f28bee7e7291f452 bec6f2b297fe5b0265be3101f5a0426ff683d0af Giulio Moro 1462896002 +0100 update by push +bec6f2b297fe5b0265be3101f5a0426ff683d0af 8e33f51fb451eef9d0d43b7d532446d68590478b Giulio Moro 1462898239 +0100 update by push diff -r 853caf8cd74b -r 01608b20a12d new/.git/logs/refs/remotes/origin/master --- a/new/.git/logs/refs/remotes/origin/master Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/logs/refs/remotes/origin/master Tue May 10 18:20:05 2016 +0100 @@ -11,3 +11,7 @@ 8b7e1ed5edee4be8fa2b7893237566ae87f474df 4197183dc59190ef5789ba989e1d1b1c73d0fcae Giulio Moro 1461955249 +0100 update by push 4197183dc59190ef5789ba989e1d1b1c73d0fcae b6cf0e3c8e5b4d1e5ae0e765d63a571b843522a4 Giulio Moro 1462285101 +0100 update by push b6cf0e3c8e5b4d1e5ae0e765d63a571b843522a4 62b1a15edb353fcbd7a2f014d35cfa31292f9f41 Giulio Moro 1462368761 +0100 pull origin master: fast-forward +62b1a15edb353fcbd7a2f014d35cfa31292f9f41 cf1029f56ea4dd477769e149a788e049d14c5ce7 Giulio Moro 1462379169 +0100 update by push +cf1029f56ea4dd477769e149a788e049d14c5ce7 dfdf68be757c8a5513d466495eee50965100d232 Giulio Moro 1462877515 +0100 update by push +dfdf68be757c8a5513d466495eee50965100d232 156d3d2316cf8d6fffc72327b95daaff29974430 Giulio Moro 1462895718 +0100 update by push +156d3d2316cf8d6fffc72327b95daaff29974430 7042107c78dac12cdcba2229a866bd8ee71582b6 Giulio Moro 1462899347 +0100 update by push diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/00/af070c539f231870a7e8b020686b6b18c5b424 Binary file new/.git/objects/00/af070c539f231870a7e8b020686b6b18c5b424 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/0c/69430f1d26112369fa39d6459bbab9a0afff80 Binary file new/.git/objects/0c/69430f1d26112369fa39d6459bbab9a0afff80 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/11/54758b085f5abdd290d36f14e69786881041fa Binary file new/.git/objects/11/54758b085f5abdd290d36f14e69786881041fa has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/15/6d3d2316cf8d6fffc72327b95daaff29974430 Binary file new/.git/objects/15/6d3d2316cf8d6fffc72327b95daaff29974430 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/18/e57d47f7f937f921d9a93696865726fb0d6969 Binary file new/.git/objects/18/e57d47f7f937f921d9a93696865726fb0d6969 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/19/ec503eb7b20c2e7d779ebd436a9d0a6ce78ae9 Binary file new/.git/objects/19/ec503eb7b20c2e7d779ebd436a9d0a6ce78ae9 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/1c/41f3f84de17ddf442912a66c0412fa179a2a62 Binary file new/.git/objects/1c/41f3f84de17ddf442912a66c0412fa179a2a62 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/29/c89d58ff6bed64dc531fdf1cd551db2d0d7fa7 Binary file new/.git/objects/29/c89d58ff6bed64dc531fdf1cd551db2d0d7fa7 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/2f/00a84d42499b58e9cb5bdbce5b6b91d9b31859 Binary file new/.git/objects/2f/00a84d42499b58e9cb5bdbce5b6b91d9b31859 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/46/b3618f54b17af78abafe93bbbd247f3a771156 Binary file new/.git/objects/46/b3618f54b17af78abafe93bbbd247f3a771156 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/47/d2bf8d2b4f8d989f9dfb520a4e95e5cb431ef9 Binary file new/.git/objects/47/d2bf8d2b4f8d989f9dfb520a4e95e5cb431ef9 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/4d/b3db5cacdfd765501f8467e0e62833053f1f87 Binary file new/.git/objects/4d/b3db5cacdfd765501f8467e0e62833053f1f87 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/5d/e20fa38eb9ec445bdb5692b63110b2420484b6 Binary file new/.git/objects/5d/e20fa38eb9ec445bdb5692b63110b2420484b6 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/5f/d08a508f6e30e1bccdf0dd2b6d81ddcdcd97a9 Binary file new/.git/objects/5f/d08a508f6e30e1bccdf0dd2b6d81ddcdcd97a9 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/6f/416ff9b142b8ac27230fc032344bf4ca84c8f8 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/6f/416ff9b142b8ac27230fc032344bf4ca84c8f8 Tue May 10 18:20:05 2016 +0100 @@ -0,0 +1,2 @@ +xJ0ay$iI@E7|1765MY|:ϥE$M4 ȄhlƄZx`CIB"D"6 Zϵ{٧R᣶ +뙏rs? 1Ý6ZtM/^s ۾u#a~+/4gc)Osly,Z \ No newline at end of file diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/70/42107c78dac12cdcba2229a866bd8ee71582b6 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/70/42107c78dac12cdcba2229a866bd8ee71582b6 Tue May 10 18:20:05 2016 +0100 @@ -0,0 +1,1 @@ +xMN0Y#u BؖZX!qמi-%qpDo#V-/y APZ[iNQTV3)0αh5TZI%Fv 9Z={B`5aoR#S.Yj>_oZsn/ 4JQo)Qm_RpW牖0W%ο'ީ޶Vr'S:t08ҒY \ No newline at end of file diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/74/db0074c36111141027d8202650e89c18554ec6 Binary file new/.git/objects/74/db0074c36111141027d8202650e89c18554ec6 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/78/f7225282f2f337a9d0d44972cea188dd1bad5e Binary file new/.git/objects/78/f7225282f2f337a9d0d44972cea188dd1bad5e has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/7d/ff7945d83e446497f65c9a988afea7e7374875 Binary file new/.git/objects/7d/ff7945d83e446497f65c9a988afea7e7374875 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/81/54b181e2d84303e77def4d734271b83cec1949 Binary file new/.git/objects/81/54b181e2d84303e77def4d734271b83cec1949 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/83/d9381e28952fade06f9a2cf96d8bc1fc461705 Binary file new/.git/objects/83/d9381e28952fade06f9a2cf96d8bc1fc461705 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/84/a211c773d0e194b58ecb27d6f658a2db22d503 Binary file new/.git/objects/84/a211c773d0e194b58ecb27d6f658a2db22d503 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/8e/33f51fb451eef9d0d43b7d532446d68590478b Binary file new/.git/objects/8e/33f51fb451eef9d0d43b7d532446d68590478b has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/91/1cd6e6397c4eea76b477f6c833f857dfafc94f Binary file new/.git/objects/91/1cd6e6397c4eea76b477f6c833f857dfafc94f has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/92/284e06ed3cf098e209c9ab4289bed321256fb6 Binary file new/.git/objects/92/284e06ed3cf098e209c9ab4289bed321256fb6 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/95/6d93a210a763d1b1da540343d4cfd8246ad040 Binary file new/.git/objects/95/6d93a210a763d1b1da540343d4cfd8246ad040 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/95/dd8bdb9e4227885920440a11520c55f465e7aa Binary file new/.git/objects/95/dd8bdb9e4227885920440a11520c55f465e7aa has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/99/36a53af7709696c81006ec28a00fd947f972a5 Binary file new/.git/objects/99/36a53af7709696c81006ec28a00fd947f972a5 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/9f/04b0ab231903f77cb71778bc60b457e855be47 Binary file new/.git/objects/9f/04b0ab231903f77cb71778bc60b457e855be47 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/a3/44725a4d28ec3744449bf67246ec61588f8467 Binary file new/.git/objects/a3/44725a4d28ec3744449bf67246ec61588f8467 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/b0/7cb72d47e661c09e7ba6ed9fbdca6328192f47 Binary file new/.git/objects/b0/7cb72d47e661c09e7ba6ed9fbdca6328192f47 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/be/c6f2b297fe5b0265be3101f5a0426ff683d0af --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/be/c6f2b297fe5b0265be3101f5a0426ff683d0af Tue May 10 18:20:05 2016 +0100 @@ -0,0 +1,2 @@ +x;0Ds푐N,SnF7z;HޘQ+)I0҉l*6Β!B0?;$G!ö[:$)0[aRZ?KeKmsܯHr9GB qW/ +#'/*TMs \ No newline at end of file diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/d4/a875d2bf2199ad605d32cb39e8e3ab4b871de9 Binary file new/.git/objects/d4/a875d2bf2199ad605d32cb39e8e3ab4b871de9 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/dd/b1b03a77d924b233edadc836224b150a20595d --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/dd/b1b03a77d924b233edadc836224b150a20595d Tue May 10 18:20:05 2016 +0100 @@ -0,0 +1,2 @@ +x1j1ESŒ4V;7qf`%1>պ FWCIN, +T3:vLd47HQ8OR8z?kjuN>RGhdalץ'ɥe|qnbޑM~^lZ`_:[*GN \ No newline at end of file diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/df/df68be757c8a5513d466495eee50965100d232 Binary file new/.git/objects/df/df68be757c8a5513d466495eee50965100d232 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/e7/ac02f6cec9bff4fa9b8488814df6525a221ae3 Binary file new/.git/objects/e7/ac02f6cec9bff4fa9b8488814df6525a221ae3 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/ec/f456b36b98ccdd707172ec02d4dea2f577def2 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/new/.git/objects/ec/f456b36b98ccdd707172ec02d4dea2f577def2 Tue May 10 18:20:05 2016 +0100 @@ -0,0 +1,1 @@ +x+)JMU026a040031Qw s*fXq^eo@$,<^|ᔭ}կ}Xt[*3TIVaijQ H黋:ԅ8̐mw*4'4%/,U&?M _)(QUV\XRk]|+rRQoԷsCVd敀T]WK(k)՗[Pf& 0\ \ No newline at end of file diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/f7/0fcff626b7f991077e7a1dc74b79dd9a85ea50 Binary file new/.git/objects/f7/0fcff626b7f991077e7a1dc74b79dd9a85ea50 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/f9/8bc6e2841e8eb68878c5c9f28bee7e7291f452 Binary file new/.git/objects/f9/8bc6e2841e8eb68878c5c9f28bee7e7291f452 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/objects/fc/d85a755979f280a5a0a1590587ea74412d7c70 Binary file new/.git/objects/fc/d85a755979f280a5a0a1590587ea74412d7c70 has changed diff -r 853caf8cd74b -r 01608b20a12d new/.git/refs/heads/giulio --- a/new/.git/refs/heads/giulio Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/refs/heads/giulio Tue May 10 18:20:05 2016 +0100 @@ -1,1 +1,1 @@ -9200a014c8ad4755bec2e2eb9405719ac7156310 +8e33f51fb451eef9d0d43b7d532446d68590478b diff -r 853caf8cd74b -r 01608b20a12d new/.git/refs/heads/master --- a/new/.git/refs/heads/master Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/refs/heads/master Tue May 10 18:20:05 2016 +0100 @@ -1,1 +1,1 @@ -cf1029f56ea4dd477769e149a788e049d14c5ce7 +7042107c78dac12cdcba2229a866bd8ee71582b6 diff -r 853caf8cd74b -r 01608b20a12d new/.git/refs/remotes/origin/Dev_main --- a/new/.git/refs/remotes/origin/Dev_main Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/refs/remotes/origin/Dev_main Tue May 10 18:20:05 2016 +0100 @@ -1,1 +1,1 @@ -1a7f95b87e707349807e750ad3c5cadb9ce6e552 +b6cf0e3c8e5b4d1e5ae0e765d63a571b843522a4 diff -r 853caf8cd74b -r 01608b20a12d new/.git/refs/remotes/origin/giulio --- a/new/.git/refs/remotes/origin/giulio Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/refs/remotes/origin/giulio Tue May 10 18:20:05 2016 +0100 @@ -1,1 +1,1 @@ -1cb124d90299eee74b5857a354bfe88dc9dcc30c +8e33f51fb451eef9d0d43b7d532446d68590478b diff -r 853caf8cd74b -r 01608b20a12d new/.git/refs/remotes/origin/master --- a/new/.git/refs/remotes/origin/master Wed May 04 17:25:19 2016 +0100 +++ b/new/.git/refs/remotes/origin/master Tue May 10 18:20:05 2016 +0100 @@ -1,1 +1,1 @@ -62b1a15edb353fcbd7a2f014d35cfa31292f9f41 +7042107c78dac12cdcba2229a866bd8ee71582b6 diff -r 853caf8cd74b -r 01608b20a12d new/.survey.php.bak.swp Binary file new/.survey.php.bak.swp has changed diff -r 853caf8cd74b -r 01608b20a12d new/.survey.php.swp Binary file new/.survey.php.swp has changed diff -r 853caf8cd74b -r 01608b20a12d new/hammond/tests/pre_survey.xml --- a/new/hammond/tests/pre_survey.xml Wed May 04 17:25:19 2016 +0100 +++ b/new/hammond/tests/pre_survey.xml Tue May 10 18:20:05 2016 +0100 @@ -5,11 +5,16 @@ - Thanks for taking part in this listening test. - - Please fill in this brief questionnaire. - - + + We would like to invite you to be part of this research project, if you would like to. You should only agree to take part if you want to, it is entirely up to you. If you choose not to take part there will not be any disadvantages for you and you will hear no more about it. + Please read the following information carefully before you decide to take part; this will tell you why the research is being done and what you will be asked to do if you take part. Please ask if there is anything that is not clear or if you would like more information. +If you decide to take part you will be asked to sign the attached form to say that you agree. + You are still free to withdraw at any time and without giving a reason. + In this listening test you will be asked to classify a set of recordings of notes played on a Hammond organ. The test is open to everyone, regardless of their background and musical knowledge. A brief training will be provided which will help you familiarize with the audio material presented. If you are undertaking this test on your own computer, you will be required to use a set of headphones and you will have to enter the model of headphones used. + + This listening test was approved by the Queen Mary University of London ethics committee, with approval code QMREC1691a. If you have any questions or concerns about the manner in which the study was conducted please, in the first instance, contact the researcher responsible for the study at g.moro[at]qmul.ac.uk . If this is unsuccessful, or not appropriate, please contact the Secretary at the Queen Mary Ethics of Research Committee, research-ethics[at]qmul.ac.uk + + What is your name? diff -r 853caf8cd74b -r 01608b20a12d new/index.html.rej --- a/new/index.html.rej Wed May 04 17:25:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -*************** -*** 22,49 **** - - - -- - - - ---- 22,27 ---- - - - - - - diff -r 853caf8cd74b -r 01608b20a12d new/interfaces/AB.css --- a/new/interfaces/AB.css Wed May 04 17:25:19 2016 +0100 +++ b/new/interfaces/AB.css Tue May 10 18:20:05 2016 +0100 @@ -62,6 +62,10 @@ background-color: #008000; } +div.comparator-selector.inactive{ + background-color: yellow !important; +} + div.comparator-selector span { font-size: 4em; } @@ -86,4 +90,4 @@ position: absolute; top: 10px; left: 120px; -} \ No newline at end of file +} diff -r 853caf8cd74b -r 01608b20a12d new/interfaces/AB.js --- a/new/interfaces/AB.js Wed May 04 17:25:19 2016 +0100 +++ b/new/interfaces/AB.js Tue May 10 18:20:05 2016 +0100 @@ -321,6 +321,9 @@ case "letter": label = String.fromCharCode(97 + index); break; + case "given": + label = element.label; + break; default: label = String.fromCharCode(65 + index); break; @@ -328,6 +331,9 @@ var node = new this.comparatorBox(audioObject,index,label); audioObject.bindInterface(node); this.comparators.push(node); + if(element.inactive===true){ + node.box.children[0].classList.add('inactive'); + } this.boxHolders.appendChild(node.box); } } @@ -388,10 +394,10 @@ var checkState = interfaceContext.checkAllCommented(); if (checkState == false) {canContinue = false;} break; - case 'scalerange': - // Check the scale has been used effectively - var checkState = interfaceContext.checkScaleRange(checks[i].min,checks[i].max); - if (checkState == false) {canContinue = false;} + case 'scalerange': + // Check the scale has been used effectively + var checkState = interfaceContext.checkScaleRange(checks[i].min,checks[i].max); + if (checkState == false) {canContinue = false;} break; default: console.log("WARNING - Check option "+checks[i].check+" is not supported on this interface"); @@ -427,4 +433,4 @@ // Get the current information in store (remember to appendChild your data to it) // pageSpecification is the current page node configuration // To create new XML nodes, use storage.document.createElement(); -} \ No newline at end of file +} diff -r 853caf8cd74b -r 01608b20a12d new/js/core.js --- a/new/js/core.js Wed May 04 17:25:19 2016 +0100 +++ b/new/js/core.js Tue May 10 18:20:05 2016 +0100 @@ -17,6 +17,7 @@ var currentTrackOrder = []; // Hold the current XML tracks in their (randomised) order var audioEngineContext; // The custome AudioEngine object var gReturnURL; +var gSaveFilenamePrefix; // Add a prototype to the bufferSourceNode to reference to the audioObject holding it @@ -160,6 +161,9 @@ case "returnURL": gReturnURL = value; break; + case "saveFilenamePrefix": + gSaveFilenamePrefix = value; + break; } } loadProjectSpec(url); @@ -411,6 +415,9 @@ console.log("returnURL Overide from "+specification.returnURL+" to "+gReturnURL); specification.returnURL = gReturnURL; } + if (gSaveFilenamePrefix != undefined){ + specification.saveFilenamePrefix = gSaveFilenamePrefix; + } // Create the audio engine object audioEngineContext = new AudioEngine(specification); @@ -439,14 +446,20 @@ popup.popupContent.innerHTML = "Please save the file below to give to your test supervisor
"; popup.popupContent.appendChild(a); } else { + var saveUrlSuffix = ""; + var saveFilenamePrefix = specification.saveFilenamePrefix; + if(typeof(saveFilenamePrefix) === "string" && saveFilenamePrefix.length > 0){ + saveUrlSuffix = "&saveFilenamePrefix="+saveFilenamePrefix; + } + var projectReturn = ""; + if (typeof specification.projectReturn == "string") { + if (specification.projectReturn.substr(0,4) == "http") { + projectReturn = specification.projectReturn; + } + } + var saveURL = projectReturn+"php/save.php?key="+storage.SessionKey.key+saveUrlSuffix; var xmlhttp = new XMLHttpRequest; - var returnURL = ""; - if (typeof specification.projectReturn == "string") { - if (specification.projectReturn.substr(0,4) == "http") { - returnURL = specification.projectReturn; - } - } - xmlhttp.open("POST",returnURL+"php/save.php?key="+storage.SessionKey.key,true); + xmlhttp.open("POST", saveURL, true); xmlhttp.setRequestHeader('Content-Type', 'text/xml'); xmlhttp.onerror = function(){ console.log('Error saving file to server! Presenting download locally'); @@ -465,10 +478,8 @@ window.onbeforeunload = undefined; var file = response.getElementsByTagName("file")[0]; console.log("Save: OK, written "+file.getAttribute("bytes")+"B"); - if (typeof specification.returnURL == "string") { - if (specification.returnURL.length > 0) { + if (typeof specification.returnURL == "string" && specification.returnURL.length > 0) { window.location = specification.returnURL; - } } else { popup.popupContent.textContent = specification.exitText; } @@ -1936,6 +1947,10 @@ interfaceContext.commentBoxes.deleteCommentBoxes(); interfaceContext.deleteCommentQuestions(); loadTest(audioHolderObject,store); + if(audioHolderObject.hidden === true){ + // work-around to have zero pages: set only one page with the attribute hidden=true and it will automatically skip over. + testState.advanceState(); + } }; // Bounded by interface!! diff -r 853caf8cd74b -r 01608b20a12d new/php/save.php --- a/new/php/save.php Wed May 04 17:25:19 2016 +0100 +++ b/new/php/save.php Tue May 10 18:20:05 2016 +0100 @@ -1,10 +1,11 @@ preserveWhiteSpace = false; $doc->formatOutput = true; @@ -31,4 +32,4 @@ // Return XML confirmation data $xml = 'OK"'.$filename.'"'; echo $xml; -?> \ No newline at end of file +?> diff -r 853caf8cd74b -r 01608b20a12d new/survey.php --- a/new/survey.php Wed May 04 17:25:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,110 +0,0 @@ -Hammond organ listening test - Preliminary survey - -
Hammond organ listening test - Preliminary survey

We would like to invite you to be part of this research project, if you would like to. You should only agree to take part if you want to, it is entirely up to you. If you choose not to take part there won't be any disadvantages for you and you will hear no more about it.
Please read the following information carefully before you decide to take part; this will tell you why the research is being done and what you will be asked to do if you take part. Please ask if there is anything that is not clear or if you would like more information.
If you decide to take part you will be asked to sign the attached form to say that you agree.
You are still free to withdraw at any time and without giving a reason.

In this listening test you will be asked to classify a set of recordings of notes played on a Hammond organ. The test is open to everyone, regardless of their background and musical knowledge. A brief training will be provided which will help you familiarize with the audio material presented. If you are undertaking this test on your own computer, you will be required to use a set of headphones and you will have to enter the model of headphones used.

This listening test was approved by the Queen Mary University of London ethics committee, with approval code QMREC1691a. If you have any questions or concerns about the manner in which the study was conducted please, in the first instance, contact the researcher responsible for the study at g.moro@qmul.ac.uk . If this is unsuccessful, or not appropriate, please contact the Secretary at the Queen Mary Ethics of Research Committee, Room W117, Queen's Building, Mile End Campus, Mile End Road, London or research-ethics@qmul.ac.uk.

To undertake this study you will need to wear headphones and be in a quiet environment. Please indicate here the brand/model of headphones you will be using.
Your answer
How old are you?
Your answer
You identify your gender as ...
Do you play any musical instruments? If yes, please list them and indicate your level of expertise with each of them.
Your answer
Please indicate which one is your main instrument
Your answer
Have you ever played a tonewheel Hammond organ? If yes, please specify which model(s) and for how long you played it.
Your answer
Have you ever played an emulator of a Hammond organ? If yes, please specify which model(s) and for how long you played it.
Your answer
Please rate your familiarity with the sound of the Hammond organ
Not familiar
Very familiar
Please rate your familiarity with the working principle of the Hammond organ
Not familiar
Very familiar
Do you have any known hearing disabilities?
Your answer
Would you like to be contacted again in the future for further studies on the Hammond organ? If yes, please leave your email address below
Your answer
Submit
Never submit passwords through Google Forms.
This content is neither created nor endorsed by Google. Report Abuse - Terms of Service - Additional Terms
Google Forms
diff -r 853caf8cd74b -r 01608b20a12d new/survey.php.bak --- a/new/survey.php.bak Wed May 04 17:25:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ - diff -r 853caf8cd74b -r 01608b20a12d new/test_base.php --- a/new/test_base.php Wed May 04 17:25:19 2016 +0100 +++ b/new/test_base.php Tue May 10 18:20:05 2016 +0100 @@ -59,7 +59,7 @@ $queryString = http_build_query($queryStringParsed); $absoluteUrlNextPlusOne = $absoluteUrlSplit[0]."?".$queryString; } - $defaultTestEntry = Array('url' => null, 'string' => null, 'class' => 'disabled', 'a' => false, 'editable' => false, 'alwaysAccessible' => false); + $defaultTestEntry = Array('url' => null, 'string' => null, 'class' => 'disabled', 'a' => false, 'editable' => false, 'alwaysAccessible' => false, 'returnUrl' => '', 'saveFilenamePrefix' => ''); require_once('test_list.php'); //this returns $tests @@ -72,8 +72,10 @@ // until this point, the content of $tests will always be the same for a given $id, // regardless of how many times we visited this page. for($n = 0; $n < sizeof($tests); $n++ ){ - //TODO: check if the corresponding file exists + //TODO: check if the corresponding file // meantime, let us just rely on the GET variable 'next' + $filename = pathinfo($tests[$n]['url'], PATHINFO_FILENAME); + $tests[$n]['saveFilenamePrefix'] = urlencode($id."-".$filename); if($n <= $next){ $tests[$n]['a'] = true; $tests[$n]['class'] = 'enabled done'; @@ -163,7 +165,7 @@ // id= keeps track of the user and of the sorting of the tests in this page // next= keeps track of the first test not yet undertaken - echo ''.($n+1).' - '.$test['string'].''; + echo ''.($n+1).' - '.$test['string'].''; } else { echo ($n+1).' - '.$test['string']; } diff -r 853caf8cd74b -r 01608b20a12d new/test_list.php --- a/new/test_list.php Wed May 04 17:25:19 2016 +0100 +++ b/new/test_list.php Tue May 10 18:20:05 2016 +0100 @@ -5,8 +5,8 @@ $lang=''; $baseUrl = 'test.html?url=hammond/tests'.$lang.'/'; $preSurvey = $defaultTestEntry; - // $preSurvey['url'] = $baseUrl.'pre_survey.xml'; - $preSurvey['url'] = "survey.php?"; + $preSurvey['url'] = $baseUrl.'pre_survey.xml'; + //$preSurvey['url'] = "survey.php?"; $preSurvey['string'] = 'Survey'; $trainingVideo = $defaultTestEntry; diff -r 853caf8cd74b -r 01608b20a12d new/xml/test-schema.xsd --- a/new/xml/test-schema.xsd Wed May 04 17:25:19 2016 +0100 +++ b/new/xml/test-schema.xsd Tue May 10 18:20:05 2016 +0100 @@ -76,6 +76,7 @@ + @@ -91,6 +92,7 @@ + @@ -161,7 +163,10 @@ + + +