Changeset 6952

Timestamp:

26 Oct 2011, 03:54:42 (13 years ago)

Author:

Henrik Bettermann

Message:

Add logger and add hostels container to site root.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• app.py (modified) (2 diffs)
• hostels/container.py (modified) (2 diffs)
• hostels/hostel.py (modified) (1 diff)
• hostels/interfaces.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/app.py

@@ -8 +8 @@
 from waeup.sirp.datacenter import DataCenter
 from waeup.sirp.students.container import StudentsContainer
+from waeup.sirp.hostels.container import HostelsContainer
 from waeup.sirp.imagestorage import ImageStorageFileRetrieval, ImageStorage
 from waeup.sirp.interfaces import (
@@ -46 +47 @@
         self['students'] = StudentsContainer()
         self['configuration'] = ConfigurationContainer()
+        self['hostels'] = HostelsContainer()
         self._createPlugins()
 

main/waeup.sirp/trunk/src/waeup/sirp/hostels/container.py

@@ -21 +21 @@
 from waeup.sirp.hostels.interfaces import IHostelsContainer
 from waeup.sirp.utils.helpers import attrs_to_fields
+from waeup.sirp.utils.logger import Logger
 
-class HostelsContainer(grok.Container):
+class HostelsContainer(grok.Container, Logger):
     """This is a container for all kind of hostels.
     """
@@ -38 +39 @@
         raise NotImplementedError()
 
-HostelsContainer = attrs_to_fields(HostelsContainer)
+    def addHostel(self, hostel):
+        """Add a hostel.
+        """
+        if not IHostel.providedBy(hostel):
+            raise TypeError(
+                'HostelsContainers contain only IHostel instances')
+        self[hostel.hostel_id] = hostel
+        return
+
+    logger_name = 'waeup.sirp.${sitename}.hostels'
+    logger_filename = 'hostels.log'
+
+    def logger_info(self, ob_class, target, comment=None):
+        """Get the logger's info method.
+        """
+        user = get_current_principal()
+        if user is None:
+            user = 'system'
+        else:
+            user = user.id
+        self.logger.info('%s - %s - %s - %s' % (
+                user, ob_class, target, comment))
+        return

main/waeup.sirp/trunk/src/waeup/sirp/hostels/hostel.py

@@ -35 +35 @@
         return
 
+    def loggerInfo(self, ob_class, comment=None):
+        target = self.__name__
+        return grok.getSite()['hostels'].logger_info(ob_class,target,comment)
+
 Hostel = attrs_to_fields(Hostel)

main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py

@@ -14 +14 @@
 
     """
+
+    def loggerInfo(ob_class, comment):
+        """Adds an INFO message to the log file
+        """
+
+    hostel_id = schema.TextLine(
+        title = u'Student ID',
+        required = False,
+        )