Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram

sails/conf/config.js

@@ -6,7 +6,7 @@
 
 
 angular.module('dashboardConfig', [])
 angular.module('dashboardConfig', [])
 .constant('config', {
 .constant('config', {
-   'backend': 'https://pre.yottacode.com:1337'
+   'backend': 'https://sinai-fernando.ujaen.es:9944'
 //  'backend': 'http://localhost:1337',
 //  'backend': 'http://localhost:1337',
 //    'backend': 'https://dev.yottacode.com',
 //    'backend': 'https://dev.yottacode.com',
 //    //  'backend': 'https://test.yottacode.com',
 //    //  'backend': 'https://test.yottacode.com',

sails/conf/installdb_caja.sh

 #!/bin/bash
 #!/bin/bash
+if [ $# -eq 0 ]
+  then
+    echo "Usage: ${0##*/}  <mysql root pwd>"
+    exit 1
+fi
 echo Drop previous database
 echo Drop previous database
 mysql -u root -p$1 < pictodb_init.sql
 mysql -u root -p$1 < pictodb_init.sql
 echo Create schema
 echo Create schema
 mysql -u pictodbuser -pp1KT015 pictodb < pictodb.sql
 mysql -u pictodbuser -pp1KT015 pictodb < pictodb.sql
-echo Insert data
-mysql -u pictodbuser -pp1KT015 pictodb < pictodb-data.sql
-mysql -u pictodbuser -pp1KT015 pictodb < pictodb-test-caja.sql
 
 
 # picto, picto_exp and picto_tag
 # picto, picto_exp and picto_tag
 echo Insert symbols
 echo Insert symbols
@@ -14,6 +16,10 @@ mysql -u pictodbuser -pp1KT015 pictodb < symbolmetadata.sql
 echo Insert cats
 echo Insert cats
 mysql -u pictodbuser -pp1KT015 pictodb < symbolcat.sql
 mysql -u pictodbuser -pp1KT015 pictodb < symbolcat.sql
 
 
+echo Insert data
+mysql -u pictodbuser -pp1KT015 pictodb < pictodb-data.sql
+mysql -u pictodbuser -pp1KT015 pictodb < pictodb-test-caja.sql
+
 echo Create constraints
 echo Create constraints
 # Triggers for enrolments (office licenses)
 # Triggers for enrolments (office licenses)
 mysql -u pictodbuser -pp1KT015 pictodb < pictodb_enrolments_integrity_constraints.sql
 mysql -u pictodbuser -pp1KT015 pictodb < pictodb_enrolments_integrity_constraints.sql

sails/conf/installdb_caja_nosymbolstix.sh

 #!/bin/bash
 #!/bin/bash
+if [ $# -eq 0 ]
+  then
+    echo "Usage: ${0##*/}  <mysql root pwd>"
+    exit 1
+fi
 echo Drop previous database
 echo Drop previous database
 mysql -u root -p$1 < pictodb_init_keepsymbolstix.sql
 mysql -u root -p$1 < pictodb_init_keepsymbolstix.sql
 echo Create schema
 echo Create schema
@@ -7,8 +12,6 @@ echo Insert data
 mysql -u pictodbuser -pp1KT015 pictodb < pictodb-data.sql
 mysql -u pictodbuser -pp1KT015 pictodb < pictodb-data.sql
 mysql -u pictodbuser -pp1KT015 pictodb < pictodb-test-caja.sql
 mysql -u pictodbuser -pp1KT015 pictodb < pictodb-test-caja.sql
 
 
-
-
 echo Create constraints
 echo Create constraints
 # Triggers for enrolments (office licenses)
 # Triggers for enrolments (office licenses)
 mysql -u pictodbuser -pp1KT015 pictodb < pictodb_enrolments_integrity_constraints.sql
 mysql -u pictodbuser -pp1KT015 pictodb < pictodb_enrolments_integrity_constraints.sql

sails/conf/pictodb.sql

@@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS `action` (
 --
 --
 CREATE TABLE IF NOT EXISTS `catexp`(
 CREATE TABLE IF NOT EXISTS `catexp`(
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `id_cat` int(11) NOT NULL,
+  `id_cat` int(11) NOT NULL REFERENCES `pictocat`,
   `lang` char(5),
   `lang` char(5),
   `exp` varchar(30) NOT NULL,
   `exp` varchar(30) NOT NULL,
   PRIMARY KEY(`id`),
   PRIMARY KEY(`id`),
@@ -221,9 +221,9 @@ CREATE TABLE IF NOT EXISTS `official_dev` (
 CREATE TABLE IF NOT EXISTS `picto` (
 CREATE TABLE IF NOT EXISTS `picto` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uri` varchar(250) COLLATE utf8_unicode_ci NOT NULL,
   `uri` varchar(250) COLLATE utf8_unicode_ci NOT NULL,
-  `id_src` tinyint(4) NOT NULL,
-  `id_owner` int(11) DEFAULT NULL,
-  `id_cat` int(11) DEFAULT NULL,
+  `id_src` tinyint(4) NOT NULL REFERENCES `source`,
+  `id_owner` int(11) DEFAULT NULL REFERENCES `supervisor`,
+  `id_cat` int(11) DEFAULT NULL REFERENCES `pictocat`,
   PRIMARY KEY (`id`),
   PRIMARY KEY (`id`),
   UNIQUE KEY `ck_pic` (`id_owner`,`id_src`,`uri`),
   UNIQUE KEY `ck_pic` (`id_owner`,`id_src`,`uri`),
   KEY `fk_sou_pic` (`id_src`)
   KEY `fk_sou_pic` (`id_src`)
@@ -299,7 +299,7 @@ CREATE TABLE IF NOT EXISTS `picto_core_cat` (
 
 
 CREATE TABLE IF NOT EXISTS `picto_exp` (
 CREATE TABLE IF NOT EXISTS `picto_exp` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `id_pic` int(11) NOT NULL,
+  `id_pic` int(11) NOT NULL REFERENCES `picto`,
   `lang` char(5) COLLATE utf8_unicode_ci NOT NULL,
   `lang` char(5) COLLATE utf8_unicode_ci NOT NULL,
   `text` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
   `text` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`),
   PRIMARY KEY (`id`),
@@ -503,13 +503,6 @@ ALTER TABLE `action`
 
 
 
 
 --
 --
--- Filtros para la tabla `catexp`
---
-ALTER TABLE `catexp`
- ADD CONSTRAINT `fk_picto_cat1` FOREIGN KEY (`id_cat`) REFERENCES `pictocat` (`id`);
-
-
---
 -- Filtros para la tabla `method`
 -- Filtros para la tabla `method`
 --
 --
 ALTER TABLE `method`
 ALTER TABLE `method`
@@ -549,15 +542,6 @@ ALTER TABLE `official_dev`
 --
 --
 -- Filtros para la tabla `picto`
 -- Filtros para la tabla `picto`
 --
 --
-ALTER TABLE `picto`
-  ADD CONSTRAINT `fk_sou_pic` FOREIGN KEY (`id_src`) REFERENCES `source` (`id`),
-  ADD CONSTRAINT `fk_sup_pic` FOREIGN KEY (`id_owner`) REFERENCES `supervisor` (`id`);
-
---
--- Filtros para la tabla `picto_cat`
---
-ALTER TABLE `picto` 
-  ADD CONSTRAINT `fk_picto_cat2` FOREIGN KEY (`id_cat`) REFERENCES `pictocat`(`id`);
 
 
 --
 --
 -- Filtros para la tabla `picto_acl`
 -- Filtros para la tabla `picto_acl`
@@ -579,11 +563,6 @@ ALTER TABLE `picto_core_cat`
   ADD CONSTRAINT `picto_core_cat_ibfk_1` FOREIGN KEY (`id_cat_pic`) REFERENCES `picto` (`id`),
   ADD CONSTRAINT `picto_core_cat_ibfk_1` FOREIGN KEY (`id_cat_pic`) REFERENCES `picto` (`id`),
   ADD CONSTRAINT `picto_core_cat_ibfk_2` FOREIGN KEY (`id_pic`) REFERENCES `picto` (`id`);
   ADD CONSTRAINT `picto_core_cat_ibfk_2` FOREIGN KEY (`id_pic`) REFERENCES `picto` (`id`);
 
 
---
--- Filtros para la tabla `picto_exp`
---
-ALTER TABLE `picto_exp`
-  ADD CONSTRAINT `fk_pic_exp` FOREIGN KEY (`id_pic`) REFERENCES `picto` (`id`);
 
 
 --
 --
 -- Filtros para la tabla `picto_tag`
 -- Filtros para la tabla `picto_tag`

sails/conf/pictodb_init_keepsymbolstix.sql

@@ -2,17 +2,18 @@ GRANT USAGE ON *.* TO 'pictodbuser'@'localhost';
 DROP USER  'pictodbuser'@'localhost';
 DROP USER  'pictodbuser'@'localhost';
 CREATE USER 'pictodbuser'@'localhost' identified by 'p1KT015';
 CREATE USER 'pictodbuser'@'localhost' identified by 'p1KT015';
 
 
-CREATE DATABASE symbolstixdb;
-alter table pictodb.picto rename symbolstixdb.picto;
-alter table pictodb.pictocat rename symbolstixdb.pictocat;
-alter table pictodb.catexp rename symbolstixdb.catexp;
-alter table pictodb.picto_exp rename symbolstixdb.picto_exp;
-
-DROP DATABASE  pictodb;
+ CREATE DATABASE symbolstixdb;
+ alter table pictodb.picto rename symbolstixdb.picto;
+ alter table pictodb.pictocat rename symbolstixdb.pictocat;
+ alter table pictodb.catexp rename symbolstixdb.catexp;
+ alter table pictodb.picto_exp rename symbolstixdb.picto_exp;
+ SET foreign_key_checks=0;
+ DROP DATABASE  pictodb;
+ SET foreign_key_checks=1;
 CREATE DATABASE pictodb;
 CREATE DATABASE pictodb;
 alter table symbolstixdb.picto rename pictodb.picto;
 alter table symbolstixdb.picto rename pictodb.picto;
 alter table symbolstixdb.pictocat rename pictodb.pictocat;
 alter table symbolstixdb.pictocat rename pictodb.pictocat;
-alter table symbolstixdb.catexp rename pictodb.pictocat;
+alter table symbolstixdb.catexp rename pictodb.catexp;
 alter table symbolstixdb.picto_exp rename pictodb.picto_exp;
 alter table symbolstixdb.picto_exp rename pictodb.picto_exp;
 
 
 grant all privileges on pictodb.* to pictodbuser;
 grant all privileges on pictodb.* to pictodbuser;