[Perfparse-cvs] _perfparse-phpgui perfparse.php, 1.41, 1.42 utils.php, 1.29, 1.30

[Florian G. <re...@us...>]

Update of /cvsroot/perfparse/_perfparse-phpgui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12477

Modified Files:
	perfparse.php utils.php 
Log Message:
fixed add_amend_host_group for new db schema


Index: utils.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** utils.php	10 Nov 2006 14:53:28 -0000	1.29
--- utils.php	29 Nov 2006 14:06:02 -0000	1.30
***************
*** 411,417 ****
  
    function get_groups_hostcount(&$db) {
!     $query='SELECT g.group_name, count(h.host_name) as count ';
!     $query.='from perfdata_host_group g left join perfdata_host h ';
!     $query.='on g.group_name=h.group_name group by g.group_name';
      $ret=$db->GetAll($query);
      // print_r($ret);
--- 411,418 ----
  
    function get_groups_hostcount(&$db) {
!     $query='SELECT g.group_name,g.group_id , count(hg.host_id) as count ';
!     $query.='from perfdata_groups g left join perfdata_host_groups hg ';
!     $query.='on g.group_id=hg.group_id group by g.group_name,g.group_id ';
!     $query.='order by g.group_name';
      $ret=$db->GetAll($query);
      // print_r($ret);
***************
*** 419,438 ****
    }
  
!   function delete_group(&$db,$group_name) {
       // check if group is empty
!      $query='SELECT count(*) from perfdata_host where group_name=?';
!      $count=$db->GetOne($query,array($group_name));
       if ($count!=0) {
! 	return(false);
       } else {
! 	$query='delete from perfdata_host_group where group_name=?';
! 	$db->Execute($query,array($group_name));
! 	return(true);
       }
    }
  
    function add_group(&$db,$group_name) {
!      $query='insert into perfdata_host_group (group_name) values (?)';
       $db->Execute($query,array($group_name));
    }
  
--- 420,449 ----
    }
  
!   function delete_group_by_id(&$db,$group_id) {
       // check if group is empty
!      $query='SELECT count(hg.host_id) from perfdata_host_groups hg 
!        where hg.group_id=?';
!      $count=$db->GetOne($query,array($group_id));
       if ($count!=0) {
! 	     return(false);
       } else {
! 	     $query='delete from perfdata_groups where group_id=?';
! 	     $db->Execute($query,array($group_id));
!        if ($db->ErrorNo() != 0) {
!          return(false);
!        } else {
! 	       return(true);
!        }
       }
    }
  
    function add_group(&$db,$group_name) {
!      $query='insert into perfdata_groups (group_name) values (?)';
       $db->Execute($query,array($group_name));
+      if ($db->ErrorNo() != 0) {
+        return(false);
+      } else {
+        return(true);
+      }
    }
  

Index: perfparse.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** perfparse.php	10 Nov 2006 14:53:28 -0000	1.41
--- perfparse.php	29 Nov 2006 14:06:02 -0000	1.42
***************
*** 407,417 ****
      case 'add_amend_host_group':
        if(isset($_REQUEST['delete'])) {
! 	 // delete group if empty
! 	 delete_group($db,$_REQUEST['delete']);
        }
  
        // handle add group here
        if(isset($_REQUEST['add_group_name']) && !empty($_REQUEST['add_group_name'])) {
! 	 add_group($db,$_REQUEST['add_group_name']);
        }
  
--- 407,421 ----
      case 'add_amend_host_group':
        if(isset($_REQUEST['delete'])) {
!         // delete group if empty
!         if(!delete_group_by_id($db,$_REQUEST['delete'])) {
!           $smarty->assign('sql_error',$db->ErrorMsg());
!         }
        }
  
        // handle add group here
        if(isset($_REQUEST['add_group_name']) && !empty($_REQUEST['add_group_name'])) {
!         if(!add_group($db,$_REQUEST['add_group_name'])){
!           $smarty->assign('sql_error',$db->ErrorMsg());
!         }
        }
  
***************
*** 422,428 ****
        break;
      case 'edit_host_list':
!       get_request_var('group_name','string','');
        get_request_var('action','string','');
!       get_request_var('host_name','string','');
  
        $groups=get_groups($db);
--- 426,432 ----
        break;
      case 'edit_host_list':
!       get_request_var('group_id','int','');
        get_request_var('action','string','');
!       get_request_var('host_id','int','');
  
        $groups=get_groups($db);