Code Cleanup, & Refactor

The code to fix issue #364 in the last push was a little incomplete, as
well as ugly. That's now fixed.

Author: Dave-Morton

chatbot/core/aiml/parse_aiml.php

@@ -293,25 +293,22 @@ function set_wildcards($convoArr, $type)
         $convoArr['aiml']['topic_stars'] = array();
     }
     // Set pattern wildcards
-    //$aiml_pattern = ($type == 'normal') ? trim($convoArr['aiml']['pattern']) : trim($convoArr['aiml']['srai_input']);
     $aiml_pattern = trim($convoArr['aiml']['pattern']);
     runDebug(__FILE__, __FUNCTION__, __LINE__, "Setting Wildcards. Pattern = '$aiml_pattern'", 2);
+/* debugging code
     $aimlArr = $convoArr['aiml'];
     ksort($aimlArr,SORT_NATURAL | SORT_FLAG_CASE);
     runDebug(__FILE__, __FUNCTION__, __LINE__, "Current AIML array =" . print_r($aimlArr, true), 2);
-    //save_file(_LOG_PATH_ . 'convoArr.txt', print_r($convoArr, true));
+*/
     $ap = str_replace(array("*", "_"), "(.+)", $aiml_pattern);
-    runDebug(__FILE__, __FUNCTION__, __LINE__, "comparing patterns $ap and $aiml_pattern", 2);
     if ($ap != $aiml_pattern)
     {
         runDebug(__FILE__, __FUNCTION__, __LINE__, "We have pattern stars to process!", 2);
         if (!isset ($convoArr['aiml']['user_raw'])) $convoArr['aiml']['user_raw'] = normalize_text($convoArr['aiml']['lookingfor'], false);
-        $checkAgainst = ($type == 'normal') ? $convoArr['aiml']['user_raw'] : $convoArr['aiml']['srai_input'];
-        runDebug(__FILE__, __FUNCTION__, __LINE__, "Checking pattern '$ap' against '$checkAgainst'.", 2);
+        $checkAgainst = ($type == 'normal') ? $convoArr['aiml']['user_raw'] : $convoArr['aiml']['lookingfor'];
         if (preg_match_all("~{$ap}$~siuU", $checkAgainst, $matches))
         {
             runDebug(__FILE__, __FUNCTION__, __LINE__, print_r($matches, true), 2);
-            //save_file(_LOG_PATH_ . 'pattern_star.matches.txt', print_r($matches, true));
             for ($i = 1; $i < count($matches); $i++)
             {
                 $curStar = trim($matches[$i][0]);

chatbot/core/aiml/parse_aiml_as_XML.php

@@ -725,32 +725,14 @@ function parse_formal_tag($convoArr, $element, $parentName, $level)
 function parse_srai_tag(&$convoArr, $element, $parentName, $level)
 {
     runDebug(__FILE__, __FUNCTION__, __LINE__, 'Parsing an SRAI tag.', 2);
-
     $starArray = array('~<star[ ]?/>~i', '~<star index="\d+"[ ]?\/>~');
     $elementXML = $element->asXML();
-
-    //$srai = tag_to_string($convoArr, $element, $parentName, $level, 'element');
     $srai = tag_to_string($convoArr, $element, $parentName, $level, 'element');
-    $convoArr['aiml']['srai_input'] = $srai;
-/*
-    $srai_new = (strstr($elementXML, '<star') !== false) ?
-        parse_star_tag($convoArr, $element, $parentName, $level) :
-        //preg_replace($starArray, '*', $elementXML) :
-        $srai;
-
-    $srai_new   = preg_replace('~<[\/]?text>~i', '', $srai_new);
-    $srai_new   = preg_replace('~<[\/]?srai>~i', '', $srai_new);
-    $convoArr['aiml']['srai_input'] = $srai_new;
-*/
-    //file_put_contents(_LOG_PATH_ . "paax.parse_srai.srai_new.txt", print_r($srai_new, true) . "\n", FILE_APPEND);
-    //file_put_contents(_LOG_PATH_ . "paax.parse_srai.srai.txt", print_r($srai, true) . "\n", FILE_APPEND);
+    $convoArr['aiml']['lookingfor'] = $srai;
     $convoArr = set_wildcards($convoArr, 'srai');
-    $response = run_srai($convoArr, $convoArr['aiml']['srai_input']);
-
-    //$response = run_srai($convoArr, $srai);
+    $response = run_srai($convoArr, $convoArr['aiml']['lookingfor']);
     runDebug(__FILE__, __FUNCTION__, __LINE__, 'Finished parsing SRAI tag', 4);
     $response_string = implode_recursive(' ', $response, __FILE__, __FUNCTION__, __LINE__);
-
     return $response_string;
 }