Download as
Browse Code »

Commit 7cbb363ae28a3176f3f810583c7e55a123b9b9f8

Authored by Tássia Camões Araújo
1 parent 8922be6e
Exists in master and in 1 other branch add_vagrant

Fixed bug when running more rounds than strategies.

Showing 1 changed file with 5 additions and 1 deletions   Show diff stats
src/web/survey.py
  Diff comments   View file @7cbb363
@@ -79,12 +79,13 @@ class Package: @@ -79,12 +79,13 @@ class Package:
79 class Request: 79 class Request:
80 def __init__(self,web_input,submissions_dir,user_id=0,pkgs_list=0): 80 def __init__(self,web_input,submissions_dir,user_id=0,pkgs_list=0):
81 self.strategy = "" 81 self.strategy = ""
  82 + print "Request from user",user_id
82 if user_id: 83 if user_id:
83 self.user_id = user_id 84 self.user_id = user_id
84 self.outputdir = os.path.join(submissions_dir,user_id) 85 self.outputdir = os.path.join(submissions_dir,user_id)
85 else: 86 else:
86 self.outputdir = tempfile.mkdtemp(prefix='',dir=submissions_dir) 87 self.outputdir = tempfile.mkdtemp(prefix='',dir=submissions_dir)
87 - print "created dir %s",self.outputdir 88 + print ("created dir %s" % self.outputdir)
88 self.user_id = self.outputdir.lstrip(submissions_dir) 89 self.user_id = self.outputdir.lstrip(submissions_dir)
89 90
90 if pkgs_list: 91 if pkgs_list:
@@ -169,6 +170,7 @@ class Survey: @@ -169,6 +170,7 @@ class Survey:
169 request = Request(web_input,self.submissions_dir) 170 request = Request(web_input,self.submissions_dir)
170 else: 171 else:
171 user_id = web_input['user_id'].encode('utf8') 172 user_id = web_input['user_id'].encode('utf8')
  173 + print "Continue", user_id
172 with open("./submissions/%s/packages_list" % user_id) as packages_list: 174 with open("./submissions/%s/packages_list" % user_id) as packages_list:
173 pkgs_list = [line.strip() for line in packages_list.readlines()] 175 pkgs_list = [line.strip() for line in packages_list.readlines()]
174 request = Request(web_input,self.submissions_dir,user_id,pkgs_list) 176 request = Request(web_input,self.submissions_dir,user_id,pkgs_list)
@@ -184,6 +186,8 @@ class Survey: @@ -184,6 +186,8 @@ class Survey:
184 print "OLD Strategies", old_strategies[0] 186 print "OLD Strategies", old_strategies[0]
185 strategies = [s for s in self.strategies if s not in old_strategies[0]] 187 strategies = [s for s in self.strategies if s not in old_strategies[0]]
186 print "LEFT",strategies 188 print "LEFT",strategies
  189 + if not strategies:
  190 + return render.thanks(user_id)
187 request.strategy = random.choice(strategies) 191 request.strategy = random.choice(strategies)
188 print "selected",request.strategy 192 print "selected",request.strategy
189 self.rec.set_strategy(request.strategy) 193 self.rec.set_strategy(request.strategy)