[PHPiCalendar-Commits] phpicalendar/lib/HTTP/CalDAV/Tools ReportParser.php,1.2,1.3

[<ja...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/lib/HTTP/CalDAV/Tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12006/lib/HTTP/CalDAV/Tools

Modified Files:
	ReportParser.php 
Log Message:
 * Working filter support for REPORT responses - at least time-range
 * TODO Move _parseComponent into separate file


Index: ReportParser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/lib/HTTP/CalDAV/Tools/ReportParser.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReportParser.php	13 Apr 2006 21:14:17 -0000	1.2
--- ReportParser.php	13 Apr 2006 22:33:13 -0000	1.3
***************
*** 167,175 ****
  
          if (count($this->_names) == 2 && end($this->_names) == 'prop') {
!             $prop = array('name' => $name);
! 
!             if ($ns) {
!                 $prop['ns'] = $ns;
!             }
  
              if ($name == 'calendar-data') {
--- 167,171 ----
  
          if (count($this->_names) == 2 && end($this->_names) == 'prop') {
!             $prop = array('name' => $name, 'ns' => $ns);
  
              if ($name == 'calendar-data') {
***************
*** 184,198 ****
  
          if ($name == 'comp') {
!             end($this->_comps);
! 
!             // Gross - end returns a copy of the last value
!             $comp =& $this->_comps[key($this->_comps)];
! 
!             if (!is_array($comp['comps'])) {
!                 $comp['comps'] = array();
              }
  
!             $comp['comps'][$attrs['name']] = array();
!             $this->_comps[] =& $comp['comps'][$attrs['name']];
              $this->_names[] = $name;
              return;
--- 180,191 ----
  
          if ($name == 'comp') {
!             if (!is_array($this->_comps[count($this->_comps) - 1]['comps'])) {
!                 $this->_comps[count($this->_comps) - 1]['comps'] = array();
              }
  
!             $this->_comps[count($this->_comps) - 1]['comps'][$attrs['name']] =
!                 array();
!             $this->_comps[] =& $this->_comps[count($this->_comps) - 1]['comps']
!                 [$attrs['name']];
              $this->_names[] = $name;
              return;
***************
*** 200,213 ****
  
          if (end($this->_names) == 'comp' && $name == 'prop') {
!             end($this->_comps);
! 
!             // Gross - end returns a copy of the last value
!             $comp =& $this->_comps[key($this->_comps)];
! 
!             if (!is_array($comp['props'])) {
!                 $comp['props'] = array();
              }
  
!             $comp['props'][] = $attrs['name'];
              $this->_names[] = $name;
              return;
--- 193,201 ----
  
          if (end($this->_names) == 'comp' && $name == 'prop') {
!             if (!is_array($this->_comps[count($this->_comps) - 1]['props'])) {
!                 $this->_comps[count($this->_comps) - 1]['props'] = array();
              }
  
!             $this->_comps[count($this->_comps) - 1]['props'][] = $attrs['name'];
              $this->_names[] = $name;
              return;
***************
*** 221,235 ****
  
          if ($name == 'comp-filter') {
!             end($this->_comps);
! 
!             // Gross - end returns a copy of the last value
!             $comp =& $this->_comps[key($this->_comps)];
! 
!             if (!is_array($comp['comps'])) {
!                 $comp['comps'] = array();
              }
  
!             $comp['comps'][$attrs['name']] = array();
!             $this->_comps[] =& $comp['comps'][$attrs['name']];
              $this->_names[] = $name;
              return;
--- 209,220 ----
  
          if ($name == 'comp-filter') {
!             if (!is_array($this->_comps[count($this->_comps) - 1]['comps'])) {
!                 $this->_comps[count($this->_comps) - 1]['comps'] = array();
              }
  
!             $this->_comps[count($this->_comps) - 1]['comps'][$attrs['name']] =
!                 array();
!             $this->_comps[] =& $this->_comps[count($this->_comps) - 1]['comps']
!                 [$attrs['name']];
              $this->_names[] = $name;
              return;
***************
*** 237,252 ****
  
          if (end($this->_names) == 'comp-filter') {
!             end($this->_comps);
! 
!             // Gross - end returns a copy of the last value
!             $comp =& $this->_comps[key($this->_comps)];
! 
!             if (!is_array($comp['filters'])) {
!                 $comp['filters'] = array();
              }
  
!             $filter = array('name' => $name, 'value' => $attrs);
! 
!             $comp['filters'][] = $filter;
              $this->_names[] = $name;
              return;
--- 222,231 ----
  
          if (end($this->_names) == 'comp-filter') {
!             if (!is_array($this->_comps[count($this->_comps) - 1]['filters'])) {
!                 $this->_comps[count($this->_comps) - 1]['filters'] = array();
              }
  
!             $this->_comps[count($this->_comps) - 1]['filters'][] =
!                 array('name' => $name, 'value' => $attrs);
              $this->_names[] = $name;
              return;