Menu
▾
▴
perfparse-cvs — CVS commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(19) |
Oct
(10) |
Nov
(14) |
Dec
(58) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(5) |
Mar
(33) |
Apr
(31) |
May
(3) |
Jun
(30) |
Jul
(4) |
Aug
(26) |
Sep
(23) |
Oct
|
Nov
(6) |
Dec
(56) |
| 2008 |
Jan
(12) |
Feb
(9) |
Mar
(2) |
Apr
(8) |
May
(2) |
Jun
(3) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
|
Nov
(16) |
Dec
(4) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(36) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: Florian G. <re...@us...> - 2007-04-09 22:39:10
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22056/db_tools Modified Files: convert.c Log Message: fixed some mem leaks Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** convert.c 3 Apr 2007 22:21:07 -0000 1.25 --- convert.c 9 Apr 2007 22:39:09 -0000 1.26 *************** *** 69,72 **** --- 69,74 ---- void init_caches(void); int get_policyId_from_name(const char *policy_name, MYSQL *db_mysql_new); + void end_curses(void); + void exit_curses(int endval); // global caches. Translates names to id (e.g. host_name to host_id) *************** *** 95,103 **** g_string_printf(gsNDBSql, "select policy_id from perfdata_delete_policy where policy_name='%s'",policy_name); query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); if((result_row_new=mysql_fetch_row(query_result_new))) { ! return(atoi(result_row_new[0])); } else { ! return(FALSE); } } } --- 97,113 ---- g_string_printf(gsNDBSql, "select policy_id from perfdata_delete_policy where policy_name='%s'",policy_name); query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); + g_string_free(gsNDBSql,TRUE); if((result_row_new=mysql_fetch_row(query_result_new))) { ! Pid=atoi(result_row_new[0]); } else { ! Pid=FALSE; } + // cleanup + g_string_free(gsNDBSql,TRUE); + dbtool_freeResult(query_result_new); + // save result in cache + g_hash_table_insert(policiesCache,(gpointer) policy_name,&Pid); + + return(Pid); } } *************** *** 117,125 **** g_string_printf(gsNDBSql, "select group_id from perfdata_groups where group_name='%s'",group_name); query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); if((result_row_new=mysql_fetch_row(query_result_new))) { ! return(atoi(result_row_new[0])); } else { ! return(FALSE); } } } --- 127,143 ---- g_string_printf(gsNDBSql, "select group_id from perfdata_groups where group_name='%s'",group_name); query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); + g_string_free(gsNDBSql,TRUE); if((result_row_new=mysql_fetch_row(query_result_new))) { ! Gid=atoi(result_row_new[0]); } else { ! Gid=FALSE; } + // cleanup + g_string_free(gsNDBSql,TRUE); + dbtool_freeResult(query_result_new); + // save result in cache + g_hash_table_insert(groupsCache,(gpointer) group_name,&Gid); + + return(Gid); } } *************** *** 138,147 **** gsNDBSql = g_string_new (""); g_string_printf(gsNDBSql, "select host_id from perfdata_host where host_name='%s'",host_name); ! query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); if((result_row_new=mysql_fetch_row(query_result_new))) { ! return(atoi(result_row_new[0])); } else { ! return(FALSE); } } } --- 156,172 ---- gsNDBSql = g_string_new (""); g_string_printf(gsNDBSql, "select host_id from perfdata_host where host_name='%s'",host_name); ! query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); if((result_row_new=mysql_fetch_row(query_result_new))) { ! Hid=atoi(result_row_new[0]); } else { ! Hid=FALSE; } + // cleanup + g_string_free(gsNDBSql,TRUE); + dbtool_freeResult(query_result_new); + // save result in cache + g_hash_table_insert(hostsCache,(gpointer) host_name,&Hid); + + return(Hid); } } *************** *** 390,394 **** if (!mysql_init (&db_mysql_old) || !mysql_init (&db_mysql_new)) { printw(_("Cannot initialise MySQL\n")); refresh(); ! exit(EXIT_FAILURE); } --- 415,419 ---- if (!mysql_init (&db_mysql_old) || !mysql_init (&db_mysql_new)) { printw(_("Cannot initialise MySQL\n")); refresh(); ! exit_curses(EXIT_FAILURE); } *************** *** 399,403 **** mysql_error(&db_mysql_old)); refresh(); ! exit(EXIT_FAILURE); } --- 424,428 ---- mysql_error(&db_mysql_old)); refresh(); ! exit_curses(EXIT_FAILURE); } *************** *** 408,412 **** mysql_error(&db_mysql_new)); refresh(); ! exit(EXIT_FAILURE); } --- 433,437 ---- mysql_error(&db_mysql_new)); refresh(); ! exit_curses(EXIT_FAILURE); } *************** *** 420,424 **** if((iODBnumFields=mysql_num_fields(query_result_old))!=1) { printw(_("Original perfdata_host_groups table modified! Bailing out")); ! exit(EXIT_FAILURE); } iODBnumrows=dbtool_rows(query_result_old); --- 445,449 ---- if((iODBnumFields=mysql_num_fields(query_result_old))!=1) { printw(_("Original perfdata_host_groups table modified! Bailing out")); ! exit_curses(EXIT_FAILURE); } iODBnumrows=dbtool_rows(query_result_old); *************** *** 727,733 **** } ! printw (_("Conversions complete.\n")); } char *read_string_from_line(char *buf, size_t length, const char* defaultval) { --- 752,769 ---- } ! printw (_("Conversions complete.\n")); refresh(); ! sleep(5); ! end_curses(); ! } ! ! void exit_curses(int exitval) { ! end_curses(); ! exit(exitval); } + void end_curses(void) { + endwin(); + // delscreen(stdscr); + } char *read_string_from_line(char *buf, size_t length, const char* defaultval) { *************** *** 745,749 **** if(scanw(fmtstr,buf) == ERR) { ! if(my==y) { move(y-1,x); } else { --- 781,785 ---- if(scanw(fmtstr,buf) == ERR) { ! if(my-1==y) { move(y-1,x); } else { *************** *** 766,770 **** if(scanw("%d",&result) == ERR) { ! if(my==y) { move(y-1,x); } else { --- 802,806 ---- if(scanw("%d",&result) == ERR) { ! if(my-1==y) { move(y-1,x); } else { *************** *** 795,799 **** sql, mysql_error(p_tmp_db_mysql)); refresh(); ! exit(EXIT_FAILURE); } --- 831,835 ---- sql, mysql_error(p_tmp_db_mysql)); refresh(); ! exit_curses(EXIT_FAILURE); } |
|
From: Florian G. <re...@us...> - 2007-04-03 22:21:09
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30932/db_tools Modified Files: convert.c Log Message: schema fine tuning and more conversion Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** convert.c 1 Apr 2007 22:39:44 -0000 1.24 --- convert.c 3 Apr 2007 22:21:07 -0000 1.25 *************** *** 494,498 **** if(result_row_old[2]!=NULL) { iRawPolicyInd=atoi(result_row_old[2])*86400; ! g_string_append_printf(gsNDBSql,",raw_delete_individual"); g_string_append_printf(gsNDBSql2,",%d",iRawPolicyInd); } --- 494,498 ---- if(result_row_old[2]!=NULL) { iRawPolicyInd=atoi(result_row_old[2])*86400; ! g_string_append_printf(gsNDBSql,",raw_delete_policy_individual"); g_string_append_printf(gsNDBSql2,",%d",iRawPolicyInd); } *************** *** 506,510 **** if(result_row_old[5]!=NULL) { iBinPolicyInd=atoi(result_row_old[5])*86400; ! g_string_append_printf(gsNDBSql,",bin_delete_individual"); g_string_append_printf(gsNDBSql2,",%d",iBinPolicyInd); } --- 506,510 ---- if(result_row_old[5]!=NULL) { iBinPolicyInd=atoi(result_row_old[5])*86400; ! g_string_append_printf(gsNDBSql,",bin_delete_policy_individual"); g_string_append_printf(gsNDBSql2,",%d",iBinPolicyInd); } *************** *** 528,532 **** printw(_("\ndone\n")); refresh(); ! /* --- 528,582 ---- printw(_("\ndone\n")); refresh(); ! ! ! // Step 4 ! iStep++; ! printw(_("(Step %d of %d)\n"),iStep,iNumSteps); ! printw(_("Copying data of perfdata_service table.\n")); ! refresh(); ! ! g_string_printf(gsODBSql, "select host_name,service_description,last_perfdata_raw,raw_delete_policy,raw_delete_policy_name,raw_delete_policy_type,is_deleted from perfdata_service"); ! query_result_old=dbtool_mysql_query(gsODBSql->str, &db_mysql_old,query_result_old); ! iODBnumrows=dbtool_rows(query_result_old); ! printw("Affected rows: %d\n",iODBnumrows);refresh(); ! getyx(stdscr,y,x); ! i=0; ! ! ! while ((result_row_old=mysql_fetch_row(query_result_old))) { ! i++; ! int iRawPolicyId=-1; ! int iRawPolicyInd=-1; ! int Hid=-1; ! ! move(y,x); ! piODBlengths=mysql_fetch_lengths(query_result_old); ! ! printw(_("Copying entry %d/%d"),i,iODBnumrows); refresh(); ! Hid=get_hostId_from_name(result_row_old[0],&db_mysql_new); ! g_string_printf(gsNDBSql, "insert ignore into perfdata_service(host_id,service_description,is_deleted"); ! g_string_printf(gsNDBSql2," values(%d,'%s',%s",Hid,result_row_old[1],result_row_old[6]); ! // get raw delete policy id if template ! if(strncmp(result_row_old[5],"template",4)==0) { ! iRawPolicyId=get_policyId_from_name(result_row_old[4],&db_mysql_new); ! g_string_append_printf(gsNDBSql,",raw_delete_policy_id"); ! g_string_append_printf(gsNDBSql2,",%d",iRawPolicyId); ! } else { ! if(result_row_old[3]!=NULL) { ! iRawPolicyInd=atoi(result_row_old[3])*86400; ! g_string_append_printf(gsNDBSql,",raw_delete_policy_individual"); ! g_string_append_printf(gsNDBSql2,",%d",iRawPolicyInd); ! } ! } ! ! g_string_append_printf(gsNDBSql2,")"); ! g_string_append_printf(gsNDBSql,")%s",gsNDBSql2->str); ! ! // printw("debug: Sql Statement: %s\n",gsNDBSql->str);refresh(); ! dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); ! } ! printw(_("\ndone\n")); refresh(); ! ! /* |
|
From: Florian G. <re...@us...> - 2007-04-03 22:21:09
|
Update of /cvsroot/perfparse/_perfparse/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30932/scripts Modified Files: mysql_create.sql Log Message: schema fine tuning and more conversion Index: mysql_create.sql =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_create.sql,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mysql_create.sql 1 Apr 2007 22:45:14 -0000 1.12 --- mysql_create.sql 3 Apr 2007 22:21:07 -0000 1.13 *************** *** 42,46 **** host_name VARCHAR(75) UNIQUE, raw_delete_policy_id INTEGER, ! raw_delete_individual INTEGER, INDEX host_ix1 (raw_delete_policy_id), FOREIGN KEY perfdata_host_ibfk_1 (raw_delete_policy_id) --- 42,46 ---- host_name VARCHAR(75) UNIQUE, raw_delete_policy_id INTEGER, ! raw_delete_policy_individual INTEGER, INDEX host_ix1 (raw_delete_policy_id), FOREIGN KEY perfdata_host_ibfk_1 (raw_delete_policy_id) *************** *** 65,69 **** host_id INT, FOREIGN KEY perfdata_host_groups_ibfk_2 (host_id) ! REFERENCES perfdata_host(host_id) ON DELETE CASCADE ) type=InnoDB; --- 65,70 ---- host_id INT, FOREIGN KEY perfdata_host_groups_ibfk_2 (host_id) ! REFERENCES perfdata_host(host_id) ON DELETE CASCADE, ! UNIQUE (group_id,host_id) ) type=InnoDB; *************** *** 74,78 **** CREATE TABLE IF NOT EXISTS perfdata_service ( ! service_id INT PRIMARY KEY, host_id INT NOT NULL, service_description VARCHAR(75) NOT NULL, --- 75,79 ---- CREATE TABLE IF NOT EXISTS perfdata_service ( ! service_id INT AUTO_IMCREMENT PRIMARY KEY, host_id INT NOT NULL, service_description VARCHAR(75) NOT NULL, |
|
From: Florian G. <re...@us...> - 2007-04-01 22:45:15
|
Update of /cvsroot/perfparse/_perfparse/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14154 Modified Files: mysql_create.sql Log Message: small fix Index: mysql_create.sql =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_create.sql,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mysql_create.sql 22 Feb 2007 16:26:54 -0000 1.11 --- mysql_create.sql 1 Apr 2007 22:45:14 -0000 1.12 *************** *** 53,57 **** REFERENCES perfdata_delete_policy (policy_id) ON DELETE SET NULL, ! is_deleted TINYINT DEFAULT 0 ) type=InnoDB; --- 53,57 ---- REFERENCES perfdata_delete_policy (policy_id) ON DELETE SET NULL, ! is_deleted TINYINT NOT NULL DEFAULT 0 ) type=InnoDB; |
|
From: Florian G. <re...@us...> - 2007-04-01 22:39:46
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11501/db_tools Modified Files: convert.c Log Message: work on conversion Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** convert.c 29 Mar 2007 22:44:23 -0000 1.23 --- convert.c 1 Apr 2007 22:39:44 -0000 1.24 *************** *** 70,74 **** int get_policyId_from_name(const char *policy_name, MYSQL *db_mysql_new); - // global caches. Translates names to id (e.g. host_name to host_id) GHashTable *policiesCache=NULL; --- 70,73 ---- *************** *** 94,99 **** GString *gsNDBSql; gsNDBSql = g_string_new (""); ! g_string_printf(gsNDBSql, "select policy_id from perfdata_delete_policy where policy_name='%s')",policy_name); ! dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); if((result_row_new=mysql_fetch_row(query_result_new))) { return(atoi(result_row_new[0])); --- 93,120 ---- GString *gsNDBSql; gsNDBSql = g_string_new (""); ! g_string_printf(gsNDBSql, "select policy_id from perfdata_delete_policy where policy_name='%s'",policy_name); ! query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); ! if((result_row_new=mysql_fetch_row(query_result_new))) { ! return(atoi(result_row_new[0])); ! } else { ! return(FALSE); ! } ! } ! } ! ! int get_groupId_from_name(const char *group_name, MYSQL *p_db_mysql_new) { ! int *pGid; ! int Gid; ! ! if((pGid=g_hash_table_lookup(groupsCache,group_name))) { ! Gid=*pGid; ! return(Gid); ! } else { ! MYSQL_RES *query_result_new = NULL; ! MYSQL_ROW result_row_new; ! GString *gsNDBSql; ! gsNDBSql = g_string_new (""); ! g_string_printf(gsNDBSql, "select group_id from perfdata_groups where group_name='%s'",group_name); ! query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); if((result_row_new=mysql_fetch_row(query_result_new))) { return(atoi(result_row_new[0])); *************** *** 104,107 **** --- 125,152 ---- } + int get_hostId_from_name(const char *host_name, MYSQL *p_db_mysql_new) { + int *pHid; + int Hid; + + if((pHid=g_hash_table_lookup(hostsCache,host_name))) { + Hid=*pHid; + return(Hid); + } else { + MYSQL_RES *query_result_new = NULL; + MYSQL_ROW result_row_new; + GString *gsNDBSql; + gsNDBSql = g_string_new (""); + g_string_printf(gsNDBSql, "select host_id from perfdata_host where host_name='%s'",host_name); + query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); + if((result_row_new=mysql_fetch_row(query_result_new))) { + return(atoi(result_row_new[0])); + } else { + return(FALSE); + } + } + } + + + void install_database (void) *************** *** 176,179 **** --- 221,225 ---- GString *gsNDBSql = g_string_new (""); + GString *gsNDBSql2 = g_string_new (""); GString *gsODBSql = g_string_new (""); *************** *** 431,450 **** i++; int iRawPolicyId=-1,iBinPolicyId=-1; move(y,x); piODBlengths=mysql_fetch_lengths(query_result_old); printw(_("Copying entry %d/%d"),i,iODBnumrows); refresh(); // get raw delete policy id if template if(strncmp(result_row_old[4],"user",4)!=0) { iRawPolicyId=get_policyId_from_name(result_row_old[3],&db_mysql_new); ! // debug ! // printw("Raw Policy Id: %d",iRawPolicyId); } ! if(strncmp(result_row_old[7],"user",4)!=0) { iBinPolicyId=get_policyId_from_name(result_row_old[6],&db_mysql_new); } ! ! g_string_printf(gsNDBSql, "insert into perfdata_host"); //g_string_printf(gsNDBSql, ""); // todo: copy policies, host info and popuplate perfdata_host_groups ! //dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); } printw(_("\ndone\n")); refresh(); --- 477,528 ---- i++; int iRawPolicyId=-1,iBinPolicyId=-1; + int iRawPolicyInd=-1,iBinPolicyInd=-1; + int Hid=-1,Gid=-1; + move(y,x); piODBlengths=mysql_fetch_lengths(query_result_old); + printw(_("Copying entry %d/%d"),i,iODBnumrows); refresh(); + g_string_printf(gsNDBSql, "insert ignore into perfdata_host(host_name,is_deleted"); + g_string_printf(gsNDBSql2," values('%s',%s",result_row_old[0],result_row_old[8]); // get raw delete policy id if template if(strncmp(result_row_old[4],"user",4)!=0) { iRawPolicyId=get_policyId_from_name(result_row_old[3],&db_mysql_new); ! g_string_append_printf(gsNDBSql,",raw_delete_policy_id"); ! g_string_append_printf(gsNDBSql2,",%d",iRawPolicyId); ! } else { ! if(result_row_old[2]!=NULL) { ! iRawPolicyInd=atoi(result_row_old[2])*86400; ! g_string_append_printf(gsNDBSql,",raw_delete_individual"); ! g_string_append_printf(gsNDBSql2,",%d",iRawPolicyInd); ! } } ! ! if(strncmp(result_row_old[7],"user",4)!=0) { iBinPolicyId=get_policyId_from_name(result_row_old[6],&db_mysql_new); + g_string_append_printf(gsNDBSql,",bin_delete_policy_id"); + g_string_append_printf(gsNDBSql2,",%d",iBinPolicyId); + } else { + if(result_row_old[5]!=NULL) { + iBinPolicyInd=atoi(result_row_old[5])*86400; + g_string_append_printf(gsNDBSql,",bin_delete_individual"); + g_string_append_printf(gsNDBSql2,",%d",iBinPolicyInd); + } } ! g_string_append_printf(gsNDBSql2,")"); ! g_string_append_printf(gsNDBSql,")%s",gsNDBSql2->str); ! ! // printw("debug: Sql Statement: %s\n",gsNDBSql->str);refresh(); //g_string_printf(gsNDBSql, ""); // todo: copy policies, host info and popuplate perfdata_host_groups ! dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); ! // get host_id and group_id (cached) for filling perfdata_host_groups table ! if(result_row_old[1]!=NULL) { // NULL means no group ! Hid=get_hostId_from_name(result_row_old[0],&db_mysql_new); ! Gid=get_groupId_from_name(result_row_old[1],&db_mysql_new); ! // printw("debug: Hid=%d, Gid=%d\n",Hid,Gid); refresh(); ! g_string_printf(gsNDBSql, "insert ignore into perfdata_host_groups(group_id,host_id) values(%d,%d)",\ ! Gid,Hid); ! dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); ! } } printw(_("\ndone\n")); refresh(); *************** *** 664,669 **** if (mysql_query(p_tmp_db_mysql, sql)) { ! printw(_("A error occured executing the sql command %s. The error message is: %s"), sql, mysql_error(p_tmp_db_mysql)); exit(EXIT_FAILURE); } --- 742,748 ---- if (mysql_query(p_tmp_db_mysql, sql)) { ! printw(_("\nA error occured executing the sql command: %s\nThe error message is: %s\n"), sql, mysql_error(p_tmp_db_mysql)); + refresh(); exit(EXIT_FAILURE); } |
|
From: Florian G. <re...@us...> - 2007-03-29 22:44:25
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3706/db_tools Modified Files: convert.c Log Message: more conversion Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** convert.c 26 Mar 2007 22:26:45 -0000 1.22 --- convert.c 29 Mar 2007 22:44:23 -0000 1.23 *************** *** 67,70 **** --- 67,106 ---- char *read_string_from_line(char *buf, size_t length, const char* defaultval); int read_int_from_line(int defaultval); + void init_caches(void); + int get_policyId_from_name(const char *policy_name, MYSQL *db_mysql_new); + + + // global caches. Translates names to id (e.g. host_name to host_id) + GHashTable *policiesCache=NULL; + GHashTable *groupsCache=NULL; + GHashTable *hostsCache=NULL; + + void init_caches(void) { + policiesCache=g_hash_table_new(g_str_hash,g_str_equal); + groupsCache=g_hash_table_new(g_str_hash,g_str_equal); + hostsCache=g_hash_table_new(g_str_hash,g_str_equal); + } + + int get_policyId_from_name(const char *policy_name, MYSQL *p_db_mysql_new) { + int *pPid; + int Pid; + + if((pPid=g_hash_table_lookup(policiesCache,policy_name))) { + Pid=*pPid; + return(Pid); + } else { + MYSQL_RES *query_result_new = NULL; + MYSQL_ROW result_row_new; + GString *gsNDBSql; + gsNDBSql = g_string_new (""); + g_string_printf(gsNDBSql, "select policy_id from perfdata_delete_policy where policy_name='%s')",policy_name); + dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new); + if((result_row_new=mysql_fetch_row(query_result_new))) { + return(atoi(result_row_new[0])); + } else { + return(FALSE); + } + } + } void *************** *** 150,153 **** --- 186,192 ---- // ncurses variables int iNCrows, iNCcols; + + // init cache tables + init_caches(); // init ncurses *************** *** 354,366 **** iStep++; printw(_("(Step %d of %d)\n"),iStep,iNumSteps); ! printw(_("Copying data of perfdata_host table.\n")); refresh(); ! g_string_printf(gsODBSql, "select * from perfdata_host"); query_result_old=dbtool_mysql_query(gsODBSql->str, &db_mysql_old,query_result_old); - if((iODBnumFields=mysql_num_fields(query_result_old))!=10) { - printw(_("Original perfdata_host table modified! Bailing out")); - exit(EXIT_FAILURE); - } iODBnumrows=dbtool_rows(query_result_old); printw("Affected rows: %d\n",iODBnumrows); --- 393,401 ---- iStep++; printw(_("(Step %d of %d)\n"),iStep,iNumSteps); ! printw(_("Copying data of perfdata_delete_policy table.\n")); refresh(); ! g_string_printf(gsODBSql, "select policy_name,delete_policy from perfdata_delete_policy"); query_result_old=dbtool_mysql_query(gsODBSql->str, &db_mysql_old,query_result_old); iODBnumrows=dbtool_rows(query_result_old); printw("Affected rows: %d\n",iODBnumrows); *************** *** 372,375 **** --- 407,448 ---- piODBlengths=mysql_fetch_lengths(query_result_old); printw(_("Copying entry %d/%d"),i,iODBnumrows); refresh(); + g_string_printf(gsNDBSql, \ + "insert ignore into perfdata_delete_policy(policy_name,delete_policy_seconds) values ('%.*s',%d)",\ + (int) piODBlengths[0],result_row_old[0],atoi(result_row_old[1])*86400); // convert days to seconds + dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); + } + printw(_("\ndone\n")); refresh(); + + // Step 3 + iStep++; + printw(_("(Step %d of %d)\n"),iStep,iNumSteps); + printw(_("Copying data of perfdata_host table.\n")); + refresh(); + + g_string_printf(gsODBSql, "select host_name,group_name,raw_delete_policy,raw_delete_policy_name,raw_delete_policy_type,bin_delete_policy,bin_delete_policy_name,bin_delete_policy_type,is_deleted from perfdata_host"); + query_result_old=dbtool_mysql_query(gsODBSql->str, &db_mysql_old,query_result_old); + iODBnumrows=dbtool_rows(query_result_old); + printw("Affected rows: %d\n",iODBnumrows);refresh(); + getyx(stdscr,y,x); + i=0; + + + while ((result_row_old=mysql_fetch_row(query_result_old))) { + i++; + int iRawPolicyId=-1,iBinPolicyId=-1; + move(y,x); + piODBlengths=mysql_fetch_lengths(query_result_old); + printw(_("Copying entry %d/%d"),i,iODBnumrows); refresh(); + // get raw delete policy id if template + if(strncmp(result_row_old[4],"user",4)!=0) { + iRawPolicyId=get_policyId_from_name(result_row_old[3],&db_mysql_new); + // debug + // printw("Raw Policy Id: %d",iRawPolicyId); + } + if(strncmp(result_row_old[7],"user",4)!=0) { + iBinPolicyId=get_policyId_from_name(result_row_old[6],&db_mysql_new); + } + + g_string_printf(gsNDBSql, "insert into perfdata_host"); //g_string_printf(gsNDBSql, ""); // todo: copy policies, host info and popuplate perfdata_host_groups //dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); *************** *** 526,530 **** } ! printf (_("Conversions complete.\n")); } --- 599,603 ---- } ! printw (_("Conversions complete.\n")); } |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:35
|
Update of /cvsroot/perfparse/_perfparse/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/scripts Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:47 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:29 -0000 1.19 *************** *** 47,60 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 47,60 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 121,124 **** --- 121,125 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 184,193 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 185,191 ---- *************** *** 208,211 **** --- 206,212 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 214,217 **** --- 215,219 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 219,229 **** --- 221,234 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:33
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/phpgui Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.in 1 Mar 2007 23:52:02 -0000 1.9 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.10 *************** *** 48,61 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 48,61 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:32
|
Update of /cvsroot/perfparse/_perfparse/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/config Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/config/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:46 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:27 -0000 1.19 *************** *** 49,62 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 49,62 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 133,136 **** --- 133,137 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 196,205 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 197,203 ---- *************** *** 220,223 **** --- 218,224 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 226,229 **** --- 227,231 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 231,241 **** --- 233,246 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:32
|
Update of /cvsroot/perfparse/_perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668 Modified Files: Makefile.in aclocal.m4 config.h.in configure configure.ac Log Message: ncurses in autoconf/automake Index: aclocal.m4 =================================================================== RCS file: /cvsroot/perfparse/_perfparse/aclocal.m4,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** aclocal.m4 20 Dec 2006 22:57:45 -0000 1.15 --- aclocal.m4 28 Mar 2007 22:54:26 -0000 1.16 *************** *** 7249,7252 **** --- 7249,7253 ---- m4_include([m4/inttypes.m4]) m4_include([m4/inttypes_h.m4]) + m4_include([m4/isc-posix.m4]) m4_include([m4/lcmessage.m4]) m4_include([m4/lib-ld.m4]) Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:45 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:26 -0000 1.19 *************** *** 51,64 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 51,64 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 145,148 **** --- 145,149 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 208,217 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 209,215 ---- *************** *** 232,235 **** --- 230,236 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 238,241 **** --- 239,243 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 243,253 **** --- 245,258 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ Index: configure.ac =================================================================== RCS file: /cvsroot/perfparse/_perfparse/configure.ac,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** configure.ac 2 Dec 2006 21:31:08 -0000 1.21 --- configure.ac 28 Mar 2007 22:54:27 -0000 1.22 *************** *** 274,277 **** --- 274,282 ---- fi + # ncurses check + AC_CHECK_LIB(ncurses,printw,,AC_MSG_ERROR(ncurses development libraries not usable. + Install ncurses development libraries and rerun configure. + See config.log or FAQs for details.)) + # Checks for header files. AC_HEADER_STDC Index: config.h.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/config.h.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.h.in 9 Mar 2006 16:24:38 -0000 1.6 --- config.h.in 28 Mar 2007 22:54:26 -0000 1.7 *************** *** 117,120 **** --- 117,123 ---- #undef HAVE_LIBGD + /* Define to 1 if you have the `ncurses' library (-lncurses). */ + #undef HAVE_LIBNCURSES + /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H *************** *** 333,337 **** /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be ! automatically deduced at run-time. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses --- 336,340 ---- /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be ! automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses *************** *** 394,398 **** #undef malloc ! /* Define to `long' if <sys/types.h> does not define. */ #undef off_t --- 397,401 ---- #undef malloc ! /* Define to `long int' if <sys/types.h> does not define. */ #undef off_t *************** *** 410,414 **** #undef signed ! /* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t --- 413,417 ---- #undef signed ! /* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t Index: configure =================================================================== RCS file: /cvsroot/perfparse/_perfparse/configure,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** configure 20 Dec 2006 22:57:45 -0000 1.23 --- configure 28 Mar 2007 22:54:26 -0000 1.24 *************** *** 1,9 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.59 for perfparse 0.106.2. # # Report bugs to <per...@li...>. # ! # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. --- 1,10 ---- [...27017 lines suppressed...] *************** *** 30904,30912 **** esac done ;; esac ! done ! _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } --- 33153,33160 ---- esac done ;; + esac ! done # for ac_tag { (exit 0); exit 0; } |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:30
|
Update of /cvsroot/perfparse/_perfparse/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/contrib Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/contrib/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:46 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.19 *************** *** 46,59 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 46,59 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 117,120 **** --- 117,121 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 180,189 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 181,187 ---- *************** *** 204,207 **** --- 202,208 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 210,213 **** --- 211,215 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 215,225 **** --- 217,230 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:30
|
Update of /cvsroot/perfparse/_perfparse/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/m4 Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/m4/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:46 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.19 *************** *** 46,59 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 46,59 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 117,120 **** --- 117,121 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 180,189 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 181,187 ---- *************** *** 204,207 **** --- 202,208 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 210,213 **** --- 211,215 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 215,225 **** --- 217,230 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:30
|
Update of /cvsroot/perfparse/_perfparse/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/modules Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:46 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.19 *************** *** 47,60 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 47,60 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 198,201 **** --- 198,202 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 261,270 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 262,268 ---- *************** *** 285,288 **** --- 283,289 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 291,294 **** --- 292,296 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 296,306 **** --- 298,311 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:30
|
Update of /cvsroot/perfparse/_perfparse/perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/perfparse Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:47 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.19 *************** *** 48,61 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 48,61 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 151,154 **** --- 151,155 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 214,223 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 215,221 ---- *************** *** 238,241 **** --- 236,242 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 244,247 **** --- 245,249 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 249,259 **** --- 251,264 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:30
|
Update of /cvsroot/perfparse/_perfparse/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/images Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/images/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.in 20 Dec 2006 22:57:46 -0000 1.19 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.20 *************** *** 47,60 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 47,60 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 128,131 **** --- 128,132 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 191,200 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 192,198 ---- *************** *** 215,218 **** --- 213,219 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 221,224 **** --- 222,226 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 226,236 **** --- 228,241 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:29
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/libpp_mysql Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:46 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.19 *************** *** 47,60 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 47,60 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 145,148 **** --- 145,149 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 208,217 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 209,215 ---- *************** *** 232,235 **** --- 230,236 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 238,241 **** --- 239,243 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 243,253 **** --- 245,258 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:29
|
Update of /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/libnagios_perfdata_parser Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:46 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.19 *************** *** 47,60 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 47,60 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 144,147 **** --- 144,148 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 207,216 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 208,214 ---- *************** *** 231,234 **** --- 229,235 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 237,240 **** --- 238,242 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 242,252 **** --- 244,257 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:29
|
Update of /cvsroot/perfparse/_perfparse/libpp_postgresql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/libpp_postgresql Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_postgresql/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:46 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.19 *************** *** 47,60 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 47,60 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 145,148 **** --- 145,149 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 208,217 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 209,215 ---- *************** *** 232,235 **** --- 230,236 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 238,241 **** --- 239,243 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 243,253 **** --- 245,258 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:29
|
Update of /cvsroot/perfparse/_perfparse/libpp_common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/libpp_common Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_common/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:46 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.19 *************** *** 47,60 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 47,60 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 145,148 **** --- 145,149 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 208,217 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 209,215 ---- *************** *** 232,235 **** --- 230,236 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 238,241 **** --- 239,243 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 243,253 **** --- 245,258 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:29
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/db_tools Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.in 14 Mar 2007 00:05:40 -0000 1.19 --- Makefile.in 28 Mar 2007 22:54:28 -0000 1.20 *************** *** 48,61 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 48,61 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) |
|
From: Florian G. <re...@us...> - 2007-03-28 22:54:28
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8668/cgi Modified Files: Makefile.in Log Message: ncurses in autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Dec 2006 22:57:45 -0000 1.18 --- Makefile.in 28 Mar 2007 22:54:27 -0000 1.19 *************** *** 48,61 **** $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ ! $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ! $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ ! $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ ! $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ ! $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ ! $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ ! $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ ! $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ ! $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) --- 48,61 ---- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ! $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ ! $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ! $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ ! $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ ! $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ ! $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ ! $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ ! $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ ! $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ ! $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) *************** *** 171,174 **** --- 171,175 ---- GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ *************** *** 234,243 **** ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ - ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --- 235,241 ---- *************** *** 258,261 **** --- 256,262 ---- cgidir = @cgidir@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ *************** *** 264,267 **** --- 265,269 ---- host_os = @host_os@ host_vendor = @host_vendor@ + htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ *************** *** 269,279 **** --- 271,284 ---- libdir = @libdir@ libexecdir = @libexecdir@ + localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ phpuidir = @phpuidir@ prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |
|
From: Florian G. <re...@us...> - 2007-03-26 22:26:47
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26018/db_tools Modified Files: convert.c Log Message: now really start convert Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** convert.c 22 Mar 2007 00:21:51 -0000 1.21 --- convert.c 26 Mar 2007 22:26:45 -0000 1.22 *************** *** 62,66 **** void addTableRawSummaryData (); void pp_mysql_convert_sql_failure(char*f,int l, const char*str, const char *error); ! void dbtool_mysql_query(const char *sql, MYSQL *p_tmp_db_mysql, MYSQL_RES *p_tmp_query_result); void dbtool_freeResult(MYSQL_RES *p_tmp_query_result); int dbtool_rows(MYSQL_RES *p_tmp_query_result); --- 62,66 ---- void addTableRawSummaryData (); void pp_mysql_convert_sql_failure(char*f,int l, const char*str, const char *error); ! MYSQL_RES *dbtool_mysql_query(const char *sql, MYSQL *p_tmp_db_mysql, MYSQL_RES *p_tmp_query_result); void dbtool_freeResult(MYSQL_RES *p_tmp_query_result); int dbtool_rows(MYSQL_RES *p_tmp_query_result); *************** *** 142,147 **** GString *gsODBSql = g_string_new (""); ! int iODBnumrows; ! int iNDBnumrows; int i,x,y; --- 142,148 ---- GString *gsODBSql = g_string_new (""); ! int iODBnumrows, iODBnumFields; ! int iNDBnumrows, iNDBnumFields; ! unsigned long *piODBlengths, *piNDBlengths; int i,x,y; *************** *** 235,241 **** sODBdatabase=malloc(65); ! printw(_("Database Name (default: perfparse): ")); refresh(); ! read_string_from_line(sODBdatabase,64,"perfparse"); --- 236,242 ---- sODBdatabase=malloc(65); ! printw(_("Database Name (default: perfparse_old): ")); refresh(); ! read_string_from_line(sODBdatabase,64,"perfparse_old"); *************** *** 279,285 **** sNDBdatabase=malloc(65); ! printw(_("Database Name (default: perfparse): ")); refresh(); ! read_string_from_line(sNDBdatabase,64,"perfparse"); --- 280,286 ---- sNDBdatabase=malloc(65); ! printw(_("Database Name (default: perfparse_new): ")); refresh(); ! read_string_from_line(sNDBdatabase,64,"perfparse_new"); *************** *** 325,345 **** } ! printw(_("Copying data of old perfdata_host_group to new perfdata_groups table.\n")); printw(_("(Step %d of %d)\n"),iStep,iNumSteps); refresh(); g_string_printf(gsODBSql, "select * from perfdata_host_group"); ! dbtool_mysql_query(gsODBSql->str, &db_mysql_old, query_result_old); iODBnumrows=dbtool_rows(query_result_old); getyx(stdscr,y,x); ! for (i=1 ; i<=iODBnumrows; i++) { move(y,x); printw(_("Copying entry %d/%d"),i,iODBnumrows); refresh(); ! // todo: make loop use mysql_fetch_row and fix next line ! g_string_printf(gsNDBSql, "insert into perfdata_groups(group_name) values('%s')"); dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); } printw(_("\ndone\n")); refresh(); /* int i_steps=20; --- 326,382 ---- } ! // Step 1 printw(_("(Step %d of %d)\n"),iStep,iNumSteps); + printw(_("Copying data of old perfdata_host_group to new perfdata_groups table.\n")); refresh(); g_string_printf(gsODBSql, "select * from perfdata_host_group"); ! query_result_old=dbtool_mysql_query(gsODBSql->str, &db_mysql_old,query_result_old); ! if((iODBnumFields=mysql_num_fields(query_result_old))!=1) { ! printw(_("Original perfdata_host_groups table modified! Bailing out")); ! exit(EXIT_FAILURE); ! } iODBnumrows=dbtool_rows(query_result_old); + printw("Affected rows: %d\n",iODBnumrows); getyx(stdscr,y,x); ! i=0; ! while ((result_row_old=mysql_fetch_row(query_result_old))) { ! i++; move(y,x); + piODBlengths=mysql_fetch_lengths(query_result_old); printw(_("Copying entry %d/%d"),i,iODBnumrows); refresh(); ! g_string_printf(gsNDBSql, "insert ignore into perfdata_groups(group_name) values('%.*s')",(int) piODBlengths[0],result_row_old[0]); dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); } printw(_("\ndone\n")); refresh(); + // Step 2 + iStep++; + printw(_("(Step %d of %d)\n"),iStep,iNumSteps); + printw(_("Copying data of perfdata_host table.\n")); + refresh(); + + g_string_printf(gsODBSql, "select * from perfdata_host"); + query_result_old=dbtool_mysql_query(gsODBSql->str, &db_mysql_old,query_result_old); + if((iODBnumFields=mysql_num_fields(query_result_old))!=10) { + printw(_("Original perfdata_host table modified! Bailing out")); + exit(EXIT_FAILURE); + } + iODBnumrows=dbtool_rows(query_result_old); + printw("Affected rows: %d\n",iODBnumrows); + getyx(stdscr,y,x); + i=0; + while ((result_row_old=mysql_fetch_row(query_result_old))) { + i++; + move(y,x); + piODBlengths=mysql_fetch_lengths(query_result_old); + printw(_("Copying entry %d/%d"),i,iODBnumrows); refresh(); + //g_string_printf(gsNDBSql, ""); // todo: copy policies, host info and popuplate perfdata_host_groups + //dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); + } + printw(_("\ndone\n")); refresh(); + + + /* int i_steps=20; *************** *** 545,549 **** } ! void dbtool_mysql_query(const char *sql, MYSQL *p_tmp_db_mysql, MYSQL_RES *p_tmp_query_result) { #ifdef SHOW_SQL --- 582,586 ---- } ! MYSQL_RES *dbtool_mysql_query(const char *sql, MYSQL *p_tmp_db_mysql, MYSQL_RES *p_tmp_query_result) { #ifdef SHOW_SQL *************** *** 567,571 **** fflush(stdout); #endif ! } --- 604,609 ---- fflush(stdout); #endif ! return(p_tmp_query_result); ! } |
|
From: Florian G. <re...@us...> - 2007-03-22 00:21:55
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30719/db_tools Modified Files: convert.c Log Message: more ... Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** convert.c 20 Mar 2007 23:17:38 -0000 1.20 --- convert.c 22 Mar 2007 00:21:51 -0000 1.21 *************** *** 65,69 **** void dbtool_freeResult(MYSQL_RES *p_tmp_query_result); int dbtool_rows(MYSQL_RES *p_tmp_query_result); - char *read_line (char *buf, size_t length); char *read_string_from_line(char *buf, size_t length, const char* defaultval); int read_int_from_line(int defaultval); --- 65,68 ---- *************** *** 261,299 **** sNDBsocket=config_get_value_as_string(CONFIG_ITEM_ID_DB_SOCKET); } else { //ask user ! printf(_("Please enter the connection data for the new database below:\n")); sNDBhost=malloc(65); ! printf(_("Database Host: ")); ! fscanf(stdin,"%s64",sNDBhost); ! sNDBuser=malloc(65); ! printf(_("Database User: ")); ! fscanf(stdin,"%s64",sNDBuser); sNDBpass=malloc(65); ! printf(_("Database Password: ")); ! fscanf(stdin,"%s64",sNDBpass); sNDBdatabase=malloc(65); ! printf(_("Database Name: ")); ! fscanf(stdin,"%s64",sNDBdatabase); ! printf(_("Database Port: ")); ! fscanf(stdin,"%d",&iNDBport); ! sNDBsocket=malloc(65); ! printf(_("Database Socket: ")); ! fscanf(stdin,"%s64",sNDBsocket); ! ! } ! printf(_("Summary old Database:\nDatabase Host: '%s'\nDatabase User: '%s'\nDatabase Password: '%s'\nDatabase Name: '%s'\nDatabase Port: '%d'\nDatabase Socket: '%s'\n"), sODBhost,sODBuser,sODBpass,sODBdatabase,iODBport,sODBsocket); ! printf(_("Summary new Database:\nDatabase Host: '%s'\nDatabase User: '%s'\nDatabase Password: '%s'\nDatabase Name: '%s'\nDatabase Port: '%d'\nDatabase Socket: '%s'\n"), sNDBhost,sNDBuser,sNDBpass,sNDBdatabase,iNDBport,sNDBsocket); // connect to both databases ! if (!mysql_init (&db_mysql_old)) { ! printf(_("Cannot initialise MySQL\n")); exit(EXIT_FAILURE); } --- 260,307 ---- sNDBsocket=config_get_value_as_string(CONFIG_ITEM_ID_DB_SOCKET); } else { //ask user ! printw(_("Please enter the connection data for the new database below:\n")); sNDBhost=malloc(65); ! printw(_("Database Host (default: localhost): ")); ! refresh(); ! read_string_from_line(sNDBhost,64,"localhost"); ! sNDBuser=malloc(65); ! printw(_("Database User (default: root): ")); ! refresh(); ! read_string_from_line(sNDBuser,64,"root"); ! sNDBpass=malloc(65); ! printw(_("Database Password: ")); ! refresh(); ! read_string_from_line(sNDBpass,64,""); sNDBdatabase=malloc(65); ! printw(_("Database Name (default: perfparse): ")); ! refresh(); ! read_string_from_line(sNDBdatabase,64,"perfparse"); ! ! printw(_("Database Port (defualt: none): ")); ! refresh(); ! iNDBport=read_int_from_line(FALSE); ! sNDBsocket=malloc(65); ! printw(_("Database Socket (default: none): ")); ! refresh(); ! read_string_from_line(sNDBsocket,64,""); ! ! } ! printw(_("Summary old Database:\nDatabase Host: '%s'\nDatabase User: '%s'\nDatabase Password: '%s'\nDatabase Name: '%s'\nDatabase Port: '%d'\nDatabase Socket: '%s'\n"), sODBhost,sODBuser,sODBpass,sODBdatabase,iODBport,sODBsocket); ! printw(_("Summary new Database:\nDatabase Host: '%s'\nDatabase User: '%s'\nDatabase Password: '%s'\nDatabase Name: '%s'\nDatabase Port: '%d'\nDatabase Socket: '%s'\n"), sNDBhost,sNDBuser,sNDBpass,sNDBdatabase,iNDBport,sNDBsocket); + refresh(); // connect to both databases ! if (!mysql_init (&db_mysql_old) || !mysql_init (&db_mysql_new)) { ! printw(_("Cannot initialise MySQL\n")); refresh(); exit(EXIT_FAILURE); } *************** *** 302,307 **** sODBhost,sODBuser,sODBpass,sODBdatabase, iODBport,sODBsocket,0)) { ! printf(_("Cannot connect to old database. Errormessage: %s"), mysql_error(&db_mysql_old)); exit(EXIT_FAILURE); } --- 310,316 ---- sODBhost,sODBuser,sODBpass,sODBdatabase, iODBport,sODBsocket,0)) { ! printw(_("Cannot connect to old database. Errormessage: %s"), mysql_error(&db_mysql_old)); + refresh(); exit(EXIT_FAILURE); } *************** *** 310,331 **** sNDBhost,sNDBuser,sNDBpass,sNDBdatabase, iNDBport,sNDBsocket,0)) { ! printf(_("Cannot connect to new database. Errormessage: %s"), mysql_error(&db_mysql_new)); exit(EXIT_FAILURE); } ! printf(_("Copying data of old perfdata_host_group to new perfdata_groups table.\n")); ! printf(_("(Step %d of %d)\n"),iStep,iNumSteps); g_string_printf(gsODBSql, "select * from perfdata_host_group"); dbtool_mysql_query(gsODBSql->str, &db_mysql_old, query_result_old); iODBnumrows=dbtool_rows(query_result_old); for (i=1 ; i<=iODBnumrows; i++) { ! printf(_("Copying entry %d/%d"),i,iODBnumrows); g_string_printf(gsNDBSql, "insert into perfdata_groups(group_name) values('%s')"); dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); - printf("\r"); } ! printf(_("\ndone\n")); /* --- 319,344 ---- sNDBhost,sNDBuser,sNDBpass,sNDBdatabase, iNDBport,sNDBsocket,0)) { ! printw(_("Cannot connect to new database. Errormessage: %s"), mysql_error(&db_mysql_new)); + refresh(); exit(EXIT_FAILURE); } ! printw(_("Copying data of old perfdata_host_group to new perfdata_groups table.\n")); ! printw(_("(Step %d of %d)\n"),iStep,iNumSteps); ! refresh(); g_string_printf(gsODBSql, "select * from perfdata_host_group"); dbtool_mysql_query(gsODBSql->str, &db_mysql_old, query_result_old); iODBnumrows=dbtool_rows(query_result_old); + getyx(stdscr,y,x); for (i=1 ; i<=iODBnumrows; i++) { ! move(y,x); ! printw(_("Copying entry %d/%d"),i,iODBnumrows); refresh(); ! // todo: make loop use mysql_fetch_row and fix next line g_string_printf(gsNDBSql, "insert into perfdata_groups(group_name) values('%s')"); dbtool_mysql_query(gsNDBSql->str, &db_mysql_new, query_result_new); } ! printw(_("\ndone\n")); refresh(); /* *************** *** 479,499 **** } - char *read_line (char *buf, size_t length) - { - char *input_line; - - if ((input_line = fgets (buf, length, stdin))) { - size_t last = strlen (buf) - 1; - - if (buf[last] == '\n') { - buf[last] = '\0'; - } else { - //clear stdin - fscanf (stdin, "%*[^\n]"); - (void) fgetc (stdin); - } - } - return input_line; - } char *read_string_from_line(char *buf, size_t length, const char* defaultval) { --- 492,495 ---- *************** *** 538,542 **** } if(defaultval==FALSE) { ! printw("none"); } else { printw("%d\n",defaultval); --- 534,538 ---- } if(defaultval==FALSE) { ! printw("none\n"); } else { printw("%d\n",defaultval); *************** *** 558,562 **** if (mysql_query(p_tmp_db_mysql, sql)) { ! printf(_("A error occured executing the sql command %s. The error message is: %s"), sql, mysql_error(p_tmp_db_mysql)); exit(EXIT_FAILURE); --- 554,558 ---- if (mysql_query(p_tmp_db_mysql, sql)) { ! printw(_("A error occured executing the sql command %s. The error message is: %s"), sql, mysql_error(p_tmp_db_mysql)); exit(EXIT_FAILURE); *************** *** 568,572 **** #ifdef SHOW_SQL ! printf("Rows: %d\n", dbtool_rows(p_tmp_query_result)); fflush(stdout); #endif --- 564,568 ---- #ifdef SHOW_SQL ! printw("Rows: %d\n", dbtool_rows(p_tmp_query_result)); fflush(stdout); #endif |
|
From: Florian G. <re...@us...> - 2007-03-20 23:17:43
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32702/db_tools Modified Files: convert.c Log Message: small changes Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** convert.c 15 Mar 2007 22:55:07 -0000 1.19 --- convert.c 20 Mar 2007 23:17:38 -0000 1.20 *************** *** 67,70 **** --- 67,71 ---- char *read_line (char *buf, size_t length); char *read_string_from_line(char *buf, size_t length, const char* defaultval); + int read_int_from_line(int defaultval); void *************** *** 240,248 **** ! printf(_("Database Port: ")); ! fscanf(stdin,"%d",&iODBport); ! sODBsocket=malloc(65); ! printf(_("Database Socket: ")); } --- 241,252 ---- ! printw(_("Database Port (defualt: none): ")); ! refresh(); ! iODBport=read_int_from_line(FALSE); ! sODBsocket=malloc(65); ! printw(_("Database Socket (default: none): ")); ! refresh(); ! read_string_from_line(sODBsocket,64,""); } *************** *** 517,520 **** --- 521,550 ---- noecho(); refresh(); + free(fmtstr); + return(buf); + } + + int read_int_from_line(int defaultval) { + int y,x,my,mx,result; + echo(); + getyx(stdscr,y,x); + getmaxyx(stdscr,my,mx); + + if(scanw("%d",&result) == ERR) { + if(my==y) { + move(y-1,x); + } else { + move(y,x); + } + if(defaultval==FALSE) { + printw("none"); + } else { + printw("%d\n",defaultval); + } + result=defaultval; + } + noecho(); + refresh(); + return(result); } |
|
From: Florian G. <re...@us...> - 2007-03-15 22:55:09
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30579/db_tools Modified Files: convert.c Log Message: more ncurses Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** convert.c 15 Mar 2007 00:01:58 -0000 1.18 --- convert.c 15 Mar 2007 22:55:07 -0000 1.19 *************** *** 66,70 **** int dbtool_rows(MYSQL_RES *p_tmp_query_result); char *read_line (char *buf, size_t length); ! char *read_string_from_line(char *buf, size_t length); void --- 66,70 ---- int dbtool_rows(MYSQL_RES *p_tmp_query_result); char *read_line (char *buf, size_t length); ! char *read_string_from_line(char *buf, size_t length, const char* defaultval); void *************** *** 221,246 **** printw(_("Database Host (default: localhost): ")); refresh(); ! echo(); ! getyx(stdscr,y,x); ! if(scanw("%s64",sODBhost) == ERR) { ! move(y,x); ! printw("localhost\n"); ! sprintf(sODBhost,"localhost"); ! } ! refresh(); ! ! sODBuser=malloc(65); ! printf(_("Database User: ")); ! read_string_from_line(sODBuser,64); sODBpass=malloc(65); ! printf(_("Database Password: ")); ! read_string_from_line(sODBpass,64); sODBdatabase=malloc(65); ! printf(_("Database Name: ")); ! read_string_from_line(sODBdatabase,64); printf(_("Database Port: ")); --- 221,242 ---- printw(_("Database Host (default: localhost): ")); refresh(); ! read_string_from_line(sODBhost,64,"localhost"); sODBuser=malloc(65); ! printw(_("Database User (default: root): ")); ! refresh(); ! read_string_from_line(sODBuser,64,"root"); ! sODBpass=malloc(65); ! printw(_("Database Password: ")); ! refresh(); ! read_string_from_line(sODBpass,64,""); sODBdatabase=malloc(65); ! printw(_("Database Name (default: perfparse): ")); ! refresh(); ! read_string_from_line(sODBdatabase,64,"perfparse"); ! printf(_("Database Port: ")); *************** *** 249,253 **** sODBsocket=malloc(65); printf(_("Database Socket: ")); ! read_string_from_line(sODBsocket,64); } --- 245,249 ---- sODBsocket=malloc(65); printf(_("Database Socket: ")); ! } *************** *** 497,509 **** } ! char *read_string_from_line(char *buf, size_t length) { ! while(TRUE) { ! if(read_line(buf,length)!=NULL) { ! if(strlen(buf)>0) { ! return(buf); ! } } ! printf(_("Wrong input! Please try again: :")); ! } } --- 493,520 ---- } ! char *read_string_from_line(char *buf, size_t length, const char* defaultval) { ! char *fmtstr; ! int y,x,my,mx; ! if(length > 1000000) { // just to be safe ! strncpy(buf,defaultval,length); ! return(buf); ! } ! fmtstr=malloc(10); ! sprintf(fmtstr,"%%s%d",length); ! echo(); ! getyx(stdscr,y,x); ! getmaxyx(stdscr,my,mx); ! ! if(scanw(fmtstr,buf) == ERR) { ! if(my==y) { ! move(y-1,x); ! } else { ! move(y,x); } ! printw("%s\n",defaultval); ! strncpy(buf,defaultval,length); ! } ! noecho(); ! refresh(); } |
