comparison cherryFxTest.py @ 13:8261089e6f04

Changed to one single file per page

 			return TestPage.index2(self)
 
 	def index2(self):
 			
 		cherrypy.session['page'] = 1
-		cherrypy.session['pages'] = 10
+		cherrypy.session['pages'] = 100
 		cherrypy.session['tests'] = len(cherrypy.session['audio'])
 		cherrypy.session['results'] = []
 		for cherrypy.session['n'] in xrange(cherrypy.session['tests']): cherrypy.session['results'].append([None])
 
 		cherrypy.session['ts'] = []
-		for cherrypy.session['k'] in xrange(10):
+		for cherrypy.session['k'] in xrange(1):
 			cherrypy.session['ts'].append(0)
 
                 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):
+                return audiotempl%TestPage.makeTuple(self, 1)
+		
+	def doAttrib(self, pageId, sessionId, submitButton, attribute1=None):
  			
 		print "################################# %s" %pageId
 
 		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)
 
-		cherrypy.session['pos'] = 10 * (cherrypy.session['page'] - 1)		
+		cherrypy.session['pos'] = (cherrypy.session['page'] - 1)		
 	 
 		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)
       
 		
 		
 		cherrypy.session['page'] += 1
 		cherrypy.session['ts'] = []
-		cherrypy.session['npos'] = cherrypy.session['pos'] + 10
-		
-		cherrypy.session['m'] = 10
+		cherrypy.session['npos'] = cherrypy.session['pos'] + 1
+		
+		cherrypy.session['m'] = 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']
+		if cherrypy.session['page'] != 100:
+			return audiotempl%TestPage.makeTuple(self, cherrypy.session['m'])
+	        else:
+			return endtempl%resString
 
 	index.exposed = True
 	doAttrib.exposed = True
 	index2.exposed = True
 	doStart.exposed = True

 	def makeTuple(TestPage, nr):
 		cherrypy.session['nr'] = nr
 		cherrypy.session['ts'].append(cherrypy.session['page'])
 		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']
+			pos = (cherrypy.session['page'] - 1) + cherrypy.session['k']
 			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'])
 		print cherrypy.session['ts']

 			</p>'''
 			
 
 	def sendMail(TestPage):
 		cherrypy.session['file'] = './sessions/%s/%s.txt'%(cherrypy.session['sid'], TestPage.outfileid)
-		username = '[e-mail]'	 
-		password = 'perceptual'
-		fro = 'FX-Test <[e-mail]>'
-		to = ['[e-mail]', '[e-mail]']
-		msg = MIMEMultipart()
-		msg['From'] = fro
-		msg['To'] = COMMASPACE.join(to)
-		msg['Date'] = formatdate(localtime=True)
-		msg['Subject'] = 'fx perceptual listening test'
-		msg.attach( MIMEText('Attached are new results from the listening test.'))
-		part = MIMEBase('application', "octet-stream")
-		part.set_payload( open(cherrypy.session['file'],"rb").read() )
-		Encoders.encode_base64(part)
-		part.add_header('Content-Disposition', 'attachment; filename="%s"' % cherrypy.session['file'])
-		msg.attach(part)
-		server = smtplib.SMTP('smtp.gmail.com:587')
-		server.starttls()
-		server.login(username,password)
-		server.sendmail(fro, to, msg.as_string() )
-		server.close()
+#		username = '[e-mail]'
+#		password = 'perceptual'
+#		fro = 'FX-Test <[e-mail]>'
+#		to = ['[e-mail]', '[e-mail]']
+#		msg = MIMEMultipart()
+#		msg['From'] = fro
+#		msg['To'] = COMMASPACE.join(to)
+#		msg['Date'] = formatdate(localtime=True)
+#		msg['Subject'] = 'fx perceptual listening test'
+#		msg.attach( MIMEText('Attached are new results from the listening test.'))
+#		part = MIMEBase('application', "octet-stream")
+#		part.set_payload( open(cherrypy.session['file'],"rb").read() )
+#		Encoders.encode_base64(part)
+#		part.add_header('Content-Disposition', 'attachment; filename="%s"' % cherrypy.session['file'])
+#		msg.attach(part)
+#		server = smtplib.SMTP('smtp.gmail.com:587')
+#		server.starttls()
+#		server.login(username,password)
+#		server.sendmail(fro, to, msg.as_string() )
+#		server.close()
 
 
 class OutPage:
 	def index(self):
 		return '''