Merge branch 'release-1.3'

PavlidisLab · Apr 19, 2018 · a366f9e · a366f9e
2 parents a8a9827 + c8db686
commit a366f9e
Show file tree

Hide file tree

Showing 108 changed files with 5,988 additions and 4,734 deletions.
diff --git a/gotrack/etc/sql/gotrack_schema_dump.sql b/gotrack/etc/sql/gotrack_schema_dump.sql
@@ -80,6 +80,7 @@ CREATE TABLE `evidence_categories` (
  `evidence` varchar(3) NOT NULL,
  `description` varchar(255) NOT NULL,
  `category` varchar(255) NOT NULL,
+ `curated` tinyint(1) DEFAULT NULL,
  PRIMARY KEY (`id`),
  UNIQUE KEY `evidence` (`evidence`)
 ) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=latin1;
@@ -91,7 +92,7 @@ CREATE TABLE `evidence_categories` (
 
 LOCK TABLES `evidence_categories` WRITE;
 /*!40000 ALTER TABLE `evidence_categories` DISABLE KEYS */;
-INSERT INTO `evidence_categories` VALUES (1,'EXP','Inferred from Experiment ','Experimental'),(2,'IDA','Inferred from Direct Assay ','Experimental'),(3,'IPI','Inferred from Physical Interaction ','Experimental'),(4,'IMP','Inferred from Mutant Phenotype ','Experimental'),(5,'IGI','Inferred from Genetic Interaction ','Experimental'),(6,'IEP','Inferred from Expression Pattern ','Experimental'),(7,'ISS','Inferred from Sequence or structural Similarity ','Computational'),(8,'ISO','Inferred from Sequence Orthology ','Computational'),(9,'ISA','Inferred from Sequence Alignment ','Computational'),(10,'ISM','Inferred from Sequence Model ','Computational'),(11,'IGC','Inferred from Genomic Context ','Computational'),(12,'IBA','Inferred from Biological aspect of Ancestor ','Computational'),(13,'IBD','Inferred from Biological aspect of Descendant ','Computational'),(14,'IKR','Inferred from Key Residues ','Computational'),(15,'IRD','Inferred from Rapid Divergence','Computational'),(16,'RCA','Inferred from Reviewed Computational Analysis ','Computational'),(17,'TAS','Traceable Author Statement ','Author'),(18,'NAS','Non-traceable Author Statement ','Author'),(19,'IC','Inferred by Curator','Curatorial'),(20,'ND','No biological Data available','Curatorial'),(21,'NR','Not recorded','Curatorial'),(22,'IEA','Inferred from Electronic Annotation ','Automatic');
+INSERT INTO `evidence_categories` VALUES (1,'EXP','Inferred from Experiment','Experimental', 1),(2,'IDA','Inferred from Direct Assay','Experimental', 1),(3,'IPI','Inferred from Physical Interaction','Experimental', 1),(4,'IMP','Inferred from Mutant Phenotype','Experimental', 1),(5,'IGI','Inferred from Genetic Interaction','Experimental', 1),(6,'IEP','Inferred from Expression Pattern','Experimental', 1),(7,'ISS','Inferred from Sequence or structural Similarity','Computational', 1),(8,'ISO','Inferred from Sequence Orthology','Computational', 1),(9,'ISA','Inferred from Sequence Alignment','Computational', 1),(10,'ISM','Inferred from Sequence Model','Computational', 1),(11,'IGC','Inferred from Genomic Context','Computational', 1),(12,'IBA','Inferred from Biological aspect of Ancestor','Computational', 1),(13,'IBD','Inferred from Biological aspect of Descendant','Computational', 1),(14,'IKR','Inferred from Key Residues','Computational', 1),(15,'IRD','Inferred from Rapid Divergence','Computational', 1),(16,'RCA','Inferred from Reviewed Computational Analysis','Computational', 1),(17,'TAS','Traceable Author Statement','Author', 1),(18,'NAS','Non-traceable Author Statement','Author', 1),(19,'IC','Inferred by Curator','Curatorial', 1),(20,'ND','No biological Data available','Curatorial', 1),(21,'NR','Not recorded','Curatorial', 1),(22,'IEA','Inferred from Electronic Annotation','Automatic', 0),(23,'HTP','Inferred from High Throughput Experiment','High Throughput',1), (24,'HDA','Inferred from High Throughput Direct Assay','High Throughput',1), (25,'HMP','Inferred from High Throughput Mutant Phenotype','High Throughput',1), (26,'HGI','Inferred from High Throughput Genetic Interaction','High Throughput',1), (27,'HEP','Inferred from High Throughput Expression Pattern','High Throughput',1);
 /*!40000 ALTER TABLE `evidence_categories` ENABLE KEYS */;
 UNLOCK TABLES;