--- a/class.Address_Book_DB.php	Wed Oct 26 20:56:15 2011 +0200
+++ b/class.Address_Book_DB.php	Wed Oct 26 21:44:35 2011 +0200
@@ -1,13 +1,13 @@
 <?
-require "interface.Address_Book.php";
+require_once "interface.Address_Book.php";
 
 class Address_Book_DB implements Address_Book {
-	const INSERT_ENTRY = 'INSERT INTO data (name, tel, email)
-	 		      VALUES(:name, :tel, :email)';
-	const SELECT_ENTRY = 'SELECT name AS NAME, tel AS TEL, email AS MAIL
+	const INSERT_ENTRY = 'INSERT INTO data (name, tel, mail)
+	 		      VALUES(:name, :tel, :mail)';
+	const SELECT_ENTRY = 'SELECT name AS NAME, tel AS TEL, mail AS MAIL
 			      FROM data WHERE name LIKE :name
 			      	           OR tel LIKE :tel
-					   OR email LIKE :email';
+					   OR mail LIKE :mail';
 		
 
 	private $dbh;
@@ -17,7 +17,7 @@
 		array( PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION));
 
 		$this->dbh->exec("CREATE TABLE IF NOT EXISTS data
-			(name TEXT, tel TEXT, email TEXT)");
+			(name TEXT, tel TEXT, mail TEXT)");
 
 		$this->dbh->beginTransaction();
 
@@ -25,8 +25,6 @@
 		$sth->execute();
 		$r = $sth->fetch();
 
-		print_r($r);
-
 		if ($r['COUNT'] == 0) 
 			$this->insert(array("Hans Hanson", "0815", "hans@hanson.de"));
 		$this->dbh->commit();
@@ -40,7 +38,7 @@
 		
 		$sth->execute(array("name" => $entry[0],
 				    "tel"  => $entry[1],
-				    "email" => $entry[2]));
+				    "mail" => $entry[2]));
 	}
 			
 	public function get_all_entries() {
@@ -77,20 +75,20 @@
 		if ($sth === null)
 			$sth = $this->dbh->prepare(self::SELECT_ENTRY);
 
-		// $pattern = "%" . trim(trim($pattern), "%") . "%";
+		$pattern = trim($pattern);
+		if (empty($pattern)) return;
 
-		$pattern = trim($pattern);
 		$pattern = trim($pattern, '%');
 		$pattern = "%$pattern%";
 
 		$sth->execute(array("name" => $pattern,
 				    "tel" => $pattern,
-				    "email" => $pattern));
+				    "mail" => $pattern));
 		$entries = array();
 		while ($r = $sth->fetch()) {
 			$entries[] = array('name' => $r['NAME'],
 					   'tel' => $r['TEL'],
-					   'mail' => $r['EMAIL']);
+					   'mail' => $r['MAIL']);
 		}
 		return $entries;
 	}