Changeset 6200

Timestamp:

05/15/12 18:10:19 (12 years ago)

Author:

acoutinho

Message:

Ticket #2741 - Duplicacao de eventos com repeticao que comecao no mesmo dia da ocorrencia

File:

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

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

@@ -122 +122 @@
                 .'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' . (!empty($ids) ? ' '
-                .'AND calendar_object.id NOT IN (\'' . implode('\',\'', $ids) . '\') ' : ' ');  
+                .'AND calendar_to_calendar_object.calendar_object_id = calendar_object.id ';    
             
             if(isset($criteria['searchEvent']) && $criteria['searchEvent']){
@@ -144 +143 @@
                 $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] . '\')) ';
-
+                        .'(range_start <= \'' . $start[2] . '\' AND range_end >= \'' . $end[2] . '\')) '
+                .(!empty($ids) ? ' ' .'AND calendar_object.id NOT IN (\'' . implode('\',\'', $ids) . '\') ' : ' ');
+
+                
+                ob_start();
+                print_r($sql.$where);
+
+                $output = ob_get_clean();
+                file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+
+                
                 $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);
-                $params = array_merge($params, $occ);
+                $params = array_merge($params, $occ);           
             }
             $params = self::deepnessFindEvent($uri, $params, $criteria, $original);