- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6267 - in freeswitch/trunk/conf/lang/de: demo vm
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: brian Date: Wed Nov 14 16:18:42 2007 New Revision: 6267 Added: freeswitch/trunk/conf/lang/de/demo/demo.xml - copied unchanged from r6264, /freeswitch/trunk/conf/lang_de.xml freeswitch/trunk/conf/lang/de/vm/tts.xml - copied unchanged from r6264, /freeswitch/trunk/conf/voicemail_de_tts.xml Log: but daddy I want a pony

1 0

[commit] r6266 - freeswitch/trunk/conf/lang/de/demo
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: brian Date: Wed Nov 14 16:17:03 2007 New Revision: 6266 Added: freeswitch/trunk/conf/lang/de/demo/ Log: more more more

1 0

[commit] r6265 - freeswitch/trunk/conf/lang/de/vm
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: brian Date: Wed Nov 14 16:13:26 2007 New Revision: 6265 Added: freeswitch/trunk/conf/lang/de/vm/ Log: more to come

1 0

[commit] r6264 - in freeswitch/trunk/conf: . lang/en lang/en/demo lang/en/vm
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: anthm Date: Wed Nov 14 16:11:54 2007 New Revision: 6264 Added: freeswitch/trunk/conf/lang/en/demo/ freeswitch/trunk/conf/lang/en/demo/demo.xml freeswitch/trunk/conf/lang/en/en.xml freeswitch/trunk/conf/lang/en/vm/ freeswitch/trunk/conf/lang/en/vm/sounds.xml freeswitch/trunk/conf/lang/en/vm/tts.xml Removed: freeswitch/trunk/conf/lang_en.xml freeswitch/trunk/conf/voicemail_en.xml freeswitch/trunk/conf/voicemail_en_tts.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: mess with config Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Nov 14 16:11:54 2007 @@ -107,14 +107,7 @@  <section name="phrases" description="Speech Phrase Management"> <macros> - <language name="en" sound-path="/snds" tts-engine="cepstral" tts-voice="david"> - <X-PRE-PROCESS cmd="include" data="lang_en.xml"/> -  - <X-PRE-PROCESS cmd="include" data="voicemail_en_tts.xml"/> - </language> - <language name="fr" sound_path="/var/sounds/lang/fr/jean" tts_engine="cepstral" tts_voice="jean-pierre"> - <X-PRE-PROCESS cmd="include" data="lang_fr.xml"/> - </language> + <X-PRE-PROCESS cmd="include" data="lang/*/*.xml"/> </macros> </section> Added: freeswitch/trunk/conf/lang/en/demo/demo.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/lang/en/demo/demo.xml Wed Nov 14 16:11:54 2007 @@ -0,0 +1,71 @@ +<include> + <macro name="msgcount"> + <input pattern="(.*)"> + <match> + <action function="execute" data="sleep(1000)"/> + <action function="play-file" data="vm-youhave.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + <action function="play-file" data="vm-messages.wav"/> +  +  + </match> + </input> + </macro> + <macro name="saydate"> + <input pattern="(.*)"> + <match> + <action function="say" data="$1" method="pronounced" type="current_date_time"/> + </match> + </input> + </macro> + <macro name="timespec"> + <input pattern="(.*)"> + <match> + <action function="say" data="$1" method="pronounced" type="time_measurement"/> + </match> + </input> + </macro> + <macro name="ip-addr"> + <input pattern="(.*)"> + <match> + <action function="say" data="$1" method="iterated" type="ip_address"/> + <action function="say" data="$1" method="pronounced" type="ip_address"/> + </match> + </input> + </macro> + <macro name="spell"> + <input pattern="(.*)"> + <match> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + </match> + </input> + </macro> + <macro name="spell-phonetic"> + <input pattern="(.*)"> + <match> + <action function="say" data="$1" method="pronounced" type="name_phonetic"/> + </match> + </input> + </macro> + <macro name="tts-timeleft"> +  +  + <input pattern="(\d+):(\d+)"> + <match> + <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/> + <action function="break"/> + </match> + <nomatch> + <action function="speak-text" data="That input was invalid."/> + </nomatch> + </input> + <input pattern="(\d+) min (\d+) sec"> + <match> + <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/> + </match> + <nomatch> + <action function="speak-text" data="That input was invalid."/> + </nomatch> + </input> + </macro> +</include> Added: freeswitch/trunk/conf/lang/en/en.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/lang/en/en.xml Wed Nov 14 16:11:54 2007 @@ -0,0 +1,7 @@ +<include> + <language name="en" sound-path="/snds" tts-engine="cepstral" tts-voice="david"> + <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/> +  + <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/> + </language> +</include> Added: freeswitch/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/lang/en/vm/sounds.xml Wed Nov 14 16:11:54 2007 @@ -0,0 +1,273 @@ +<include> + <macro name="voicemail_enter_id"> + <input pattern="(.*)"> + <match> + <action function="play-file" data="voicemail/vm-enter_id.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + </match> + </input> + </macro> + + <macro name="voicemail_enter_pass"> + <input pattern="(.*)"> + <match> + <action function="play-file" data="voicemail/vm-enter_pass.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + </match> + </input> + </macro> + + <macro name="voicemail_fail_auth"> + <input pattern="(.*)"> + <match> + <action function="play-file" data="voicemail/vm-fail_auth.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_hello"> + <input pattern="(.*)"> + <match> + <action function="play-file" data="voicemail/vm-hello.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_goodbye"> + <input pattern="(.*)"> + <match> + <action function="play-file" data="voicemail/vm-goodbye.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_abort"> + <input pattern="(.*)"> + <match> + <action function="play-file" data="voicemail/vm-abort.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_message_count"> + <input pattern="^1:(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-you_have.wav"/> + <action function="say" data="1" method="pronounced" type="items"/> + <action function="play-file" data="voicemail/vm-$1.wav"/> + <action function="play-file" data="voicemail/vm-message.wav"/> + <action function="play-file" data="voicemail/vm-in_folder.wav"/> + </match> + </input> + <input pattern="^([0,2-9]+):(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-you_have.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + <action function="play-file" data="voicemail/vm-$1.wav"/> + <action function="play-file" data="voicemail/vm-messages.wav"/> + <action function="play-file" data="voicemail/vm-in_folder.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_menu"> + <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> + <match> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-listen_new.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-listen_saved.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$3" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-advanced.wav"/> + <action function="say" data="$4" method="pronounced" type="name_phonetic"/> + <action function="play-file" data="voicemail/vm-to_exit.wav"/> + </match> + </input> + </macro> + + + <macro name="voicemail_config_menu"> + <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> + <match> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-record_greeting.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-choose_greeting.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$3" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-record_name2.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$4" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-main_menu.wav"/> + </match> + </input> + </macro> + + + <macro name="voicemail_record_name"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-record_name1.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_record_file_check"> + <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$"> + <match> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-save_recording.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$3" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-rerecord.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_record_urgent_check"> + <input pattern="^([0-9#*]):([0-9#*])$"> + <match> + <action function="play-file" data="voicemail/vm-mark_urgent.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-continue.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> + </match> + </input> + </macro> + + <macro name="voicemail_listen_file_check"> + <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> + <match> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-save_recording.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$3" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-delete_recording.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$4" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-forward_to_email.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$4" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-return_call.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_choose_greeting"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-choose_greeting.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_choose_greeting_fail"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_record_greeting"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-record_greeting.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_record_message"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-record_message.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_greeting_selected"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-greeting.wav"/> + <action function="say" data="$1" method="pronounced" type="items"/> + <action function="play-file" data="voicemail/vm-selected.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_play_greeting"> + <input pattern="^(.*)$"> + <match> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-not_avaliable.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_say_number"> + <input pattern="^(.*)$"> + <match> + <action function="say" data="$1" method="pronounced" type="items"/> + </match> + </input> + </macro> + + <macro name="voicemail_say_message_number"> + <input pattern="^([a-z]+):(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-$1.wav"/> + <action function="play-file" data="voicemail/vm-message_number.wav"/> + <action function="say" data="$2" method="pronounced" type="items"/> + </match> + </input> + </macro> + + <macro name="voicemail_say_phone_number"> + <input pattern="^(.*)$"> + <match> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + </match> + </input> + </macro> + + <macro name="voicemail_say_name"> + <input pattern="^(.*)$"> + <match> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + </match> + </input> + </macro> + + <macro name="voicemail_ack"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-message.wav"/> + <action function="play-file" data="voicemail/vm-$1.wav"/> + </match> + </input> + </macro> + + <macro name="voicemail_say_date"> + <input pattern="^(.*)$"> + <match> + <action function="say" data="$strftime($1|%A, %B %d %Y, %I %M %p)" method="pronounced" type="current_date_time"/> + </match> + </input> + </macro> + +</include> Added: freeswitch/trunk/conf/lang/en/vm/tts.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/lang/en/vm/tts.xml Wed Nov 14 16:11:54 2007 @@ -0,0 +1,215 @@ +<include> + <macro name="voicemail_enter_id"> + <input pattern="(.*)"> + <match> + <action function="speak-text" data="please enter your i d, followed by $1."/> + </match> + </input> + </macro> + + <macro name="voicemail_enter_pass"> + <input pattern="(.*)"> + <match> + <action function="speak-text" data="please enter your password, followed by $1."/> + </match> + </input> + </macro> + + <macro name="voicemail_fail_auth"> + <input pattern="(.*)"> + <match> + <action function="speak-text" data="login incorrect."/> + </match> + </input> + </macro> + + <macro name="voicemail_hello"> + <input pattern="(.*)"> + <match> + <action function="speak-text" data="welcome to your voicemail."/> + </match> + </input> + </macro> + + <macro name="voicemail_goodbye"> + <input pattern="(.*)"> + <match> + <action function="speak-text" data="goodbye."/> + </match> + </input> + </macro> + + <macro name="voicemail_abort"> + <input pattern="(.*)"> + <match> + <action function="speak-text" data="too many failed attempts."/> + </match> + </input> + </macro> + + <macro name="voicemail_message_count"> + <input pattern="^1:(.*)$"> + <match> + <action function="speak-text" data="you have 1 $1 message in folder ${voicemail_current_folder}."/> + </match> + </input> + <input pattern="^([0,2-9]+):(.*)$"> + <match> + <action function="speak-text" data="you have $1 $2 messages in folder ${voicemail_current_folder}."/> + </match> + </input> + </macro> + + <macro name="voicemail_menu"> + <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> + <match> + <action function="speak-text" + data="To listen to new messages, press $1, To listen to saved messages, press $2, For advanced options, press $3, to exit, press $4."/> + </match> + </input> + </macro> + + + <macro name="voicemail_config_menu"> + <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> + <match> + <action function="speak-text" + data="To record a greeting, press $1, To choose a greeting, press $2, To record your name, press $3, to return to the main menu, press $4."/> + </match> + </input> + </macro> + + + <macro name="voicemail_record_name"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="at the tone, record your name, press any key or stop talking to end the recording."/> + + </match> + </input> + </macro> + + <macro name="voicemail_record_file_check"> + <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$"> + <match> + <action function="speak-text" + data="To listen to the recording, press $1, To save the recording, press $2, To re record, press $3."/> + </match> + </input> + </macro> + + <macro name="voicemail_record_urgent_check"> + <input pattern="^([0-9#*]):([0-9#*])$"> + <match> + <action function="speak-text" + data="To mark this message urgent, press $1, To continue, press $2."/> + </match> + </input> + </macro> + + <macro name="voicemail_listen_file_check"> + <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> + <match> + <action function="speak-text" + data="To listen to the recording again, press $1, To save the recording, press $2, To delete the recording, press $3, to forward the recording to your email, press $4, to call the caller now, press $5."/> + </match> + </input> + </macro> + + <macro name="voicemail_choose_greeting"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="choose a greeting between 1 and 3."/> + </match> + </input> + </macro> + + <macro name="voicemail_choose_greeting_fail"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="invalid value."/> + </match> + </input> + </macro> + + <macro name="voicemail_record_greeting"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="record your greeting at the tone, press any key or stop talking to end the recording."/> + </match> + </input> + </macro> + + <macro name="voicemail_record_message"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="record your message at the tone, press any key or stop talking to end the recording."/> + </match> + </input> + </macro> + + <macro name="voicemail_greeting_selected"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="greeting $1 selected."/> + </match> + </input> + </macro> + + <macro name="voicemail_play_greeting"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="$1 is not available."/> + </match> + </input> + </macro> + + <macro name="voicemail_say_number"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="$1"/> + </match> + </input> + </macro> + + <macro name="voicemail_say_message_number"> + <input pattern="^([a-z]+):(.*)$"> + <match> + <action function="speak-text" data="$1 message number $2."/> + </match> + </input> + </macro> + + <macro name="voicemail_say_phone_number"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="$1."/> + </match> + </input> + </macro> + + <macro name="voicemail_say_name"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="$1."/> + </match> + </input> + </macro> + + <macro name="voicemail_ack"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="message $1"/> + </match> + </input> + </macro> + + <macro name="voicemail_say_date"> + <input pattern="^(.*)$"> + <match> + <action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/> + </match> + </input> + </macro> + +</include>

1 0

[commit] r6263 - freeswitch/trunk/src
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: anthm Date: Wed Nov 14 16:08:21 2007 New Revision: 6263 Modified: freeswitch/trunk/src/switch_xml.cpp Log: don't delete fsxml files Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Wed Nov 14 16:08:21 2007 @@ -1694,7 +1694,9 @@ } if (xml->free_path) { - unlink(xml->free_path); + if (!switch_stristr(xml->free_path, ".fsxml")) { + unlink(xml->free_path); + } switch_safe_free(xml->free_path); }

1 0

[commit] r6262 - freeswitch/trunk/src
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: anthm Date: Wed Nov 14 16:01:15 2007 New Revision: 6262 Modified: freeswitch/trunk/src/switch_xml.cpp Log: relative path in include Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Wed Nov 14 16:01:15 2007 @@ -69,7 +69,7 @@ #define SWITCH_XML_ERRL 128 // maximum error string length #include "SimpleGlob.h" -static int preprocess(const char *file, int write_fd, int rlevel); +static int preprocess(const char *cwd, const char *file, int write_fd, int rlevel); typedef struct switch_xml_root *switch_xml_root_t; struct switch_xml_root { // additional data for the root tag @@ -938,14 +938,15 @@ } -static int preprocess_glob(const char *pattern, int write_fd, int rlevel) +static int preprocess_glob(const char *cwd, const char *pattern, int write_fd, int rlevel) { char *argv[1] = {0}; int argc = 1; char *full_path = NULL; + char *dir_path = NULL, *e = NULL; if (!switch_is_file_path(pattern)) { - full_path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, pattern); + full_path = switch_mprintf("%s%s%s", cwd, SWITCH_PATH_SEPARATOR, pattern); pattern = full_path; } @@ -961,14 +962,19 @@ } for (int n = 0; n < glob.FileCount(); ++n) { - if (preprocess(glob.File(n), write_fd, rlevel) < 0) { + dir_path = strdup(glob.File(n)); + assert(dir_path); + if ((e = strrchr(dir_path, *SWITCH_PATH_SEPARATOR))) { + *e = '\0'; + } + if (preprocess(dir_path, glob.File(n), write_fd, rlevel) < 0) { const char *reason = strerror(errno); if (rlevel > 100) { reason = "Maximum recursion limit reached"; } fprintf(stderr, "Error including %s (%s)\n", argv[0], reason); } - + free(dir_path); } end: @@ -978,7 +984,7 @@ return write_fd; } -static int preprocess(const char *file, int write_fd, int rlevel) +static int preprocess(const char *cwd, const char *file, int write_fd, int rlevel) { int read_fd = -1; switch_size_t cur = 0, ml = 0; @@ -1078,7 +1084,7 @@ } } else if (!strcasecmp(tcmd, "include")) { - preprocess_glob(targ, write_fd, rlevel + 1); + preprocess_glob(cwd, targ, write_fd, rlevel + 1); } continue; @@ -1134,7 +1140,7 @@ } } else if (!strcasecmp(cmd, "include")) { - preprocess_glob(arg, write_fd, rlevel + 1); + preprocess_glob(cwd, arg, write_fd, rlevel + 1); } } @@ -1192,7 +1198,7 @@ goto done; } - if (preprocess(file, write_fd, 0) > -1) { + if (preprocess(SWITCH_GLOBAL_dirs.conf_dir, file, write_fd, 0) > -1) { close(write_fd); write_fd = -1; if ((fd = open(new_file, O_RDONLY, 0)) > -1) {

1 0

[commit] r6261 - freeswitch/trunk/w32/Library
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: mikej Date: Wed Nov 14 15:42:16 2007 New Revision: 6261 Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: fix to changing file names Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Wed Nov 14 15:42:16 2007 @@ -435,8 +435,18 @@ > </File> <File - RelativePath="..\..\src\switch_xml.c" + RelativePath="..\..\src\switch_xml.cpp" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> </File> </Filter> <Filter @@ -481,11 +491,11 @@ > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File

1 0

[commit] r6260 - in freeswitch/trunk/conf/lang: . de en fr
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: brian Date: Wed Nov 14 15:37:01 2007 New Revision: 6260 Added: freeswitch/trunk/conf/lang/ freeswitch/trunk/conf/lang/de/ freeswitch/trunk/conf/lang/en/ freeswitch/trunk/conf/lang/fr/ Log: lang

1 0

[commit] r6259 - freeswitch/trunk/conf
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: anthm Date: Wed Nov 14 15:29:19 2007 New Revision: 6259 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/conf/vars.xml Log: make preprocessor also be a tag for everyone who keeps begging for it Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Nov 14 15:29:19 2007 @@ -9,63 +9,66 @@ (note the double $$ which denotes preprocessor variables) #comment ==> A general comment such as this - The preprocessor will compile the full xml document to ${prefix}/log/freeswitch.registry + The preprocessor will compile the full xml document to ${prefix}/log/freeswitch.xml.fsxml Don't modify it while freeswitch is running cos it is mem mapped in most cases =D + + The same can be achieved with the <X-PRE-PROCESS> tag where the attrs 'cmd' and 'data' are + parsed in the same way. -->  -  + <X-PRE-PROCESS cmd="include" data="vars.xml"/> <section name="configuration" description="Various Configuration"> -  -  + <X-PRE-PROCESS cmd="include" data="switch.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="modules.conf.xml"/>   -  -  + <X-PRE-PROCESS cmd="include" data="console.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="syslog.conf.xml"/>  -  + <X-PRE-PROCESS cmd="include" data="enum.conf.xml"/>  -  -  -  + <X-PRE-PROCESS cmd="include" data="xml_rpc.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="xml_cdr.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="xml_curl.conf.xml"/>   -  -  -  -  -  + <X-PRE-PROCESS cmd="include" data="cdr.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="xmpp_event.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="zeroconf.conf.xml"/>    -  -  -  -  -  -  -  + <X-PRE-PROCESS cmd="include" data="dingaling.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="iax.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="portaudio.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="alsa.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="sofia.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="wanpipe.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="woomera.conf.xml"/>   -  + <X-PRE-PROCESS cmd="include" data="conference.conf.xml"/>  -  -  -  + <X-PRE-PROCESS cmd="include" data="ivr.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="voicemail.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="limit.conf.xml"/>  -  + <X-PRE-PROCESS cmd="include" data="dialplan_directory.conf.xml"/>   @@ -76,41 +79,41 @@   -  + <X-PRE-PROCESS cmd="include" data="spidermonkey.conf.xml"/>  -  + <X-PRE-PROCESS cmd="include" data="java.conf.xml"/>   -  -  + <X-PRE-PROCESS cmd="include" data="rss.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="mod_openmrcp.conf.xml"/>   -  -  + <X-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="mod_local_stream.conf.xml"/> </section> <section name="dialplan" description="Regex/XML Dialplan"> -  + <X-PRE-PROCESS cmd="include" data="dialplan/*.xml"/> </section>   <section name="directory" description="User Directory"> -  + <X-PRE-PROCESS cmd="include" data="directory/*.xml"/> </section>  <section name="phrases" description="Speech Phrase Management"> <macros> <language name="en" sound-path="/snds" tts-engine="cepstral" tts-voice="david"> -  + <X-PRE-PROCESS cmd="include" data="lang_en.xml"/>  -  + <X-PRE-PROCESS cmd="include" data="voicemail_en_tts.xml"/> </language> <language name="fr" sound_path="/var/sounds/lang/fr/jean" tts_engine="cepstral" tts_voice="jean-pierre"> -  + <X-PRE-PROCESS cmd="include" data="lang_fr.xml"/> </language> </macros> </section> Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Wed Nov 14 15:29:19 2007 @@ -1,5 +1,5 @@ <configuration name="sofia.conf" description="sofia Endpoint"> <profiles> -  + <X-PRE-PROCESS cmd="include" data="sip_profiles/*.xml"/> </profiles> </configuration> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed Nov 14 15:29:19 2007 @@ -1,23 +1,23 @@  -  + <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>  -  -  + <X-PRE-PROCESS cmd="set" data="sip_profile=$${domain}"/> + <X-PRE-PROCESS cmd="set" data="nat_sip_profile=nat_$${domain}"/>  -  -  -  + <X-PRE-PROCESS cmd="set" data="global_codec_prefs=PCMU@20i"/> + <X-PRE-PROCESS cmd="set" data="xmpp_client_profile=xmppc"/> + <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/>  -  + <X-PRE-PROCESS cmd="set" data="bind_server_ip=auto"/>  -  + <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.fwdnet.net"/>  -  + <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.fwdnet.net"/>  -  -  + <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/> + <X-PRE-PROCESS cmd="set" data="outbound_caller_id=8777423583"/>

1 0

[commit] r6258 - freeswitch/trunk/src
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: anthm Date: Wed Nov 14 15:18:46 2007 New Revision: 6258 Modified: freeswitch/trunk/src/switch_xml.cpp Log: add <X-PRE-PROCESS> tag Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Wed Nov 14 15:18:46 2007 @@ -983,6 +983,7 @@ int read_fd = -1; switch_size_t cur = 0, ml = 0; char *q, *cmd, buf[2048], ebuf[8192]; + const char *tcmd, *targ; if ((read_fd = open(file, O_RDONLY, 0)) < 0) { return read_fd; @@ -1011,6 +1012,78 @@ } } + if ((tcmd = switch_stristr(bp, "<X-pre-process"))) { + if ((e = strstr(tcmd, "/>"))) { + *e += 2; + *e = '\0'; + if(write(write_fd, e, (unsigned) strlen(e)) != (int) strlen(e)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n"); + } + } + + if (!(tcmd = switch_stristr(tcmd, "cmd"))) { + continue; + } + + if (!(tcmd = switch_stristr(tcmd, "="))) { + continue; + } + + if (!(tcmd = switch_stristr(tcmd, "\""))) { + continue; + } + + tcmd++; + + + if ((e = strchr(tcmd, '"'))) { + *e++ = '\0'; + } + + if (!(targ = switch_stristr(e, "data"))) { + continue; + } + + if (!(targ = switch_stristr(targ, "="))) { + continue; + } + + if (!(targ = switch_stristr(targ, "\""))) { + continue; + } + + targ++; + + if ((e = strchr(targ, '"'))) { + *e++ = '\0'; + } + + if (!strcasecmp(tcmd, "set")) { + char *name = (char *)targ; + char *val = strchr(name, '='); + + if (val) { + char *ve = val++; + while (*val && *val == ' ') { + val++; + } + *ve-- = '\0'; + while (*ve && *ve == ' ') { + *ve-- = '\0'; + } + } + + if (name && val) { + switch_core_set_variable(name, val); + } + + } else if (!strcasecmp(tcmd, "include")) { + preprocess_glob(targ, write_fd, rlevel + 1); + } + + continue; + } + if ((cmd = strstr(bp, "<!--#"))) { if(write(write_fd, bp, (unsigned) (cmd - bp)) != (cmd - bp)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write!\n");

1 0