diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index 2125c46..58c0a55 100644 Binary files a/locales/de/LC_MESSAGES/loops.mo and b/locales/de/LC_MESSAGES/loops.mo differ diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index ffc763d..dcd9da5 100644 --- a/locales/de/LC_MESSAGES/loops.po +++ b/locales/de/LC_MESSAGES/loops.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: $Id$\n" "POT-Creation-Date: 2007-05-22 12:00 CET\n" -"PO-Revision-Date: 2008-10-15 12:00 CET\n" +"PO-Revision-Date: 2008-11-01 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -377,3 +377,6 @@ msgstr "loops-Notiz anlegen" msgid "State information for $definition: $title" msgstr "Status ($definition): $title" +msgid "User ID" +msgstr "Benutzerkennung" + diff --git a/organize/tracking/README.txt b/organize/tracking/README.txt index f2c34d8..487038c 100644 --- a/organize/tracking/README.txt +++ b/organize/tracking/README.txt @@ -89,6 +89,7 @@ in the request; all collected data are then written triggered by the EndRequestEvent. >>> from loops.organize.tracking.access import logfile_option, record, logAccess + >>> #from loops.organize.tracking.access import AccessRecordManagerView >>> from loops.organize.tracking.access import AccessRecordManager >>> from loops.organize.tracking.tests import testDir >>> from loops.browser.node import NodeView @@ -121,7 +122,8 @@ of job control. >>> len(access) 0 - >>> rm = AccessRecordManager(loopsRoot, TestRequest()) + >>> #rm = AccessRecordManagerView(loopsRoot, TestRequest()) + >>> rm = AccessRecordManager(loopsRoot) >>> rm.baseDir = testDir >>> rm.loadRecordsFromLog() >>> len(access) @@ -138,7 +140,7 @@ Tracking Reports >>> result['macro'][4][1][u'define-macro'] u'overview' >>> result['data'] - [{'access': 2, 'new': 0, 'changed': 1, 'period': '2008-11', 'count': 3}] + [{'access': 2, 'new': 0, 'changed': 1, 'period': '...', 'count': 3}] Fin de partie diff --git a/organize/tracking/access.py b/organize/tracking/access.py index 3ac479e..fe8e801 100644 --- a/organize/tracking/access.py +++ b/organize/tracking/access.py @@ -38,6 +38,7 @@ from cybertools.tracking.btree import Track, getTimeStamp from cybertools.tracking.interfaces import ITrack from cybertools.tracking.logfile import Logger, loggers from loops.interfaces import ILoopsObject +from loops.organize.job.base import JobManager from loops.organize.tracking.base import BaseRecordManager from loops import util @@ -95,15 +96,17 @@ def marshall(data): # record manager -class AccessRecordManager(BaseRecordManager): +class AccessRecordManager(BaseRecordManager, JobManager): storageName = 'access' - def __init__(self, context, request): + def __init__(self, context): self.context = context - self.request = request self.baseDir = util.getVarDirectory() + def process(self): + self.loadRecordsFromLog() + @Lazy def logfile(self): value = self.options(logfile_option) @@ -161,6 +164,16 @@ class AccessRecordManager(BaseRecordManager): timeStamp=timeStamp) +class AccessRecordManagerView(AccessRecordManager): + # obsolete, records are now loaded via AccessRecordManager adapter + # that is called via a job executor view. + + def __init__(self, context, request): + self.context = context + self.request = request + self.baseDir = util.getVarDirectory() + + class IAccessRecord(ITrack): pass diff --git a/organize/tracking/configure.zcml b/organize/tracking/configure.zcml index d452e10..53d52f4 100644 --- a/organize/tracking/configure.zcml +++ b/organize/tracking/configure.zcml @@ -26,6 +26,14 @@ + + + + +