Changeset 1596 for WAeUP_SRP/branches/joachim-event-branch/Accommodation.py

Timestamp:

19 Mar 2007, 21:45:44 (18 years ago)

Author:

joachim

Message:

merged changes from trunk to joachim-event-branch

File:

• WAeUP_SRP/branches/joachim-event-branch/Accommodation.py (modified) (5 diffs)

WAeUP_SRP/branches/joachim-event-branch/Accommodation.py

@@ -107 +107 @@
         no_import = []
         imported = []
-        logger = logging.getLogger('Import.%s' % name)
+        logger = logging.getLogger('Accommodation.AccoFolder.importReservedBeds')
         try:
             beds = csv.DictReader(open("%s/import/%s.csv" % (i_home,name),"rb"))
@@ -169 +169 @@
                     no_import.append( format_error % bed)
                     continue
-                halls[hall] = hall_doc = hall_object.getContent() 
+                halls[hall] = hall_doc = hall_object.getContent()
             bid = "%(hall)s_%(block)s_%(room)s_%(bed)s" % bed
             res = accommodation(bed = bid)
@@ -201 +201 @@
                     acco_doc.edit(mapping={'bed': bid})
                     member = self.portal_membership.getAuthenticatedMember()
-                    logger.info('"%s","changed reserved bed %s for","%s"' % (member,bid,sid))
+                    logger.info('%s changed reserved bed %s for %s' % (member,bid,sid))
             accommodation.modifyRecord(bed = bid, student = sid)
             imported.append( format % bed)
@@ -227 +227 @@
         return self.REQUEST.RESPONSE.redirect("%s" % self.REQUEST.get('URL1'))
 
-        
+
 InitializeClass(AccoFolder)
 
@@ -256 +256 @@
 InitializeClass(AccoHall)
 
-    
+
 def addAccoHall(container, id, REQUEST=None, **kw):
     """Add a AccoHall."""