- Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r3836 - freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 27 Dec '06

27 Dec '06

Author: mishehu Date: Tue Dec 26 22:45:26 2006 New Revision: 3836 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp Log: SqliteCDR compiles and appears to behave as expected. Welcome it to the list of CDR backends. Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README Tue Dec 26 22:45:26 2006 @@ -82,6 +82,14 @@ <param name="chanvars_supp" value=""/> value is a comma separated list of supplemental channel variables to log. Can be a wildcard (*) (optional) <param name="chanvars_supp_repeat_fixed" value=""/> value is 0 for no, 1 for yes, and determines whether or not to repeat any of the fixed channel variables as key / value pairs in the chanvars table. <param name="timezone" value=""/> value is utc for utc time, local for localtime. If not specified or incorrectly specified, localtime is assumed. + +Class: SqliteCDR, located in sqlitecdr.h and sqlitecdr.cpp + This class uses the Sqlite3 library as included with FreeSWITCH's core. Sqlite is not strict in its handling of column types, and in theory you can toss any sort of data at any sort of column. That being said, this logger was designed to at least attempt to match the column types to the type of data being sent to it. It will warn you if the schema does not match what chanvars_fixed types you specify, but it will not fail on them. However, due to the use of prepared statements, it is likely that you will have unexpected results if you mismatch your chanvars_fixed logging to db schema. The is the first SQL logger to automatically create the db schema and even update it on its own. +Configuration: Section <sqlitecdr> + <param name="path" value=""/> value is the path to the database to open or create (required) + <param name="chanvars_fixed" value=""/> Is a comma separated list of key=type pairs. Types are x for decimal, s for string (varchar), d for double, i for integer, t for tiny. If no type is provided, it defaults that column to string (varchar). It cannot accept wildcards (*). You must have a matching column of matching type in the main freeswitchcdr table. The logger will attempt to automatically update the schema, but it cannot if a column by that name already exists.(optional) + <param name="chanvars_supp" value=""/> value is a comma separated list of supplemental channel variables to log. Can be a wildcard (*) (optional) + <param name="chanvars_supp_repeat_fixed" value=""/> value is 0 for no, 1 for yes, and determines whether or not to repeat any of the fixed channel variables as key / value pairs in the chanvars table. FAQ: Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp Tue Dec 26 22:45:26 2006 @@ -179,7 +179,7 @@ if(outputfile.good()) { activated = 1; - switch_console_printf(SWITCH_CHANNEL_LOG,"CsvCDR activated, log rotation will occur at or after %d MB",(filesize_limit/1024/1024)); + switch_console_printf(SWITCH_CHANNEL_LOG,"CsvCDR activated, log rotation will occur at or after %d MB\n",(filesize_limit/1024/1024)); } } else @@ -329,7 +329,7 @@ chanvars_fixed_list.clear(); chanvars_supp_list.clear(); connectionstate = 0; - switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down CsvCDR... Done!"); + switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down CsvCDR... Done!\n"); } AUTO_REGISTER_BASECDR(CsvCDR); Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp Tue Dec 26 22:45:26 2006 @@ -200,7 +200,7 @@ if(sql_rc == SQLITE_OK) { - for(int i = 0; i < nrows; i++) + for(int i = 0; i < ((nrow+1)*ncol); i++) { std::string tablename = result[i]; if(tablename == "freeswitchcdr" || tablename == "chanvars") @@ -212,14 +212,14 @@ else switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error in executing query %s: The error was %s.\n",sql_query_check_tables,errormessage); - switch_core_db_free_table(&result); + switch_core_db_free_table(result); if(!temp_sql_tables["freeswitchcdr"]) { switch_console_printf(SWITCH_CHANNEL_LOG,"Creating the freeswitchcdr table in the SQLite mod_cdr database file.\n"); // Must create the missing freeswitchcdr table. char sql_query_create_freeswitchcdr[] = "CREATE TABLE freeswitchcdr (\n" - "callid INTEGER AUTOINCREMENT PRIMARY KEY,\n" + "callid INTEGER PRIMARY KEY AUTOINCREMENT,\n" "callstartdate INTEGER NOT NULL,\n" "callanswerdate INTEGER NOT NULL,\n" "calltransferdate INTEGER NOT NULL,\n" @@ -239,8 +239,8 @@ "lastapp TEXT default \"\",\n" "lastdata TEXT default \"\",\n" "billusec INTEGER default 0,\n" - "disposition INTEGER default 0,\n" /* 0 = Busy or Unanswered, 1 = Answered */ - "hangupcause INTEGER default 0\n", + "disposition INTEGER default 0,\n" + "hangupcause INTEGER default 0,\n" "amaflags INTEGER default 0\n" ");\n"; @@ -251,8 +251,8 @@ { switch_console_printf(SWITCH_CHANNEL_LOG,"Creating the chanvars table in the SQLite mod_cdr database file.\n"); // Must create the missing chanvars table. - sql_query_create_chanvars[] = "CREATE TABLE chanvars (\n" - "callid INTEGER default 0,\n"" + char sql_query_create_chanvars[] = "CREATE TABLE chanvars (\n" + "callid INTEGER default 0,\n" "varname TEXT NOT NULL,\n" "varvalue TEXT default \"\"\n" ");\n"; @@ -264,19 +264,23 @@ { // Now to check if the freeswitchcdr schema matches std::map<std::string,std::string> freeswitchcdr_columns; - char sql_query_get_schema_of_freeswitchcdr[] = "SELECT * FROM SQLITE_MASTER WHERE name=\"freeswitchcdr\""; + char sql_query_get_schema_of_freeswitchcdr[] = "SELECT sql FROM SQLITE_MASTER WHERE name=\"freeswitchcdr\""; char **result2; nrow = 0; ncol = 0; char *errormessage2; - sql_rc = switch_core_db_get_table(db,sql_query_get_schema_of_freeswitchcdr,&result2,&nrow,&ncol,&errormessage); + sql_rc = switch_core_db_get_table(db,sql_query_get_schema_of_freeswitchcdr,&result2,&nrow,&ncol,&errormessage2); if(sql_rc == SQLITE_OK) { - for(int i = 0; i < nrows; i++) + for(int k = 0; k < nrow; k++) { - std::string resultstring = result2[i][4]; - std::string::size_type j = resultstring.find('(',i); + // Warning - this is slightly ugly for string parsing + std::string resultstring = result2[1]; + std::string::size_type j = resultstring.find('(',0); + j = resultstring.find('\n',j); + + std::string::size_type h = 0; std::string tempstring1,tempstring2; @@ -285,15 +289,29 @@ j = resultstring.find(' ',i); if(j > 0) { - tempstring = resultstring.substr(i,(j-i)); + if(j == i) + { + i++; + j = resultstring.find(' ',(i)); + } + + tempstring1 = resultstring.substr(i,(j-i)); i = j+1; j =resultstring.find(',',i); + + h = resultstring.find(' ',i); if(j == std::string::npos) tempstring2 = resultstring.substr(i,(resultstring.size() - i)); + else if(j > h) + tempstring2 = resultstring.substr(i,(h-i)); else tempstring2 = resultstring.substr(i,(j-i)); freeswitchcdr_columns[tempstring1] = tempstring2; + // switch_console_printf(SWITCH_CHANNEL_LOG,"tempstring1 = %s, tempstring2 = %s\n",tempstring1.c_str(),tempstring2.c_str()); + if(resultstring.find('\n',j+1) == (j+1)) + j++; + i = j+1; } else switch_console_printf(SWITCH_CHANNEL_LOG,"There has been a parsing problem with the freeswitchcdr schema.\n"); @@ -301,7 +319,7 @@ } } - switch_core_db_free_table(&result2); + switch_core_db_free_table(result2); // Now to actually compare what we have in the config against the db schema std::map<std::string,std::string> freeswitchcdr_add_columns; @@ -315,7 +333,8 @@ case CDR_TINY: if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) { - if(freeswitchcdr_columns[*iItr] != "INTEGER") + //switch_console_printf(SWITCH_CHANNEL_LOG,"freeswitchcdr_columns[%s] == %s.\n",iItr->c_str(),freeswitchcdr_columns[*iItr].c_str()); + if(freeswitchcdr_columns[*iItr].find("INTEGER",0) == std::string::npos) switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of an INTEGER type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); } else @@ -324,7 +343,7 @@ case CDR_DOUBLE: if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) { - if(freeswitchcdr_columns[*iItr] != "REAL") + if(freeswitchcdr_columns[*iItr].find("REAL",0) == std::string::npos) switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a REAL type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); } else @@ -334,21 +353,21 @@ case CDR_STRING: if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) { - if(freeswitchcdr_columns[*iItr] != "TEXT") + if(freeswitchcdr_columns[*iItr].find("TEXT",0) == std::string::npos) switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a TEXT type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); } else freeswitchcdr_add_columns[*iItr] = "TEXT"; break; default: - switch_console_printf("Oh bother, I should not have fallen into this hole in the switch/case statement. Please notify the author.\n"); + switch_console_printf(SWITCH_CHANNEL_LOG,"Oh bother, I should not have fallen into this hole in the switch/case statement. Please notify the author.\n"); } } if(freeswitchcdr_add_columns.size()) { switch_console_printf(SWITCH_CHANNEL_LOG,"Updating the freeswitchcdr table schema.\n"); - std::string tempsql_freeswitchcdr_alter_table = "ALTER TABLE freeswithcdr ADD "; + std::string tempsql_freeswitchcdr_alter_table = "ALTER TABLE freeswitchcdr ADD "; std::map<std::string, std::string>::iterator iItr, iEnd; for(iItr = freeswitchcdr_add_columns.begin(), iEnd = freeswitchcdr_add_columns.end(); iItr != iEnd; iItr++) { @@ -356,6 +375,7 @@ sql_query_freeswitchcdr_alter_table.append(iItr->first); sql_query_freeswitchcdr_alter_table.append(" "); sql_query_freeswitchcdr_alter_table.append(iItr->second); + switch_console_printf(SWITCH_CHANNEL_LOG,"Updating the freeswitchcdr table with the following SQL command: %s.\n",sql_query_freeswitchcdr_alter_table.c_str()); switch_core_db_exec(db, sql_query_freeswitchcdr_alter_table.c_str(), NULL, NULL, NULL); } } @@ -391,11 +411,12 @@ { int column = 1; switch_core_db_step(stmt_begin); + switch_core_db_reset(stmt_begin); switch_core_db_bind_int64(stmt, column++, (sqlite_int64) callstartdate); switch_core_db_bind_int64(stmt, column++, (sqlite_int64) callanswerdate); switch_core_db_bind_int64(stmt, column++, (sqlite_int64) calltransferdate); switch_core_db_bind_int64(stmt, column++, (sqlite_int64) callenddate); - switch_core_db_bind_int(stmt, column++, (sqlite_int) originated); + switch_core_db_bind_int(stmt, column++, (int) originated); switch_core_db_bind_text(stmt, column++, clid,-1,SQLITE_STATIC); switch_core_db_bind_text(stmt, column++, src,-1,SQLITE_STATIC); switch_core_db_bind_text(stmt, column++, dst,-1,SQLITE_STATIC); @@ -410,9 +431,55 @@ switch_core_db_bind_text(stmt, column++, lastapp,-1,SQLITE_STATIC); switch_core_db_bind_text(stmt, column++, lastdata,-1,SQLITE_STATIC); switch_core_db_bind_int64(stmt, column++, (sqlite_int64) billusec); - switch_core_db_bind_int(stmt, column++, (sqlite_int) disposition); - switch_core_db_bind_int(stmt, column++, (sqlite_int) hangupcause); - switch_core_db_bind_int(stmt, column++, (sqlite_int) amaflags); + switch_core_db_bind_int(stmt, column++, disposition); + switch_core_db_bind_int(stmt, column++, (int) hangupcause); + switch_core_db_bind_int(stmt, column++, amaflags); + + if(chanvars_fixed.size()) + { + std::list< std::pair<std::string,std::string> >::iterator iItr, iEnd; + int count = 0; + for(iItr = chanvars_fixed.begin(), iEnd = chanvars_fixed.end(); iItr != iEnd; iItr++, count++) + { + switch(chanvars_fixed_types[count]) + { + case CDR_INTEGER: + case CDR_TINY: + { + int x; + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> x; + } + else + x = 0; + switch_core_db_bind_int(stmt,column++,x); + break; + } + case CDR_DOUBLE: + { + double x = 0; + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> x; + } + switch_core_db_bind_double(stmt,column++,x); + break; + } + case CDR_DECIMAL: + case CDR_STRING: + { + switch_core_db_bind_text(stmt,column++,iItr->second.c_str(),-1,SQLITE_STATIC); + break; + } + default: + switch_console_printf(SWITCH_CHANNEL_LOG,"Oh bother, I should not have fallen into this hole in the switch/case statement. Please notify the author.\n"); + } + } + } + int sql_rc = switch_core_db_step(stmt); if(sql_rc != SQLITE_DONE) { @@ -422,6 +489,8 @@ switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error executing switch_core_db_step on SqliteCDR::stmt. The error was: %s\n",switch_core_db_errmsg(db)); } + sql_rc = switch_core_db_reset(stmt); + if(logchanvars && chanvars_supp.size()) { sqlite_int64 rowid = switch_core_db_last_insert_rowid(db); @@ -429,22 +498,24 @@ std::map<std::string,std::string>::iterator iItr, iEnd; for(iItr = chanvars_supp.begin(), iEnd = chanvars_supp.end(); iItr != iEnd; iItr++) { - switch_core_db_bind_int64(stmt_chanvars, column++, rowid); - switch_core_db_bind_text(stmt_chanvars, column++, iItr->first.c_str(),-1,SQLITE_STATIC); - switch_core_db_bind_text(stmt_chanvars, column++, iItr->second.c_str(),-1,SQLITE_STATIC); - } - - int sql_rc = switch_core_db_step(stmt_chanvars); - if(sql_rc != SQLITE_DONE) - { - if(sql_rc == SQLITE_BUSY) - sql_rc = switch_core_db_step(stmt_chanvars); - else if (sql_rc == SQLITE_ERROR || sql_rc == SQLITE_MISUSE) - switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error executing switch_core_db_step on SqliteCDR::stmt_chanvars. The error was: %s\n",switch_core_db_errmsg(db)); + switch_core_db_bind_int64(stmt_chanvars, column2++, rowid); + switch_core_db_bind_text(stmt_chanvars, column2++, iItr->first.c_str(),-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt_chanvars, column2++, iItr->second.c_str(),-1,SQLITE_STATIC); + int sql_rc = switch_core_db_step(stmt_chanvars); + if(sql_rc != SQLITE_DONE) + { + if(sql_rc == SQLITE_BUSY) + sql_rc = switch_core_db_step(stmt_chanvars); + else if (sql_rc == SQLITE_ERROR || sql_rc == SQLITE_MISUSE) + switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error executing switch_core_db_step on SqliteCDR::stmt_chanvars. The error was: %s\n",switch_core_db_errmsg(db)); + } + + switch_core_db_reset(stmt_chanvars); } } switch_core_db_step(stmt_commit); + switch_core_db_reset(stmt_commit); return 1; } @@ -465,6 +536,12 @@ tmp_sql_query.clear(); } +std::string SqliteCDR::get_display_name() +{ + return display_name; +} + + AUTO_REGISTER_BASECDR(SqliteCDR); Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h Tue Dec 26 22:45:26 2006 @@ -59,7 +59,7 @@ static std::string tmp_sql_query; // Object must exist to bind the statement, this used for generating the sql static char sql_query_chanvars[100]; static std::string db_filename; - static switch_core_db *db; + static switch_core_db_t *db; static switch_core_db_stmt_t *stmt; static switch_core_db_stmt_t *stmt_chanvars; static switch_core_db_stmt_t *stmt_begin; Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp Tue Dec 26 22:45:26 2006 @@ -171,7 +171,7 @@ switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::process_record(): Unable to open file %s to commit the call record to. Invalid path name, invalid permissions, or no space available?\n",outputfile_name.c_str()); else { - switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::process_record(): Preping the CDR to %s.\n",outputfile_name.c_str()); + //switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::process_record(): Preping the CDR to %s.\n",outputfile_name.c_str()); // Format the call record and proceed from here... outputfile << "<?xml version=\"1.0\"?>" << std::endl; outputfile << "<document type=\"freeswitch-cdr/xml\">" << std::endl; @@ -213,7 +213,7 @@ } outputfile << "\t</chanvars>" << std::endl << "</document>" << std::endl << std::endl; - switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::process_record(): Dumping the CDR to %s.\n",outputfile_name.c_str()); + //switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::process_record(): Dumping the CDR to %s.\n",outputfile_name.c_str()); retval = 1; }

1 0

[commit] r3835 - freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 26 Dec '06

26 Dec '06

Author: mishehu Date: Tue Dec 26 15:38:03 2006 New Revision: 3835 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/odbccdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema.sql freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp Log: Ack, no logging of network_addr in a couple of the SQL based logger backends. I believe this is now fixed. Still not tested. Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Tue Dec 26 15:38:03 2006 @@ -62,6 +62,7 @@ dstchannel_length = (long unsigned int)strlen(dstchannel); lastapp_length = (long unsigned int)strlen(lastapp); lastdata_length = (long unsigned int)strlen(lastdata); + network_addr_length = (long unsigned int)strlen(network_addr); if(chanvars_fixed_list.size() > 0) process_channel_variables(chanvars_fixed_list,newchannel->channel); @@ -195,7 +196,7 @@ if(activated) { - tmp_sql_query = "INSERT INTO freeswitchcdr (callstartdate,callanswerdate,calltransferdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"; + tmp_sql_query = "INSERT INTO freeswitchcdr (callstartdate,callanswerdate,calltransferdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,network_addr,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"; int items_appended = 0; @@ -213,7 +214,7 @@ } } - tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); + tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); if(chanvars_fixed_list.size() > 0 ) { @@ -353,6 +354,7 @@ add_string_parameter(destuuid,destuuid_length,MYSQL_TYPE_VAR_STRING,0); add_string_parameter(srcchannel,srcchannel_length,MYSQL_TYPE_VAR_STRING,0); add_string_parameter(dstchannel,dstchannel_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(network_addr,network_addr_length,MYSQL_TYPE_VAR_STRING,0); add_string_parameter(lastapp,lastapp_length,MYSQL_TYPE_VAR_STRING,0); add_string_parameter(lastdata,lastdata_length,MYSQL_TYPE_VAR_STRING,0); add_parameter(billusec,MYSQL_TYPE_LONGLONG,0); Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h Tue Dec 26 15:38:03 2006 @@ -95,6 +95,7 @@ long unsigned int aniii_length; long unsigned int lastapp_length; long unsigned int lastdata_length; + long unsigned int network_addr_length; // Now a couple internal methods template <typename T> void add_parameter(T& param, enum_field_types type, bool *is_null=0); void add_string_parameter(char* param, long unsigned int& param_length, enum_field_types type, bool* is_null=0); Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/odbccdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/odbccdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/odbccdr.cpp Tue Dec 26 15:38:03 2006 @@ -222,7 +222,7 @@ { tmp_sql_query = "INSERT INTO "; tmp_sql_query.append(tablename); - tmp_sql_query.append(" (callstartdate,callanswerdate,calltransferdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"); + tmp_sql_query.append(" (callstartdate,callanswerdate,calltransferdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,network_addr,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"); int items_appended = 0; @@ -240,7 +240,7 @@ } } - tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); + tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); if(chanvars_fixed_list.size() > 0 ) { @@ -422,6 +422,7 @@ SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(destuuid), 0, destuuid, 0, 0); SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(srcchannel), 0, srcchannel, 0, 0); SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(dstchannel), 0, dstchannel, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(network_addr), 0, network_addr, 0, 0); SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(lastapp), 0, lastapp, 0, 0); SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(lastdata), 0, lastdata, 0, 0); SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_UBIGINT, SQL_BIGINT, 0, 0, &billusec, 0, 0); Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema.sql ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema.sql (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema.sql Tue Dec 26 15:38:03 2006 @@ -15,6 +15,7 @@ destuuid char(36) NOT NULL, srcchannel varchar(80) NOT NULL, dstchannel varchar(80) NOT NULL, /* Need to decide - this might be redundant as you can link the records via uuid */ + network_addr varchar(40) default "", lastapp varchar(80) default "", lastdata varchar(255) default "", billusec bigint default 0, Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp Tue Dec 26 15:38:03 2006 @@ -141,7 +141,7 @@ if(activated) { - tmp_sql_query = "INSERT INTO freeswitchcdr (callstartdate,callanswerdate,calltransferdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"; + tmp_sql_query = "INSERT INTO freeswitchcdr (callstartdate,callanswerdate,calltransferdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,network_addr,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"; int items_appended = 0; @@ -159,7 +159,7 @@ } } - tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); + tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); if(chanvars_fixed_list.size() > 0 ) { @@ -235,6 +235,7 @@ "destuuid TEXT NOT NULL,\n" "srcchannel TEXT NOT NULL,\n" "dstchannel TEXT NOT NULL,\n" + "network_addr TEXT,\n" "lastapp TEXT default \"\",\n" "lastdata TEXT default \"\",\n" "billusec INTEGER default 0,\n" @@ -405,6 +406,7 @@ switch_core_db_bind_text(stmt, column++, destuuid,36,SQLITE_STATIC); switch_core_db_bind_text(stmt, column++, srcchannel,-1,SQLITE_STATIC); switch_core_db_bind_text(stmt, column++, dstchannel,-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, network_addr,-1,SQLITE_STATIC); switch_core_db_bind_text(stmt, column++, lastapp,-1,SQLITE_STATIC); switch_core_db_bind_text(stmt, column++, lastdata,-1,SQLITE_STATIC); switch_core_db_bind_int64(stmt, column++, (sqlite_int64) billusec); @@ -438,7 +440,7 @@ if(sql_rc == SQLITE_BUSY) sql_rc = switch_core_db_step(stmt_chanvars); else if (sql_rc == SQLITE_ERROR || sql_rc == SQLITE_MISUSE) - switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error executing switch_core_db_step on SqliteCDR::stmt. The error was: %s\n",switch_core_db_errmsg(db)); + switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error executing switch_core_db_step on SqliteCDR::stmt_chanvars. The error was: %s\n",switch_core_db_errmsg(db)); } } @@ -451,6 +453,8 @@ { switch_core_db_finalize(stmt_chanvars); switch_core_db_finalize(stmt); + switch_core_db_finalize(stmt_begin); + switch_core_db_finalize(stmt_commit); switch_core_db_close(db); activated = 0; logchanvars = 0;

1 0

[commit] r3834 - freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 26 Dec '06

26 Dec '06

Author: mishehu Date: Tue Dec 26 14:17:22 2006 New Revision: 3834 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp Log: Added output of a header to CsvCDR so that folks know what the format is. Not yet tested either. Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp Tue Dec 26 14:17:22 2006 @@ -228,7 +228,21 @@ switch_console_printf(SWITCH_CHANNEL_LOG,"Could not open the CSV file %s . CsvCDR logger will not be functional until this is resolved and a reload is issued. Failbit is set to %d.\n",filename.c_str(),outputfile.fail()); activated = 0; } + else + { + outputfile << "callstartdate,formattedcallstartdate,callanswerdate,formattedcallanswerdate,calltransferdate,formattedcalltransferdate,callendate,formattedcallenddate,hangupcause_text,hangupcause,clid,originated,dialplan,myuuid,destuuid,src,dst,srcchannel,dstchannel,ani,aniii,network_address,lastapp,lastdata,billusec,disposition,amaflags"; + if(chanvars_fixed_list.size()) + { + std::list<std::string>::iterator iItr, iEnd; + for(iItr = chanvars_fixed_list.begin(),iEnd = chanvars_fixed_list.end(); iItr != iEnd; iItr++) + outputfile << "," << *iItr; + } + + if(logchanvars) + outputfile << ",chanvars_supp"; + outputfile << std::endl; + } } bool CsvCDR::process_record()

