Mercurial > hg > env-test-daniele

changeset 12:8a595d55e245

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed back to lists from radio buttons. Now test runs and logs results
author Daniele Barchiesi <daniele.barchiesi@eecs.qmul.ac.uk>
date Tue, 12 Mar 2013 15:11:39 +0000
parents 15260ae0d6bc
children 8261089e6f04
files cherryFxTest.py local.conf templates.py
diffstat 3 files changed, 251 insertions(+), 317 deletions(-) [+]
line wrap: on
line diff
--- a/cherryFxTest.py	Mon Mar 11 13:31:44 2013 +0000
+++ b/cherryFxTest.py	Tue Mar 12 15:11:39 2013 +0000
@@ -15,15 +15,9 @@
 from pprint import pprint
 
 PATH = os.path.abspath(os.path.dirname(__file__))
-
-#audiodir = './audio'
-#cherrypy.session['fxs'] = [cherrypy.session['f'] for cherrypy.session['f'] in os.listdir(audiodir) if os.path.isdir(os.path.join(audiodir, cherrypy.session['f']))]
-#cherrypy.session['fxs'].remove('dry')
-#print cherrypy.session['fxs']
 	
 class Root(object): pass
 
-
 class HomePage:
 	def index(self):
 		
@@ -34,9 +28,9 @@
 class TestPage:
 
 	def getAASPFiles(self):
-		audioDir = '/Users/daniele/Documents/AASPChallenge/survey/AASPAudio'
+		audioDir = './AASPAudio'
 		cherrypy.session['cats'] = [cherrypy.session['f'] for cherrypy.session['f'] in os.listdir(audioDir) if os.path.isdir(os.path.join(audioDir,cherrypy.session['f']))]
-		print cherrypy.session['cats']
+		#print cherrypy.session['cats']
 	
 	def index(self):
 		TestPage.getAASPFiles(self)
@@ -61,36 +55,24 @@
 		cherrypy.session['pages'] = 6
 		cherrypy.session['userinfobox'] = None
 		cherrypy.session['ts'] = None
-		#return '''
-		#	<p>
-		#	<a href="/test/">start test</a>
-		#	</p>'''
-		
-		#take 2 examples for each effect
 
 		cherrypy.session['audio'] = []
 		
-		# get effected files:
 		cherrypy.session['audio'] = []	
 		for cherrypy.session['cat'] in cherrypy.session['cats']:
-			cherrypy.session['dirlist'] = os.listdir('/Users/daniele/Documents/AASPChallenge/survey/AASPAudio/%s/'%cherrypy.session['cat'])
+			cherrypy.session['dirlist'] = os.listdir('./AASPAudio/%s/'%cherrypy.session['cat'])
 			for cherrypy.session['item'] in cherrypy.session['dirlist']:
 				if cherrypy.session['item'].split('.')[-1] == 'wav':
 					cherrypy.session['audio'].append(cherrypy.session['cat'] + '/' + cherrypy.session['item'].split('.')[0])
-			
-		
-		#print TestPage.audio
+
 		random.shuffle(cherrypy.session['audio'])
 		
-		print "NUMBER OF TESTS:"
-		print len(cherrypy.session['audio'])
+		#print "NUMBER OF TESTS:"
+		#print len(cherrypy.session['audio'])
 		
 		cherrypy.session['sid'] = cherrypy.session.get_session_path().split('/')[1]
-		print cherrypy.session['sid']
-		
-		#print cherrypy.session['audio']
-		pprint(cherrypy.session['audio'])
-		
+		#print cherrypy.session['sid']
+		#pprint(cherrypy.session['audio'])
 		
 		TestPage.outfileid = '%s' %cherrypy.session['sid']
 		ida = 0
@@ -104,54 +86,38 @@
 		
 	def doStart(self, pageId, sessionId, startButton, uinfo00=None, uinfo01=None, info1=None):
 		
-		
-		
 		if cherrypy.session['page'] != int(pageId):
 			print "################################# BACK BUTTON PRESSED #################################"
 
 		
 		if cherrypy.session['sid'] != str(sessionId):
 			return TestPage.sessionError(self)
-		#cherrypy.session['page'] = int(pageId)
-		
-		
-		
 		
 		cherrypy.session['userinfobox'] = str([str(uinfo00), str(uinfo01), int(info1)]) + '\n'
 		cherrypy.session['sessionId'] = sessionId
