remove annotated_keyword_listid column

svn path=/; revision=349

diff --git a/Personnel/athreyab/image_annotation_db/image_annotation.mwb b/Personnel/athreyab/image_annotation_db/image_annotation.mwb
index fe317ddb9a466bad6d1f352a1018a0fc65482c30..8ed60e17b85e93b49d6fbc54b74bdeb414840d1e 100644 (file)
Binary files a/Personnel/athreyab/image_annotation_db/image_annotation.mwb and b/Personnel/athreyab/image_annotation_db/image_annotation.mwb differ

diff --git a/Personnel/athreyab/image_annotation_db/image_annotation.png b/Personnel/athreyab/image_annotation_db/image_annotation.png
index 08832112bfc5cff799655b70f66b3f1d3d88d391..99d8db734f009c7237b27669b7602ebe1fa1cb8e 100644 (file)
Binary files a/Personnel/athreyab/image_annotation_db/image_annotation.png and b/Personnel/athreyab/image_annotation_db/image_annotation.png differ

diff --git a/Personnel/athreyab/image_annotation_db/image_annotation.sql b/Personnel/athreyab/image_annotation_db/image_annotation.sql
index 5bf512485868a6816639f71ecd3418b7675d1274..34826e77492f0219f15bc12e72b3e68fc422da27 100644 (file)
--- a/Personnel/athreyab/image_annotation_db/image_annotation.sql
+++ b/Personnel/athreyab/image_annotation_db/image_annotation.sql
@@ -8,6 +8,8 @@ USE `image_annotation` ;
 -- -----------------------------------------------------
 -- Table `image_annotation`.`Species_map`
 -- -----------------------------------------------------
+DROP TABLE IF EXISTS `image_annotation`.`Species_map` ;
+
 CREATE  TABLE IF NOT EXISTS `image_annotation`.`Species_map` (
   `ubio_id` INT(11) NOT NULL ,
   `po_species_id` INT(11) NOT NULL ,
@@ -25,6 +27,8 @@ DEFAULT CHARACTER SET = latin1;
 -- -----------------------------------------------------
 -- Table `image_annotation`.`Annotated_term_type`
 -- -----------------------------------------------------
+DROP TABLE IF EXISTS `image_annotation`.`Annotated_term_type` ;
+
 CREATE  TABLE IF NOT EXISTS `image_annotation`.`Annotated_term_type` (
   `annotated_term_type_id` INT(11) NOT NULL ,
   `annotated_term_type` VARCHAR(45) NULL DEFAULT NULL ,
@@ -36,6 +40,8 @@ DEFAULT CHARACTER SET = latin1;
 -- -----------------------------------------------------
 -- Table `image_annotation`.`Annotated_term`
 -- -----------------------------------------------------
+DROP TABLE IF EXISTS `image_annotation`.`Annotated_term` ;
+
 CREATE  TABLE IF NOT EXISTS `image_annotation`.`Annotated_term` (
   `annotated_term_id` INT(11) NOT NULL ,
   `annotated_term` VARCHAR(45) NULL DEFAULT NULL ,
@@ -61,12 +67,13 @@ DEFAULT CHARACTER SET = latin1;
 -- -----------------------------------------------------
 -- Table `image_annotation`.`Annotated_image`
 -- -----------------------------------------------------
+DROP TABLE IF EXISTS `image_annotation`.`Annotated_image` ;
+
 CREATE  TABLE IF NOT EXISTS `image_annotation`.`Annotated_image` (
   `annotated_image_id` INT(11) NOT NULL ,
   `image_path` VARCHAR(255) NULL DEFAULT NULL ,
   `curator` VARCHAR(45) NULL DEFAULT NULL ,
   `comments` VARCHAR(45) NULL DEFAULT NULL ,
-  `annotated_keywordlist_id` INT(11) NULL DEFAULT NULL ,
   `annotated_term_id` INT(11) NULL DEFAULT NULL ,
   `ubio_id` INT(11) NULL DEFAULT NULL ,
   `ubio_name` VARCHAR(45) NULL DEFAULT NULL ,
@@ -91,6 +98,8 @@ DEFAULT CHARACTER SET = latin1;
 -- -----------------------------------------------------
 -- Table `image_annotation`.`Annotated_keyword`
 -- -----------------------------------------------------
+DROP TABLE IF EXISTS `image_annotation`.`Annotated_keyword` ;
+
 CREATE  TABLE IF NOT EXISTS `image_annotation`.`Annotated_keyword` (
   `annotated_keyword_id` INT(11) NOT NULL ,
   `annotated_keyword` VARCHAR(45) NULL DEFAULT NULL ,
@@ -102,6 +111,8 @@ DEFAULT CHARACTER SET = latin1;
 -- -----------------------------------------------------
 -- Table `image_annotation`.`Annotated_keywordlist`
 -- -----------------------------------------------------
+DROP TABLE IF EXISTS `image_annotation`.`Annotated_keywordlist` ;
+
 CREATE  TABLE IF NOT EXISTS `image_annotation`.`Annotated_keywordlist` (
   `annotated_image_id` INT(11) NOT NULL ,
   `annotated_keyword_id` INT(11) NOT NULL ,
@@ -125,6 +136,8 @@ DEFAULT CHARACTER SET = latin1;
 -- -----------------------------------------------------
 -- Table `image_annotation`.`Segment`
 -- -----------------------------------------------------
+DROP TABLE IF EXISTS `image_annotation`.`Segment` ;
+
 CREATE  TABLE IF NOT EXISTS `image_annotation`.`Segment` (
   `segment_id` INT(11) NOT NULL ,
   `color` VARCHAR(45) NULL DEFAULT NULL ,
@@ -153,4 +166,3 @@ DEFAULT CHARACTER SET = latin1;
 SET SQL_MODE=@OLD_SQL_MODE;
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
-