1 0

[commit] r3833 - freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 26 Dec '06

26 Dec '06

Author: mishehu Date: Tue Dec 26 13:54:12 2006 New Revision: 3833 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp Log: Made more code updates to SqliteCDR. In theory it should be functional now, but it has not even been compiled yet. Surely there's at least one honorary typo in it somewhere... Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp Tue Dec 26 13:54:12 2006 @@ -141,7 +141,7 @@ if(activated) { - tmp_sql_query = "INSERT INTO freeswitchcdr (callstartdate,callanswerdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"; + tmp_sql_query = "INSERT INTO freeswitchcdr (callstartdate,callanswerdate,calltransferdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"; int items_appended = 0; @@ -159,7 +159,7 @@ } } - tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); + tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); if(chanvars_fixed_list.size() > 0 ) { @@ -175,173 +175,196 @@ strncpy(sql_query,tmp_sql_query.c_str(),tmp_sql_query.size()); - switch_core_db_open(db_filename.c_str(),&db); + int sql_rc = switch_core_db_open(db_filename.c_str(),&db); - char sql_query_check_tables[] = "SELECT name FROM sqlite_master WHERE type = \"table\""; - char **result; - int nrow = 0, ncol = 0; - char *errormessage; - int sql_rc = switch_core_db_get_table(db,sql_query_check_tables,&result,&nrow,&ncol,&errormessage); - - std::map<std::string,bool> temp_chanvars_map; - // Now to copy out all the chanvars from the list into - - std::map<std::string,bool> temp_sql_tables; - temp_sql_tables["freeswitchcdr"] = 0; - temp_sql_tables["chanvars"] = 0; + if(sql_rc != SQLITE_OK) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error opening database filename %s. The error was: %s. SqliteCDR logging has been disabled until the problem is resolved and modcdr_reload is initiated.\n",db_filename.c_str(),switch_core_db_errmsg(db)); + activated = 0; + switch_core_db_close(db); + } + else + { + char sql_query_check_tables[] = "SELECT name FROM sqlite_master WHERE type = \"table\""; + char **result; + int nrow = 0, ncol = 0; + char *errormessage; + sql_rc = switch_core_db_get_table(db,sql_query_check_tables,&result,&nrow,&ncol,&errormessage); + + std::map<std::string,bool> temp_chanvars_map; + // Now to copy out all the chanvars from the list into + + std::map<std::string,bool> temp_sql_tables; + temp_sql_tables["freeswitchcdr"] = 0; + temp_sql_tables["chanvars"] = 0; - if(sql_rc == SQLITE_OK) - for(int i = 0; i < nrows; i++) + if(sql_rc == SQLITE_OK) { - std::string tablename = result[i]; - if(tablename == "freeswitchcdr" || tablename == "chanvars") + for(int i = 0; i < nrows; i++) { - temp_sql_tables[tablename] = 1; + std::string tablename = result[i]; + if(tablename == "freeswitchcdr" || tablename == "chanvars") + { + temp_sql_tables[tablename] = 1; + } } } - else - switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error in executing query %s: The error was %s.\n",sql_query_check_tables,errormessage); - - if(!temp_sql_tables["freeswitchcdr"]) - { - switch_console_printf(SWITCH_CHANNEL_LOG,"Creating the freeswitchcdr table in the SQLite mod_cdr database file.\n"); - // Must create the missing freeswitchcdr table. - char sql_query_create_freeswitchcdr[] = "CREATE TABLE freeswitchcdr (\n" - "callid INTEGER AUTOINCREMENT PRIMARY KEY,\n" - "callstartdate INTEGER NOT NULL,\n" - "callanswerdate INTEGER NOT NULL,\n" - "calltransferdate INTEGER NOT NULL,\n" - "callenddate INTEGER NOT NULL,\n" - "originated INTEGER default 0,\n" - "clid TEXT default \"Freeswitch - Unknown\",\n" - "src TEXT NOT NULL,\n" - "dst TEXT NOT NULL,\n" - "ani TEXT default \"\",\n" - "aniii TEXT default \"\",\n" - "dialplan TEXT default \"\",\n" - "myuuid TEXT NOT NULL,\n" - "destuuid TEXT NOT NULL,\n" - "srcchannel TEXT NOT NULL,\n" - "dstchannel TEXT NOT NULL,\n" - "lastapp TEXT default \"\",\n" - "lastdata TEXT default \"\",\n" - "billusec INTEGER default 0,\n" - "disposition INTEGER default 0,\n" /* 0 = Busy or Unanswered, 1 = Answered */ - "hangupcause INTEGER default 0\n", - "amaflags INTEGER default 0\n" - ");\n"; - - switch_core_db_exec(db, sql_query_create_freeswitchcdr, NULL, NULL, NULL); - } - - if(!temp_sql_tables["chanvars"]) - { - switch_console_printf(SWITCH_CHANNEL_LOG,"Creating the chanvars table in the SQLite mod_cdr database file.\n"); - // Must create the missing chanvars table. - sql_query_create_chanvars[] = "CREATE TABLE chanvars (\n" - "callid INTEGER default 0,\n"" - "varname TEXT NOT NULL,\n" - "varvalue TEXT default \"\"\n" - ");\n"; + else + switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error in executing query %s: The error was %s.\n",sql_query_check_tables,errormessage); - switch_core_db_exec(db, sql_query_create_chanvars, NULL, NULL, NULL); - } + switch_core_db_free_table(&result); - if(chanvars_fixed_list.size() > 0) - { - // Now to check if the freeswitchcdr schema matches - std::map<std::string,std::string> freeswitchcdr_columns; - char sql_query_get_schema_of_freeswitchcdr[] = "SELECT * FROM SQLITE_MASTER WHERE name=\"freeswitchcdr\""; - char **result2; - nrow = 0; - ncol = 0; - char *errormessage2; - sql_rc = switch_core_db_get_table(db,sql_query_get_schema_of_freeswitchcdr,&result,&nrow,&ncol,&errormessage); + if(!temp_sql_tables["freeswitchcdr"]) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Creating the freeswitchcdr table in the SQLite mod_cdr database file.\n"); + // Must create the missing freeswitchcdr table. + char sql_query_create_freeswitchcdr[] = "CREATE TABLE freeswitchcdr (\n" + "callid INTEGER AUTOINCREMENT PRIMARY KEY,\n" + "callstartdate INTEGER NOT NULL,\n" + "callanswerdate INTEGER NOT NULL,\n" + "calltransferdate INTEGER NOT NULL,\n" + "callenddate INTEGER NOT NULL,\n" + "originated INTEGER default 0,\n" + "clid TEXT default \"Freeswitch - Unknown\",\n" + "src TEXT NOT NULL,\n" + "dst TEXT NOT NULL,\n" + "ani TEXT default \"\",\n" + "aniii TEXT default \"\",\n" + "dialplan TEXT default \"\",\n" + "myuuid TEXT NOT NULL,\n" + "destuuid TEXT NOT NULL,\n" + "srcchannel TEXT NOT NULL,\n" + "dstchannel TEXT NOT NULL,\n" + "lastapp TEXT default \"\",\n" + "lastdata TEXT default \"\",\n" + "billusec INTEGER default 0,\n" + "disposition INTEGER default 0,\n" /* 0 = Busy or Unanswered, 1 = Answered */ + "hangupcause INTEGER default 0\n", + "amaflags INTEGER default 0\n" + ");\n"; + + switch_core_db_exec(db, sql_query_create_freeswitchcdr, NULL, NULL, NULL); + } + + if(!temp_sql_tables["chanvars"]) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Creating the chanvars table in the SQLite mod_cdr database file.\n"); + // Must create the missing chanvars table. + sql_query_create_chanvars[] = "CREATE TABLE chanvars (\n" + "callid INTEGER default 0,\n"" + "varname TEXT NOT NULL,\n" + "varvalue TEXT default \"\"\n" + ");\n"; + + switch_core_db_exec(db, sql_query_create_chanvars, NULL, NULL, NULL); + } - if(sql_rc == SQLITE_OK) - for(int i = 0; i < nrows; i++) + if(chanvars_fixed_list.size() > 0) + { + // Now to check if the freeswitchcdr schema matches + std::map<std::string,std::string> freeswitchcdr_columns; + char sql_query_get_schema_of_freeswitchcdr[] = "SELECT * FROM SQLITE_MASTER WHERE name=\"freeswitchcdr\""; + char **result2; + nrow = 0; + ncol = 0; + char *errormessage2; + sql_rc = switch_core_db_get_table(db,sql_query_get_schema_of_freeswitchcdr,&result2,&nrow,&ncol,&errormessage); + + if(sql_rc == SQLITE_OK) { - std::string resultstring = result2[i][4]; - std::string::size_type j = resultstring.find('(',i); - - std::string tempstring1,tempstring2; - - for(std::string::size_type i = j+1 ; j != std::string::npos; ) + for(int i = 0; i < nrows; i++) { - j = resultstring.find(' ',i); - if(j > 0) + std::string resultstring = result2[i][4]; + std::string::size_type j = resultstring.find('(',i); + + std::string tempstring1,tempstring2; + + for(std::string::size_type i = j+1 ; j != std::string::npos; ) { - tempstring = resultstring.substr(i,(j-i)); - i = j+1; - j =resultstring.find(',',i); - if(j == std::string::npos) - tempstring2 = resultstring.substr(i,(resultstring.size() - i)); + j = resultstring.find(' ',i); + if(j > 0) + { + tempstring = resultstring.substr(i,(j-i)); + i = j+1; + j =resultstring.find(',',i); + if(j == std::string::npos) + tempstring2 = resultstring.substr(i,(resultstring.size() - i)); + else + tempstring2 = resultstring.substr(i,(j-i)); + + freeswitchcdr_columns[tempstring1] = tempstring2; + } else - tempstring2 = resultstring.substr(i,(j-i)); - - freeswitchcdr_columns[tempstring1] = tempstring2; + switch_console_printf(SWITCH_CHANNEL_LOG,"There has been a parsing problem with the freeswitchcdr schema.\n"); } - else - switch_console_printf(SWITCH_CHANNEL_LOG,"There has been a parsing problem with the freeswitchcdr schema.\n"); } } - - // Now to actually compare what we have in the config against the db schema - std::map<std::string,std::string> freeswitchcdr_add_columns; - std::list<std::string>::iterator iItr, iEnd; - switch_size_t i = 0; - for(iItr = chanvars_fixed_list.begin(), iEnd = chanvars_fixed_list.end(); iItr != iEnd; iItr++, i++) - { - switch(chanvars_fixed_types[i]) + + switch_core_db_free_table(&result2); + + // Now to actually compare what we have in the config against the db schema + std::map<std::string,std::string> freeswitchcdr_add_columns; + std::list<std::string>::iterator iItr, iEnd; + switch_size_t i = 0; + for(iItr = chanvars_fixed_list.begin(), iEnd = chanvars_fixed_list.end(); iItr != iEnd; iItr++, i++) { - case CDR_INTEGER: - case CDR_TINY: - if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) - { - if(freeswitchcdr_columns[*iItr] != "INTEGER") - switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of an INTEGER type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); - } - else - freeswitchcdr_add_columns[*iItr] = "INTEGER"; - break; - case CDR_DOUBLE: - if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) - { - if(freeswitchcdr_columns[*iItr] != "REAL") - switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a REAL type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); - } - else - freeswitchcdr_add_columns[*iItr] = "REAL"; - break; - case CDR_DECIMAL: - case CDR_STRING: - if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) - { - if(freeswitchcdr_columns[*iItr] != "TEXT") - switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a TEXT type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); - } - else - freeswitchcdr_add_columns[*iItr] = "TEXT"; - break; - default: - switch_console_printf("Oh bother, I should not have fallen into this hole in the switch/case statement. Please notify the author.\n"); + switch(chanvars_fixed_types[i]) + { + case CDR_INTEGER: + case CDR_TINY: + if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) + { + if(freeswitchcdr_columns[*iItr] != "INTEGER") + switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of an INTEGER type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); + } + else + freeswitchcdr_add_columns[*iItr] = "INTEGER"; + break; + case CDR_DOUBLE: + if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) + { + if(freeswitchcdr_columns[*iItr] != "REAL") + switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a REAL type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); + } + else + freeswitchcdr_add_columns[*iItr] = "REAL"; + break; + case CDR_DECIMAL: + case CDR_STRING: + if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) + { + if(freeswitchcdr_columns[*iItr] != "TEXT") + switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a TEXT type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); + } + else + freeswitchcdr_add_columns[*iItr] = "TEXT"; + break; + default: + switch_console_printf("Oh bother, I should not have fallen into this hole in the switch/case statement. Please notify the author.\n"); + } } - } - - if(freeswitchcdr_add_columns.size()) - { - switch_console_printf(SWITCH_CHANNEL_LOG,"Updating the freeswitchcdr table schema.\n"); - std::string tempsql_freeswitchcdr_alter_table = "ALTER TABLE freeswithcdr ADD "; - std::map<std::string, std::string>::iterator iItr, iEnd; - for(iItr = freeswitchcdr_add_columns.begin(), iEnd = freeswitchcdr_add_columns.end(); iItr != iEnd; iItr++) + + if(freeswitchcdr_add_columns.size()) { - std::string sql_query_freeswitchcdr_alter_table = tempsql_freeswitchcdr_alter_table; - sql_query_freeswitchcdr_alter_table.append(iItr->first); - sql_query_freeswitchcdr_alter_table.append(" "); - sql_query_freeswitchcdr_alter_table.append(iItr->second); - switch_core_db_exec(db, sql_query_freeswitchcdr_alter_table.c_str(), NULL, NULL, NULL); + switch_console_printf(SWITCH_CHANNEL_LOG,"Updating the freeswitchcdr table schema.\n"); + std::string tempsql_freeswitchcdr_alter_table = "ALTER TABLE freeswithcdr ADD "; + std::map<std::string, std::string>::iterator iItr, iEnd; + for(iItr = freeswitchcdr_add_columns.begin(), iEnd = freeswitchcdr_add_columns.end(); iItr != iEnd; iItr++) + { + std::string sql_query_freeswitchcdr_alter_table = tempsql_freeswitchcdr_alter_table; + sql_query_freeswitchcdr_alter_table.append(iItr->first); + sql_query_freeswitchcdr_alter_table.append(" "); + sql_query_freeswitchcdr_alter_table.append(iItr->second); + switch_core_db_exec(db, sql_query_freeswitchcdr_alter_table.c_str(), NULL, NULL, NULL); + } } } + + switch_core_db_prepare(db,"BEGIN TRANSACTION SqliteCDR",-1,&stmt_begin,0); + switch_core_db_prepare(db,"COMMIT TRANSACTION SqliteCDR",-1,&stmt_commit,0); + switch_core_db_prepare(db,tmp_sql_query.c_str(),-1,&stmt,0); + if(chanvars_supp_list.size()) + switch_core_db_prepare(db,sql_query_chanvars,-1,&stmt_chanvars,0); } } } @@ -365,237 +388,62 @@ bool SqliteCDR::process_record() { - std::list<void*> temp_chanvars_holder; // This is used for any fixed chanvars, as we don't want things out of scope - - if(chanvars_fixed_list.size() > 0) + int column = 1; + switch_core_db_step(stmt_begin); + switch_core_db_bind_int64(stmt, column++, (sqlite_int64) callstartdate); + switch_core_db_bind_int64(stmt, column++, (sqlite_int64) callanswerdate); + switch_core_db_bind_int64(stmt, column++, (sqlite_int64) calltransferdate); + switch_core_db_bind_int64(stmt, column++, (sqlite_int64) callenddate); + switch_core_db_bind_int(stmt, column++, (sqlite_int) originated); + switch_core_db_bind_text(stmt, column++, clid,-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, src,-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, dst,-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, ani,-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, aniii,-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, dialplan,-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, myuuid,36,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, destuuid,36,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, srcchannel,-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, dstchannel,-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, lastapp,-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt, column++, lastdata,-1,SQLITE_STATIC); + switch_core_db_bind_int64(stmt, column++, (sqlite_int64) billusec); + switch_core_db_bind_int(stmt, column++, (sqlite_int) disposition); + switch_core_db_bind_int(stmt, column++, (sqlite_int) hangupcause); + switch_core_db_bind_int(stmt, column++, (sqlite_int) amaflags); + int sql_rc = switch_core_db_step(stmt); + if(sql_rc != SQLITE_DONE) { - switch_size_t i = 0; // temporary variable, i is current spot on the string of types - std::list<std::pair<std::string,std::string> >::iterator iItr, iEnd; - for(iItr = chanvars_fixed.begin(), iEnd = chanvars_fixed.end(); iItr != iEnd; iItr++) - { - switch(chanvars_fixed_types[i]) - { - case CDR_INTEGER: - { - int* x = new int; - *x = 0; - bool* is_null = new bool; - *is_null = 0; - - if(iItr->second.size() > 0) - { - std::istringstream istring(iItr->second); - istring >> *x; - } - else - *is_null = 1; - temp_chanvars_holder.push_back(x); - temp_chanvars_holder.push_back(is_null); - add_parameter(*x,MYSQL_TYPE_LONG,is_null); - break; - } - case CDR_DOUBLE: - { - double* x = new double; - *x = 0; - bool* is_null = new bool; - *is_null = 0; - if(iItr->second.size() > 0) - { - std::istringstream istring(iItr->second); - istring >> *x; - } - else - *is_null = 1; - temp_chanvars_holder.push_back(x); - temp_chanvars_holder.push_back(is_null); - add_parameter(*x,MYSQL_TYPE_DOUBLE,is_null); - break; - } - case CDR_TINY: - { - short* x = new short; - *x = 0; - bool* is_null = new bool; - *is_null = 0; - if(iItr->second.size() > 0) - { - std::istringstream istring(iItr->second); - istring >> *x; - } - else - *is_null = 1; - temp_chanvars_holder.push_back(x); - temp_chanvars_holder.push_back(is_null); - add_parameter(*x,MYSQL_TYPE_TINY,is_null); - break; - } - case CDR_STRING: - case CDR_DECIMAL: - { - long unsigned int* stringlength = new long unsigned int; - *stringlength = (long unsigned int)(iItr->second.size()); - - char* x = new char[(*stringlength+1)]; - strncpy(x,iItr->second.c_str(),*stringlength); - - bool* is_null = new bool; - *is_null = 0; - add_string_parameter(x,*stringlength,MYSQL_TYPE_VAR_STRING,is_null); - - temp_chanvars_holder.push_back(stringlength); - temp_chanvars_holder.push_back(x); - temp_chanvars_holder.push_back(is_null); - break; - } - default: - switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); - } - i++; - } + if(sql_rc == SQLITE_BUSY) + sql_rc = switch_core_db_step(stmt); + else if (sql_rc == SQLITE_ERROR || sql_rc == SQLITE_MISUSE) + switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error executing switch_core_db_step on SqliteCDR::stmt. The error was: %s\n",switch_core_db_errmsg(db)); } - - MYSQL_BIND *bindmetemp; - bindmetemp = new MYSQL_BIND[bindme.size()]; - copy(bindme.begin(), bindme.end(), bindmetemp); - for(int mysql_ping_result = -1, count = 0, mysql_stmt_error_code = -1; mysql_ping_result != 0 && count < 5 && mysql_stmt_error_code != 0 ; count++) + if(logchanvars && chanvars_supp.size()) { - mysql_ping_result = mysql_ping(conn); - if(mysql_ping_result) + sqlite_int64 rowid = switch_core_db_last_insert_rowid(db); + int column2 = 1; + std::map<std::string,std::string>::iterator iItr, iEnd; + for(iItr = chanvars_supp.begin(), iEnd = chanvars_supp.end(); iItr != iEnd; iItr++) { - switch(mysql_ping_result) - { - case CR_SERVER_GONE_ERROR: - case CR_SERVER_LOST: - { - switch_console_printf(SWITCH_CHANNEL_LOG,"We lost connection to the MySQL server. Trying to reconnect.\n"); - connect_to_database(); - break; - } - default: - { - switch_console_printf(SWITCH_CHANNEL_LOG,"We have encountered an unknown error when pinging the MySQL server. Attempting to reconnect anyways.\n"); - connect_to_database(); - } - } + switch_core_db_bind_int64(stmt_chanvars, column++, rowid); + switch_core_db_bind_text(stmt_chanvars, column++, iItr->first.c_str(),-1,SQLITE_STATIC); + switch_core_db_bind_text(stmt_chanvars, column++, iItr->second.c_str(),-1,SQLITE_STATIC); } - else + + int sql_rc = switch_core_db_step(stmt_chanvars); + if(sql_rc != SQLITE_DONE) { - mysql_stmt_bind_param(stmt,bindmetemp); - mysql_stmt_error_code = mysql_stmt_execute(stmt); - - if(mysql_stmt_error_code != 0) - { - errorstate = 1; - switch_console_printf(SWITCH_CHANNEL_LOG,"MysqlCDR::process_record() - Statement executed? Error: %d\n",mysql_stmt_error_code); - - const char* mysql_stmt_error_string = mysql_stmt_error(stmt); - switch_console_printf(SWITCH_CHANNEL_LOG,"MySQL encountered error: %s\n",mysql_stmt_error_string); - } - else - errorstate = 0; - - if(logchanvars && chanvars_supp.size() > 0 && errorstate == 0) - { - long long insertid = mysql_stmt_insert_id(stmt); - - std::map<std::string,std::string>::iterator iItr,iBeg,iEnd; - iEnd = chanvars_supp.end(); - for(iItr = chanvars_supp.begin(); iItr != iEnd; iItr++) - { - MYSQL_BIND bindme_chanvars[3]; - memset(bindme_chanvars,0,sizeof(bindme_chanvars)); - - bindme_chanvars[0].buffer_type = MYSQL_TYPE_LONGLONG; - bindme_chanvars[0].buffer = &insertid; - - std::vector<char> tempfirstvector(iItr->first.begin(), iItr->first.end()); - tempfirstvector.push_back('\0'); - char* varname_temp = &tempfirstvector[0]; - - bindme_chanvars[1].buffer_type = MYSQL_TYPE_VAR_STRING; - long unsigned int varname_length = (long unsigned int)(iItr->first.size()); - bindme_chanvars[1].length = &varname_length; - bindme_chanvars[1].buffer_length = varname_length; - bindme_chanvars[1].buffer = varname_temp; - - std::vector<char> tempsecondvector(iItr->second.begin(), iItr->second.end()); - tempsecondvector.push_back('\0'); - char* varvalue_temp = &tempsecondvector[0]; - - bindme_chanvars[2].buffer_type = MYSQL_TYPE_VAR_STRING; - if(iItr->second.size() == 0) - bindme_chanvars[2].is_null = (my_bool*)1; - else - { - long unsigned int varvalue_length = (long unsigned int)(iItr->second.size()); - bindme_chanvars[2].length = &varvalue_length; - bindme_chanvars[2].buffer_length = varvalue_length; - bindme_chanvars[2].buffer = varvalue_temp; - } - - mysql_stmt_bind_param(stmt_chanvars,bindme_chanvars); - mysql_stmt_execute(stmt_chanvars); - } - } - - if(errorstate == 0) - mysql_commit(conn); - else - mysql_rollback(conn); + if(sql_rc == SQLITE_BUSY) + sql_rc = switch_core_db_step(stmt_chanvars); + else if (sql_rc == SQLITE_ERROR || sql_rc == SQLITE_MISUSE) + switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error executing switch_core_db_step on SqliteCDR::stmt. The error was: %s\n",switch_core_db_errmsg(db)); } } - delete [] bindmetemp; - if(temp_chanvars_holder.size() > 0) - { - std::string::size_type i = 0, j = chanvars_fixed_types.size(); - for(; i < j ; i++) - { - switch(chanvars_fixed_types[i]) - { - case CDR_STRING: - case CDR_DECIMAL: - { - long unsigned int* stringlength = (long unsigned int*)temp_chanvars_holder.front(); - temp_chanvars_holder.pop_front(); - delete stringlength; - char* tempstring = (char*) temp_chanvars_holder.front(); - temp_chanvars_holder.pop_front(); - delete [] tempstring; - break; - } - case CDR_INTEGER: - { - int* tempint = (int*) temp_chanvars_holder.front(); - temp_chanvars_holder.pop_front(); - delete tempint; - break; - } - case CDR_DOUBLE: - { - double* tempdouble = (double*) temp_chanvars_holder.front(); - temp_chanvars_holder.pop_front(); - delete tempdouble; - break; - } - case CDR_TINY: - { - short* tempshort = (short*) temp_chanvars_holder.front(); - temp_chanvars_holder.pop_front(); - delete tempshort; - break; - } - default: - switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); - } - - bool* tempbool = (bool*) temp_chanvars_holder.front(); - temp_chanvars_holder.pop_front(); - delete tempbool; - } - } + switch_core_db_step(stmt_commit); + return 1; }

1 0

[commit] r3829 - freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 26 Dec '06

26 Dec '06

Author: mishehu Date: Tue Dec 26 00:24:03 2006 New Revision: 3829 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h Log: Working on SqliteCDR, adding the ability of the logger to add and alter the tables as necessary. As of yet untested, even in compilation. Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp Tue Dec 26 00:24:03 2006 @@ -73,6 +73,9 @@ switch_core_db_t* SqliteCDR::db = 0; switch_core_db_stmt_t* SqliteCDR::stmt=0; switch_core_db_stmt_t* SqliteCDR::stmt_chanvars=0; +switch_core_db_stmt_t* SqliteCDR::stmt_begin=0; +switch_core_db_stmt_t* SqliteCDR::stmt_commit=0; +std::string SqliteCDR::display_name = "SqliteCDR - The sqlite3 cdr logging backend"; void SqliteCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) { @@ -183,7 +186,7 @@ std::map<std::string,bool> temp_chanvars_map; // Now to copy out all the chanvars from the list into - std::hash<std::string,bool> temp_sql_tables; + std::map<std::string,bool> temp_sql_tables; temp_sql_tables["freeswitchcdr"] = 0; temp_sql_tables["chanvars"] = 0; @@ -201,8 +204,144 @@ if(!temp_sql_tables["freeswitchcdr"]) { + switch_console_printf(SWITCH_CHANNEL_LOG,"Creating the freeswitchcdr table in the SQLite mod_cdr database file.\n"); // Must create the missing freeswitchcdr table. + char sql_query_create_freeswitchcdr[] = "CREATE TABLE freeswitchcdr (\n" + "callid INTEGER AUTOINCREMENT PRIMARY KEY,\n" + "callstartdate INTEGER NOT NULL,\n" + "callanswerdate INTEGER NOT NULL,\n" + "calltransferdate INTEGER NOT NULL,\n" + "callenddate INTEGER NOT NULL,\n" + "originated INTEGER default 0,\n" + "clid TEXT default \"Freeswitch - Unknown\",\n" + "src TEXT NOT NULL,\n" + "dst TEXT NOT NULL,\n" + "ani TEXT default \"\",\n" + "aniii TEXT default \"\",\n" + "dialplan TEXT default \"\",\n" + "myuuid TEXT NOT NULL,\n" + "destuuid TEXT NOT NULL,\n" + "srcchannel TEXT NOT NULL,\n" + "dstchannel TEXT NOT NULL,\n" + "lastapp TEXT default \"\",\n" + "lastdata TEXT default \"\",\n" + "billusec INTEGER default 0,\n" + "disposition INTEGER default 0,\n" /* 0 = Busy or Unanswered, 1 = Answered */ + "hangupcause INTEGER default 0\n", + "amaflags INTEGER default 0\n" + ");\n"; + + switch_core_db_exec(db, sql_query_create_freeswitchcdr, NULL, NULL, NULL); + } + + if(!temp_sql_tables["chanvars"]) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Creating the chanvars table in the SQLite mod_cdr database file.\n"); + // Must create the missing chanvars table. + sql_query_create_chanvars[] = "CREATE TABLE chanvars (\n" + "callid INTEGER default 0,\n"" + "varname TEXT NOT NULL,\n" + "varvalue TEXT default \"\"\n" + ");\n"; + + switch_core_db_exec(db, sql_query_create_chanvars, NULL, NULL, NULL); + } + + if(chanvars_fixed_list.size() > 0) + { + // Now to check if the freeswitchcdr schema matches + std::map<std::string,std::string> freeswitchcdr_columns; + char sql_query_get_schema_of_freeswitchcdr[] = "SELECT * FROM SQLITE_MASTER WHERE name=\"freeswitchcdr\""; + char **result2; + nrow = 0; + ncol = 0; + char *errormessage2; + sql_rc = switch_core_db_get_table(db,sql_query_get_schema_of_freeswitchcdr,&result,&nrow,&ncol,&errormessage); + + if(sql_rc == SQLITE_OK) + for(int i = 0; i < nrows; i++) + { + std::string resultstring = result2[i][4]; + std::string::size_type j = resultstring.find('(',i); + + std::string tempstring1,tempstring2; + + for(std::string::size_type i = j+1 ; j != std::string::npos; ) + { + j = resultstring.find(' ',i); + if(j > 0) + { + tempstring = resultstring.substr(i,(j-i)); + i = j+1; + j =resultstring.find(',',i); + if(j == std::string::npos) + tempstring2 = resultstring.substr(i,(resultstring.size() - i)); + else + tempstring2 = resultstring.substr(i,(j-i)); + + freeswitchcdr_columns[tempstring1] = tempstring2; + } + else + switch_console_printf(SWITCH_CHANNEL_LOG,"There has been a parsing problem with the freeswitchcdr schema.\n"); + } + } + // Now to actually compare what we have in the config against the db schema + std::map<std::string,std::string> freeswitchcdr_add_columns; + std::list<std::string>::iterator iItr, iEnd; + switch_size_t i = 0; + for(iItr = chanvars_fixed_list.begin(), iEnd = chanvars_fixed_list.end(); iItr != iEnd; iItr++, i++) + { + switch(chanvars_fixed_types[i]) + { + case CDR_INTEGER: + case CDR_TINY: + if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) + { + if(freeswitchcdr_columns[*iItr] != "INTEGER") + switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of an INTEGER type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); + } + else + freeswitchcdr_add_columns[*iItr] = "INTEGER"; + break; + case CDR_DOUBLE: + if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) + { + if(freeswitchcdr_columns[*iItr] != "REAL") + switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a REAL type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); + } + else + freeswitchcdr_add_columns[*iItr] = "REAL"; + break; + case CDR_DECIMAL: + case CDR_STRING: + if(freeswitchcdr_columns.find(*iItr) != freeswitchcdr_columns.end()) + { + if(freeswitchcdr_columns[*iItr] != "TEXT") + switch_console_printf(SWITCH_CHANNEL_LOG,"WARNING: SqliteCDR freeswitchcdr table column type mismatch: Column \"%s\" is not of a TEXT type. This is not necessarily fatal, but may result in unexpected behavior.\n",iItr->c_str()); + } + else + freeswitchcdr_add_columns[*iItr] = "TEXT"; + break; + default: + switch_console_printf("Oh bother, I should not have fallen into this hole in the switch/case statement. Please notify the author.\n"); + } + } + + if(freeswitchcdr_add_columns.size()) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Updating the freeswitchcdr table schema.\n"); + std::string tempsql_freeswitchcdr_alter_table = "ALTER TABLE freeswithcdr ADD "; + std::map<std::string, std::string>::iterator iItr, iEnd; + for(iItr = freeswitchcdr_add_columns.begin(), iEnd = freeswitchcdr_add_columns.end(); iItr != iEnd; iItr++) + { + std::string sql_query_freeswitchcdr_alter_table = tempsql_freeswitchcdr_alter_table; + sql_query_freeswitchcdr_alter_table.append(iItr->first); + sql_query_freeswitchcdr_alter_table.append(" "); + sql_query_freeswitchcdr_alter_table.append(iItr->second); + switch_core_db_exec(db, sql_query_freeswitchcdr_alter_table.c_str(), NULL, NULL, NULL); + } + } } } } @@ -462,6 +601,8 @@ void SqliteCDR::disconnect() { + switch_core_db_finalize(stmt_chanvars); + switch_core_db_finalize(stmt); switch_core_db_close(db); activated = 0; logchanvars = 0; Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h Tue Dec 26 00:24:03 2006 @@ -51,6 +51,7 @@ virtual bool is_activated(); virtual void tempdump_record(); virtual void reread_tempdumped_records(); + virtual std::string get_display_name(); private: static bool activated; @@ -61,12 +62,15 @@ static switch_core_db *db; static switch_core_db_stmt_t *stmt; static switch_core_db_stmt_t *stmt_chanvars; + static switch_core_db_stmt_t *stmt_begin; + static switch_core_db_stmt_t *stmt_commit; static bool connectionstate; static bool logchanvars; static std::list<std::string> chanvars_fixed_list; static std::vector<switch_mod_cdr_sql_types_t> chanvars_fixed_types; static std::list<std::string> chanvars_supp_list; // The supplemental list static bool repeat_fixed_in_supp; + static std::string display_name; }; #endif

1 0

[commit] r3828 - freeswitch/branches/markjcrane
by Freeswitch SVN 26 Dec '06

26 Dec '06

Author: sphere Date: Mon Dec 25 21:05:35 2006 New Revision: 3828 Added: freeswitch/branches/markjcrane/ Log: Creating empty folder for markjcrane

1 0

[commit] r3826 - in freeswitch/branches/knhor/trunk: . build libs/win32/js src src/mod/applications/mod_ivrtest src/mod/applications/mod_playback src/mod/applications/mod_rss src/mod/languages/mod_spidermonkey
by Freeswitch SVN 24 Dec '06

24 Dec '06

Author: knhor Date: Sun Dec 24 16:27:26 2006 New Revision: 3826 Removed: freeswitch/branches/knhor/trunk/build/thisbuild-init.sh Modified: freeswitch/branches/knhor/trunk/ (props changed) freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c freeswitch/branches/knhor/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/knhor/trunk/src/switch_ivr.c Log: Merged revisions 3816-3825 via svnmerge from trunk Modified: freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj ============================================================================== --- freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj (original) +++ freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj Sun Dec 24 16:27:26 2006 @@ -25,7 +25,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"" + CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
" /> <Tool Name="VCCustomBuildTool" @@ -111,7 +111,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libnspr4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libplc4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libplds4.dll $(OutDir)\ /C /Y /D
" + CommandLine="" /> </Configuration> <Configuration @@ -125,7 +125,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"" + CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
" /> <Tool Name="VCCustomBuildTool" @@ -209,7 +209,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libnspr4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libplc4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libplds4.dll $(OutDir)\ /C /Y /D
" + CommandLine="" /> </Configuration> </Configurations> Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Sun Dec 24 16:27:26 2006 @@ -102,7 +102,7 @@ "I have no idea what that is", "cepstral", "david", - 15000, 10, NULL, NULL); + 15000, 10, NULL); status = switch_ivr_menu_init(&sub_menu, @@ -114,7 +114,7 @@ "/ram/invalid.wav", NULL, NULL, - 15000, 10, NULL, NULL); + 15000, 10, NULL); if (status == SWITCH_STATUS_SUCCESS) { // build the menu Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c Sun Dec 24 16:27:26 2006 @@ -69,7 +69,6 @@ char *engine = NULL; char *voice = NULL; char *text = NULL; - char *timer_name = NULL; char *mydata = NULL; switch_codec_t *codec; switch_input_args_t args = {0}; Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_rss/mod_rss.c Sun Dec 24 16:27:26 2006 @@ -184,6 +184,7 @@ char buf[1024]; int32_t jumpto = -1; uint32_t matches = 0; + switch_input_args_t args = {0}; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -324,14 +325,15 @@ snprintf(buf + len, sizeof(buf) - len, "<break time=\"2000ms\"/>"); len = (int32_t)strlen(buf); + args.input_callback = NULL; + args.buf = cmd; + args.buflen = sizeof(cmd); status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, - NULL, buf, - cmd, - sizeof(cmd)); + &args); if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto finished; } @@ -370,14 +372,15 @@ } else if (matches > 1) { } else { + args.input_callback = NULL; + args.buf = NULL; + args.buflen = 0; status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, - NULL, "I'm sorry. That is an Invalid Selection. ", - NULL, - 0); + &args); if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto finished; } @@ -492,14 +495,15 @@ snprintf(buf, sizeof(buf), ",<break time=\"500ms\"/>%s. %s. %s. local time: %s, Press 0 for options, 5 to change voice, or pound to return to the main menu. ", title_txt, description_txt, rights_txt, date); + args.input_callback = NULL; + args.buf = cmd; + args.buflen = sizeof(cmd); status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, - NULL, buf, - cmd, - sizeof(cmd)); + &args); if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto finished; } @@ -591,14 +595,15 @@ } } switch_core_speech_flush_tts(&sh); + args.input_callback = on_dtmf; + args.buf = &dtb; + args.buflen = sizeof(dtb); status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, - on_dtmf, buf, - &dtb, - sizeof(dtb)); + &args); if (status == SWITCH_STATUS_BREAK) { continue; } else if (status != SWITCH_STATUS_SUCCESS) { @@ -611,14 +616,15 @@ } if (entries[dtb.index].description_txt) { + args.input_callback = on_dtmf; + args.buf = &dtb; + args.buflen = sizeof(dtb); status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, - on_dtmf, entries[dtb.index].description_txt, - &dtb, - sizeof(dtb)); + &args); } if (status == SWITCH_STATUS_BREAK) { continue; Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sun Dec 24 16:27:26 2006 @@ -2262,7 +2262,9 @@ JS_InitStandardClasses(cx, javascript_object); /* this doesnt load in standard classes figure out wtf */ - js_InitFileClass(cx, javascript_object); +#ifndef _MSC_VER //somthing is badly wrong in our build here, need to fix this. + js_InitFileClass(cx, javascript_object); +#endif JS_InitClass(cx, javascript_object, Modified: freeswitch/branches/knhor/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_ivr.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_ivr.c Sun Dec 24 16:27:26 2006 @@ -450,7 +450,7 @@ break; } - if (args->input_callback || args->buf || args->buflen) { + if (args && (args->input_callback || args->buf || args->buflen)) { /* dtmf handler function you can hook up to be executed when a digit is dialed during playback if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. @@ -1162,7 +1162,7 @@ switch_event_destroy(&event); } - if (args->input_callback || args->buf || args->buflen) { + if (args && (args->input_callback || args->buf || args->buflen)) { /* dtmf handler function you can hook up to be executed when a digit is dialed during playback if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. @@ -1559,7 +1559,7 @@ switch_event_destroy(&event); } - if (args->input_callback || args->buf || args->buflen) { + if (args && (args->input_callback || args->buf || args->buflen)) { /* dtmf handler function you can hook up to be executed when a digit is dialed during playback if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.

1 0

[commit] r3825 - freeswitch/branches/brian
by Freeswitch SVN 24 Dec '06

24 Dec '06

Author: brian Date: Sat Dec 23 21:57:31 2006 New Revision: 3825 Removed: freeswitch/branches/brian/.indent.pro Log: update update update

1 0

[commit] r3824 - in freeswitch/branches/brian: . conf docs libs src w32
by Freeswitch SVN 24 Dec '06

24 Dec '06

Author: brian Date: Sat Dec 23 21:56:14 2006 New Revision: 3824 Removed: freeswitch/branches/brian/AUTHORS freeswitch/branches/brian/COPYING freeswitch/branches/brian/ChangeLog freeswitch/branches/brian/INSTALL freeswitch/branches/brian/Makefile.am freeswitch/branches/brian/Makefile.in freeswitch/branches/brian/NEWS freeswitch/branches/brian/README freeswitch/branches/brian/TODO freeswitch/branches/brian/aclocal.m4 freeswitch/branches/brian/build.sh freeswitch/branches/brian/buildlib.sh freeswitch/branches/brian/checkversion.sh freeswitch/branches/brian/compile freeswitch/branches/brian/conf/ freeswitch/branches/brian/config.guess freeswitch/branches/brian/config.h.in freeswitch/branches/brian/config.sub freeswitch/branches/brian/configure freeswitch/branches/brian/configure.in freeswitch/branches/brian/configure.scan freeswitch/branches/brian/depcomp freeswitch/branches/brian/docs/ freeswitch/branches/brian/generic_mod.mk freeswitch/branches/brian/indent_options.sh freeswitch/branches/brian/install-sh freeswitch/branches/brian/libs/ freeswitch/branches/brian/ltmain.sh freeswitch/branches/brian/missing freeswitch/branches/brian/mkinstalldirs freeswitch/branches/brian/modmake.sh freeswitch/branches/brian/modules.conf freeswitch/branches/brian/modules.conf.in freeswitch/branches/brian/src/ freeswitch/branches/brian/w32/ Log: update update update

1 0

[commit] r3818 - freeswitch/branches/xachentest
by Freeswitch SVN 24 Dec '06

24 Dec '06

Author: sphere Date: Sat Dec 23 19:29:37 2006 New Revision: 3818 Added: freeswitch/branches/xachentest/ Log: Creating empty folder for xachentest

1 0