-		#print "sid:"
-		#print TestPage.sid
-		#print sessionId
 		if cherrypy.session['sid'] != str(cherrypy.session['sessionId']):
 			return TestPage.sessionError(self)
 		else:
 			return TestPage.index2(self)
 
-		
-
 	def index2(self):
-		#try: print testvar
-		#except: pass
-	
+			
 		cherrypy.session['page'] = 1
 		cherrypy.session['pages'] = 10
-		cherrypy.session['tests'] = len(cherrypy.session['audio']) #should be 66  #10 * cherrypy.session['pages']
+		cherrypy.session['tests'] = len(cherrypy.session['audio'])
 		cherrypy.session['results'] = []
 		for cherrypy.session['n'] in xrange(cherrypy.session['tests']): cherrypy.session['results'].append([None])
 
-		# create tuple to fill template
 		cherrypy.session['ts'] = []
 		for cherrypy.session['k'] in xrange(10):
 			cherrypy.session['ts'].append(0)
-			
-		return audiotempl%TestPage.makeTuple(self, 10)
+
+                print "################################# %s" %str(cherrypy.session['page'])
+                return audiotempl%TestPage.makeTuple(self, 10)
 		
 	def doAttrib(self, pageId, sessionId, submitButton, attribute1=None, attribute2=None, attribute3=None, attribute4=None, attribute5=None, attribute6=None, attribute7=None, attribute8=None, attribute9=None, attribute10=None):
-		#print attribute1 + ' ' + attribute2
-		# Error check
  			
 		print "################################# %s" %pageId
-		#_pageId = int(pageId) - 1
 
 		if cherrypy.session['page'] != int(pageId):
 			print "################################# BACK BUTTON PRESSED #################################"
@@ -160,123 +126,58 @@
 						
 		if cherrypy.session['sid'] != str(sessionId):
 			return TestPage.sessionError(self)
-				
-		#store results
-		
+
 		cherrypy.session['pos'] = 10 * (cherrypy.session['page'] - 1)		
 	 
-		cherrypy.session['results'][cherrypy.session['pos']] = [cherrypy.session['audio'][cherrypy.session['pos']][2].split('/')[-1], int(attribute1)]
-		cherrypy.session['results'][cherrypy.session['pos']+1] = [cherrypy.session['audio'][cherrypy.session['pos']+1][2].split('/')[-1], int(attribute2)]
-		cherrypy.session['results'][cherrypy.session['pos']+2] = [cherrypy.session['audio'][cherrypy.session['pos']+2][2].split('/')[-1], int(attribute3)]
-		cherrypy.session['results'][cherrypy.session['pos']+3] = [cherrypy.session['audio'][cherrypy.session['pos']+3][2].split('/')[-1], int(attribute4)]
-		cherrypy.session['results'][cherrypy.session['pos']+4] = [cherrypy.session['audio'][cherrypy.session['pos']+4][2].split('/')[-1], int(attribute5)]
-		cherrypy.session['results'][cherrypy.session['pos']+5] = [cherrypy.session['audio'][cherrypy.session['pos']+5][2].split('/')[-1], int(attribute6)]
-		cherrypy.session['results'][cherrypy.session['pos']+6] = [cherrypy.session['audio'][cherrypy.session['pos']+6][2].split('/')[-1], int(attribute7)]
-		cherrypy.session['results'][cherrypy.session['pos']+7] = [cherrypy.session['audio'][cherrypy.session['pos']+7][2].split('/')[-1], int(attribute8)]
-		cherrypy.session['results'][cherrypy.session['pos']+8] = [cherrypy.session['audio'][cherrypy.session['pos']+8][2].split('/')[-1], int(attribute9)]
-		cherrypy.session['results'][cherrypy.session['pos']+9] = [cherrypy.session['audio'][cherrypy.session['pos']+9][2].split('/')[-1], int(attribute10)]
+		cherrypy.session['results'][cherrypy.session['pos']] = [cherrypy.session['audio'][cherrypy.session['pos']].split('/')[-1], int(attribute1)]
+		cherrypy.session['results'][cherrypy.session['pos']+1] = [cherrypy.session['audio'][cherrypy.session['pos']+1].split('/')[-1], int(attribute2)]
+		cherrypy.session['results'][cherrypy.session['pos']+2] = [cherrypy.session['audio'][cherrypy.session['pos']+2].split('/')[-1], int(attribute3)]
+		cherrypy.session['results'][cherrypy.session['pos']+3] = [cherrypy.session['audio'][cherrypy.session['pos']+3].split('/')[-1], int(attribute4)]
+		cherrypy.session['results'][cherrypy.session['pos']+4] = [cherrypy.session['audio'][cherrypy.session['pos']+4].split('/')[-1], int(attribute5)]
+		cherrypy.session['results'][cherrypy.session['pos']+5] = [cherrypy.session['audio'][cherrypy.session['pos']+5].split('/')[-1], int(attribute6)]
+		cherrypy.session['results'][cherrypy.session['pos']+6] = [cherrypy.session['audio'][cherrypy.session['pos']+6].split('/')[-1], int(attribute7)]
+		cherrypy.session['results'][cherrypy.session['pos']+7] = [cherrypy.session['audio'][cherrypy.session['pos']+7].split('/')[-1], int(attribute8)]
+		cherrypy.session['results'][cherrypy.session['pos']+8] = [cherrypy.session['audio'][cherrypy.session['pos']+8].split('/')[-1], int(attribute9)]
+		cherrypy.session['results'][cherrypy.session['pos']+9] = [cherrypy.session['audio'][cherrypy.session['pos']+9].split('/')[-1], int(attribute10)]
+		resString = cherrypy.session['ip'] + '\n' + TestPage.outfileid + '\n' + cherrypy.session['userinfobox'] + '\n' + ',\n'.join(str(x) for x in cherrypy.session['results'])
+		print resString
 		
