Index: /WAeUP_SRP/trunk/Accommodation.py
===================================================================
--- /WAeUP_SRP/trunk/Accommodation.py	(revision 622)
+++ /WAeUP_SRP/trunk/Accommodation.py	(revision 623)
@@ -11,4 +11,8 @@
 from Products.CPSCore.CPSBase import CPSBaseBTreeFolder as BaseBTreeFolder
 from Products.WAeUP_SRP.WAeUPTables import AccommodationTable
+import Globals
+import DateTime
+p_home = Globals.package_home(globals())
+i_home = Globals.INSTANCE_HOME
 
 class AccoFolder(CPSDocument): ###(
@@ -30,10 +34,13 @@
         generate the free Bedslist.
         """
-        freelist = AccommodationTable()
-        l = self.portal_catalog({'meta_type': "Accommodation"})
+        freelist = self.portal_accommodation
+        l = self.portal_catalog({'meta_type': "AccoHall"})
         halls = []
+        generated = []
+        generated.append('"Bed","BedType","Student"' % vars())
         for h in l:
             halls.append(h.getObject())
         for hall in halls:
+            #import pdb;pdb.set_trace()
             h = hall.getContent()
             reserved = [int(r) for r in h.reserved_rooms.split()]
@@ -47,9 +54,8 @@
                         for bed in 'ABCDEFGH'[:int(h.beds_per_room)]:
                             room_nr = floor*100 + room
+                            bt = 'xx'
                             if room_nr in reserved:
-                                print room_nr
-                                continue
-                            bt = 'xx'
-                            if bed in h.beds_for_fresh:
+                                bt = "reserved"
+                            elif bed in h.beds_for_fresh:
                                 bt = 'fr'
                             elif bed in h.beds_for_returning:
@@ -58,12 +64,10 @@
                                 bt = 'fi'
                             bt = "%(sex)s_%(bt)s" % vars()
-                            uid = '%s_%d_%s' % (hall.getId(),room_nr,bed)
+                            uid = '%s_%d_%d_%s' % (hall.getId(),block,room_nr,bed)
                             print bt,uid
-                            freelist.addRecord(bed = uid)
-                            try:
-                                freelist.modifyRecord(uid, bed = bed, bed_type = bt)
-                            except ValueError,e:
-                                freelist.deleteRecord(uid)
-
+                            freelist.addRecord(bed = uid, bed_type = bt, student= '')
+                            generated.append('"%(uid)s","%(bt)s"' % vars())
+        current = DateTime.DateTime().strftime("%d-%m-%y_%H_%M_%S")
+        open("%s/import/bedlist_%s.csv" % (i_home,current),"w+").write('\n'.join(generated))
         return self.accommodation.academics_contents()
 
Index: /WAeUP_SRP/trunk/profiles/default/accommodation.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/accommodation.xml	(revision 623)
+++ /WAeUP_SRP/trunk/profiles/default/accommodation.xml	(revision 623)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<object name="portal_catalog" meta_type="CMF Catalog">
+ <column value="bed"/>
+ <column value="bed_type"/>
+ <column value="student"/>
+ <index name="bed" meta_type="FieldIndex">
+  <indexed_attr value="bed"/>
+ </index>
+ <index name="bed_type" meta_type="FieldIndex">
+  <indexed_attr value="bed_type"/>
+ </index>
+ <index name="student" meta_type="FieldIndex">
+  <indexed_attr value="student"/>
+ </index>
+</object>
Index: /WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml	(revision 622)
+++ /WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml	(revision 623)
@@ -35,7 +35,13 @@
   <permission value="View"/>
  </action>
- <action title="Add Accommodation Hall" action_id="new_entry"
+<action title="Add Accommodation Hall" action_id="new_entry"
     category="object" condition_expr=""
     url_expr="string:${object_url}/content_create?type_name=AccoHall"
+    visible="True">
+  <permission value="Modify portal content"/>
+ </action>
+<action title="Generate Bedslist" action_id="new_list"
+    category="object" condition_expr=""
+    url_expr="string:${object_url}/generateFreeBedsList"
     visible="True">
   <permission value="Modify portal content"/>
