Bug Fixes, and updated the install SQL

Author: Dave-Morton

chatbot/conversation_start.php

@@ -175,5 +175,6 @@
   runDebug(__FILE__, __FUNCTION__, __LINE__, "Closing Database", 2);
   db_close($con);
     #echo $display;
+  //save_file(_DEBUG_PATH_ . 'function_list.txt', print_r(get_defined_functions(), true));
   $convoArr = handleDebug($convoArr); // Make sure this is the last line in the file, so that all debug entries are captured.
   if (isset($convoArr['conversation']['format'])) display_conversation($display, $convoArr['conversation']['format']);

chatbot/core/aiml/find_aiml.php

@@ -179,6 +179,20 @@ function unset_all_bad_pattern_matches($allrows, $lookingfor, $current_thatpatte
             }
           }
         }
+        else
+        {
+          $tmp_rows[$i] = array(
+            'aiml_id' => -1,
+            'bot_id'  => -1,
+            'pattern' => '',
+            'thatpattern'  => '',
+            'topic'  => '',
+            'score'   => 0,
+            'track_score' => ''
+          );
+/*
+*/
+        }
         //echo "<br/>--------------";
       }
     }
@@ -397,6 +411,7 @@ function score_matches($convoArr, $bot_parent_id, $allrows, $lookingfor, $curren
     print_r($allrows);
     echo "</pre>";
     */
+    runDebug(__FILE__, __FUNCTION__, __LINE__,"Returned array:\n" . print_r($allrows, true), 4);
     return $allrows;
     //return the scored rows
   }
@@ -415,8 +430,8 @@ function sort2DArray($opName, $thisArr, $sortByItem, $sortAsc = 1, $limit = 10)
   {
     $thisCount = count($thisArr);
     $showLimit = ($thisCount < $limit) ? $thisCount : $limit;
-    runDebug(__FILE__, __FUNCTION__, __LINE__, "$opName - sorting $thisCount results by $sortByItem and getting the top $showLimit for debugging.", 4);
     runDebug(__FILE__, __FUNCTION__, __LINE__, print_r($thisArr, true), 4);
+    runDebug(__FILE__, __FUNCTION__, __LINE__, "$opName - sorting $thisCount results by $sortByItem and getting the top $showLimit for debugging.", 4);
     $i = 0;
     $tmpSortArr = array();
     $resArr = array();

chatbot/core/aiml/parse_aiml_as_XML.php

@@ -617,10 +617,10 @@ function parse_input_tag($convoArr, $element, $parentName, $level)
   {
     runDebug(__FILE__, __FUNCTION__, __LINE__, 'Parsing an INPUT tag.', 2);
     $element = $element->input;
-    $index = $element['index'];
-    $index = (!empty ($index)) ? $index : 1;
-    runDebug(__FILE__, __FUNCTION__, __LINE__, "Parsing the INPUT tag. Index = $index.", 4);
-    $response_string = $convoArr['input'][$index];
+    $input_index = (string)$element['index'];
+    $input_index = (!empty ($input_index)) ? $input_index : 1;
+    runDebug(__FILE__, __FUNCTION__, __LINE__, "Parsing the INPUT tag. Index = $input_index.", 4);
+    $response_string = $convoArr['input'][$input_index];
     return $response_string;
   }
 

chatbot/core/conversation/intialise_conversation.php

@@ -609,21 +609,25 @@ function load_that($convoArr)
     $user_id = $convoArr['conversation']['user_id'];
     $bot_id = $convoArr['conversation']['bot_id'];
     $limit = $remember_up_to;
-    $sql = "select `response` from `$dbn`.`conversation_log` where `user_id` = $user_id and `bot_id` = $bot_id order by `id` asc limit $limit;"; // desc
+    $sql = "select `input`, `response` from `$dbn`.`conversation_log` where `user_id` = $user_id and `bot_id` = $bot_id order by `id` asc limit $limit;"; // desc
     runDebug(__FILE__, __FUNCTION__, __LINE__, "Getting conversation log entries for the current user. SQL:\n$sql", 3);
     $result = db_query($sql, $con);
     if ($result)
     {
-      $tmpRows = array();
+      $tmpThatRows = array();
+      $tmpInputRows = array();
       $tmpThat = array();
+      $tmpInput = array();
       $puncuation = array(',', '?', ';', '!');
       while ($row = mysql_fetch_assoc($result))
       {
-        $tmpRows[] = $row['response'];
+        $tmpThatRows[] = $row['response'];
+        $tmpInputRows[] = $row['input'];
       }
-      runDebug(__FILE__, __FUNCTION__, __LINE__, 'Finished loading previous responses into the ~THAT~ array.', 4);
-      array_reverse($tmpRows);
-      foreach ($tmpRows as $row)
+      runDebug(__FILE__, __FUNCTION__, __LINE__, 'Inputs returned:' . print_r($tmpInputRows, true), 1);
+      runDebug(__FILE__, __FUNCTION__, __LINE__, 'Loading previous responses into the ~THAT~ array.', 4);
+      array_reverse($tmpThatRows);
+      foreach ($tmpThatRows as $row)
       {
         $row = str_replace($puncuation, '.', $row);
         $tmpThat[] = explode('.', $row);
@@ -636,9 +640,24 @@ function load_that($convoArr)
         $value = clean_that($value, __FILE__, __FUNCTION__, __LINE__);
         $convoArr = push_on_front_convoArr('that', $value, $convoArr);
       }
+      runDebug(__FILE__, __FUNCTION__, __LINE__, 'Loading previous user inputs into the ~INPUT~ array.', 4);
+      array_reverse($tmpInputRows);
+      foreach ($tmpInputRows as $row)
+      {
+        $row = str_replace($puncuation, '.', $row);
+        $tmpInput[] = explode('.', $row);
+      }
+      array_unshift($tmpThat, NULL);
+      unset ($tmpThat[0]);
+      foreach ($tmpInput as $index => $value)
+      {
+        $value = implode_recursive(' ', $value, __FILE__, __FUNCTION__, __LINE__);
+        $value = clean_that($value, __FILE__, __FUNCTION__, __LINE__);
+        $convoArr = push_on_front_convoArr('input', $value, $convoArr);
+      }
     }
+    else runDebug(__FILE__, __FUNCTION__, __LINE__, 'Couldn\'t find any previous inputs or responses.', 4);
     mysql_free_result($result);
     return $convoArr;
   }
-
-?>
+?>

gui/xml/index.php

@@ -109,7 +109,7 @@ function get_convo_id()
       }
     </style>
   </head>
-  <body>
+  <body onload="document.forms[0].say.focus();">
     <h3>Program O XML GUI</h3>
     <form accept-charset="utf-8" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
       <p>