+				
+		cherrypy.session.write_data(resString,'%s.txt'%TestPage.outfileid)
+      
 		
-		resString = cherrypy.session['ip'] + '\n' + TestPage.outfileid + '\n' + cherrypy.session['userinfobox'] + '\n' + ',\n'.join(str(x) for x in cherrypy.session['results'])
 		
-		#f = open(TestPage.sid_filename, 'w')
-		#f.write(resString)
-		#f.close()
-		
-		cherrypy.session.write_data(resString,'%s.txt'%TestPage.outfileid)
-		
-		#if cherrypy.session['page'] < cherrypy.session['pages'] - 1:
 		cherrypy.session['page'] += 1
-		# create tuple to fill template
 		cherrypy.session['ts'] = []
 		cherrypy.session['npos'] = cherrypy.session['pos'] + 10
 		
-		if cherrypy.session['page'] < cherrypy.session['pages']:
-			cherrypy.session['m'] = 10
-		else:
-			cherrypy.session['m'] = 6
+		cherrypy.session['m'] = 10
 		
-		for cherrypy.session['k'] in xrange(cherrypy.session['m']):
-			for cherrypy.session['i'] in xrange(4):
-				#print cherrypy.session['k']
-				#print cherrypy.session['i']
-				cherrypy.session['ts'].append(cherrypy.session['results'][cherrypy.session['npos']+cherrypy.session['k']][cherrypy.session['i']+1])	
-			
+		for cherrypy.session['k'] in xrange(cherrypy.session['m']): cherrypy.session['ts'].append(0)
+      #cherrypy.session['ts'].append(cherrypy.session['results'][cherrypy.session['npos']+cherrypy.session['k']])
+		
+		
 		return audiotempl%TestPage.makeTuple(self, cherrypy.session['m'])
+		
+		#if cherrypy.session['page'] != cherrypy.session['pages']	
+		#	return audiotempl%TestPage.makeTuple(self, cherrypy.session['m'])
+		#else
+		#	cherrypy.session['templ'] = ''
+		#	for cherrypy.session['n'] in xrange(cherrypy.session['tests']):
+		#		cherrypy.session['_templ'] = endtempl2 %(cherrypy.session['results'][cherrypy.session['n']][0], cherrypy.session['results'][cherrypy.session['n']][1], cherrypy.session['results'][cherrypy.session['n']][2], cherrypy.session['results'][cherrypy.session['n']][3], cherrypy.session['results'][cherrypy.session['n']][4])
+		#		cherrypy.session['templ'] += cherrypy.session['_templ'] 
+		#	try: 
+		#		TestPage.sendMail(self)
+		#	except:
+		#		print "WARNING: COULD NOT SEND RESULTS"
+		#		pass
+		#	cherrypy.session['sid'] = None
+		#	return endtempl%cherrypy.session['templ']
 
-	
 	index.exposed = True
 	doAttrib.exposed = True
 	index2.exposed = True
 	doStart.exposed = True
