--- bookreview.install	2006-06-15 15:32:33.000000000 +0100
+++ bookreview.install.new	2008-03-06 12:05:20.000000000 +0000
@@ -9,24 +9,24 @@ function bookreview_install() {
   switch ($db_type) {
     case 'mysql':
     case 'mysqli':
-      db_query("CREATE TABLE bookreview (
+      db_query("CREATE TABLE {bookreview} (
		  nid int(10) unsigned NOT NULL,
                  booktitle varchar(255) NOT NULL default '',
                  cover varchar(255) NOT NULL default '',
                  publisher varchar(255) NOT NULL default '',
                  copyright varchar(255) NOT NULL default 0,
                  isbn varchar(255) NOT NULL default '',
-		  price varchar(255) NOT NULL default '',
-		  pages varchar(255) NOT NULL default 0,
-		  rating int(1) NOT NULL default 0,
-		  synopsis text,
-		  contents text,
-		  review text,
-		  PRIMARY KEY (nid),
-		  KEY (booktitle)
+		  price varchar(255) NOT NULL default '',
+		  pages varchar(255) NOT NULL default 0,
+		  rating int(1) NOT NULL default 0,
+		  synopsis text,
+		  contents text,
+		  review text,
+		  PRIMARY KEY (nid),
+		  KEY (booktitle)
                 );");
 
-      db_query("CREATE TABLE bookreview_links (
+      db_query("CREATE TABLE {bookreview_links} (
                   lid int(10) unsigned NOT NULL auto_increment,
                   nid int(10) unsigned NOT NULL,
                   booklink varchar(255) NOT NULL default '',
@@ -36,7 +36,7 @@ function bookreview_install() {
                   KEY (nid)
                 );");
 
-      db_query("CREATE TABLE bookreview_authors (
+      db_query("CREATE TABLE {bookreview_authors} (
                   aid int(10) unsigned NOT NULL auto_increment,
                   nid int(10) unsigned NOT NULL,
                   author varchar(255) NOT NULL default '',
@@ -44,9 +44,10 @@ function bookreview_install() {
                   KEY (aid),
                   KEY (nid)
                 );");
+      $success = TRUE;
       break;
     case 'pgsql':
-      db_query("CREATE TABLE bookreview (
+      db_query("CREATE TABLE {bookreview} (
                   nid integer NOT NULL,
                   booktitle varchar(255) NOT NULL default '',
                   cover varchar(255) NOT NULL default '',
@@ -57,30 +58,56 @@ function bookreview_install() {
                   pages varchar(255) NOT NULL default '',
                   rating integer NOT NULL default 0,
                   synopsis text,
-		  contents text,
-		  review text,
-		  PRIMARY KEY (nid)
+				  contents text,
+				  review text,
+				  PRIMARY KEY (nid)
 		);");
-      db_query("CREATE index bookreview_booktitle on bookreview (booktitle);");
+      db_query("CREATE index bookreview_booktitle on {bookreview} (booktitle);");
 
-      db_query("CREATE TABLE bookreview_links (
+      db_query("CREATE TABLE {bookreview_links} (
 		  lid serial NOT NULL,
 		  nid integer NOT NULL,
 		  booklink varchar(255) NOT NULL default '',
 		  description varchar(255) NOT NULL default '',
 		  weight smallint DEFAULT '0'
 		);");
-      db_query("CREATE index bookreview_links_lid on bookreview_links (lid);");
-      db_query("CREATE index bookreview_links_nid on bookreview_links (nid);");
+      db_query("CREATE index bookreview_links_lid on {bookreview_links} (lid);");
+      db_query("CREATE index bookreview_links_nid on {bookreview_links} (nid);");
 
-      db_query("CREATE TABLE bookreview_authors (
+      db_query("CREATE TABLE {bookreview_authors} (
 		  aid serial NOT NULL,
 		  nid integer NOT NULL,
 		  author varchar(255) NOT NULL default '',
 		  weight smallint DEFAULT '0');");
-      db_query("CREATE index bookreview_authors_aid on bookreview_authors (aid);");
-      db_query("CREATE index bookreview_authors_nid on bookreview_authors (nid);");
+      db_query("CREATE index bookreview_authors_aid on {bookreview_authors} (aid);");
+      db_query("CREATE index bookreview_authors_nid on {bookreview_authors} (nid);");
+      $success = TRUE;
       break;
+	default:
+      drupal_set_message(t('Unsupported database.'));
+  }
+
+  if ($success) {
+	  drupal_set_message(t('Congratulations! All tables required by the Book Review module have been created.'));
+  }
+  else {
+    drupal_set_message(t('The installation of the Book Review module and Database tables
+      were unsuccessful. Try installing the tables manually (INSTALL.txt) if you 
+    keep getting this error.'),'error');
   }
-  drupal_set_message(t('All tables required by the bookreview module have been created.'));
 }
+
+/**
+ * Implementation of hook_uninstall()
+ */
+function bookreview_uninstall() {
+  db_query("DROP TABLE {bookreview}");
+  db_query("DROP TABLE {bookreview_links}");
+  db_query("DROP TABLE {bookreview_authors}");
+  variable_del('bookreview_store_blocktitle');
+  variable_del('bookreview_store_snippet');
+  variable_del('minimum_bookreview_size');
+  variable_del('bookreview_detail');
+  variable_del('bookreview_css');
+  variable_del('bookreview_help');
+}
\ Nenhuma linha nova no fim do ficheiro