1.1 --- a/db.py	Fri Oct 01 23:23:26 2010 +0200
     1.2 +++ b/db.py	Tue Oct 05 14:44:31 2010 +0200
     1.3 @@ -170,7 +170,7 @@
     1.4  def activity_id(db_file, name):
     1.5  	return row_id(db_file, "activities", name)
     1.6  
     1.7 -def end(db_file, project, activity, time):
     1.8 +def end(db_file, project, activity, time, log):
     1.9  	print "ending: %s:%s" % (project, activity)
    1.10  	if activity or project:		
    1.11  		if not activity:
    1.12 @@ -180,11 +180,12 @@
    1.13  		
    1.14  		con, cur = session(db_file)
    1.15  		if activity == "all" and project == "all":
    1.16 -			values = (time,)
    1.17 -			sql = "update tasks set end=? where end is null"
    1.18 +			values = (time, log)
    1.19 +			sql = "update tasks set end=?, log=? where end is null"
    1.20  		else:
    1.21 -			values = (time, project_id(db_file, project), activity_id(db_file, activity))
    1.22 -			sql = "update tasks set end=? where project=? and activity=?"
    1.23 +			values = (time, log, project_id(db_file, project), 
    1.24 +						activity_id(db_file, activity))
    1.25 +			sql = "update tasks set end=?, log=? where project=? and activity=?"
    1.26  		cur.execute(sql, values)
    1.27  		con.commit()
    1.28  		cur.close()
    1.29 @@ -199,7 +200,7 @@
    1.30  	elif not activity:
    1.31  			activity = DEF_ACTIVITY
    1.32  	if activity != last_activity or project != last_project:
    1.33 -		end(db_file, last_project, last_activity, time)
    1.34 +		end(db_file, last_project, last_activity, time, None)
    1.35  		con, cur = session(db_file)
    1.36  		values = (time, None, project_id(db_file, project), 
    1.37  					activity_id(db_file, activity), None)
    1.38 @@ -220,26 +221,21 @@
    1.39  def pause(db_file, project, activity, time):
    1.40  	print "pausing" 
    1.41  	if not is_paused(db_file, time):
    1.42 -		project = find_last_project(db_file, time) 
    1.43 -		activity = find_last_activity(db_file, time)
    1.44 +		task = find_active_task(db_file)
    1.45  		con, cur = session(db_file)
    1.46 -		values = (time, None, project_id(db_file, project), 
    1.47 -					activity_id(db_file, activity), None)
    1.48 -		sql = "insert into breaks values(?, ?, ?, ?, ?)"
    1.49 +		values = (time, None, task, None)
    1.50 +		sql = "insert into breaks values(?, ?, ?, ?)"
    1.51  		cur.execute(sql, values)
    1.52  		con.commit()
    1.53  		cur.close()
    1.54  	test(db_file)
    1.55  
    1.56 -def resume(db_file, project, activity, time):
    1.57 +def resume(db_file, task, time, log):
    1.58  	print "resuming"
    1.59 -	if is_paused(db_file, time):
    1.60 -		task = find_active_task(db_file)
    1.61 -		activity = find_last_activity(db_file, time)
    1.62 -		project = find_last_project(db_file, time) 			
    1.63 +	if is_paused(db_file, time):		
    1.64  		con, cur = session(db_file)
    1.65 -		values = (time, project_id(db_file, project), activity_id(db_file, activity))
    1.66 -		sql = "update breaks set end=? where project=? and activity=?"
    1.67 +		values = (time, log, task)
    1.68 +		sql = "update breaks set end=?, log=? where task=?"
    1.69  		cur.execute(sql, values)
    1.70  		con.commit()
    1.71  		cur.close()