-
-	
-	def doAttrib2(self, pageId, sessionId, submitButton, attribute1=None, attribute2=None, attribute3=None, attribute4=None, attribute5=None, attribute6=None):
-		#print attribute1 + ' ' + attribute2
-		# Error check
- 			
-		print "################################# %s" %pageId
-		#_pageId = int(pageId) - 1
-
-		if cherrypy.session['page'] != int(pageId):
-			print "################################# BACK BUTTON PRESSED #################################"
-
-		cherrypy.session['page'] = int(pageId)
-						
-		if cherrypy.session['sid'] != str(sessionId):
-			return TestPage.sessionError(self)
-				
-		#store results
-		
-		cherrypy.session['pos'] = 10 * (cherrypy.session['page'] - 1)		
-	 
-		cherrypy.session['results'][cherrypy.session['pos']] = [cherrypy.session['audio'][cherrypy.session['pos']][2].split('/')[-1], int(attribute1)]
-		cherrypy.session['results'][cherrypy.session['pos']+1] = [cherrypy.session['audio'][cherrypy.session['pos']+1][2].split('/')[-1], int(attribute2)]
-		cherrypy.session['results'][cherrypy.session['pos']+2] = [cherrypy.session['audio'][cherrypy.session['pos']+2][2].split('/')[-1], int(attribute3)]
-		cherrypy.session['results'][cherrypy.session['pos']+3] = [cherrypy.session['audio'][cherrypy.session['pos']+3][2].split('/')[-1], int(attribute4)]
-		cherrypy.session['results'][cherrypy.session['pos']+4] = [cherrypy.session['audio'][cherrypy.session['pos']+4][2].split('/')[-1], int(attribute5)]
-		cherrypy.session['results'][cherrypy.session['pos']+5] = [cherrypy.session['audio'][cherrypy.session['pos']+5][2].split('/')[-1], int(attribute6)]
-
-		
-		
-		resString = cherrypy.session['ip'] + '\n' + cherrypy.session['sid'] + '\n' + cherrypy.session['userinfobox'] + '\n' + ',\n'.join(str(x) for x in cherrypy.session['results'])
-		
-		#f = open(TestPage.sid_filename, 'w')
-		#f.write(resString)
-		#f.close()
-		#os.path.exists()
-		
-		cherrypy.session.write_data(resString,'%s.txt'%TestPage.outfileid)
-		
-	
-		print cherrypy.session['results']
-		#_results = []
-		
-		cherrypy.session['templ'] = ''
-		for cherrypy.session['n'] in xrange(cherrypy.session['tests']):
-			#print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-			#print cherrypy.session['n']
-			cherrypy.session['_templ'] = endtempl2 %(cherrypy.session['results'][cherrypy.session['n']][0], cherrypy.session['results'][cherrypy.session['n']][1], cherrypy.session['results'][cherrypy.session['n']][2], cherrypy.session['results'][cherrypy.session['n']][3], cherrypy.session['results'][cherrypy.session['n']][4])
-			cherrypy.session['templ'] += cherrypy.session['_templ'] 
-
-		#TestPage.pageComplete += 1
-		try: 
-			#print 'skipping email'
-			TestPage.sendMail(self)
-		except:
-			print "WARNING: COULD NOT SEND RESULTS"
-			pass
-		cherrypy.session['sid'] = None
-		return endtempl%cherrypy.session['templ']
-		#return lastpage
-			
-			
-	index.exposed = True
-	doAttrib.exposed = True
-	doAttrib2.exposed = True
-	index2.exposed = True
-	doStart.exposed = True
-	
 	
 	def makeTuple(TestPage, nr):
 		cherrypy.session['nr'] = nr
@@ -284,8 +185,7 @@
 		cherrypy.session['ts'].append(cherrypy.session['pages'])
 		for cherrypy.session['k'] in xrange(cherrypy.session['nr']):
 			pos = 10 * (cherrypy.session['page'] - 1) + cherrypy.session['k']
-			#print pos
-			cherrypy.session['ts'].append(cherrypy.session['audio'][pos])			
+			for n in xrange(3): cherrypy.session['ts'].append(cherrypy.session['audio'][pos])
 		cherrypy.session['ts'].append(cherrypy.session['page'])
 		cherrypy.session['ts'].append(cherrypy.session['sid'])
 		cherrypy.session['ts'] = tuple(cherrypy.session['ts'])
--- a/local.conf	Mon Mar 11 13:31:44 2013 +0000
+++ b/local.conf	Tue Mar 12 15:11:39 2013 +0000
@@ -19,7 +19,7 @@
 tools.sessions.SESSIONS_PATH = 'sessions/'
 
 [/]
