Mercurial > kraina_muminkow
comparison frontend/mfrontend/db.py @ 25:3a26da290650
merge
| author | Michał Rudowicz <michal.rudowicz@fl9.eu> |
|---|---|
| date | Mon, 09 May 2011 10:49:01 +0200 |
| parents | b75a9ae3a060 9916d46ff096 |
| children | 28eb82047167 |
comparison
equal
deleted
inserted
replaced
| 24:3a2876457625 | 25:3a26da290650 |
|---|---|
| 133 sqlLine = "select * from jobs;" | 133 sqlLine = "select * from jobs;" |
| 134 else: | 134 else: |
| 135 sqlLine = "select * from jobs where " + sqlLine + ";" | 135 sqlLine = "select * from jobs where " + sqlLine + ";" |
| 136 result = query_db(sqlLine,parameters) | 136 result = query_db(sqlLine,parameters) |
| 137 # teraz trochę upiększamy wynik, np. pobierając nazwy użytkowników | 137 # teraz trochę upiększamy wynik, np. pobierając nazwy użytkowników |
| 138 index = 0 | |
| 138 for job in result: | 139 for job in result: |
| 140 job['index'] = index | |
| 139 job['username'] = get_user_name(job['owner_id']) | 141 job['username'] = get_user_name(job['owner_id']) |
| 140 job['state_text'] = states[job['state']] | 142 job['state_text'] = states[job['state']] |
| 143 index = index + 1 | |
| 141 return result | 144 return result |
| 142 | 145 |
| 143 def get_waiting_job(): | 146 def get_waiting_job(): |
| 144 """ Funkcja zwraca dane o najstarszym oczekującym zadaniu. | 147 """ Funkcja zwraca dane o najstarszym oczekującym zadaniu. |
| 145 | 148 |