Changeset 7702 for trunk/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

01/03/13 08:46:17 (11 years ago)

Author:

acoutinho

Message:

Ticket #3259 - Otimizar carregamento de eventos no modulo ExpressoCalendar?

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -194 +194 @@
 
     public function findSchedulable(&$uri, &$params, &$criteria, $original) {
-        if (isset($criteria['filter'][2][1]) && $criteria['filter'][2][1] == 'calendar') {
-
-            $sql = ' SELECT calendar_object.id as id ,calendar_object.cal_uid as "uid", calendar_object.type_id as "type", '
-                .'calendar_object.dtstart as "startTime", calendar_object.summary as "summary", '
-                .'calendar_object.description as "description", calendar_object.dtend as "endTime" , '
-        .'calendar_object.priority as "priority", calendar_object.due as "due", '
-        .'calendar_object.percentage as "percentage", calendar_object.status as "status", '
-                .'calendar_object.location as "location", calendar_object.allday as "allDay", '
-                .'calendar_object.transp as "transparent", calendar_object.class_id as "class", '
-                .'calendar_object.repeat as "repeat", calendar_object.range_start as "rangeStart", '
-                .'calendar_object.range_end as "rangeEnd", calendar_object.last_update as "lastUpdate", '
-                .'calendar_object.dtstamp as "dtstamp", calendar_object.sequence as "sequence", '
-                .'calendar_object.tzid as "timezone" ,calendar_to_calendar_object.calendar_id as '
-                .'calendar FROM calendar_to_calendar_object , calendar_object '
-                .'WHERE ( calendar_to_calendar_object.calendar_id IN (\'' . implode('\',\'', $criteria['filter'][2][2]) . '\')) '
-                .'AND calendar_to_calendar_object.calendar_object_id = calendar_object.id '
-        .'AND calendar_object.id NOT IN(select calendar_object_task_id from calendar_task_to_activity_object where owner = \'' . Config::me('uidNumber') . '\') ';      
-            
-            if(isset($criteria['searchEvent']) && $criteria['searchEvent']){
-                $where = 'AND (((upper("summary") like upper(\'%'.$criteria['filter'][1][1][2].'%\') OR upper("description") like upper(\'%'.$criteria['filter'][1][2][2].'%\')))) ORDER BY dtstart LIMIT '.$criteria['limit'].'  OFFSET '.$criteria['offset'].' ';
-                $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);
-
-            }else{
-                $start = array( $criteria['filter'][1][1][1][2] , $criteria['filter'][1][2][1][2], $criteria['filter'][1][3][1][2] );
-                $end = array( $criteria['filter'][1][1][2][2] , $criteria['filter'][1][2][2][2], $criteria['filter'][1][3][2][2] );
-
-                $ids = array();
-                $occ = array();
-
-                if ($occurrences = self::checkOccurrences($start[0], $end[0], $criteria['filter'][2][2]))
-                    foreach ($occurrences as $id => $occurrence) {
-                        $ids[] = $id;
-                        $occ[] = $occurrence;
-                    }   
-
-                $where = 'AND ((range_end >= \'' . $start[0] . '\' AND range_end <= \'' . $end[0] . '\') OR '
-                        .'(range_start >= \'' . $start[1] . '\' AND range_start <= \'' . $end[1] . '\') OR '
-                        .'(range_start <= \'' . $start[2] . '\' AND range_end >= \'' . $end[2] . '\')) '
-                .(!empty($ids) ? ' ' .'AND calendar_object.id NOT IN (\'' . implode('\',\'', $ids) . '\') ' : ' ')
-                .'AND calendar_object.dtstart NOT IN (SELECT calendar_repeat_occurrence.occurrence from calendar_repeat_occurrence, '
-                .'calendar_repeat where (calendar_repeat_occurrence.repeat_id = calendar_repeat.id) '
-                .'AND (calendar_repeat.object_id = calendar_object.id))';
-
-                $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);
-                $params = array_merge($params, $occ);           
-            }
-            $params = self::deepnessFindEvent($uri, $params, $criteria, $original);
-            return false;
-        }
+        if (isset($criteria['customQuery']) && $criteria['customQuery'] == '1') {
+
+            $sql = ' SELECT calendar_object.id as id ,calendar_object.cal_uid as "uid", calendar_object.type_id as "type", '
+            .'calendar_object.dtstart as "startTime", calendar_object.summary as "summary", '
+            .'calendar_object.description as "description", calendar_object.dtend as "endTime" , '
+            .'calendar_object.priority as "priority", calendar_object.due as "due", '
+            .'calendar_object.percentage as "percentage", calendar_object.status as "status", '
+            .'calendar_object.location as "location", calendar_object.allday as "allDay", '
+            .'calendar_object.transp as "transparent", calendar_object.class_id as "class", '
+            .'calendar_object.repeat as "repeat", calendar_object.range_start as "rangeStart", '
+            .'calendar_object.range_end as "rangeEnd", calendar_object.last_update as "lastUpdate", '
+            .'calendar_object.dtstamp as "dtstamp", calendar_object.sequence as "sequence", '
+            .'calendar_object.tzid as "timezone" ,calendar_to_calendar_object.calendar_id as '
+            .'calendar FROM calendar_to_calendar_object , calendar_object '
+            .'WHERE ( calendar_to_calendar_object.calendar_id IN (\'' . implode('\',\'', $criteria['calendar']) . '\')) '
+            .'AND calendar_to_calendar_object.calendar_object_id = calendar_object.id '
+            .'AND calendar_object.id NOT IN(select calendar_object_task_id from calendar_task_to_activity_object where owner = \'' . Config::me('uidNumber') . '\') ';
+
+            if(isset($criteria['searchEvent']) && $criteria['searchEvent']){
+                $where = 'AND (((upper("summary") like upper(\'%'.$criteria['filter'][1][1][2].'%\') OR upper("description") like upper(\'%'.$criteria['filter'][1][2][2].'%\')))) ORDER BY dtstart LIMIT '.$criteria['limit'].'  OFFSET '.$criteria['offset'].' ';
+                $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);
+
+            }else{
+                $start = $criteria['rangeStart'];
+                $end = $criteria['rangeEnd'];
+
+                $ids = array();
+                $occ = array();
+
+                if ($occurrences = self::checkOccurrences($start, $end, $criteria['calendar']))
+                    foreach ($occurrences as $id => $occurrence) {
+                        $ids[] = $id;
+                        $occ[] = $occurrence;
+                    }
+
+                $where = 'AND ((range_end >= \'' . $start . '\' AND range_end <= \'' . $end . '\') OR '
+                    .'(range_start >= \'' . $start . '\' AND range_start <= \'' . $end . '\') OR '
+                    .'(range_start <= \'' . $start . '\' AND range_end >= \'' . $end . '\')) '
+                .(!empty($ids) ? ' ' .'AND calendar_object.id NOT IN (\'' . implode('\',\'', $ids) . '\') ' : ' ')
+                .'AND calendar_object.dtstart NOT IN (SELECT calendar_repeat_occurrence.occurrence from calendar_repeat_occurrence, '
+                .'calendar_repeat where (calendar_repeat_occurrence.repeat_id = calendar_repeat.id) '
+                .'AND (calendar_repeat.object_id = calendar_object.id))';
+
+                $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);
+                $params = array_merge($params, $occ);
+            }
+
+
+            $params = self::deepnessFindEvent($uri, $params, $criteria, $original);
+            return false;
+        }
     }
 