-tools.staticdir.root = "/Users/daniele/Documents/AASPChallenge/survey/"
+tools.staticdir.root = "/Users/danielebarchiesi/Documents/AASPChallenge/survey/"
 
 [/build]
 tools.staticdir.on = True
@@ -39,4 +39,8 @@
 
 [/js]
 tools.staticdir.on = True
-tools.staticdir.dir = "js"
\ No newline at end of file
+tools.staticdir.dir = "js"
+
+[/AASPAudio]
+tools.staticdir.on = True
+tools.staticdir.dir = "AASPAudio"
--- a/templates.py	Mon Mar 11 13:31:44 2013 +0000
+++ b/templates.py	Tue Mar 12 15:11:39 2013 +0000
@@ -5,9 +5,11 @@
 <html lang="en" dir="ltr">
 
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8;charset=utf-8" >
-	<! link rel="stylesheet" href="../build/mediaelementplayer.min.css" TITLE="combined">
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8;charset=utf-8" >
+	<link rel="stylesheet" type="text/css" href="../htempl/barrensa.css" TITLE="combined" />
+	<link rel="stylesheet" href="../build/mediaelementplayer.min.css" TITLE="combined">
   	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
 		<title>Audio Environment Classification</title>	
 	
 	<script src="../build/jquery.js"></script>	
@@ -36,192 +38,219 @@
 </head>
 
 <body>
+   
+   <div id="mainPicture">
+   <div class="picture">
+   <div id="headerTitle">Audio Environment Classification</div>
+   </div>
+   </div>
+   <div class="contentBox">
 
   <h3 id="test 1">%i/%i</h3><br>
   <h4>Please play the sounds and indicate where they have been recorded </h4>
-
+   
 <form name="attributes" action="doAttrib" method="POST">
-
-<audio id="audio player 1" controls>
-  <source src="../AASPAudio/%s.wav" type="audio/wav">
-</audio>
-
-<form name = "attribute1" id="a1">
-<input type="radio" name="cat" value="bus">bus
-<input type="radio" name="cat" value="busy street">busy street
-<input type="radio" name="cat" value="office">office
-<input type="radio" name="cat" value="open air market">open air market
-<input type="radio" name="cat" value="park">park <br>
-<input type="radio" name="cat" value="quiet street">quiet street
-<input type="radio" name="cat" value="restaurant">restaurant
-<input type="radio" name="cat" value="supermarket">supermarket
-<input type="radio" name="cat" value="tube">tube
-<input type="radio" name="cat" value="tube station">tube station
-</form>
+   <audio id="audio player 1" controls>
+     <source src="../AASPAudio/%s.wav" type="audio/wav">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+   </audio>
 <br>
 
-<audio id="audio player 2" controls>
-  <source src="/Users/daniele/Documents/AASPChallenge/survey/AASPAudio/%s.wav" type="audio/wav">
-</audio>
-
-<form name = "attribute2" id="a2">
-<input type="radio" name="cat" value="bus">bus
-<input type="radio" name="cat" value="busy street">busy street
-<input type="radio" name="cat" value="office">office
-<input type="radio" name="cat" value="open air market">open air market
-<input type="radio" name="cat" value="park">park <br>
-<input type="radio" name="cat" value="quiet street">quiet street
-<input type="radio" name="cat" value="restaurant">restaurant
-<input type="radio" name="cat" value="supermarket">supermarket
-<input type="radio" name="cat" value="tube">tube
-<input type="radio" name="cat" value="tube station">tube station
-</form>
+   <select name="attribute1" id="a1">
+   <option value="0"></option>
+	<option value="1">bus</option>
+   <option value="2">busy street</option>
+   <option value="3">office</option>
+	<option value="4">open air market</option>
+	<option value="5">park</option>
+	<option value="6">quiet street</option>
+	<option value="7">restaurant</option>
+	<option value="8">supermarket</option>
+   <option value="9">tube</option>
+	<option value="10">tube station</option>
+   </select>
 <br>
 
-<audio id="audio player 3" controls>
-  <source src="/Users/daniele/Documents/AASPChallenge/survey/AASPAudio/%s.wav" type="audio/wav">
-</audio>
+   <audio id="audio player 2" controls>
+   <source src="../AASPAudio/%s.wav" type="audio/wav">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+   </audio>
 
