0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed all instances of dateconstruct()...

Browse source 
...with the more general rangeconstruct(). Added unique game-id
generation to rows added to GAMES/GAMES_MP.
This commit is contained in:
Gregory Shikhman 2009-08-15 19:20:11 +00:00
parent ae446c35ec
commit 435280f3eb
5 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
website/stats.wesnoth.org/helperlib.py
View file

@ -80,14 +80,6 @@ def fconstruct_helper(filters,newfilter):
filters += " WHERE "
filters += newfilter
return filters
#@TODO: replace all instances of this with rangeconstruct
def dateconstruct(filters,start_date,end_date):
if len(filters) != 0:
filters += " AND "
else:
filters += " WHERE "
filters += "timestamp BETWEEN '"+start_date+"' AND '"+end_date+"'"
return filters
def rangeconstruct(filters,colname,start,end):
if len(filters) != 0:

2
website/stats.wesnoth.org/wesstats/controllers/killview.py
View file

@ -85,7 +85,7 @@ class KillGraphController(BaseController):
startdate = ""
enddate = ""
if 'startdate' in kw and 'enddate' in kw and helperlib.is_valid_date(kw['startdate']) and helperlib.is_valid_date(kw['enddate']):
filters = helperlib.dateconstruct(filters,kw['startdate'],kw['enddate'])
filters = helperlib.rangeconstruct(filters,"timestamp",kw['startdate'],kw['enddate'])
used_filters.append("dates")
ufilters_vals["dates"] = [kw['startdate'] + " to " + kw['enddate']]
startdate = kw['startdate']

2
website/stats.wesnoth.org/wesstats/controllers/lineview.py
View file

@ -73,7 +73,7 @@ class LineGraphController(BaseController):
filters = helperlib.fconstruct(filters,filter,filter_vals)
ufilters_vals[filter] = filter_vals
if 'startdate' in kw and 'enddate' in kw and helperlib.is_valid_date(kw['startdate']) and helperlib.is_valid_date(kw['enddate']):
filters = helperlib.dateconstruct(filters,kw['startdate'],kw['enddate'])
filters = helperlib.rangeconstruct(filters,"timestamp",kw['startdate'],kw['enddate'])
used_filters.append("dates")
ufilters_vals["dates"] = [kw['startdate'] + " to " + kw['enddate']]
startdate = kw['startdate']

2
website/stats.wesnoth.org/wesstats/controllers/pieview.py
View file

@ -63,7 +63,7 @@ class PieGraphController(BaseController):
filters = helperlib.fconstruct(filters,filter,filter_vals)
ufilters_vals[filter] = filter_vals
if 'startdate' in kw and 'enddate' in kw and helperlib.is_valid_date(kw['startdate']) and helperlib.is_valid_date(kw['enddate']):
filters = helperlib.dateconstruct(filters,kw['startdate'],kw['enddate'])
filters = helperlib.rangeconstruct(filters,"timestamp",kw['startdate'],kw['enddate'])
used_filters.append("dates")
ufilters_vals["dates"] = [kw['startdate'] + " to " + kw['enddate']]
startdate = kw['startdate']

3
website/stats.wesnoth.org/wesstats/controllers/root.py
View file

@ -137,14 +137,13 @@ class RootController(BaseController):
params = (
wml_tree["game"]["scenario"],
map_id.hexdigest(),
0, #@TODO: retrieve actual game_id of the game this is from from GAMES table
kill["attack"]["turn"],
killed_id,
killed_lvl,
killer_id,
killer_lvl,
killed_position[0]+","+killed_position[1] )
curs.execute("INSERT INTO KILLMAP VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s)",params)
curs.execute("INSERT INTO KILLMAP VALUES (%s,%s,LAST_INSERT_ID(),%s,%s,%s,%s,%s,%s)",params)
conn.close()
return dict()