[Freeswitch-svn] [commit] r4025 - freeswitch/trunk/src/mod/event_handlers/mod_cdr

[Freeswitch SVN]

Author: mishehu
Date: Mon Jan 22 18:33:35 2007
New Revision: 4025

Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile
   freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp
   freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp
   freeswitch/trunk/src/mod/event_handlers/mod_cdr/curlcdr.cpp
   freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp
   freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp

Log:
Merged changes from my branch r4024.

Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile	Mon Jan 22 18:33:35 2007
@@ -1,11 +1,11 @@
 
-CFLAGS  += $(shell mysql_config --include) 
+#CFLAGS  += $(shell mysql_config --include) 
 #CFLAGS  += -DSWITCH_QUEUE_ENHANCED
-LDFLAGS += $(shell mysql_config --libs)
+#LDFLAGS += $(shell mysql_config --libs)
 #LDFLAGS += -lcurl
 
 CPPCC = g++
-OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o csvcdr.o xmlcdr.o
+OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o csvcdr.o xmlcdr.o sqlitecdr.o
 
 all:	depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 

Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp	Mon Jan 22 18:33:35 2007
@@ -324,7 +324,7 @@
 			temppair.second = tempvariable;
 		
 		chanvars_fixed.push_back(temppair);
-	}	
+	}
 }
 
 // This one is for processing of supplemental chanvars

Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp	Mon Jan 22 18:33:35 2007
@@ -74,8 +74,11 @@
 		switch_strftime(formattedcalltransferdate,&retsizectd,sizeof(formattedcalltransferdate),format,&tempcalltransfer);
 		switch_strftime(formattedcallenddate,&retsizeced,sizeof(formattedcallenddate),format,&tempcallend);
 
-		process_channel_variables(chanvars_fixed_list,newchannel->channel);
-		process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat_fixed_in_supp);
+		if(chanvars_fixed_list.size() > 0)
+			process_channel_variables(chanvars_fixed_list,newchannel->channel);
+		
+		if(chanvars_supp_list.size() > 0)
+			process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat_fixed_in_supp);
 	}
 }
 

Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/curlcdr.cpp
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_cdr/curlcdr.cpp	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/curlcdr.cpp	Mon Jan 22 18:33:35 2007
@@ -79,8 +79,11 @@
 		switch_strftime(formattedcalltransferdate,&retsizectd,sizeof(formattedcalltransferdate),format,&tempcalltransfer);
 		switch_strftime(formattedcallenddate,&retsizeced,sizeof(formattedcallenddate),format,&tempcallend);
 
-		process_channel_variables(chanvars_fixed_list,newchannel->channel);
-		process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,0);
+		if(chanvars_fixed_list.size() > 0)
+			process_channel_variables(chanvars_fixed_list,newchannel->channel);
+		
+		if(chanvars_supp_list.size() > 0)
+			process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,0);
 	}
 }
 

Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp	Mon Jan 22 18:33:35 2007
@@ -79,8 +79,9 @@
 		outputfile_name.append(".");
 		outputfile_name.append(myuuid);  // The goal is to have a resulting filename of "/path/to/myuuid"
 		outputfile_name.append(".pdd");  // .pdd - "perl data dumper"	
-		bool repeat = 1;
-		process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat);
+		bool repeat_fixed_in_supp = 1;
+		if(chanvars_supp_list.size() > 0)
+			process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat_fixed_in_supp);
 	}
 }
 

Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp	Mon Jan 22 18:33:35 2007
@@ -80,8 +80,10 @@
 		outputfile_name.append(myuuid);  // The goal is to have a resulting filename of "/path/to/myuuid"
 		outputfile_name.append(".xml");  // .xml - "XML Data Dumper"
 		
-		bool repeat = 1;
-		process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat);
+		bool repeat_fixed_in_supp = 1;
+		
+		if(chanvars_supp_list.size() > 0)
+			process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat_fixed_in_supp);
 	}
 }