-<form name = "attribute3" id="a3">
-<input type="radio" name="cat" value="bus">bus
-<input type="radio" name="cat" value="busy street">busy street
-<input type="radio" name="cat" value="office">office
-<input type="radio" name="cat" value="open air market">open air market
-<input type="radio" name="cat" value="park">park <br>
-<input type="radio" name="cat" value="quiet street">quiet street
-<input type="radio" name="cat" value="restaurant">restaurant
-<input type="radio" name="cat" value="supermarket">supermarket
-<input type="radio" name="cat" value="tube">tube
-<input type="radio" name="cat" value="tube station">tube station
-</form>
+   <select name="attribute2" id="a2">
+   <option value="0"></option>
+	<option value="1">bus</option>
+   <option value="2">busy street</option>
+   <option value="3">office</option>
+	<option value="4">open air market</option>
+	<option value="5">park</option>
+	<option value="6">quiet street</option>
+	<option value="7">restaurant</option>
+	<option value="8">supermarket</option>
+   <option value="9">tube</option>
+	<option value="10">tube station</option>
+   </select>
 <br>
 
-<audio id="audio player 4" controls>
-  <source src="/Users/daniele/Documents/AASPChallenge/survey/AASPAudio/%s.wav" type="audio/wav">
-</audio>
+   <audio id="audio player 3" controls>
+   <source src="../AASPAudio/%s.wav" type="audio/wav">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+   </audio>
 
-<form name = "attribute4" id="a4">
-<input type="radio" name="cat" value="bus">bus
-<input type="radio" name="cat" value="busy street">busy street
-<input type="radio" name="cat" value="office">office
-<input type="radio" name="cat" value="open air market">open air market
-<input type="radio" name="cat" value="park">park <br>
-<input type="radio" name="cat" value="quiet street">quiet street
-<input type="radio" name="cat" value="restaurant">restaurant
-<input type="radio" name="cat" value="supermarket">supermarket
-<input type="radio" name="cat" value="tube">tube
-<input type="radio" name="cat" value="tube station">tube station
-</form>
+   <select name="attribute3" id="a3">
+   <option value="0"></option>
+	<option value="1">bus</option>
+   <option value="2">busy street</option>
+   <option value="3">office</option>
+	<option value="4">open air market</option>
+	<option value="5">park</option>
+	<option value="6">quiet street</option>
+	<option value="7">restaurant</option>
+	<option value="8">supermarket</option>
+   <option value="9">tube</option>
+	<option value="10">tube station</option>
+   </select>
 <br>
 
-<audio id="audio player 5" controls>
-  <source src="/Users/daniele/Documents/AASPChallenge/survey/AASPAudio/%s.wav" type="audio/wav">
-</audio>
+   <audio id="audio player 4" controls>
+   <source src="../AASPAudio/%s.wav" type="audio/wav">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+   </audio>
 
-<form name = "attribute5" id="a5">
-<input type="radio" name="cat" value="bus">bus
-<input type="radio" name="cat" value="busy street">busy street
-<input type="radio" name="cat" value="office">office
-<input type="radio" name="cat" value="open air market">open air market
-<input type="radio" name="cat" value="park">park <br>
-<input type="radio" name="cat" value="quiet street">quiet street
-<input type="radio" name="cat" value="restaurant">restaurant
-<input type="radio" name="cat" value="supermarket">supermarket
-<input type="radio" name="cat" value="tube">tube
-<input type="radio" name="cat" value="tube station">tube station
-</form>
+   <select name="attribute4" id="a4">
+   <option value="0"></option>
+	<option value="1">bus</option>
+   <option value="2">busy street</option>
+   <option value="3">office</option>
+	<option value="4">open air market</option>
+	<option value="5">park</option>
+	<option value="6">quiet street</option>
+	<option value="7">restaurant</option>
+	<option value="8">supermarket</option>
+   <option value="9">tube</option>
+	<option value="10">tube station</option>
+   </select>
 <br>
 
-<audio id="audio player 6" controls>
-  <source src="/Users/daniele/Documents/AASPChallenge/survey/AASPAudio/%s.wav" type="audio/wav">
-</audio>
+   <audio id="audio player 5" controls>
+   <source src="../AASPAudio/%s.wav" type="audio/wav">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+   </audio>
 
