Changeset 309

Show
Ignore:
Timestamp:
04/04/05 23:45:19 (4 years ago)
Author:
johann
Message:

Imported changes for 0.2 version.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/database/job.py

    r308 r309  
    1 # Distributed Automatic Browser Screenshots 
     1# Browsershots 
    22# Copyright (C) 2005 Johann C. Rocholl <johann@rocholl.net> 
    33# 
     
    1818 
    1919""" 
    20 Database interface for the webshots.job table. 
     20Database interface for the job table. 
    2121""" 
    2222 
     
    2727import md5, time, random 
    2828 
    29 import shotdb.db as db 
     29import shotserver02.database as db 
    3030 
    3131default_history_timeout = 3600 * 36 # 36 hours 
     
    165165 
    166166def open_jobs_by_url(url): 
     167    """ 
     168    List open jobs for one URL. 
     169    """ 
    167170    db.cursor.execute("SELECT id, url, browser, resolution" + \ 
    168171                      " FROM job" + \ 
  • trunk/database/lock.py

    r308 r309  
    1 # Distributed Automatic Browser Screenshots 
     1# Browsershots 
    22# Copyright (C) 2005 Johann C. Rocholl <johann@rocholl.net> 
    33# 
     
    1818 
    1919""" 
    20 Database interface for the webshots.lock table. 
     20Database interface for the lock table. 
    2121""" 
    2222 
     
    2626 
    2727import MySQLdb 
    28 import shotdb.db as db 
     28import shotserver02.database as db 
    2929 
    3030class LockError(Exception):