Changeset 3090

Show
Ignore:
Timestamp:
01/17/08 20:32:25 (10 months ago)
Author:
ixokai
Message:

More random watcher fixes and pg-compatability things.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • announcerplugin/0.11/announcerplugin/subscribers/watchers.py

    r3089 r3090  
    3535        req.perm.require('%s_VIEW' % realm.upper()) 
    3636         
    37         self.toggle_watched(req.session.sid, not req.authname == 'anonymous', resource, req) 
     37        self.toggle_watched(req.session.sid, (not req.authname == 'anonymous') and 1 or 0, resource, req) 
    3838 
    3939        req.redirect(req.href(resource)) 
    …… 
    7777               AND category=%s 
    7878               AND rule=%s 
    79         """, (sid, authenticated and 1 or 0, 'watcher', realm, 'changed', resource)) 
     79        """, (sid, authenticated and 1 or 0, 'watcher', realm, '*', resource)) 
    8080         
    8181        result = cursor.fetchone() 
    …… 
    127127               AND category=%s 
    128128               AND rule=%s 
    129         """, (sid, authenticated, 'watcher', realm, 'changed', resource)) 
     129        """, (sid, authenticated, 'watcher', realm, '*', resource)) 
    130130         
    131131        if not use_db: 
    …… 
    249249                       AND category=%s 
    250250                       AND rule=%s 
    251                 """, ('watcher', event.realm, 'changed', self._get_target_identifier(event.realm, event.target))) 
     251                """, ('watcher', event.realm, '*', self._get_target_identifier(event.realm, event.target))) 
    252252             
    253253                for transport, sid in cursor.fetchall():