-<form name = "attribute6" id="a6">
-<input type="radio" name="cat" value="bus">bus
-<input type="radio" name="cat" value="busy street">busy street
-<input type="radio" name="cat" value="office">office
-<input type="radio" name="cat" value="open air market">open air market
-<input type="radio" name="cat" value="park">park <br>
-<input type="radio" name="cat" value="quiet street">quiet street
-<input type="radio" name="cat" value="restaurant">restaurant
-<input type="radio" name="cat" value="supermarket">supermarket
-<input type="radio" name="cat" value="tube">tube
-<input type="radio" name="cat" value="tube station">tube station
-</form>
+   <select name="attribute5" id="a5">
+   <option value="0"></option>
+	<option value="1">bus</option>
+   <option value="2">busy street</option>
+   <option value="3">office</option>
+	<option value="4">open air market</option>
+	<option value="5">park</option>
+	<option value="6">quiet street</option>
+	<option value="7">restaurant</option>
+	<option value="8">supermarket</option>
+   <option value="9">tube</option>
+	<option value="10">tube station</option>
+   </select>
 <br>
 
-<audio id="audio player 7" controls>
-  <source src="/Users/daniele/Documents/AASPChallenge/survey/AASPAudio/%s.wav" type="audio/wav">
-</audio>
+   <audio id="audio player 6" controls>
+   <source src="../AASPAudio/%s.wav" type="audio/wav">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+   </audio>
 
-<form name = "attribute7" id="a7">
-<input type="radio" name="cat" value="bus">bus
-<input type="radio" name="cat" value="busy street">busy street
-<input type="radio" name="cat" value="office">office
-<input type="radio" name="cat" value="open air market">open air market
-<input type="radio" name="cat" value="park">park <br>
-<input type="radio" name="cat" value="quiet street">quiet street
-<input type="radio" name="cat" value="restaurant">restaurant
-<input type="radio" name="cat" value="supermarket">supermarket
-<input type="radio" name="cat" value="tube">tube
-<input type="radio" name="cat" value="tube station">tube station
-</form>
+   <select name="attribute6" id="a6">
+   <option value="0"></option>
+	<option value="1">bus</option>
+   <option value="2">busy street</option>
+   <option value="3">office</option>
+	<option value="4">open air market</option>
+	<option value="5">park</option>
+	<option value="6">quiet street</option>
+	<option value="7">restaurant</option>
+	<option value="8">supermarket</option>
+   <option value="9">tube</option>
+	<option value="10">tube station</option>
+   </select>
 <br>
 
-<audio id="audio player 8" controls>
-  <source src="/Users/daniele/Documents/AASPChallenge/survey/AASPAudio/%s.wav" type="audio/wav">
-</audio>
-
-<form name = "attribute8" id="a8">
-<input type="radio" name="cat" value="bus">bus
-<input type="radio" name="cat" value="busy street">busy street
-<input type="radio" name="cat" value="office">office
-<input type="radio" name="cat" value="open air market">open air market
-<input type="radio" name="cat" value="park">park <br>
-<input type="radio" name="cat" value="quiet street">quiet street
-<input type="radio" name="cat" value="restaurant">restaurant
-<input type="radio" name="cat" value="supermarket">supermarket
-<input type="radio" name="cat" value="tube">tube
-<input type="radio" name="cat" value="tube station">tube station
-</form>
+   <audio id="audio player 7" controls>
+   <source src="../AASPAudio/%s.wav" type="audio/wav">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+   </audio>
+   <select name="attribute7" id="a7">
+   <option value="0"></option>
+	<option value="1">bus</option>
+   <option value="2">busy street</option>
+   <option value="3">office</option>
+	<option value="4">open air market</option>
+	<option value="5">park</option>
+	<option value="6">quiet street</option>
+	<option value="7">restaurant</option>
+	<option value="8">supermarket</option>
+   <option value="9">tube</option>
+	<option value="10">tube station</option>
+   </select>
 <br>
 
-<audio id="audio player 9" controls>
-  <source src="/Users/daniele/Documents/AASPChallenge/survey/AASPAudio/%s.wav" type="audio/wav">
-</audio>
+   <audio id="audio player 8" controls>
+   <source src="../AASPAudio/%s.wav" type="audio/wav">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+   </audio>
 
