Bug Fix

Found and corrected a bug that prevented certain AIML tags (notably, the
<star> tag) from being parsed at times.

Special thanks to Xtciann for helping me to isolate and correct this
bug.

Author: Dave-Morton

chatbot/core/aiml/find_aiml.php

@@ -143,18 +143,18 @@ function unset_all_bad_pattern_matches($allrows, $lookingfor, $current_thatpatte
         }
         else
         {
-          $that_match = "$aiml_thatpattern == ''";
+          $that_match = ($aiml_thatpattern == '');
           $tmp_rows[$i]['track_score'] .= "c";
         }
         if ($aiml_topic != '')
         {
-          $topic_match = "$aiml_topic == $current_topic";
+          $topic_match = ($aiml_topic == $current_topic);
           $tmp_rows[$i]['track_score'] .= "d";
         }
         else
         {
-          $topic_match = "$aiml_topic == ''";
-          $tmp_rows[$i]['track_score'] .= "e";
+          $topic_match = ($aiml_topic == '');
+          $tmp_rows[$i]['track_score'] .= "xe";
         }
         //try to match the returned aiml pattern with the user input (lookingfor) and with the that's and topic's
         preg_match($aiml_pattern_matchme, $lookingfor, $matches);
@@ -177,25 +177,11 @@ function unset_all_bad_pattern_matches($allrows, $lookingfor, $current_thatpatte
         }
         else
         {
+          if (!isset($tmp_rows[$i]['pattern'])) unset($tmp_rows[$i]);
           continue;
-/*
-          $tmp_rows[$i] = array(
-            'aiml_id' => -1,
-            'bot_id'  => -1,
-            'pattern' => '',
-            'thatpattern'  => '',
-            'topic'  => '',
-            'score'   => 0,
-            'track_score' => ''
-          );
-*/
         }
-        //echo "<br/>--------------";
       }
     }
-    //	echo "<pre>";
-    //	print_r($tmp_rows);
-    //	echo "</pre>";
     runDebug(__FILE__, __FUNCTION__, __LINE__, "Found '$i' relevant rows", 2);
     runDebug(__FILE__, __FUNCTION__, __LINE__, print_r($tmp_rows,true), 4);
     return $tmp_rows;
@@ -775,10 +761,7 @@ function find_aiml_matches($convoArr)
     else
     {
       $thatPattern = '';
-      //$lastThatPattern = '';
-      //$firstThatPattern = '';
       $thatPatternSQL = '';
-      //$storedthatpattern ='';
     }
     //get the word count
     $word_count = wordsCount_inSentence($lookingfor);
@@ -833,6 +816,8 @@ function find_aiml_matches($convoArr)
         $allrows[$i]['pattern'] = $row['pattern'];
         $allrows[$i]['thatpattern'] = $row['thatpattern'];
         $allrows[$i]['topic'] = $row['topic'];
+        $allrows[$i]['score'] = 0;
+        $allrows[$i]['track_score'] = '';
         $i++;
         $mu = memory_get_usage(true);
         if ($mu >= MEM_TRIGGER)

chatbot/core/aiml/parse_aiml_as_XML.php

@@ -774,7 +774,10 @@ function tag_to_string($convoArr, $element, $parentName, $level, $type = 'elemen
     $children = $element->children();
     if (!empty ($children))
     {
-      $response = parseTemplateRecursive($convoArr, $children, $level + 1);
+      foreach ($children as $child)
+      {
+        $response[] = parseTemplateRecursive($convoArr, $child, $level + 1);
+      }
     }
     else
     {

chatbot/core/user/handle_user.php

@@ -24,7 +24,6 @@ function load_new_client_defaults($convoArr)
   runDebug( __FILE__, __FUNCTION__, __LINE__, 'Loading client defaults', 2);
   $convoArr['client_properties']['name'] = $unknown_user;
   $convoArr['client_properties']['id'] = session_id();
-  runDebug(__FILE__, __FUNCTION__, __LINE__, 'Conversation element = ' . print_r($convoArr['conversation'], true), 4);
   return $convoArr;
 }