Bug Fix and Code Cleanup

Fixed a bug in the scoring function that added an extra "empty" element
to the scoring array, which could cause the script to return the default
response under certain conditions

Author: Dave-Morton

chatbot/core/aiml/find_aiml.php

@@ -71,7 +71,6 @@ function make_like_pattern($sentence, $field)
 
     $sql_like_pattern .= " `$field` like '% $last_word%' OR  `$field` like '$first_word % $last_word' OR `$field` like '$last_word'";
     runDebug(__FILE__, __FUNCTION__, __LINE__, "returning like pattern:\n$sql_like_pattern", 4);
-    //return
     return $sql_like_pattern;
   }
 
@@ -114,38 +113,38 @@ function unset_all_bad_pattern_matches($allrows, $lookingfor, $current_thatpatte
     //loop through the results array
     foreach ($allrows as $all => $subrow)
     {
-      $aiml_pattern = $subrow['pattern'];
+      // set the score to zero
+      $tmp_rows[$i]['track_score'] = '';
       //get the pattern
-      $aiml_topic = $subrow['topic'];
+      $aiml_pattern = $subrow['pattern'];
       //get the topic
-      $aiml_thatpattern = $subrow['thatpattern'];
+      $aiml_topic = $subrow['topic'];
       //get the that
-      //$aiml_pattern = (IS_MB_ENABLED) ? mb_strtolower($aiml_pattern) : strtolower($aiml_pattern);
-      //$default_pattern = (IS_MB_ENABLED) ? mb_strtolower($default_pattern) : strtolower($default_pattern);
+      $aiml_thatpattern = $subrow['thatpattern'];
+      //if it is a direct match with our default pattern then add to tmp_rows
       if ($aiml_pattern == $default_pattern)
       {
-      //if it is a direct match with our default pattern then add to tmp_rows
         $tmp_rows[$i] = $subrow;
         $tmp_rows[$i]['score'] = 0;
-        $tmp_rows[$i]['track_score'] = "za";
+        $tmp_rows[$i]['track_score'] .= "za";
         $i++;
       }
+      //build an aiml_pattern with wild cards to check for a match
       else
       {
         $aiml_pattern_matchme = match_wildcard_rows($aiml_pattern);
-        //build an aiml_pattern with wild cards to check for a match
         if ($aiml_thatpattern != '')
         {
-          $aiml_thatpattern_matchme = match_wildcard_rows($aiml_thatpattern);
           //build an aiml_thatpattern with wild cards to check for a match
+          $aiml_thatpattern_matchme = match_wildcard_rows($aiml_thatpattern);
           $that_match = preg_match($aiml_thatpattern_matchme, $current_thatpattern, $matches);
           //see if that patterns match
-          $tmp_rows[$i]['track_score'] = "b";
+          $tmp_rows[$i]['track_score'] .= "b";
         }
         else
         {
           $that_match = "$aiml_thatpattern == ''";
-          $tmp_rows[$i]['track_score'] = "c";
+          $tmp_rows[$i]['track_score'] .= "c";
         }
         if ($aiml_topic != '')
         {
@@ -162,25 +161,24 @@ function unset_all_bad_pattern_matches($allrows, $lookingfor, $current_thatpatte
 
         if (count($matches)>0)
         {
-        //echo "<br/>TRUE1";
           if ($that_match)
           {
-          //echo "<br/>TRUE2";
             if ($topic_match)
             {
               if ((isset ($subrow['pattern'])) && ($subrow['pattern'] != ''))
               {
-              //	echo "<br/>TRUE3";
                 $tmp_rows[$i] = $subrow;
                 $tmp_rows[$i]['score'] = 0;
-                $tmp_rows[$i]['track_score'] = "f";
+                $tmp_rows[$i]['track_score'] .= "f";
                 $i++;
               }
             }
           }
         }
         else
         {
+          continue;
+/*
           $tmp_rows[$i] = array(
             'aiml_id' => -1,
             'bot_id'  => -1,
@@ -190,7 +188,6 @@ function unset_all_bad_pattern_matches($allrows, $lookingfor, $current_thatpatte
             'score'   => 0,
             'track_score' => ''
           );
-/*
 */
         }
         //echo "<br/>--------------";
@@ -406,11 +403,6 @@ function score_matches($convoArr, $bot_parent_id, $allrows, $lookingfor, $curren
     //send off for debugging
     sort2DArray("show top scoring aiml matches", $allrows, "score", 1, 10);
 
-    /*
-    echo "<pre>";
-    print_r($allrows);
-    echo "</pre>";
-    */
     runDebug(__FILE__, __FUNCTION__, __LINE__,"Returned array:\n" . print_r($allrows, true), 4);
     return $allrows;
     //return the scored rows
@@ -473,7 +465,7 @@ function sort2DArray($opName, $thisArr, $sortByItem, $sortAsc = 1, $limit = 10)
     //get the limited top results
     $outArr = array_slice($resArr, 0, $limit);
     //send to debug
-    runDebug(__FILE__, __FUNCTION__, __LINE__, "$opName " . print_r($outArr, true), 3);
+    runDebug(__FILE__, __FUNCTION__, __LINE__, "$opName " . print_r($outArr, true), 4);
   }
 
   /**
@@ -494,6 +486,7 @@ function get_highest_score_rows($allrows, $lookingfor)
     {
       if (!isset ($subrow['score']))
       {
+        continue;
       }
       elseif ($subrow['score'] > $last_high_score)
       {