-<form name = "attribute9" id="a9">
-<input type="radio" name="cat" value="bus">bus
-<input type="radio" name="cat" value="busy street">busy street
-<input type="radio" name="cat" value="office">office
-<input type="radio" name="cat" value="open air market">open air market
-<input type="radio" name="cat" value="park">park <br>
-<input type="radio" name="cat" value="quiet street">quiet street
-<input type="radio" name="cat" value="restaurant">restaurant
-<input type="radio" name="cat" value="supermarket">supermarket
-<input type="radio" name="cat" value="tube">tube
-<input type="radio" name="cat" value="tube station">tube station
-</form>
+   <select name="attribute8" id="a8">
+   <option value="0"></option>
+	<option value="1">bus</option>
+   <option value="2">busy street</option>
+   <option value="3">office</option>
+	<option value="4">open air market</option>
+	<option value="5">park</option>
+	<option value="6">quiet street</option>
+	<option value="7">restaurant</option>
+	<option value="8">supermarket</option>
+   <option value="9">tube</option>
+	<option value="10">tube station</option>
+   </select>
 <br>
 
-<audio id="audio player 10" controls>
-  <source src="/Users/daniele/Documents/AASPChallenge/survey/AASPAudio/%s.wav" type="audio/wav">
-</audio>
+   <audio id="audio player 9" controls>
+   <source src="../AASPAudio/%s.wav" type="audio/wav">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+   </audio>
 
-<form name = "attribute10" id="a10">
-<input type="radio" name="cat" value="bus">bus
-<input type="radio" name="cat" value="busy street">busy street
-<input type="radio" name="cat" value="office">office
-<input type="radio" name="cat" value="open air market">open air market
-<input type="radio" name="cat" value="park">park <br>
-<input type="radio" name="cat" value="quiet street">quiet street
-<input type="radio" name="cat" value="restaurant">restaurant
-<input type="radio" name="cat" value="supermarket">supermarket
-<input type="radio" name="cat" value="tube">tube
-<input type="radio" name="cat" value="tube station">tube station
-</form>
+   <select name="attribute9" id="a9">
+   <option value="0"></option>
+	<option value="1">bus</option>
+   <option value="2">busy street</option>
+   <option value="3">office</option>
+	<option value="4">open air market</option>
+	<option value="5">park</option>
+	<option value="6">quiet street</option>
+	<option value="7">restaurant</option>
+	<option value="8">supermarket</option>
+   <option value="9">tube</option>
+	<option value="10">tube station</option>
+   </select>
 <br>
 
+   <audio id="audio player 10" controls>
+   <source src="../AASPAudio/%s.wav" type="audio/wav">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+   </audio>
+
+   <select name="attribute10" id="a10">
+   <option value="0"></option>
+	<option value="1">bus</option>
+   <option value="2">busy street</option>
+   <option value="3">office</option>
+	<option value="4">open air market</option>
+	<option value="5">park</option>
+	<option value="6">quiet street</option>
+	<option value="7">restaurant</option>
+	<option value="8">supermarket</option>
+   <option value="9">tube</option>
+	<option value="10">tube station</option>
+   </select>
+   
+   </p>
+   <br>
 	<input type="hidden" name="pageId" value="%i">
 	<input type="hidden" name="sessionId" value="%s">
 	
@@ -230,9 +259,9 @@
 	</form>
 	
 	<script language="JavaScript" type="text/javascript"
-	    xml:space="preserve">//<![CDATA[
-	  var frmvalidator  = new Validator("attributes");
-
+   xml:space="preserve">//<![CDATA[
+   var frmvalidator  = new Validator("attributes");
+   
 	frmvalidator.addValidation("attribute1","dontselect=0", "Please select at least one main attribute for each item");
 	frmvalidator.addValidation("attribute2","dontselect=0", "Please select at least one main attribute for each item");
 	frmvalidator.addValidation("attribute3","dontselect=0", "Please select at least one main attribute for each item");
@@ -243,14 +272,14 @@
 	frmvalidator.addValidation("attribute8","dontselect=0", "Please select at least one main attribute for each item");
 	frmvalidator.addValidation("attribute9","dontselect=0", "Please select at least one main attribute for each item");
 	frmvalidator.addValidation("attribute10","dontselect=0", "Please select at least one main attribute for each item");
-
+   
 	//]]></script>
 	
 	</div>
-
-	    </div>
-
-</body>
+   
+   </div>
+   
+   </body>
 
 <script>
 $('audio,video').mediaelementplayer();
@@ -266,6 +295,7 @@
 
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8;charset=utf-8" >
+	<link rel="stylesheet" type="text/css" href="../htempl/barrensa.css">
   	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<title>Environment Classification</title>	
 <script language="JavaScript" src="../js/gen_validatorv4.js"