Merged changes from my branch r4024.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4025 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/event_handlers/mod_cdr/Makefile

 
-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)
 

src/mod/event_handlers/mod_cdr/basecdr.cpp

@@ -324,7 +324,7 @@ void BaseCDR::process_channel_variables(const std::list<std::string>& stringlist
 			temppair.second = tempvariable;
 		
 		chanvars_fixed.push_back(temppair);
-	}	
+	}
 }
 
 // This one is for processing of supplemental chanvars

src/mod/event_handlers/mod_cdr/csvcdr.cpp

@@ -74,8 +74,11 @@ CsvCDR::CsvCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel)
 		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);
 	}
 }
 

src/mod/event_handlers/mod_cdr/curlcdr.cpp

@@ -79,8 +79,11 @@ CurlCDR::CurlCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel)
 		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);
 	}
 }
 

src/mod/event_handlers/mod_cdr/pddcdr.cpp

@@ -79,8 +79,9 @@ PddCDR::PddCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel)
 		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);
 	}
 }
 

src/mod/event_handlers/mod_cdr/xmlcdr.cpp

@@ -80,8 +80,10 @@ XmlCDR::XmlCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel)
 		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);
 	}
 }