fix get_variable

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

diff --git a/src/mod/languages/mod_python/freeswitch_python.cpp b/src/mod/languages/mod_python/freeswitch_python.cpp
index 13c799fe1a4485a5a26163448203e36e146105c5..2d4f82b9badf578447cc5d18836d192249c4790f 100644 (file)
--- a/src/mod/languages/mod_python/freeswitch_python.cpp
+++ b/src/mod/languages/mod_python/freeswitch_python.cpp
@@ -51,10 +51,10 @@ void SessionContainer::set_variable(char *var, char *val)
     switch_channel_set_variable(channel, var, val);
 }
 
-void SessionContainer::get_variable(char *var, char *val)
+char *SessionContainer::get_variable(char *var)
 {
-       sanity_check();
-    switch_channel_get_variable(channel, var);
+       sanity_check(NULL);
+    return switch_channel_get_variable(channel, var);
 }
 
 void SessionContainer::execute(char *app, char *data)

diff --git a/src/mod/languages/mod_python/freeswitch_python.h b/src/mod/languages/mod_python/freeswitch_python.h
index ab48821a09b2d6b6a93dd9ed089364e699053436..338915d70a809dcd2c924f01a98e7ffa4d521b95 100644 (file)
--- a/src/mod/languages/mod_python/freeswitch_python.h
+++ b/src/mod/languages/mod_python/freeswitch_python.h
@@ -34,7 +34,7 @@ class SessionContainer {
        int pre_answer();
        void hangup(char *cause);
        void set_variable(char *var, char *val);
-       void get_variable(char *var, char *val);
+       char *get_variable(char *var);
        int play_file(char *file, char *timer_name);
        void set_dtmf_callback(PyObject * pyfunc);
        int speak_text(char *text);

diff --git a/src/mod/languages/mod_python/mod_python_wrap.cpp b/src/mod/languages/mod_python/mod_python_wrap.cpp
index 5150be44c8a64036830f87213c04716023e188c0..99091a52159e42b9e5dc4e45a9572c255b012b08 100644 (file)
--- a/src/mod/languages/mod_python/mod_python_wrap.cpp
+++ b/src/mod/languages/mod_python/mod_python_wrap.cpp
@@ -1045,14 +1045,14 @@ static PyObject *_wrap_SessionContainer_get_variable(PyObject *self, PyObject *a
     PyObject *resultobj;
     SessionContainer *arg1 = (SessionContainer *) 0 ;
     char *arg2 ;
-    char *arg3 ;
+    char *result;
     PyObject * obj0 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_get_variable",&obj0,&arg2,&arg3)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"Os:SessionContainer_get_variable",&obj0,&arg2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    (arg1)->get_variable(arg2,arg3);
+    result = (char *)(arg1)->get_variable(arg2);
     
-    Py_INCREF(Py_None); resultobj = Py_None;
+    resultobj = result ? PyString_FromString(result) : Py_BuildValue((char*)"");
     return resultobj;
     fail:
     return NULL;