Suppress spurious warning in phrase macro playback

Prior to this commit, if anything at all went wrong in
switch_ivr_phrase_macro_event() we would generate a warning like this:

  [WARNING] switch_ivr_play_say.c:348 Macro [macro_name]: 'pattern_name' did not match any patterns

This is clearly misleading.  The natural thing to do on seeing that
message is to verify that the language files are there, and that the
pattern really does exist in that macro.  But none of that was usually
the problem.  The message would be generated if the language wasn't
found, or if the channel had gone away, for example.

With this commit, we verify that we actually tried looking for the
pattern before displaying the warning about the pattern not matching.

diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index cf285851749b5c80f5a0283483d8fe3212043506..f4025c2eab6f20cf60fa7cfcbcd48e63848f4e15 100644 (file)
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -45,7 +45,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro_event(switch_core_sessio
        const char *old_sound_prefix = NULL, *sound_path = NULL, *tts_engine = NULL, *tts_voice = NULL;
        const char *module_name = NULL, *chan_lang = NULL;
        switch_channel_t *channel = switch_core_session_get_channel(session);
-       uint8_t done = 0;
+       uint8_t done = 0, searched = 0;
        int matches = 0;
        const char *pause_val;
        int pause = 100;
@@ -178,6 +178,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro_event(switch_core_sessio
                char *field_expanded = NULL;
                char *field_expanded_alloc = NULL;
 
+               searched = 1;
                if (!field) {
                        field = (char *) data;
                }
@@ -344,7 +345,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro_event(switch_core_sessio
                switch_event_destroy(&hint_data);
        }
 
-       if (!matches) {
+       if (searched && !matches) {
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Macro [%s]: '%s' did not match any patterns\n", macro_name, data);
        }