removed clientid from job_conditions.

changed run_interval to run_schedule
added return_output to scripts table.  will help with post-processing.
added a few drop table if exists lines to the phpgacl code.
added commented-out sequences should they prove necessary.

svn path=/; revision=204

1 files changed, 68 insertions, 2 deletions

diff --git a/docs/scire.sql b/docs/scire.sql
index d87e357..8f1b781 100644
--- a/docs/scire.sql
+++ b/docs/scire.sql
@@ -91,12 +91,11 @@ CREATE TABLE jobs_clients (
 DROP TABLE IF EXISTS job_conditions;
 CREATE TABLE job_conditions (
   jobid INT NOT NULL,
-  clientid INT NOT NULL,
   job_dependency INT NOT NULL,
   start_time TIMESTAMP,
   start_period TIMESTAMP,
   end_period TIMESTAMP,
-  run_interval INT,   #in seconds?
+  run_schedule VARCHAR(255),   #a cron-like string showing the schedule to run. min interval of 1 minute.
   last_run INT,
   last_run_date TIMESTAMP,
 # conditions here (TBD)
@@ -123,6 +122,7 @@ CREATE TABLE scripts (
   permission INT,
   pp_location VARCHAR(255),
   pp_script_data TEXT,
+  return_output INT DEFAULT 0,
   FOREIGN KEY (permission) REFERENCES permissions.permid
 ) ENGINE = MyISAM;
 
@@ -234,6 +234,7 @@ PRIMARY KEY (id)
 
 
 #########PHPGACL CODE##########
+DROP TABLE IF EXISTS gacl_phpgacl;
 CREATE TABLE gacl_phpgacl (
 	name VARCHAR(230) NOT NULL,
 	value VARCHAR(230) NOT NULL,
@@ -248,6 +249,7 @@ DELETE FROM gacl_phpgacl WHERE name='schema_version';
 
 INSERT INTO gacl_phpgacl (name,value) VALUES ('schema_version','2.1');
 
+DROP TABLE IF EXISTS gacl_acl;
 CREATE TABLE gacl_acl (
 	id INTEGER NOT NULL DEFAULT 0,
 	section_value VARCHAR(230) NOT NULL DEFAULT 'system',
@@ -265,6 +267,7 @@ ALTER TABLE gacl_acl ADD INDEX gacl_section_value_acl (section_value);
 
 ALTER TABLE gacl_acl ADD INDEX gacl_updated_date_acl (updated_date);
 
+DROP TABLE IF EXISTS gacl_acl_sections;
 CREATE TABLE gacl_acl_sections (
 	id INTEGER NOT NULL DEFAULT 0,
 	value VARCHAR(230) NOT NULL,
@@ -286,6 +289,7 @@ DELETE FROM gacl_acl_sections WHERE id=2 AND value='user';
 
 INSERT INTO gacl_acl_sections (id,value,order_value,name) VALUES (2,'user',2,'User');
 
+DROP TABLE IF EXISTS gacl_aco;
 CREATE TABLE gacl_aco (
 	id INTEGER NOT NULL DEFAULT 0,
 	section_value VARCHAR(240) NOT NULL DEFAULT '0',
@@ -300,6 +304,7 @@ ALTER TABLE gacl_aco ADD UNIQUE INDEX gacl_section_value_value_aco (section_valu
 
 ALTER TABLE gacl_aco ADD INDEX gacl_hidden_aco (hidden);
 
+DROP TABLE IF EXISTS gacl_aco_map;
 CREATE TABLE gacl_aco_map (
 	acl_id INTEGER NOT NULL DEFAULT 0,
 	section_value VARCHAR(230) NOT NULL DEFAULT '0',
@@ -307,6 +312,7 @@ CREATE TABLE gacl_aco_map (
 	PRIMARY KEY (acl_id, section_value, value)
 );
 
+DROP TABLE IF EXISTS gacl_aco_sections;
 CREATE TABLE gacl_aco_sections (
 	id INTEGER NOT NULL DEFAULT 0,
 	value VARCHAR(230) NOT NULL,
@@ -320,6 +326,7 @@ ALTER TABLE gacl_aco_sections ADD UNIQUE INDEX gacl_value_aco_sections (value);
 
 ALTER TABLE gacl_aco_sections ADD INDEX gacl_hidden_aco_sections (hidden);
 
+DROP TABLE IF EXISTS gacl_aro;
 CREATE TABLE gacl_aro (
 	id INTEGER NOT NULL DEFAULT 0,
 	section_value VARCHAR(240) NOT NULL DEFAULT '0',
@@ -334,6 +341,7 @@ ALTER TABLE gacl_aro ADD UNIQUE INDEX gacl_section_value_value_aro (section_valu
 
 ALTER TABLE gacl_aro ADD INDEX gacl_hidden_aro (hidden);
 
+DROP TABLE IF EXISTS gacl_aro_map;
 CREATE TABLE gacl_aro_map (
 	acl_id INTEGER NOT NULL DEFAULT 0,
 	section_value VARCHAR(230) NOT NULL DEFAULT '0',
@@ -341,6 +349,7 @@ CREATE TABLE gacl_aro_map (
 	PRIMARY KEY (acl_id, section_value, value)
 );
 
+DROP TABLE IF EXISTS gacl_aro_sections;
 CREATE TABLE gacl_aro_sections (
 	id INTEGER NOT NULL DEFAULT 0,
 	value VARCHAR(230) NOT NULL,
@@ -354,6 +363,7 @@ ALTER TABLE gacl_aro_sections ADD UNIQUE INDEX gacl_value_aro_sections (value);
 
 ALTER TABLE gacl_aro_sections ADD INDEX gacl_hidden_aro_sections (hidden);
 
+DROP TABLE IF EXISTS gacl_axo;
 CREATE TABLE gacl_axo (
 	id INTEGER NOT NULL DEFAULT 0,
 	section_value VARCHAR(240) NOT NULL DEFAULT '0',
@@ -368,6 +378,7 @@ ALTER TABLE gacl_axo ADD UNIQUE INDEX gacl_section_value_value_axo (section_valu
 
 ALTER TABLE gacl_axo ADD INDEX gacl_hidden_axo (hidden);
 
+DROP TABLE IF EXISTS gacl_axo_map;
 CREATE TABLE gacl_axo_map (
 	acl_id INTEGER NOT NULL DEFAULT 0,
 	section_value VARCHAR(230) NOT NULL DEFAULT '0',
@@ -375,6 +386,7 @@ CREATE TABLE gacl_axo_map (
 	PRIMARY KEY (acl_id, section_value, value)
 );
 
+DROP TABLE IF EXISTS gacl_axo_sections;
 CREATE TABLE gacl_axo_sections (
 	id INTEGER NOT NULL DEFAULT 0,
 	value VARCHAR(230) NOT NULL,
@@ -388,6 +400,7 @@ ALTER TABLE gacl_axo_sections ADD UNIQUE INDEX gacl_value_axo_sections (value);
 
 ALTER TABLE gacl_axo_sections ADD INDEX gacl_hidden_axo_sections (hidden);
 
+DROP TABLE IF EXISTS gacl_aro_groups;
 CREATE TABLE gacl_aro_groups (
 	id INTEGER NOT NULL DEFAULT 0,
 	parent_id INTEGER NOT NULL DEFAULT 0,
@@ -404,6 +417,7 @@ ALTER TABLE gacl_aro_groups ADD UNIQUE INDEX gacl_value_aro_groups (value);
 
 ALTER TABLE gacl_aro_groups ADD INDEX gacl_lft_rgt_aro_groups (lft, rgt);
 
+DROP TABLE IF EXISTS gacl_groups_aro_map;
 CREATE TABLE gacl_groups_aro_map (
 	group_id INTEGER NOT NULL DEFAULT 0,
 	aro_id INTEGER NOT NULL DEFAULT 0,
@@ -412,12 +426,14 @@ CREATE TABLE gacl_groups_aro_map (
 
 ALTER TABLE gacl_groups_aro_map ADD INDEX gacl_aro_id (aro_id);
 
+DROP TABLE IF EXISTS gacl_aro_groups_map;
 CREATE TABLE gacl_aro_groups_map (
 	acl_id INTEGER NOT NULL DEFAULT 0,
 	group_id INTEGER NOT NULL DEFAULT 0,
 	PRIMARY KEY (acl_id, group_id)
 );
 
+DROP TABLE IF EXISTS gacl_axo_groups;
 CREATE TABLE gacl_axo_groups (
 	id INTEGER NOT NULL DEFAULT 0,
 	parent_id INTEGER NOT NULL DEFAULT 0,
@@ -434,6 +450,7 @@ ALTER TABLE gacl_axo_groups ADD UNIQUE INDEX gacl_value_axo_groups (value);
 
 ALTER TABLE gacl_axo_groups ADD INDEX gacl_lft_rgt_axo_groups (lft, rgt);
 
+DROP TABLE IF EXISTS gacl_groups_axo_map;
 CREATE TABLE gacl_groups_axo_map (
 	group_id INTEGER NOT NULL DEFAULT 0,
 	axo_id INTEGER NOT NULL DEFAULT 0,
@@ -442,8 +459,57 @@ CREATE TABLE gacl_groups_axo_map (
 
 ALTER TABLE gacl_groups_axo_map ADD INDEX gacl_axo_id (axo_id);
 
+DROP TABLE IF EXISTS gacl_axo_groups_map;
 CREATE TABLE gacl_axo_groups_map (
 	acl_id INTEGER NOT NULL DEFAULT 0,
 	group_id INTEGER NOT NULL DEFAULT 0,
 	PRIMARY KEY (acl_id, group_id)
 );
+
+/*
+DROP TABLE IF EXISTS `gacl_acl_seq`;
+CREATE TABLE `gacl_acl_seq` (
+  `id` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+
+DROP TABLE IF EXISTS `gacl_aco_sections_seq`;
+CREATE TABLE `gacl_aco_sections_seq` (
+  `id` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `gacl_aco_seq`;
+CREATE TABLE `gacl_aco_seq` (
+  `id` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `gacl_aro_groups_id_seq`;
+CREATE TABLE `gacl_aro_groups_id_seq` (
+  `id` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `gacl_aro_sections_seq`;
+CREATE TABLE `gacl_aro_sections_seq` (
+  `id` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `gacl_aro_seq`;
+CREATE TABLE `gacl_aro_seq` (
+  `id` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `gacl_axo_groups_id_seq`;
+CREATE TABLE `gacl_axo_groups_id_seq` (
+  `id` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `gacl_axo_sections_seq`;
+CREATE TABLE `gacl_axo_sections_seq` (
+  `id` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `gacl_axo_seq`;
+CREATE TABLE `gacl_axo_seq` (
+  `id` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+*/;