[Perfparse-cvs] _perfparse-phpgui perfparse.php, 1.45, 1.46 utils.php, 1.34, 1.35

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

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

Modified Files:
	perfparse.php utils.php 
Log Message:
fix workflow in edit policies and made schema changes in utils working


Index: utils.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** utils.php	22 Feb 2007 16:26:54 -0000	1.34
--- utils.php	1 Jun 2007 10:54:04 -0000	1.35
***************
*** 377,384 ****
      }
  
!     $query ='SELECT s.host_name, s.service_description, r.ctime, r.txt_data, nagios_status, s.service_id ';
!     $query.='FROM perfdata_service s, perfdata_service_raw r, perfdata_host h ';
!     $query.='WHERE r.id = s.last_perfdata_raw AND s.host_name = h.host_name ';
!     $query.='AND h.group_name=? ';
      $bindvars=array($group);
      if($normal==false || $warning==false || $critical==false || $unknown==false) {
--- 377,383 ----
      }
  
!     $query ='SELECT h.host_name, s.service_description, r.ctime, r.txt_data, nagios_status, s.service_id ';
!     $query.='FROM perfdata_service s, perfdata_service_raw r, perfdata_host h, perfdata_host_groups hg, perfdata_groups g ';
!     $query.='WHERE g.group_name=? and g.group_id=hg.group_id and hg.host_id=h.host_id and h.host_id=s.host_id and r.id = s.last_perfdata_raw';
      $bindvars=array($group);
      if($normal==false || $warning==false || $critical==false || $unknown==false) {
***************
*** 424,427 ****
--- 423,427 ----
        die();
      }
+     // echo "<pre>"; print_r($ret); echo "</pre>";
      return($ret);
    }

Index: perfparse.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** perfparse.php	29 Dec 2006 23:19:24 -0000	1.45
--- perfparse.php	1 Jun 2007 10:54:03 -0000	1.46
***************
*** 520,523 ****
--- 520,524 ----
  	     $smarty->assign('sql_error',$db->ErrorMsg());
  	   }
+      $smarty->assign('edit_policy',false); // switch to create policy after editing
  	 } else {
  	   // policy was created