Mercurial > hg > webaudioevaluationtool
changeset 2456:f7b363b45cc5
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
| author | www-data <www-data@sucuk.dcs.qmul.ac.uk> |
|---|---|
| date | Tue, 02 Aug 2016 11:20:43 +0100 |
| parents | c3e00c178760 (current diff) 17688ed74bed (diff) |
| children | 7875d043f8ba |
| files | |
| diffstat | 5 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/README.md Mon Jul 11 22:20:49 2016 +0100 +++ b/README.md Tue Aug 02 11:20:43 2016 +0100 @@ -13,7 +13,7 @@ ## Instructions -Please refer to the [Wiki](https://github.com/BrechtDeMan/WebAudioEvaluationTool/wiki) or the documentation in ['docs/Instructions/Instructions.pdf'](https://github.com/BrechtDeMan/WebAudioEvaluationTool/raw/master/docs/Instructions/Instructions.pdf). +Please refer to the [Wiki](https://github.com/BrechtDeMan/WebAudioEvaluationTool/wiki). ### Preview The video below shows you can set up a simple test from scratch in under five minutes (click to open):
--- a/php/pseudo.php Mon Jul 11 22:20:49 2016 +0100 +++ b/php/pseudo.php Tue Aug 02 11:20:43 2016 +0100 @@ -8,14 +8,14 @@ $numsaves = count( $files ); } - $files = glob('tests/' . '*.xml'); + $files = glob('../tests/' . '*.xml'); $numtests = 0; if ( $numtests !== false ) { $numtests = count( $files ); } - $testID = ($numsaves % $numtests)-1; + $testID = ($numsaves % $numtests); readfile($files[$testID]); ?> \ No newline at end of file
--- a/python/pythonServer.py Mon Jul 11 22:20:49 2016 +0100 +++ b/python/pythonServer.py Tue Aug 02 11:20:43 2016 +0100 @@ -28,6 +28,7 @@ PSEUDO_PATH = '../tests/' pseudo_files = [] +pseudo_index = 0 for filename in os.listdir(PSEUDO_PATH): print(filename) if filename.endswith('.xml'): @@ -221,6 +222,7 @@ s.end_headers() def http_do_GET(request): + global pseudo_index if(request.client_address[0] == "127.0.0.1"): if (request.path == "/favicon.ico"): send404(request) @@ -233,7 +235,7 @@ if (request.path == '/'): request.path = '/index.html' elif (request.path == '/pseudo.xml'): - request.path = '/'+PSEUDO_PATH + pseudo_files[pseudo_index] + request.path = PSEUDO_PATH + pseudo_files[pseudo_index] print(request.path) pseudo_index += 1 pseudo_index %= len(pseudo_files)