← Back to branch summary

~ubuntu-branches/ubuntu/lucid/prewikka/lucid

« back to all changes in this revision

Viewing changes to prewikka/IDMEFDatabase.py

  • Committer: Bazaar Package Importer
  • Author(s): Pierre Chifflier
  • Date: 2008-07-02 16:49:06 UTC
  • mfrom: (6.1.2 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080702164906-q2bkfn6i40hd95tt
Tags: 0.9.14-2
* Update watch file
* Bump Standards version to 3.8.0 (no changes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
prewikka/IDMEFDatabase.py
367
367
        if self._db:
368
368
            self._db_destroy(self._db)
369
369
            
370
 
    def _getMessageIdents(self, get_message_idents, criteria, limit, offset):
 
370
    def _getMessageIdents(self, get_message_idents, criteria, limit, offset, order_by):
371
371
        if type(criteria) is list:
372
372
            if len(criteria) == 0:
373
373
                criteria = None
379
379
 
380
380
        idents = [ ]
381
381
    
 
382
        if order_by == "time_asc":
 
383
            order_by = PRELUDEDB_RESULT_IDENTS_ORDER_BY_CREATE_TIME_ASC
 
384
        else:
 
385
            order_by = PRELUDEDB_RESULT_IDENTS_ORDER_BY_CREATE_TIME_DESC
 
386
            
382
387
        try:    
383
 
            result = get_message_idents(self._db, criteria, limit, offset,
384
 
                                        PRELUDEDB_RESULT_IDENTS_ORDER_BY_CREATE_TIME_DESC)
 
388
            result = get_message_idents(self._db, criteria, limit, offset, order_by)
385
389
        except:
386
390
            self._freeDbParams(criteria=criteria)
387
391
            raise
394
398
        
395
399
        return DbResultIdents(result)
396
400
        
397
 
    def getAlertIdents(self, criteria=None, limit=-1, offset=-1):
398
 
        return self._getMessageIdents(preludedb_get_alert_idents2, criteria, limit, offset)
 
401
    def getAlertIdents(self, criteria=None, limit=-1, offset=-1, order_by="time_desc"):
 
402
        return self._getMessageIdents(preludedb_get_alert_idents2, criteria, limit, offset, order_by)
399
403
 
400
 
    def getHeartbeatIdents(self, criteria=None, limit=-1, offset=-1):
401
 
        return self._getMessageIdents(preludedb_get_heartbeat_idents2, criteria, limit, offset)
 
404
    def getHeartbeatIdents(self, criteria=None, limit=-1, offset=-1, order_by="time_desc"):
 
405
        return self._getMessageIdents(preludedb_get_heartbeat_idents2, criteria, limit, offset, order_by)
402
406
 
403
407
    def _getLastMessageIdent(self, type, get_message_idents, analyzerid):
404
408
        criteria = None