--- ./o/casetracker.module	2006-04-02 15:45:41.000000000 -0400
+++ casetracker.module	2006-04-02 15:15:28.000000000 -0400
@@ -1014,9 +1014,10 @@ function casetracker_case_table_view($ta
     $header[] = array('data' => "$field", 'field' => "$field");
   }
 
-  $sql = "SELECT * FROM {$table}";
+  $sql = "SELECT * FROM {".$table."}";
   $sql .= tablesort_sql($header);
-  $result = pager_query($sql, 20);
+  // $result = pager_query($sql, 20);
+  $result = pager_query($sql.$tablesort, 15, 0, NULL);
 
   if (db_num_rows($result)) {
     while ($row = db_fetch_array($result)) {
@@ -1039,7 +1040,8 @@ function casetracker_case_table_view($ta
  
 function casetracker_get_fields($table) {
   $fields = array();
-  $result = db_query("DESCRIBE $table");
+  //$result = db_query("DESCRIBE $table");
+  $result = db_query("DESCRIBE {%s}", $table);
   while ($row = db_fetch_object($result)) {
     $fields[] = $row->Field;
   }
@@ -1099,7 +1101,8 @@ function casetracker_case_table_edit_sub
   $pos = strpos($str, ' ');
   $str = substr($str, $pos);
   if ($_POST['op'] == 'Delete') {
-    $result = db_query('DESCRIBE %s', $form_values['casetracker_table_name']);
+    // $result = db_query('DESCRIBE %s', $form_values['casetracker_table_name']);
+    $result = db_query('DESCRIBE {%s}', $form_values['casetracker_table_name']);
     while ($row = db_fetch_array($result)) {
       $fields[] = $row[Field];
     }
@@ -1112,7 +1115,8 @@ function casetracker_case_table_edit_sub
 
   }  
   if ($form_values['casetracker_new_values'] && $_POST['op'] == 'Update' && casetracker_type_add_validate($form_id, $form_values)) {
-    $result = db_query('DESCRIBE %s', $form_values['casetracker_table_name']);
+    // $result = db_query('DESCRIBE %s', $form_values['casetracker_table_name']);
+    $result = db_query('DESCRIBE {%s}', $form_values['casetracker_table_name']);
     while ($row = db_fetch_array($result)) {
       $fields[] = $row[Field];
     }
@@ -1141,7 +1145,8 @@ function casetracker_case_table_delete()
  */
  
 function casetracker_case_table_delete_confirm_submit($form_id, $form_values) {
-   $result = db_query('DESCRIBE %s', $form_values['casetracker_table_name']);
+   // $result = db_query('DESCRIBE %s', $form_values['casetracker_table_name']);
+   $result = db_query('DESCRIBE {%s}', $form_values['casetracker_table_name']);
    while ($row = db_fetch_array($result)) {
       $fields[] = $row[Field];
    }
@@ -1783,9 +1788,11 @@ function casetracker_get_value($table, $
   $fields = casetracker_get_fields($table);
   switch ($table) {
     case 'term_data':
-      return db_result(db_query("SELECT %s FROM %s WHERE %s = %d", $fields[2], $table, $fields[0], $id));
+      // return db_result(db_query("SELECT %s FROM %s WHERE %s = %d", $fields[2], $table, $fields[0], $id));
+	  return db_result(db_query("SELECT x.%s FROM {%s} WHERE x.%s = %d", $fields[2], $table, $fields[0], $id));
     default:
-      return db_result(db_query("SELECT %s FROM %s WHERE %s = %d", $fields[1], $table, $fields[0], $id));
+      // return db_result(db_query("SELECT %s FROM %s WHERE %s = %d", $fields[1], $table, $fields[0], $id));	  
+	  return db_result(db_query("SELECT x.%s FROM {%s} x WHERE x.%s = %d", $fields[1], $table, $fields[0], $id));
   }
 }