Changeset 7e6678 in indico

Timestamp:

08/23/11 15:38:55 (21 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

e3162f

Parents:

a2a484

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (05/26/11 14:46:10)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (08/23/11 15:38:55)

Message:

[IMP] Much faster day queries for RB

• added 'day' parameter for single day queries;

Location:

indico

Files:

• MaKaC/plugins/RoomBooking/default/reservation.py (modified) (1 diff)
• MaKaC/plugins/RoomBooking/export.py (modified) (3 diffs)
• web/http_api/export.py (modified) (3 diffs)

indico/MaKaC/plugins/RoomBooking/default/reservation.py

@@ -253 +253 @@
             for day in days:
                 dayResvs = Reservation.getDayReservationsIndexRoot().get( day )
+
                 if dayResvs:
                     for resv in dayResvs:

indico/MaKaC/plugins/RoomBooking/export.py

@@ -22 +22 @@
 import fnmatch
 import itertools
+from dateutil import rrule
 from datetime import datetime, timedelta
 from indico.web.http_api import ExportInterface, Exporter
@@ -210 +211 @@
 
     def _getQueryParams(self, qdata):
-        fromDT = get_query_parameter(qdata, ['f', 'from'])
-        toDT = get_query_parameter(qdata, ['t', 'to'])
-        self._fromDT = utcdate(ExportInterface._getDateTime('from', fromDT, self._tz)) if fromDT != None else None
-        self._toDT = utcdate(ExportInterface._getDateTime('to', toDT, self._tz, aux=self._fromDT)) if toDT != None else None
+        super(RoomBookingExportInterface, self)._getQueryParams(qdata)
+
+        self._fromDT = utcdate(self._fromDT) if self._fromDT else None
+        self._toDT = utcdate(self._toDT) if self._toDT else None
         self._resvFilter = getResvStateFilter(qdata)
-
 
     @staticmethod
@@ -321 +321 @@
         locList = filter(lambda loc: Location.parse(loc) is not None, locList)
 
+        if self._fromDT or self._toDT:
+            daysParam = (day.date() for day in rrule.rrule(rrule.DAILY, dtstart=self._fromDT, until=self._toDT))
+        else:
+            # slow!
+            daysParam = None
+
         for loc in sorted(locList):
-            resvs = CrossLocationQueries.getReservations(location=loc, resvExample=resvEx)
+            resvs = CrossLocationQueries.getReservations(location=loc, resvExample=resvEx, days=daysParam)
             for obj in self._process(resvs, filter=self._resvFilter):
                 yield obj

indico/web/http_api/export.py

@@ -251 +251 @@
             return tz.localize(value.combine(value.date(), time(23, 59, 59)))
 
+    def _getQueryParams(self, qdata):
+        fromDT = get_query_parameter(qdata, ['f', 'from'])
+        toDT = get_query_parameter(qdata, ['t', 'to'])
+        dayDT = get_query_parameter(qdata, ['day'])
+
+        if (fromDT or toDT) and dayDT:
+            raise HTTPAPIError("'day' can only be used without 'from' and 'to'", apache.HTTP_BAD_REQUEST)
+        elif dayDT:
+            fromDT = toDT = dayDT
+
+        self._fromDT = ExportInterface._getDateTime('from', fromDT, self._tz)
+        self._toDT = ExportInterface._getDateTime('to', toDT, self._tz, aux=self._fromDT)
+
     def _limitIterator(self, iterator, limit):
         counter = 0
@@ -355 +368 @@
 
     def category(self, idlist, qdata):
-        fromDT = get_query_parameter(qdata, ['f', 'from'])
-        toDT = get_query_parameter(qdata, ['t', 'to'])
+        super(CategoryEventExporter, self)._getQueryParams()
         location = get_query_parameter(qdata, ['l', 'location'])
         room = get_query_parameter(qdata, ['r', 'room'])
-
-        fromDT = ExportInterface._getDateTime('from', fromDT, self._tz) if fromDT != None else None
-        toDT = ExportInterface._getDateTime('to', toDT, self._tz, aux=fromDT) if toDT != None else None
 
         idx = IndexesHolder().getById('categoryDate')
@@ -379 +388 @@
 
         for catId in idlist:
-            for obj in self._process(idx.iterateObjectsIn(catId, fromDT, toDT), filter, IConferenceMetadataFossil):
+            for obj in self._process(idx.iterateObjectsIn(catId, self._fromDT, self._toDT), filter, IConferenceMetadataFossil):
                 yield obj