@@ -841 +843 @@
     }
 
+    //TODO: Remover apos suporte a deepness na api
+    public function findDeepnessOne(&$uri, &$params, &$criteria, $original){
+
+        if (isset($criteria['findOne']) && $criteria['findOne'] == '1') {
+
+            $sql = ' SELECT DISTINCT calendar_object.id as id ,calendar_object.cal_uid as "uid", calendar_object.type_id as "type", '
+                .'calendar_object.dtstart as "startTime", calendar_object.summary as "summary", '
+                .'calendar_object.description as "description", calendar_object.dtend as "endTime" , '
+                .'calendar_object.priority as "priority", calendar_object.due as "due", '
+                .'calendar_object.percentage as "percentage", calendar_object.status as "status", '
+                .'calendar_object.location as "location", calendar_object.allday as "allDay", '
+                .'calendar_object.transp as "transparent", calendar_object.class_id as "class", '
+                .'calendar_object.repeat as "repeat", calendar_object.range_start as "rangeStart", '
+                .'calendar_object.range_end as "rangeEnd", calendar_object.last_update as "lastUpdate", '
+                .'calendar_object.dtstamp as "dtstamp", calendar_object.sequence as "sequence", '
+                .'calendar_object.tzid as "timezone" '
+                .'FROM calendar_object '
+                .'WHERE ( calendar_object.id = '. $criteria['schedulable'] .')';
+
+            $params = Controller::service('PostgreSQL')->execResultSql($sql);
+
+            $params = self::deepnessFindEvent($uri, $params, $criteria, $original);
+            return false;
+        }
+
+
+
+    }
+
     //TODO: Remover apos suporte a deepness na api 
     public function deepnessFindEvent(&$uri, &$result, &$criteria, $original) {
-        if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != 0) {
+        if ((isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != 0) ) {
 
             $date = new DateTime('now', new DateTimeZone('UTC'));