From 650bdb3af2eec7c9cb168f2e30e21ebb350882c5 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Mon, 19 Sep 2005 10:52:27 +0000
Subject: [PATCH] Give the ID used for a lookup in our error messages, and catch a potential error that may be returned by a query.

---
 lib/ktentity.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/ktentity.inc b/lib/ktentity.inc
index 9a1bcc2..97724bd 100644
--- a/lib/ktentity.inc
+++ b/lib/ktentity.inc
@@ -119,10 +119,10 @@ class KTEntity {
             return $res;
         }
         if (count($res) === 0) {
-            return PEAR::raiseError("No such ID");
+            return PEAR::raiseError("No such ID: $iId");
         }
         if (count($res) > 1) {
-            return PEAR::raiseError("Multiple matches for ID");
+            return PEAR::raiseError("Multiple matches for ID: $iID");
         }
         $vk = array_flip($this->_aFieldToSelect);
         $aLoadInfo = array();
@@ -262,6 +262,9 @@ class KTEntityUtil {
             $sQuery .= " ORDER BY " . $sOrderBy;
         }
         $aIDs = DBUtil::getResultArrayKey(array($sQuery, $aParams), $sIDField);
+        if (PEAR::isError($aIDs)) {
+            return $aIDs;
+        }
 
         if ($bIDs === true) {
             return $aIDs;
--
libgit2 0.21.4