Merged changes from my branch r4024.

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

diff --git a/src/mod/event_handlers/mod_cdr/Makefile b/src/mod/event_handlers/mod_cdr/Makefile
index 6f72c21bf056bf8bbc043b83742a061089509224..bc86663d245ac63789340813c205d0aa1098b280 100644 (file)
--- a/src/mod/event_handlers/mod_cdr/Makefile
+++ b/src/mod/event_handlers/mod_cdr/Makefile
@@ -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)
 

diff --git a/src/mod/event_handlers/mod_cdr/basecdr.cpp b/src/mod/event_handlers/mod_cdr/basecdr.cpp
index 4c3415cb1b79e4e89ea533649ce74ce242375ed1..05bd3d31101f8059c4cda187f4f29042914fbaa2 100644 (file)
--- a/src/mod/event_handlers/mod_cdr/basecdr.cpp
+++ b/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

diff --git a/src/mod/event_handlers/mod_cdr/csvcdr.cpp b/src/mod/event_handlers/mod_cdr/csvcdr.cpp
index 9f636c30b75f562e6575d6ae44d00408e99cb030..982b9259c1ba3b831c6124b97233e09ecbe7e0fd 100644 (file)
--- a/src/mod/event_handlers/mod_cdr/csvcdr.cpp
+++ b/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);
        }
 }
 

diff --git a/src/mod/event_handlers/mod_cdr/curlcdr.cpp b/src/mod/event_handlers/mod_cdr/curlcdr.cpp
index 50dde5865c05dcbbb9438403567eb7ef0de38431..bfc55736f90bd77d7715fde3b9c072d9b6d5f180 100644 (file)
--- a/src/mod/event_handlers/mod_cdr/curlcdr.cpp
+++ b/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);
        }
 }
 

diff --git a/src/mod/event_handlers/mod_cdr/pddcdr.cpp b/src/mod/event_handlers/mod_cdr/pddcdr.cpp
index 5ed5723bfa7b041481220e5e3bb61438142a5943..ea84a16e92a52c10082f3fad0bfc9a4a77fa2516 100644 (file)
--- a/src/mod/event_handlers/mod_cdr/pddcdr.cpp
+++ b/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);
        }
 }
 

diff --git a/src/mod/event_handlers/mod_cdr/xmlcdr.cpp b/src/mod/event_handlers/mod_cdr/xmlcdr.cpp
index 6429591f0f91c67f9283ae718113c95959dd05bd..31726f262a7631cc47f66ab9ec30895019bda1a0 100644 (file)
--- a/src/mod/event_handlers/mod_cdr/xmlcdr.cpp
+++ b/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);
        }
 }