[Perfparse-cvs] _perfparse/perfparse Makefile.am, 1.1.1.1, 1.2 Makefile.in, 1.21, 1.22 storage.h, 1.1.1.1, 1.2

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

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

Modified Files:
	Makefile.am Makefile.in storage.h 
Log Message:
some refactoring


Index: Makefile.in
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/perfparse/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile.in	18 Dec 2007 15:10:34 -0000	1.21
--- Makefile.in	3 Jan 2008 22:04:44 -0000	1.22
***************
*** 267,274 ****
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  @USE_DB_MYSQL_TRUE@GO_MYSQL = mysql
  @USE_DB_POSTGRESQL_TRUE@GO_POSTGRESSQL = postgresql
  PERFPARSE_MODULES_LOG2ANY = ${GO_MYSQL} ${GO_POSTGRESQL} stdout socket_output file_output gnuplot
! PERFPARSE_CFLAGS = '-DSYSCONFDIR="${sysconfdir}"' '-DLOCALEDIR="$(datadir)/locale"' ${ZLIB_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser -I${top_srcdir}/modules -I${top_srcdir}
  PERFPARSE_LIBS = -L${top_builddir}/libpp_common -lpp_common -L${top_builddir}/libnagios_perfdata_parser -lnagios_perfdata_parser ${GLIB_LIBS} @LTLIBINTL@
  PERFPARSE_LDFLAGS = 
--- 267,277 ----
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ 
+ # Perfparse storage module api. Change if API has changed.
+ STORAGE_MODULE_API_VERSION = 2
  @USE_DB_MYSQL_TRUE@GO_MYSQL = mysql
  @USE_DB_POSTGRESQL_TRUE@GO_POSTGRESSQL = postgresql
  PERFPARSE_MODULES_LOG2ANY = ${GO_MYSQL} ${GO_POSTGRESQL} stdout socket_output file_output gnuplot
! PERFPARSE_CFLAGS = '-DSYSCONFDIR="${sysconfdir}"' '-DLOCALEDIR="$(datadir)/locale"' ${ZLIB_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser -I${top_srcdir}/modules -I${top_srcdir} -DSTORAGE_MODULE_API_VERSION=${STORAGE_MODULE_API_VERSION}
  PERFPARSE_LIBS = -L${top_builddir}/libpp_common -lpp_common -L${top_builddir}/libnagios_perfdata_parser -lnagios_perfdata_parser ${GLIB_LIBS} @LTLIBINTL@
  PERFPARSE_LDFLAGS = 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/perfparse/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	26 Sep 2005 14:36:33 -0000	1.1.1.1
--- Makefile.am	3 Jan 2008 22:04:44 -0000	1.2
***************
*** 1,2 ****
--- 1,6 ----
+ # Perfparse storage module api. Change if API has changed.
+ STORAGE_MODULE_API_VERSION=2
+ 
+ 
  if USE_DB_MYSQL
    GO_MYSQL = mysql
***************
*** 9,13 ****
  PERFPARSE_MODULES_LOG2ANY=${GO_MYSQL} ${GO_POSTGRESQL} stdout socket_output file_output gnuplot
  
! PERFPARSE_CFLAGS='-DSYSCONFDIR="${sysconfdir}"' '-DLOCALEDIR="$(datadir)/locale"' ${ZLIB_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser -I${top_srcdir}/modules -I${top_srcdir}
  PERFPARSE_LIBS=-L${top_builddir}/libpp_common -lpp_common -L${top_builddir}/libnagios_perfdata_parser -lnagios_perfdata_parser ${GLIB_LIBS} @LTLIBINTL@
  PERFPARSE_LDFLAGS=
--- 13,17 ----
  PERFPARSE_MODULES_LOG2ANY=${GO_MYSQL} ${GO_POSTGRESQL} stdout socket_output file_output gnuplot
  
! PERFPARSE_CFLAGS='-DSYSCONFDIR="${sysconfdir}"' '-DLOCALEDIR="$(datadir)/locale"' ${ZLIB_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser -I${top_srcdir}/modules -I${top_srcdir} -DSTORAGE_MODULE_API_VERSION=${STORAGE_MODULE_API_VERSION}
  PERFPARSE_LIBS=-L${top_builddir}/libpp_common -lpp_common -L${top_builddir}/libnagios_perfdata_parser -lnagios_perfdata_parser ${GLIB_LIBS} @LTLIBINTL@
  PERFPARSE_LDFLAGS=

Index: storage.h
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/perfparse/storage.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** storage.h	26 Sep 2005 14:36:33 -0000	1.1.1.1
--- storage.h	3 Jan 2008 22:04:44 -0000	1.2
***************
*** 3,8 ****
   * storage.h - Parse Nagios data and store in relational database.
   *
!  * Copyright (c) 2004 Yves Mettier (yme...@li...)
!  * Last Modified:   2004-09-01
   *
   * License:
--- 3,10 ----
   * storage.h - Parse Nagios data and store in relational database.
   *
!  * Copyright (c) 2004-2007 Yves Mettier (yme...@li...)
!  *                         Florian Gleixner
!  * 
!  * $Id$
   *
   * License: