[Phpgroupware-cvs] CVS: cdb/inc class.bo_filter.inc.php,1.1,1.2

[Patrick Walsh <address@hidden>]

Update of /cvsroot/phpgroupware/cdb/inc
In directory subversions:/tmp/cvs-serv16860/inc

Modified Files:
        class.bo_filter.inc.php 
Log Message:
minor edits... switching to another machine so i need to commit...


Index: class.bo_filter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/cdb/inc/class.bo_filter.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.bo_filter.inc.php     20 Mar 2002 19:37:03 -0000      1.1
--- class.bo_filter.inc.php     21 Mar 2002 21:01:52 -0000      1.2
***************
*** 57,61 ****
                        if (!isset($filter_name))
                        {
!                               // TODO: Raise error
                                return FALSE;
                        }
--- 57,61 ----
                        if (!isset($filter_name))
                        {
!                               // TODO: Raise error: no filter name set
                                return FALSE;
                        }
***************
*** 71,75 ****
                        else
                        {
!                               //TODO: Raise error
                                return FALSE;
                        }
--- 71,75 ----
                        else
                        {
!                               //TODO: Raise error: no such filter name
                                return FALSE;
                        }
***************
*** 191,195 ****
                                        * code simply because it was such hell 
to design  *
                                        * it.  And then I'm going to do the 
same thing    *
!                                       * client side that this did db side.    
          *
                                        
\*************************************************/
                                /*      $sql_cat = 'CREATE TEMPORARY TABLE ' .
--- 191,195 ----
                                        * code simply because it was such hell 
to design  *
                                        * it.  And then I'm going to do the 
same thing    *
!                                       * client side that this did db side. 
-mr_e        *
                                        
\*************************************************/
                                /*      $sql_cat = 'CREATE TEMPORARY TABLE ' .
***************
*** 225,232 ****
                                                'WHERE 
phpgw_cdb_category_link.category_id='.
                                                        
'phpgw_cdb_category.category_id '.
!                                               'SORT BY entity_id';
                                        
$this->_db->query($sql_cat,__LINE__,__FILE__);
                                        $entity_id=0;
                                        $cat_str='';
                                        while ($this->_db->next_record())
                                        {
--- 225,237 ----
                                                'WHERE 
phpgw_cdb_category_link.category_id='.
                                                        
'phpgw_cdb_category.category_id '.
!                                               'ORDER BY entity_id,name';
                                        
$this->_db->query($sql_cat,__LINE__,__FILE__);
                                        $entity_id=0;
                                        $cat_str='';
+                                       
/*************************************************\
+                                       * Every row has one entity id and one 
category.   *
+                                       * We need to concat all the categories 
for each   *
+                                       * entity into a comma separated list.   
          *
+                                       
\*************************************************/
                                        while ($this->_db->next_record())
                                        {
***************
*** 334,338 ****
                        * Some notes: First, most criteria depends upon the  *
                        * proper tables being joined together.  This is the  *
!                       * same process as 
                }
  
--- 339,350 ----
                        * Some notes: First, most criteria depends upon the  *
                        * proper tables being joined together.  This is the  *
!                       * same process as eval_fields, so we'll reuse the    *
!                       * same routines for some things.                     *
!                       * To clarify: a person might want to select three    *
!                       * fields, a, b and c, where d=e.  If this is the     *
!                       * case, we need to be sure we've joined d and e even *
!                       * though we don't select those fields.               *
!                       \****************************************************/
!                       
                }