You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(267) |
Nov
(344) |
Dec
(119) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(23) |
Feb
(15) |
Mar
(16) |
Apr
(388) |
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
From: <td...@us...> - 2002-11-07 19:18:40
|
Update of /cvsroot/genex/genex-server/site/webtools In directory usw-pr-cvs1:/tmp/cvs-serv19323 Added Files: Tag: Rel-1_0_1-branch add_analysis.pl Log Message: Initial draft --- NEW FILE: add_analysis.pl --- #!/usr/bin/perl -w =head1 NAME act_analysis - add an analysis to the list of possible analyses =head1 SYNOPSIS ./act_analysis =head1 DESCRIPTION The act_analysis is intended to configure an new analysis for use with in the gene analsys system. It does the following: - adds appropriate records to the database based on the config file - puts supplied scripts in appropriate locations - verifies syntax and runnability of scripts - verifies the existence of documentation =cut use strict; use DBI; use Getopt::Long 2.13; use AppConfig qw(:expand :argcount); require "sessionlib.pl"; my $config = AppConfig->new(); $config->define('name', {ARGCOUNT => ARGCOUNT_ONE}, 'cmdstr', {ARGCOUNT => ARGCOUNT_ONE}, 'up', { ARGCOUNT => ARGCOUNT_LIST }, 'filetype',{ ARGCOUNT => ARGCOUNT_LIST }, 'sp', { ARGCOUNT => ARGCOUNT_LIST }, 'outputfile', { ARGCOUNT => ARGCOUNT_LIST,}, 'inputfile', { ARGCOUNT => ARGCOUNT_LIST,}); $config->define('configfile', {ARGCOUNT => ARGCOUNT_ONE}, 'action', {ARGCOUNT => ARGCOUNT_ONE}, 'debug', {ARGCOUNT => ARGCOUNT_ONE}); $config->getopt(\@ARGV); my $cfgfile = $config->get('configfile'); my $debug = $config->get('debug'); usage() if (!defined $cfgfile); $config->file($cfgfile); modifyDB($config); # end main sub modifyDB { my ($config) = @_; my $action = $config->get('action'); # open handle to database my $dbh = new_connection(); if ($action eq 'insert') { # insert appropriate values in appropriate tables # we need to add filetypes (optional) act_filetype($dbh, $config->get('filetype'), $action); # we need to add the analysis act_analysis($dbh, $config->get('name'), $config->get('cmdstr'), $action); # we need to add the input links to filetypes act_file_links($dbh, "input", $config->get('inputfile'), $config->get('name'), $action); # we need to add the output links to filetypes act_file_links($dbh, "output", $config->get('outputfile'), $config->get('name'), $action); # we need to add the sysparams act_sysparams($dbh, $config->get('sp'), $config->get('name'), $action); # we need to add the userparams act_userparams($dbh, $config->get('up'), $config->get('name'), $action); } elsif ($action eq "remove") { # note: removing must be done in a somewhat opposite # order to adding # we need to add the input links to filetypes act_file_links($dbh, "input", $config->get('inputfile'), $config->get('name'), $action); # we need to add the output links to filetypes act_file_links($dbh, "output", $config->get('outputfile'), $config->get('name'), $action); # we need to add the sysparams act_sysparams($dbh, $config->get('sp'), $config->get('name'), $action); # we need to add the userparams act_userparams($dbh, $config->get('up'), $config->get('name'), $action); # we need to add the analysis act_analysis($dbh, $config->get('name'), $config->get('cmdstr'), $action); # insert appropriate values in appropriate tables # we need to add filetypes (optional) act_filetype($dbh, $config->get('filetype'), $action); } else { print "Unrecognized action: $action\n"; usage(); } $dbh->commit(); $dbh->disconnect(); } # addToDB sub parse_into_records { my @input = @_; my @return = (); my %rec = (); while (my $element = shift(@input)) { my ($key, $value) = split(/=/, $element); #remove spaces from key $key =~ tr/ //d; if (exists $rec{$key}) { my %dup = %rec; push(@return, \%dup); %rec = (); } $rec{$key} = $value; } push(@return, \%rec); return(@return); } #parse_into_record sub act_filetype { my ($dbh, $filetype, $action) = @_; my $stm = ""; my $record; my @records = parse_into_records(@$filetype); # TODO - handle spaces in keys foreach $record (@records) { my %rec = %$record; my $name = $rec{name}; my $ext = $rec{extension}; my $comment = $rec{comment}; checkValidFields([ "name" ], ["name", "extension", "comment"], $record); if ($action eq "remove") { $stm = "delete from filetypes where name = '$name'"; } else { $stm = "insert into filetypes (name, extension, comment) " . "values ('$name', '$ext', '$comment');"; } print "$stm\n" if $debug; my $sth = $dbh->prepare( $stm ); $sth->execute(); } $dbh->commit(); } # act_filetype sub act_analysis { my ($dbh, $name, $cmdstr, $action) = @_; my $stm = ""; if ($action eq "remove") { $stm = "delete from analysis where name = '$name'"; } else { $stm = "insert into analysis (name, cmdstr) values ('$name', '$cmdstr');"; } print "$stm\n" if $debug; my $sth = $dbh->prepare( $stm ); $sth->execute(); $dbh->commit(); } # act_analysis sub act_file_links { my ($dbh, $table, $filelist, $name, $action) = @_; my $stm = ""; my $record; $table = "analysis_ft_input_link" if $table eq "input"; $table = "analysis_ft_output_link" if $table eq "output"; # select the analysis pk for the analysis $stm = $dbh->prepare("select anal_pk from analysis where name = '$name'"); $stm->execute(); # get result my $an_fk = $stm->fetchrow_array(); if (!defined $an_fk) { warn "Unable to get analysis key value for $name"; return; } foreach my $rec (@$filelist) { # select the filetypes pk for the filetype $stm = $dbh->prepare("select ft_pk from filetypes where name = '$rec'"); $stm->execute(); my $ft_fk = $stm->fetchrow_array(); if (!defined $ft_fk) { warn "Unable to get filetypes key value for $rec"; } else { if ($action eq "remove") { $stm = "delete from $table where anal_fk = '$an_fk'"; } else { $stm = "insert into $table (anal_fk, ft_fk) " . "values ('$an_fk', '$ft_fk');"; } print "$stm\n" if $debug; my $sth = $dbh->prepare( $stm ); $sth->execute(); } } } # act_file_links sub act_sysparams { my ($dbh, $sp, $name, $action) = @_; my $stm = ""; my $record; my @records = parse_into_records(@$sp); # select the analysis pk for the analysis $stm = $dbh->prepare("select anal_pk from analysis where name = '$name'"); $stm->execute(); # get result my $an_fk = $stm->fetchrow_array(); if (!defined $an_fk) { warn "Unable to get analysis key value for $name"; return; } foreach $record (@records) { my %rec = %$record; checkValidFields([ "name" ], ["name", "default"], $record); my $name = $rec{name}; my $default ="NULL"; $default = "'$rec{default}'" if exists($rec{default}); if ($action eq "remove") { $stm = "delete from sys_parameter_names where anal_fk = '$an_fk'"; } else { $stm = "insert into sys_parameter_names (anal_fk, sp_name, sp_default) values ('$an_fk', '$name', $default);"; } print "$stm\n" if $debug; my $sth = $dbh->prepare( $stm ); $sth->execute(); } $dbh->commit(); } # act_sysparams sub act_userparams { my ($dbh, $up, $name, $action) = @_; my $stm = ""; my $record; my @records = parse_into_records(@$up); # select the analysis pk for the analysis $stm = $dbh->prepare("select anal_pk from analysis where name = '$name'"); $stm->execute(); # get result my $an_fk = $stm->fetchrow_array(); if (!defined $an_fk) { warn "Unable to get analysis key value for $name"; return; } # TODO - handle spaces in keys foreach $record (@records) { my %rec = %$record; my $name = $rec{name}; my $display_name = $rec{display_name}; my $type = $rec{type}; my $default ="NULL"; $default = "'$rec{default}'" if exists($rec{default}); checkValidFields([ "name", "display_name", "type" ], ["name", "display_name", "type", "default"], $record); if ($action eq "remove") { $stm = "delete from user_parameter_names where anal_fk = '$an_fk'"; } else { $stm = "insert into user_parameter_names (anal_fk, up_name, up_display_name, up_type, up_default) values ('$an_fk', '$name', '$display_name', '$type', $default);"; } print "$stm\n" if $debug; my $sth = $dbh->prepare( $stm ); $sth->execute(); } } # act_userparams sub checkValidFields { my ($reqref, $fieldsref, $record) = @_; my @req = @$reqref; my @fields = @$fieldsref; my %rec = %$record; foreach my $req (@req) { warn "Incorrect configuration. Sys params requires $req field.\n" if (!exists $rec{$req}); } foreach my $key (keys(%rec)) { my $found = 0; foreach my $field (@fields) { $found = 1 if ($field eq $key); } if (! $found) { warn "Invalid sys param field: $key.\n"; warn "Valid field names are: @fields\n"; } } } # checkValidFields sub usage { print "Usage: \n"; print "./act_analysis.pl --configfile <filename>\n"; } # usage |
From: <tw...@us...> - 2002-11-07 18:32:36
|
Update of /cvsroot/genex/genex-server In directory usw-pr-cvs1:/tmp/cvs-serv32743 Modified Files: Tag: Rel-1_0_1-branch genex_schema.sql Log Message: Jodi's changes updated. Index: genex_schema.sql =================================================================== RCS file: /cvsroot/genex/genex-server/genex_schema.sql,v retrieving revision 1.3.2.14 retrieving revision 1.3.2.15 diff -C2 -d -r1.3.2.14 -r1.3.2.15 *** genex_schema.sql 7 Nov 2002 18:22:07 -0000 1.3.2.14 --- genex_schema.sql 7 Nov 2002 18:32:33 -0000 1.3.2.15 *************** *** 2964,2978 **** -- UPDATE pg_class SET reltriggers = (SELECT count(*) FROM pg_trigger where pg_class.oid = tgrelid) WHERE relname = 'species'; - - --ANALYSIS TABLES --GeneX analysis requirements call for an additional 5 tables in the database. ! CREATE SEQUENCE "analysis_anal_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; ! REVOKE ALL on "analysis_anal_pk_seq" from PUBLIC; ! GRANT ALL on "analysis_anal_pk_seq" to "genex"; ! GRANT SELECT on "analysis_anal_pk_seq" to "readonly"; --- 2964,2976 ---- -- UPDATE pg_class SET reltriggers = (SELECT count(*) FROM pg_trigger where pg_class.oid = tgrelid) WHERE relname = 'species'; --ANALYSIS TABLES --GeneX analysis requirements call for an additional 5 tables in the database. ! CREATE SEQUENCE "analysis_an_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; ! REVOKE ALL on "analysis_an_pk_seq" from PUBLIC; ! GRANT ALL on "analysis_an_pk_seq" to "genex"; ! GRANT SELECT on "analysis_an_pk_seq" to "readonly"; *************** *** 3011,3021 **** GRANT SELECT on "sys_parameter_values_spv_pk" to "readonly"; --Table: analysis --This table stores the information on the different kinds of analyses that can be run by the system. It is populated when researchers upload an analysis. CREATE TABLE "analysis" ( ! "anal_pk" integer DEFAULT nextval('analysis_anal_pk_seq'::text) NOT NULL, "name" character varying(128), ! "cmdstr" text ) without OIDs; --- 3009,3028 ---- GRANT SELECT on "sys_parameter_values_spv_pk" to "readonly"; + + CREATE SEQUENCE "extension_ext_pk" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + + REVOKE ALL on "extension_ext_pk" from PUBLIC; + GRANT ALL on "extension_ext_pk" to "genex"; + GRANT SELECT on "extension_ext_pk" to "readonly"; + + --Table: analysis --This table stores the information on the different kinds of analyses that can be run by the system. It is populated when researchers upload an analysis. CREATE TABLE "analysis" ( ! "an_pk" integer DEFAULT nextval('analysis_an_pk_seq'::text) NOT NULL, "name" character varying(128), ! "cmdstr" text, ! "version" character varying(128) ) without OIDs; *************** *** 3029,3033 **** CREATE TABLE "user_parameter_names" ( "upn_pk" integer DEFAULT nextval('user_parameter_names_upn_pk_seq'::text) NOT NULL, ! "anal_fk" integer, "up_name" character varying(128), "up_display_name" character varying(128), --- 3036,3040 ---- CREATE TABLE "user_parameter_names" ( "upn_pk" integer DEFAULT nextval('user_parameter_names_upn_pk_seq'::text) NOT NULL, ! "an_fk" integer, "up_name" character varying(128), "up_display_name" character varying(128), *************** *** 3038,3041 **** --- 3045,3050 ---- REVOKE ALL on "user_parameter_names" from PUBLIC; + GRANT ALL on "user_parameter_names" to "genex"; + GRANT SELECT on "user_parameter_names" to "readonly"; *************** *** 3045,3051 **** CREATE TABLE "sys_parameter_names" ( "spn_pk" integer DEFAULT nextval('sys_parameter_names_spn_pk_seq'::text) NOT NULL, ! "anal_fk" integer, "sp_name" character varying(128), - "sp_type" character varying(128), "sp_default" character varying(128) ) without OIDs; --- 3054,3059 ---- CREATE TABLE "sys_parameter_names" ( "spn_pk" integer DEFAULT nextval('sys_parameter_names_spn_pk_seq'::text) NOT NULL, ! "an_fk" integer, "sp_name" character varying(128), "sp_default" character varying(128) ) without OIDs; *************** *** 3056,3083 **** GRANT SELECT on "sys_parameter_names" to "readonly"; ! --Linking Table: analysis_ft_input_link --This linking table was created due to a many to many relationship between the input files of the analysis table and the filetypes table. ! CREATE TABLE "analysis_ft_input_link" ( ! "anal_fk" integer, ! "ft_fk" integer ! ) without OIDs; ! ! REVOKE ALL on "analysis_ft_input_link" from PUBLIC; ! GRANT ALL on "analysis_ft_input_link" to "genex"; ! GRANT SELECT on "analysis_ft_input_link" to "readonly"; ! ! ! --Linking Table: analysis_ft_output_link ! --This linking table was created due to a many to many relationship between the output files of the analysis table and the filetypes table. ! ! CREATE TABLE "analysis_ft_output_link" ( ! "anal_fk" integer, ! "ft_fk" integer ) without OIDs; ! REVOKE ALL on "analysis_ft_output_link" from PUBLIC; ! GRANT ALL on "analysis_ft_output_link" to "genex"; ! GRANT SELECT on "analysis_ft_output_link" to "readonly"; --- 3064,3079 ---- GRANT SELECT on "sys_parameter_names" to "readonly"; ! --Linking Table: analysis_filetypes_link --This linking table was created due to a many to many relationship between the input files of the analysis table and the filetypes table. ! CREATE TABLE "analysis_filetypes_link" ( ! "an_fk" integer, ! "ft_fk" integer, ! "input" boolean ) without OIDs; ! REVOKE ALL on "analysis_filetypes_link" from PUBLIC; ! GRANT ALL on "analysis_filetypes_link" to "genex"; ! GRANT SELECT on "analysis_filetypes_link" to "readonly"; *************** *** 3088,3092 **** "ft_pk" integer DEFAULT nextval('filetypes_ft_pk_seq'::text) NOT NULL, "name" character varying(128), - "extension" character varying(128), "comment" text ) without OIDs; --- 3084,3087 ---- *************** *** 3096,3099 **** --- 3091,3106 ---- GRANT SELECT on "filetypes" to "readonly"; + --Table: extension + --This table was created to hold the extensions associated with the various file types. We need a separate table since files will have multiple extensions. + + CREATE TABLE "extension" ( + "ext_pk" integer DEFAULT nextval('extension_ext_pk_seq'::text) NOT NULL, + "ft_fk" integer, + "extension" character varying(128) + ) without OIDs; + + REVOKE ALL on "extension" from PUBLIC; + GRANT ALL on "extension" to "genex"; + GRANT SELECT on "extension" to "readonly"; --Table: Tree *************** *** 3104,3108 **** "name" character varying(128), "owner" character varying(128), ! "fi_fk" integer ) without OIDs; --- 3111,3116 ---- "name" character varying(128), "owner" character varying(128), ! "fi_input_fk" integer, ! "fi_log_fk" integer ) without OIDs; *************** *** 3118,3122 **** "node_pk" integer DEFAULT nextval('pk_seq'::text) NOT NULL, "tree_fk" integer, ! "anal_fk" integer, "parent_key" integer ) without OIDs; --- 3126,3130 ---- "node_pk" integer DEFAULT nextval('pk_seq'::text) NOT NULL, "tree_fk" integer, ! "an_fk" integer, "parent_key" integer ) without OIDs; *************** *** 3156,3158 **** GRANT ALL on "sys_parameter_values" to "genex"; GRANT SELECT on "sys_parameter_values" to "readonly"; ! --- 3164,3166 ---- GRANT ALL on "sys_parameter_values" to "genex"; GRANT SELECT on "sys_parameter_values" to "readonly"; ! -- |
From: <tw...@us...> - 2002-11-07 18:22:10
|
Update of /cvsroot/genex/genex-server In directory usw-pr-cvs1:/tmp/cvs-serv27200 Modified Files: Tag: Rel-1_0_1-branch genex_schema.sql Log Message: Older copy overwriting genex merged(?) version. Index: genex_schema.sql =================================================================== RCS file: /cvsroot/genex/genex-server/genex_schema.sql,v retrieving revision 1.3.2.13 retrieving revision 1.3.2.14 diff -C2 -d -r1.3.2.13 -r1.3.2.14 *** genex_schema.sql 7 Nov 2002 17:26:00 -0000 1.3.2.13 --- genex_schema.sql 7 Nov 2002 18:22:07 -0000 1.3.2.14 *************** *** 2965,2983 **** - --ANALYSIS TABLES - --GeneX analysis requirements call for an additional 5 tables in the database. --ANALYSIS TABLES --GeneX analysis requirements call for an additional 5 tables in the database. - CREATE SEQUENCE "analysis_an_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - <<<<<<< genex_schema.sql - REVOKE ALL on "analysis_an_pk_seq" from PUBLIC; - GRANT ALL on "analysis_an_pk_seq" to "genex"; - GRANT SELECT on "analysis_an_pk_seq" to "readonly"; - ======= CREATE SEQUENCE "analysis_anal_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - >>>>>>> 1.3.2.12 REVOKE ALL on "analysis_anal_pk_seq" from PUBLIC; --- 2965,2974 ---- *************** *** 2985,2997 **** GRANT SELECT on "analysis_anal_pk_seq" to "readonly"; - CREATE SEQUENCE "filetypes_ft_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - <<<<<<< genex_schema.sql - REVOKE ALL on "filetypes_ft_pk_seq" from PUBLIC; - GRANT ALL on "filetypes_ft_pk_seq" to "genex"; - GRANT SELECT on "filetypes_ft_pk_seq" to "readonly"; - ======= CREATE SEQUENCE "filetypes_ft_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - >>>>>>> 1.3.2.12 REVOKE ALL on "filetypes_ft_pk_seq" from PUBLIC; --- 2976,2981 ---- *************** *** 2999,3011 **** GRANT SELECT on "filetypes_ft_pk_seq" to "readonly"; - CREATE SEQUENCE "user_parameter_names_upn_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - <<<<<<< genex_schema.sql - REVOKE ALL on "user_parameter_names_upn_pk_seq" from PUBLIC; - GRANT ALL on "user_parameter_names_upn_pk_seq" to "genex"; - GRANT SELECT on "user_parameter_names_upn_pk_seq" to "readonly"; - ======= CREATE SEQUENCE "user_parameter_names_upn_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - >>>>>>> 1.3.2.12 REVOKE ALL on "user_parameter_names_upn_pk_seq" from PUBLIC; --- 2983,2988 ---- *************** *** 3013,3025 **** GRANT SELECT on "user_parameter_names_upn_pk_seq" to "readonly"; - CREATE SEQUENCE "sys_parameter_names_spn_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - <<<<<<< genex_schema.sql - REVOKE ALL on "sys_parameter_names_spn_pk_seq" from PUBLIC; - GRANT ALL on "sys_parameter_names_spn_pk_seq" to "genex"; - GRANT SELECT on "sys_parameter_names_spn_pk_seq" to "readonly"; - ======= CREATE SEQUENCE "sys_parameter_names_spn_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - >>>>>>> 1.3.2.12 REVOKE ALL on "sys_parameter_names_spn_pk_seq" from PUBLIC; --- 2990,2995 ---- *************** *** 3027,3200 **** GRANT SELECT on "sys_parameter_names_spn_pk_seq" to "readonly"; - CREATE SEQUENCE "user_parameter_values_upv_pk" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - - <<<<<<< genex_schema.sql - REVOKE ALL on "user_parameter_values_upv_pk" from PUBLIC; - GRANT ALL on "user_parameter_values_upv_pk" to "genex"; - GRANT SELECT on "user_parameter_values_upv_pk" to "readonly"; - - - CREATE SEQUENCE "sys_parameter_values_spv_pk" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - - REVOKE ALL on "sys_parameter_values_spv_pk" from PUBLIC; - GRANT ALL on "sys_parameter_values_spv_pk" to "genex"; - GRANT SELECT on "sys_parameter_values_spv_pk" to "readonly"; - - - CREATE SEQUENCE "extension_ext_pk" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; - - REVOKE ALL on "extension_ext_pk" from PUBLIC; - GRANT ALL on "extension_ext_pk" to "genex"; - GRANT SELECT on "extension_ext_pk" to "readonly"; - - --Table: analysis - --This table stores the information on the different kinds of analyses that can be run by the system. It is populated when researchers upload an analysis. - - CREATE TABLE "analysis" ( - "an_pk" integer DEFAULT nextval('analysis_an_pk_seq'::text) NOT NULL, - "name" character varying(128), - "cmdstr" text, - "version" character varying(128) - ) without OIDs; - - REVOKE ALL on "analysis" from PUBLIC; - GRANT ALL on "analysis" to "genex"; - GRANT SELECT on "analysis" to "readonly"; - - --Table: user_parameter_names - --This table was created as a solution to having analysis.userparameternames as an array data type. - - CREATE TABLE "user_parameter_names" ( - "upn_pk" integer DEFAULT nextval('user_parameter_names_upn_pk_seq'::text) NOT NULL, - "an_fk" integer, - "up_name" character varying(128), - "up_display_name" character varying(128), - "up_type" character varying(128), - "up_default" character varying(128) - ) without OIDs; - - - REVOKE ALL on "user_parameter_names" from PUBLIC; - GRANT ALL on "user_parameter_names" to "genex"; - GRANT SELECT on "user_parameter_names" to "readonly"; - - - --Table: sys_parameter_names - --This table was created as a solution to having analysis.sysparameternames as an array data type. - - CREATE TABLE "sys_parameter_names" ( - "spn_pk" integer DEFAULT nextval('sys_parameter_names_spn_pk_seq'::text) NOT NULL, - "an_fk" integer, - "sp_name" character varying(128), - "sp_default" character varying(128) - ) without OIDs; - - - REVOKE ALL on "sys_parameter_names" from PUBLIC; - GRANT ALL on "sys_parameter_names" to "genex"; - GRANT SELECT on "sys_parameter_names" to "readonly"; - - --Linking Table: analysis_filetypes_link - --This linking table was created due to a many to many relationship between the input files of the analysis table and the filetypes table. - - CREATE TABLE "analysis_filetypes_link" ( - "an_fk" integer, - "ft_fk" integer, - "input" boolean - ) without OIDs; - - REVOKE ALL on "analysis_filetypes_link" from PUBLIC; - GRANT ALL on "analysis_filetypes_link" to "genex"; - GRANT SELECT on "analysis_filetypes_link" to "readonly"; - - - --Table: filetypes - --This table stores all distinct file types for which we would like to type check. Analysis can specify acceptable file types for input and output files. - - CREATE TABLE "filetypes" ( - "ft_pk" integer DEFAULT nextval('filetypes_ft_pk_seq'::text) NOT NULL, - "name" character varying(128), - "comment" text - ) without OIDs; - - REVOKE ALL on "filetypes" from PUBLIC; - GRANT ALL on "filetypes" to "genex"; - GRANT SELECT on "filetypes" to "readonly"; - - --Table: extension - --This table was created to hold the extensions associated with the various file types. We need a separate table since files will have multiple extensions. - - CREATE TABLE "extension" ( - "ext_pk" integer DEFAULT nextval('extension_ext_pk_seq'::text) NOT NULL, - "ft_fk" integer, - "extension" character varying(128) - ) without OIDs; - - REVOKE ALL on "extension" from PUBLIC; - GRANT ALL on "extension" to "genex"; - GRANT SELECT on "extension" to "readonly"; - - --Table: Tree - --This table stores analysis trees - groups of analysis nodes that are run in sequence. - - CREATE TABLE "tree" ( - "tree_pk" integer DEFAULT nextval('pk_seq'::text) NOT NULL, - "name" character varying(128), - "owner" character varying(128), - "fi_fk" integer - ) without OIDs; - - REVOKE ALL on "tree" from PUBLIC; - GRANT ALL on "tree" to "genex"; - GRANT SELECT on "tree" to "readonly"; - - - --Table: node - --Nodes are actual instances of analyses that should be run. They contain all information necessary to run the analysis. - - CREATE TABLE "node" ( - "node_pk" integer DEFAULT nextval('pk_seq'::text) NOT NULL, - "tree_fk" integer, - "an_fk" integer, - "parent_key" integer - ) without OIDs; - - REVOKE ALL on "node" from PUBLIC; - GRANT ALL on "node" to "genex"; - GRANT SELECT on "node" to "readonly"; - - --Table: user_paramter_values - --This table was created to eliminate the need for an array data type for the node.userparametervalues field. - - CREATE TABLE "user_parameter_values" ( - "upv_pk" integer DEFAULT nextval('user_parameter_values_upv_pk'::text) NOT NULL, - "node_fk" integer, - "upn_fk" integer, - "up_value" character varying(128) - ) without OIDs; - - - REVOKE ALL on "user_parameter_values" from PUBLIC; - GRANT ALL on "user_parameter_values" to "genex"; - GRANT SELECT on "user_parameter_values" to "readonly"; - - --Table: sys_parameter_values - --This table was created to eliminate the need for an array data type for the node.sysparametervalues field. - - - CREATE TABLE "sys_parameter_values" ( - "spv_pk" integer DEFAULT nextval('sys_parameter_values_spv_pk'::text) NOT NULL, - "node_fk" integer, - "spn_fk" integer, - "sp_value" character varying(128) - ) without OIDs; - - - REVOKE ALL on "sys_parameter_values" from PUBLIC; - GRANT ALL on "sys_parameter_values" to "genex"; - GRANT SELECT on "sys_parameter_values" to "readonly"; - -- - ======= CREATE SEQUENCE "user_parameter_values_upv_pk" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; --- 2997,3001 ---- *************** *** 3303,3308 **** "name" character varying(128), "owner" character varying(128), ! "fi_input_fk" integer, ! "fi_log_fk" integer ) without OIDs; --- 3104,3108 ---- "name" character varying(128), "owner" character varying(128), ! "fi_fk" integer ) without OIDs; *************** *** 3357,3359 **** GRANT SELECT on "sys_parameter_values" to "readonly"; - >>>>>>> 1.3.2.12 --- 3157,3158 ---- |
From: <tw...@us...> - 2002-11-07 17:43:39
|
Update of /cvsroot/genex/genex-server/site/webtools In directory usw-pr-cvs1:/tmp/cvs-serv6306 Modified Files: Tag: Rel-1_0_1-branch sessionlib.pl analysis_tree_lib.pl Added Files: Tag: Rel-1_0_1-branch sql_lib.pl Log Message: Updates to the require loading chain, new analysis tree subs. --- NEW FILE: sql_lib.pl --- $::sql_lib_loaded = 1; $::sql_lib_loaded = 1; # quiet compile warnings sub getq { my $q_name = $_[0]; my $dbh = $_[1]; my @args = @{$_[2]}; my $us_fk = get_us_fk($dbh); my $sth; my $fclause; my $wclause; my $ok_flag = 0; if ($qname == "select_tree") { $ok_flag = 1; ($fclause, $wclause) = write_where_clause("tree", "tree_pk", $us_fk ); my $sql = "select name,tree_pk from tree,$fclause where $wclause order by name"; } if ($ok_flag) { $sth = $dbh->prepare($sql) || die "$sql\n$DBI::errstr\n"; return $sth; } else { die "Query $q_name not found in sql_lib.pl getq()\n"; } } 1; Index: sessionlib.pl =================================================================== RCS file: /cvsroot/genex/genex-server/site/webtools/Attic/sessionlib.pl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** sessionlib.pl 24 Oct 2002 18:26:53 -0000 1.1.2.1 --- sessionlib.pl 7 Nov 2002 17:43:35 -0000 1.1.2.2 *************** *** 7,11 **** my $dbname = 'genex'; ! my $sessionlib_loaded = 1; sub messages --- 7,26 ---- my $dbname = 'genex'; ! $::sessionlib_loaded = 1; ! $::sessionlib_loaded = 1; ! if (! defined($::sql_lib_loaded)) ! { ! require "./sql_lib.pl"; ! } ! if (! defined($::analysis_tree_lib_loaded)) ! { ! require "./analysis_tree_lib.pl"; ! } ! # double check, and quiet the compiler warnings about only using a var once. ! if ((!defined($::sql_lib_loaded)) || (!defined($::analysis_tree_lib_loaded))) ! { ! write_log("Libs failed to load??"); ! die "Libs failed to load\n"; ! } sub messages *************** *** 451,465 **** - # aug 1 2002 Tom moved read_optionsdotreminders() to install-all.pl - # since Config.pm is required for sessionlib.pl, but it doesn't exist until install-all.pl - # has been run. - # # aug 9 2002 Tom moves read_optionsdotreminders() back here, and removes any references to Bio::Genex # ! ! # ! # Reads options.reminders into the global %Vars ! # Some other values of %Vars are created on the fly elsewhere. # sub read_optionsdotreminders --- 466,474 ---- # # aug 9 2002 Tom moves read_optionsdotreminders() back here, and removes any references to Bio::Genex # ! # Reads options.reminders into the local %Vars, and do some processing to create ! # a few extra entries, and return %Vars. # sub read_optionsdotreminders *************** *** 1664,1668 **** # so it can be nested in the first loop. # - sub readtemplate { --- 1673,1676 ---- Index: analysis_tree_lib.pl =================================================================== RCS file: /cvsroot/genex/genex-server/site/webtools/Attic/analysis_tree_lib.pl,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -C2 -d -r1.1.2.21 -r1.1.2.22 *** analysis_tree_lib.pl 6 Nov 2002 16:38:58 -0000 1.1.2.21 --- analysis_tree_lib.pl 7 Nov 2002 17:43:36 -0000 1.1.2.22 *************** *** 13,16 **** --- 13,38 ---- my @m_width; + $::analysis_tree_lib_loaded = 1; + $::analysis_tree_lib_loaded = 1; # quiet compile warnings + + # + # Build an HTML select tag based on a query from the tree table. + # + sub select_tree + { + my $dbh=$_[0]; + my $sth = getq("select_tree", $dbh); + $sth->execute() || die "Query select_tree execute error: $DBI::errstr\n"; + my $st_html = "<select name=\"select_tree\">\n"; + while((my $name, my $tree_pk) = $sth->fetchrow_array()) + { + $st_html .= "<option value=\"$tree_pk\">$name</option>\n"; + } + $st_html .= "</select>\n"; + $sth->finish(); + return $st_html; + } + + sub select_node { *************** *** 293,298 **** } } ! my $table_width = 75 * $tmax; ! $html = "<table width=\"$table_width\" border=\"0\" cellpadding=\"0\" cellspacing=\"4\">"; for(my $xx=0; $xx<=$#table; $xx++) { --- 315,322 ---- } } ! my $at_width = 75 * $tmax; ! my $outer_width = $at_width+300; ! $html = "<table width=\"$outer_width\" border=\"0\" cellpadding=\"0\" cellspacing=\"4\"><tr><td width=\"$at_width\">\n"; ! $html .= "<table width=\"$at_width\" border=\"0\" cellpadding=\"0\" cellspacing=\"4\">"; for(my $xx=0; $xx<=$#table; $xx++) { *************** *** 336,340 **** $html .= "</tr>\n"; } ! $html .= "</table>\n"; return $html; } --- 360,364 ---- $html .= "</tr>\n"; } ! $html .= "</table></td><td bgcolor=\"#00CC99\" width=\"1\"></td><td valign=\"top\">Node Properties Here...</td></tr></table></td></tr></table>\n"; return $html; } |
From: <tw...@us...> - 2002-11-07 17:26:07
|
Update of /cvsroot/genex/genex-server In directory usw-pr-cvs1:/tmp/cvs-serv31095 Modified Files: Tag: Rel-1_0_1-branch genex_schema.sql Log Message: Jodi fixed: analysis tree tables. Index: genex_schema.sql =================================================================== RCS file: /cvsroot/genex/genex-server/genex_schema.sql,v retrieving revision 1.3.2.12 retrieving revision 1.3.2.13 diff -C2 -d -r1.3.2.12 -r1.3.2.13 *** genex_schema.sql 5 Nov 2002 14:36:09 -0000 1.3.2.12 --- genex_schema.sql 7 Nov 2002 17:26:00 -0000 1.3.2.13 *************** *** 2965,2974 **** --- 2965,2983 ---- + --ANALYSIS TABLES + --GeneX analysis requirements call for an additional 5 tables in the database. --ANALYSIS TABLES --GeneX analysis requirements call for an additional 5 tables in the database. + CREATE SEQUENCE "analysis_an_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + <<<<<<< genex_schema.sql + REVOKE ALL on "analysis_an_pk_seq" from PUBLIC; + GRANT ALL on "analysis_an_pk_seq" to "genex"; + GRANT SELECT on "analysis_an_pk_seq" to "readonly"; + ======= CREATE SEQUENCE "analysis_anal_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + >>>>>>> 1.3.2.12 REVOKE ALL on "analysis_anal_pk_seq" from PUBLIC; *************** *** 2976,2981 **** --- 2985,2997 ---- GRANT SELECT on "analysis_anal_pk_seq" to "readonly"; + CREATE SEQUENCE "filetypes_ft_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + <<<<<<< genex_schema.sql + REVOKE ALL on "filetypes_ft_pk_seq" from PUBLIC; + GRANT ALL on "filetypes_ft_pk_seq" to "genex"; + GRANT SELECT on "filetypes_ft_pk_seq" to "readonly"; + ======= CREATE SEQUENCE "filetypes_ft_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + >>>>>>> 1.3.2.12 REVOKE ALL on "filetypes_ft_pk_seq" from PUBLIC; *************** *** 2983,2988 **** --- 2999,3011 ---- GRANT SELECT on "filetypes_ft_pk_seq" to "readonly"; + CREATE SEQUENCE "user_parameter_names_upn_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + <<<<<<< genex_schema.sql + REVOKE ALL on "user_parameter_names_upn_pk_seq" from PUBLIC; + GRANT ALL on "user_parameter_names_upn_pk_seq" to "genex"; + GRANT SELECT on "user_parameter_names_upn_pk_seq" to "readonly"; + ======= CREATE SEQUENCE "user_parameter_names_upn_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + >>>>>>> 1.3.2.12 REVOKE ALL on "user_parameter_names_upn_pk_seq" from PUBLIC; *************** *** 2990,2995 **** --- 3013,3025 ---- GRANT SELECT on "user_parameter_names_upn_pk_seq" to "readonly"; + CREATE SEQUENCE "sys_parameter_names_spn_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + <<<<<<< genex_schema.sql + REVOKE ALL on "sys_parameter_names_spn_pk_seq" from PUBLIC; + GRANT ALL on "sys_parameter_names_spn_pk_seq" to "genex"; + GRANT SELECT on "sys_parameter_names_spn_pk_seq" to "readonly"; + ======= CREATE SEQUENCE "sys_parameter_names_spn_pk_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + >>>>>>> 1.3.2.12 REVOKE ALL on "sys_parameter_names_spn_pk_seq" from PUBLIC; *************** *** 2997,3001 **** --- 3027,3200 ---- GRANT SELECT on "sys_parameter_names_spn_pk_seq" to "readonly"; + CREATE SEQUENCE "user_parameter_values_upv_pk" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + + <<<<<<< genex_schema.sql + REVOKE ALL on "user_parameter_values_upv_pk" from PUBLIC; + GRANT ALL on "user_parameter_values_upv_pk" to "genex"; + GRANT SELECT on "user_parameter_values_upv_pk" to "readonly"; + + + CREATE SEQUENCE "sys_parameter_values_spv_pk" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + + REVOKE ALL on "sys_parameter_values_spv_pk" from PUBLIC; + GRANT ALL on "sys_parameter_values_spv_pk" to "genex"; + GRANT SELECT on "sys_parameter_values_spv_pk" to "readonly"; + + + CREATE SEQUENCE "extension_ext_pk" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; + + REVOKE ALL on "extension_ext_pk" from PUBLIC; + GRANT ALL on "extension_ext_pk" to "genex"; + GRANT SELECT on "extension_ext_pk" to "readonly"; + + --Table: analysis + --This table stores the information on the different kinds of analyses that can be run by the system. It is populated when researchers upload an analysis. + + CREATE TABLE "analysis" ( + "an_pk" integer DEFAULT nextval('analysis_an_pk_seq'::text) NOT NULL, + "name" character varying(128), + "cmdstr" text, + "version" character varying(128) + ) without OIDs; + + REVOKE ALL on "analysis" from PUBLIC; + GRANT ALL on "analysis" to "genex"; + GRANT SELECT on "analysis" to "readonly"; + + --Table: user_parameter_names + --This table was created as a solution to having analysis.userparameternames as an array data type. + + CREATE TABLE "user_parameter_names" ( + "upn_pk" integer DEFAULT nextval('user_parameter_names_upn_pk_seq'::text) NOT NULL, + "an_fk" integer, + "up_name" character varying(128), + "up_display_name" character varying(128), + "up_type" character varying(128), + "up_default" character varying(128) + ) without OIDs; + + + REVOKE ALL on "user_parameter_names" from PUBLIC; + GRANT ALL on "user_parameter_names" to "genex"; + GRANT SELECT on "user_parameter_names" to "readonly"; + + + --Table: sys_parameter_names + --This table was created as a solution to having analysis.sysparameternames as an array data type. + + CREATE TABLE "sys_parameter_names" ( + "spn_pk" integer DEFAULT nextval('sys_parameter_names_spn_pk_seq'::text) NOT NULL, + "an_fk" integer, + "sp_name" character varying(128), + "sp_default" character varying(128) + ) without OIDs; + + + REVOKE ALL on "sys_parameter_names" from PUBLIC; + GRANT ALL on "sys_parameter_names" to "genex"; + GRANT SELECT on "sys_parameter_names" to "readonly"; + + --Linking Table: analysis_filetypes_link + --This linking table was created due to a many to many relationship between the input files of the analysis table and the filetypes table. + + CREATE TABLE "analysis_filetypes_link" ( + "an_fk" integer, + "ft_fk" integer, + "input" boolean + ) without OIDs; + + REVOKE ALL on "analysis_filetypes_link" from PUBLIC; + GRANT ALL on "analysis_filetypes_link" to "genex"; + GRANT SELECT on "analysis_filetypes_link" to "readonly"; + + + --Table: filetypes + --This table stores all distinct file types for which we would like to type check. Analysis can specify acceptable file types for input and output files. + + CREATE TABLE "filetypes" ( + "ft_pk" integer DEFAULT nextval('filetypes_ft_pk_seq'::text) NOT NULL, + "name" character varying(128), + "comment" text + ) without OIDs; + + REVOKE ALL on "filetypes" from PUBLIC; + GRANT ALL on "filetypes" to "genex"; + GRANT SELECT on "filetypes" to "readonly"; + + --Table: extension + --This table was created to hold the extensions associated with the various file types. We need a separate table since files will have multiple extensions. + + CREATE TABLE "extension" ( + "ext_pk" integer DEFAULT nextval('extension_ext_pk_seq'::text) NOT NULL, + "ft_fk" integer, + "extension" character varying(128) + ) without OIDs; + + REVOKE ALL on "extension" from PUBLIC; + GRANT ALL on "extension" to "genex"; + GRANT SELECT on "extension" to "readonly"; + + --Table: Tree + --This table stores analysis trees - groups of analysis nodes that are run in sequence. + + CREATE TABLE "tree" ( + "tree_pk" integer DEFAULT nextval('pk_seq'::text) NOT NULL, + "name" character varying(128), + "owner" character varying(128), + "fi_fk" integer + ) without OIDs; + + REVOKE ALL on "tree" from PUBLIC; + GRANT ALL on "tree" to "genex"; + GRANT SELECT on "tree" to "readonly"; + + + --Table: node + --Nodes are actual instances of analyses that should be run. They contain all information necessary to run the analysis. + + CREATE TABLE "node" ( + "node_pk" integer DEFAULT nextval('pk_seq'::text) NOT NULL, + "tree_fk" integer, + "an_fk" integer, + "parent_key" integer + ) without OIDs; + + REVOKE ALL on "node" from PUBLIC; + GRANT ALL on "node" to "genex"; + GRANT SELECT on "node" to "readonly"; + + --Table: user_paramter_values + --This table was created to eliminate the need for an array data type for the node.userparametervalues field. + + CREATE TABLE "user_parameter_values" ( + "upv_pk" integer DEFAULT nextval('user_parameter_values_upv_pk'::text) NOT NULL, + "node_fk" integer, + "upn_fk" integer, + "up_value" character varying(128) + ) without OIDs; + + + REVOKE ALL on "user_parameter_values" from PUBLIC; + GRANT ALL on "user_parameter_values" to "genex"; + GRANT SELECT on "user_parameter_values" to "readonly"; + + --Table: sys_parameter_values + --This table was created to eliminate the need for an array data type for the node.sysparametervalues field. + + + CREATE TABLE "sys_parameter_values" ( + "spv_pk" integer DEFAULT nextval('sys_parameter_values_spv_pk'::text) NOT NULL, + "node_fk" integer, + "spn_fk" integer, + "sp_value" character varying(128) + ) without OIDs; + + + REVOKE ALL on "sys_parameter_values" from PUBLIC; + GRANT ALL on "sys_parameter_values" to "genex"; + GRANT SELECT on "sys_parameter_values" to "readonly"; + -- + ======= CREATE SEQUENCE "user_parameter_values_upv_pk" start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1 ; *************** *** 3104,3108 **** "name" character varying(128), "owner" character varying(128), ! "fi_fk" integer ) without OIDs; --- 3303,3308 ---- "name" character varying(128), "owner" character varying(128), ! "fi_input_fk" integer, ! "fi_log_fk" integer ) without OIDs; *************** *** 3157,3158 **** --- 3357,3359 ---- GRANT SELECT on "sys_parameter_values" to "readonly"; + >>>>>>> 1.3.2.12 |
From: <tw...@us...> - 2002-11-07 15:41:29
|
Update of /cvsroot/genex/genex-server/site In directory usw-pr-cvs1:/tmp/cvs-serv7571 Modified Files: Tag: Rel-1_0_1-branch index.html Log Message: update. Index: index.html =================================================================== RCS file: /cvsroot/genex/genex-server/site/Attic/index.html,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** index.html 24 Oct 2002 18:35:16 -0000 1.1.2.1 --- index.html 7 Nov 2002 15:41:26 -0000 1.1.2.2 *************** *** 2,7 **** <HTML> <HEAD> ! <TITLE>GeneX Home Page</TITLE> ! </HEAD> --- 2,7 ---- <HTML> <HEAD> ! <TITLE>GeneX Home Page</TITLE> ! </HEAD> *************** *** 30,36 **** <td width="530"> <p><b> </b>General information:</p> ! <p><img src="graphics/x.jpg" alt="x" align="LEFT" width="14" height="14"> ! <a href="webtools/">Manage Your Account</a><br> ! Registered users only. Analyze and manage data.</p> <p><img src="graphics/x.jpg" alt="x" align="LEFT" width="14" height="14"> --- 30,37 ---- <td width="530"> <p><b> </b>General information:</p> ! <p><img src="graphics/x.jpg" alt="x" align="LEFT" width="14" height="14"> ! <a href="webtools/">GeneX Login</a><br> ! Registered users only. Login to your account to create studies, orders, ! analyze data, and download files.</p> <p><img src="graphics/x.jpg" alt="x" align="LEFT" width="14" height="14"> *************** *** 135,139 **** The current stable release: <pre> ! cvs -d:pserver:ano...@cv...:/cvsroot/genex co -r Rel-1_5_9 genex-server </pre> <br> --- 136,140 ---- The current stable release: <pre> ! cvs -d:pserver:ano...@cv...:/cvsroot/genex co -r Rel-1_5_10 genex-server </pre> <br> |
From: <tw...@us...> - 2002-11-07 15:40:51
|
Update of /cvsroot/genex/genex-server In directory usw-pr-cvs1:/tmp/cvs-serv7074 Modified Files: Tag: Rel-1_0_1-branch install_lib.pl Log Message: Fixed a small path problem. Index: install_lib.pl =================================================================== RCS file: /cvsroot/genex/genex-server/Attic/install_lib.pl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** install_lib.pl 29 Oct 2002 14:49:21 -0000 1.1.2.3 --- install_lib.pl 7 Nov 2002 15:40:48 -0000 1.1.2.4 *************** *** 12,20 **** $ENV{PATH} = "/bin:/usr/bin"; ! if (! defined(eval('$sessionlib_loaded'))) { ! require "./site/webtools/sessionlib.pl"; } - my %Vars = read_optionsdotreminders(); --- 12,25 ---- $ENV{PATH} = "/bin:/usr/bin"; ! if (!defined($::sessionlib_loaded)) { ! chdir("./site/webtools/"); ! require "./sessionlib.pl"; ! chdir("../../"); ! } ! if (!defined($::sessionlib_loaded)) ! { ! die "Couldn't load required sessionlib.pl\n"; } my %Vars = read_optionsdotreminders(); |
From: <jas...@us...> - 2002-11-07 15:08:05
|
Update of /cvsroot/genex/genex-server/Genex/GenexAdmin In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/GenexAdmin Modified Files: GenexAdmin.pm Log Message: new Index: GenexAdmin.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/GenexAdmin/GenexAdmin.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 |
From: <jas...@us...> - 2002-11-07 15:08:05
|
Update of /cvsroot/genex/genex-server/Genex/ExternalDatabase In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/ExternalDatabase Modified Files: ExternalDatabase.pm Log Message: new Index: ExternalDatabase.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/ExternalDatabase/ExternalDatabase.pm,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 |
From: <jas...@us...> - 2002-11-07 15:08:05
|
Update of /cvsroot/genex/genex-server/Genex/Feature In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/Feature Modified Files: Feature.pm Log Message: new Index: Feature.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/Feature/Feature.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 |
From: <jas...@us...> - 2002-11-07 15:08:05
|
Update of /cvsroot/genex/genex-server/Genex/FeatureExtractionSoftware In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/FeatureExtractionSoftware Modified Files: FeatureExtractionSoftware.pm Log Message: new Index: FeatureExtractionSoftware.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/FeatureExtractionSoftware/FeatureExtractionSoftware.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 |
From: <jas...@us...> - 2002-11-07 15:08:04
|
Update of /cvsroot/genex/genex-server/Genex/GroupLink In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/GroupLink Modified Files: GroupLink.pm Log Message: new Index: GroupLink.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/GroupLink/GroupLink.pm,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 |
From: <jas...@us...> - 2002-11-07 15:01:13
|
Update of /cvsroot/genex/genex-server In directory usw-pr-cvs1:/tmp/cvs-serv18716 Modified Files: .cvsignore ChangeLog Log Message: usual Index: .cvsignore =================================================================== RCS file: /cvsroot/genex/genex-server/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** .cvsignore 18 Sep 2002 22:52:30 -0000 1.10 --- .cvsignore 7 Nov 2002 15:01:08 -0000 1.11 *************** *** 1,4 **** --- 1,5 ---- .subst_cache Config.pm + MANIFEST Option.Reminders configure.pl Index: ChangeLog =================================================================== RCS file: /cvsroot/genex/genex-server/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** ChangeLog 20 Oct 2002 21:19:04 -0000 1.102 --- ChangeLog 7 Nov 2002 15:01:09 -0000 1.103 *************** *** 1,2 **** --- 1,25 ---- + 2002-11-07 Jason E. Stewart <ja...@op...> + + * Install (Repository): + no longer installs DTD files + uses MANIFEST + + * Configure (Repository): + GRAPHICS_DIR ==> GENEX_GRAPHICS_DIR + HTMLDIR ==> GENEX_HTMLDIR + + + * MANIFEST.in (Repository): + new file documenting which local files get installed and where + + * G2G/mason/group-maint.html.in (Repository): + fixed error output + + * G2G/mason/data-loader.html.in (Repository): + removed debugging cruft + + * DB/xml/ExperimentSet.xml (Repository): + removed creation_data - it is redundant with audit info + 2002-10-20 Jason E. Stewart <ja...@op...> |
From: <jas...@us...> - 2002-11-07 15:00:46
|
Update of /cvsroot/genex/genex-server In directory usw-pr-cvs1:/tmp/cvs-serv18436 Modified Files: Install Log Message: * Install (Repository): no longer installs DTD files uses MANIFEST Index: Install =================================================================== RCS file: /cvsroot/genex/genex-server/Install,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Install 20 Oct 2002 21:18:13 -0000 1.10 --- Install 7 Nov 2002 15:00:40 -0000 1.11 *************** *** 47,51 **** $GENEX_CGI_URL $GENEX_DIR $GENEX_DIR_DEF $GENEX_EXTRALIBS $GENEX_HTM_URL $GNUCUT $GNUMKDIR $GNUPLOT $GNUSORT $GNUTAIL $GNUTAR $GNUINSTALL ! $DOWNLOAD_DIR $CyberT_Demo_DIR $DTD_DIR $RCluster_Demo_DIR $GRAPHICS_DIR $INCLUDE_DIR $TOP_LEVEL_DIR $XCLUSTER_DIR $GS $GXQUERY_DIR $ENV_HOME $HTMLDIR $HTMLDIR_DEF $HTML_ROOT_URL $HTMLTMPDIR --- 47,51 ---- $GENEX_CGI_URL $GENEX_DIR $GENEX_DIR_DEF $GENEX_EXTRALIBS $GENEX_HTM_URL $GNUCUT $GNUMKDIR $GNUPLOT $GNUSORT $GNUTAIL $GNUTAR $GNUINSTALL ! $DOWNLOAD_DIR $CyberT_Demo_DIR $DTD_DIR $RCluster_Demo_DIR $GENEX_GRAPHICS_DIR $INCLUDE_DIR $TOP_LEVEL_DIR $XCLUSTER_DIR $GS $GXQUERY_DIR $ENV_HOME $HTMLDIR $HTMLDIR_DEF $HTML_ROOT_URL $HTMLTMPDIR *************** *** 184,188 **** $DIR = $VARS{GENEX_WORKSPACE_DIR}; # Brevity && Clarity! genex_mkdir($DIR) unless -d $DIR; ! genex_system("cd $MOTHERDIR/G2G/mason; cp -r * $DIR"); # the mason data dir needs to be world writable --- 184,188 ---- $DIR = $VARS{GENEX_WORKSPACE_DIR}; # Brevity && Clarity! genex_mkdir($DIR) unless -d $DIR; ! # genex_system("cd $MOTHERDIR/G2G/mason; cp -r * $DIR"); # the mason data dir needs to be world writable *************** *** 190,195 **** genex_mkdir($DIR) unless -d $DIR; $DIR = $VARS{GENEX_MASON_DATA_DIR}; # Brevity && Clarity! ! genex_mkdir($DIR) unless -d $DIR; ! genex_system("chmod 777 $DIR"); # --------------- controlled vocabs ---------------- --- 190,194 ---- genex_mkdir($DIR) unless -d $DIR; $DIR = $VARS{GENEX_MASON_DATA_DIR}; # Brevity && Clarity! ! genex_mkdir($DIR, 777) unless -d $DIR; # --------------- controlled vocabs ---------------- *************** *** 199,203 **** $DIR = $VARS{GENEX_VOCAB_DIR}; # Brevity && Clarity! genex_mkdir($DIR) unless -d $DIR; ! genex_system("cp -r $MOTHERDIR/DB/controlled_vocab/*.xml $DIR"); if (0) { --- 198,202 ---- $DIR = $VARS{GENEX_VOCAB_DIR}; # Brevity && Clarity! genex_mkdir($DIR) unless -d $DIR; ! # genex_system("cp -r $MOTHERDIR/DB/controlled_vocab/*.xml $DIR"); if (0) { *************** *** 289,295 **** $DIR = "$VARS{HTMLDIR}/$VARS{DOWNLOAD_DIR}"; # Brevity && Clarity! genex_mkdir($DIR) unless -d $DIR; - # we don't copy distribute software from remote installations anymore so - # the line below is commented out - #genex_system("cd $MOTHERDIR/download; cp -R curation_tool ../graphics index.shtml $DIR; "); } --- 288,291 ---- *************** *** 327,330 **** --- 323,327 ---- } + if (0) { # --------------- DTD dir ---------------- print STDERR "\n\nCreating / Installing the DTD dirs & files..\n\n"; *************** *** 333,337 **** $DIR = $VARS{GENEXML_DIR}; # Brevity && Clarity! genex_mkdir($DIR) unless -d $DIR; ! genex_system("cd $MOTHERDIR/DTD; cp -R *.dtd $DIR"); # now create the html version of the DTD's --- 330,334 ---- $DIR = $VARS{GENEXML_DIR}; # Brevity && Clarity! genex_mkdir($DIR) unless -d $DIR; ! # genex_system("cd $MOTHERDIR/DTD; cp -R *.dtd $DIR"); # now create the html version of the DTD's *************** *** 409,412 **** --- 406,411 ---- genex_system("ln -sf $DIR $VARS{HTMLDIR}/$VARS{DTD_DIR}"); + } + if (0) { *************** *** 423,427 **** print STDERR "\n\nCreating / Installing the graphics dirs & files..\n\n"; #make the HTML dir for the graphics/ and move the nec files there ! $DIR = "$VARS{HTMLDIR}/$VARS{GRAPHICS_DIR}"; # Brevity && Clarity! genex_mkdir($DIR) unless -d $DIR; genex_system("cd $MOTHERDIR/graphics; cp -R * $DIR;"); --- 422,426 ---- print STDERR "\n\nCreating / Installing the graphics dirs & files..\n\n"; #make the HTML dir for the graphics/ and move the nec files there ! $DIR = "$VARS{GENEX_GRAPHICS_DIR}"; # Brevity && Clarity! genex_mkdir($DIR) unless -d $DIR; genex_system("cd $MOTHERDIR/graphics; cp -R * $DIR;"); *************** *** 735,739 **** print STDERR "\n\nThat was definitely NOT a 'Y' or a 'N'. Please try again!\n"; } ! } # and make sure to change the permissions on the rcluster/var tree to allow # 'job tracking dirs' to be created there --- 734,739 ---- print STDERR "\n\nThat was definitely NOT a 'Y' or a 'N'. Please try again!\n"; } ! } ! # and make sure to change the permissions on the rcluster/var tree to allow # 'job tracking dirs' to be created there *************** *** 743,746 **** --- 743,756 ---- slow() if ($SLOW); + # now go through the MANIFEST and install all the files + print STDERR "\nCopying all files to their locations\n"; + my %FILES = %{do 'MANIFEST' }; + foreach my $file (keys %FILES) { + warn "No such file: $file" + unless -f $file; + print STDERR "\t$file => $FILES{$file}\n"; + genex_system("cp $file $FILES{$file}"); + } + print "\n\nChanging permissions on genex trees..\n\n"; *************** *** 799,803 **** $DIR = $APACHE_CONF_DIR; my $file = 'genex-2.conf'; ! genex_system("cp $MOTHERDIR/apache/$file $DIR"); print STDERR <<EOT; --- 809,813 ---- $DIR = $APACHE_CONF_DIR; my $file = 'genex-2.conf'; ! # genex_system("cp $MOTHERDIR/apache/$file $DIR"); print STDERR <<EOT; |
From: <jas...@us...> - 2002-11-07 14:59:23
|
Update of /cvsroot/genex/genex-server/G2G/mason In directory usw-pr-cvs1:/tmp/cvs-serv17753/G2G/mason Modified Files: .cvsignore Log Message: usual Index: .cvsignore =================================================================== RCS file: /cvsroot/genex/genex-server/G2G/mason/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .cvsignore 20 Oct 2002 14:02:05 -0000 1.4 --- .cvsignore 7 Nov 2002 14:59:19 -0000 1.5 *************** *** 1,2 **** --- 1,3 ---- + add_user_to_group.html array-design.html authenticate.html *************** *** 5,9 **** --- 6,13 ---- data-loader.html data-sources.html + experimentset-create.html + generate_group.html generate_user.html + group-create.html group-maint.html query.html |
From: <jas...@us...> - 2002-11-07 14:59:15
|
Update of /cvsroot/genex/genex-server/Genex In directory usw-pr-cvs1:/tmp/cvs-serv17689/Genex Modified Files: ChangeLog Log Message: usual Index: ChangeLog =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/ChangeLog,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** ChangeLog 20 Oct 2002 21:15:51 -0000 1.116 --- ChangeLog 7 Nov 2002 14:59:11 -0000 1.117 *************** *** 1,2 **** --- 1,26 ---- + 2002-11-07 Jason E. Stewart <ja...@op...> + + * scripts/xml2sql.pl.in (Repository): + fixed call to xml2sql() to add DB handle + + * scripts/mbad-insert.pl.in (Repository): + added die if not all features were found + + * scripts/group-insert.pl.in (Repository): + implemented all documented options + + * scripts/create_genex_db.pl.in (Repository): + fixed call to xml2sql() to add DB handle + all grants now done here and not in xml2sql() + better USAGE + + * XMLUtils/XMLUtils.pm.in (Repository): + started using create_view_sql() + removed all GRANT's + + * Genex.pm.in (Repository): + modified version format to be recognized + new version (2.7.20021106) + 2002-10-20 Jason E. Stewart <ja...@op...> |
From: <jas...@us...> - 2002-11-07 14:59:01
|
Update of /cvsroot/genex/genex-server/Genex/scripts In directory usw-pr-cvs1:/tmp/cvs-serv17592/Genex/scripts Modified Files: .cvsignore Log Message: usual Index: .cvsignore =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/scripts/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** .cvsignore 15 Oct 2002 14:44:16 -0000 1.23 --- .cvsignore 7 Nov 2002 14:58:58 -0000 1.24 *************** *** 11,14 **** --- 11,15 ---- db2xml.pl dbxml2tab.pl + experimentset-create.pl externaldb-insert.pl gendb.pl |
From: <jas...@us...> - 2002-11-07 14:58:32
|
Update of /cvsroot/genex/genex-server/Genex/SequenceFeature In directory usw-pr-cvs1:/tmp/cvs-serv17442/Genex/SequenceFeature Removed Files: Makefile.PL Log Message: cruft --- Makefile.PL DELETED --- |
From: <jas...@us...> - 2002-11-07 14:55:57
|
Update of /cvsroot/genex/genex-server/Genex/ExperimentSet In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/ExperimentSet Modified Files: ExperimentSet.pm Log Message: new Index: ExperimentSet.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/ExperimentSet/ExperimentSet.pm,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ExperimentSet.pm 20 Oct 2002 14:43:20 -0000 1.34 --- ExperimentSet.pm 7 Nov 2002 14:55:24 -0000 1.35 *************** *** 61,65 **** 'quantity_series_type', 'release_date', - 'creation_date', 'local_accession', 'archive_bundle_ref' --- 61,64 ---- *************** *** 188,192 **** 'biology_description' => 'Biology Description', 'es_pk' => 'Accession Number', - 'creation_date' => 'Creation Date', 'quantity_series_type' => 'Quantity Series Type', 'ro_groupname' => 'Read-Only Group Name', --- 187,190 ---- *************** *** 206,210 **** 'Primary Citation' => 'cit_fk', 'Local Accession Number' => 'local_accession', - 'Creation Date' => 'creation_date', 'Audit' => 'audit_fk', 'Release Date' => 'release_date', --- 204,207 ---- *************** *** 303,309 **** $ExperimentSet->release_date($value); - my $creation_date_val = $ExperimentSet->creation_date(); - $ExperimentSet->creation_date($value); - my $local_accession_val = $ExperimentSet->local_accession(); $ExperimentSet->local_accession($value); --- 300,303 ---- *************** *** 461,465 **** # this calls the Class::ObjectTemplate::attributes() method # to initialize all the class attributes ! attributes (no_lookup=>['fetched', 'fetch_all', 'fetched_attr', 'id', 'dbh'], lookup=>['es_pk', 'name', 'cit_fk', 'provider_con_fk', 'ro_groupname', 'rw_groupname', 'audit_fk', 'biology_description', 'analysis_description', 'treatment_type', 'quantity_series_type', 'release_date', 'creation_date', 'local_accession', 'archive_bundle_ref', 'cit_obj', 'provider_con_obj', 'ro_groupname_obj', 'rw_groupname_obj', 'audit_obj', 'measuredbioassay_obj', 'measuredbioassay_fk', 'experimentfactors_obj', 'experimentfactors_fk', 'physicalbioassay_obj', 'physicalbioassay_fk', 'treatmentlevel_obj', 'treatmentlevel_fk', 'hotspots_obj', 'hotspots_fk']); --- 455,459 ---- # this calls the Class::ObjectTemplate::attributes() method # to initialize all the class attributes ! attributes (no_lookup=>['fetched', 'fetch_all', 'fetched_attr', 'id', 'dbh'], lookup=>['es_pk', 'name', 'cit_fk', 'provider_con_fk', 'ro_groupname', 'rw_groupname', 'audit_fk', 'biology_description', 'analysis_description', 'treatment_type', 'quantity_series_type', 'release_date', 'local_accession', 'archive_bundle_ref', 'cit_obj', 'provider_con_obj', 'ro_groupname_obj', 'rw_groupname_obj', 'audit_obj', 'measuredbioassay_obj', 'measuredbioassay_fk', 'experimentfactors_obj', 'experimentfactors_fk', 'physicalbioassay_obj', 'physicalbioassay_fk', 'treatmentlevel_obj', 'treatmentlevel_fk', 'hotspots_obj', 'hotspots_fk']); *************** *** 1413,1423 **** Methods for the release_date attribute. - - - =item $value = creation_date(); - - =item creation_date($value); - - Methods for the creation_date attribute. --- 1407,1410 ---- |
From: <jas...@us...> - 2002-11-07 14:55:57
|
Update of /cvsroot/genex/genex-server/Genex/ExperimentFactors In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/ExperimentFactors Modified Files: ExperimentFactors.pm Log Message: new Index: ExperimentFactors.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/ExperimentFactors/ExperimentFactors.pm,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 |
From: <jas...@us...> - 2002-11-07 14:55:57
|
Update of /cvsroot/genex/genex-server/Genex/ControlledVocab In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/ControlledVocab Modified Files: ControlledVocab.pm Log Message: new Index: ControlledVocab.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/ControlledVocab/ControlledVocab.pm,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 |
From: <jas...@us...> - 2002-11-07 14:55:56
|
Update of /cvsroot/genex/genex-server/Genex/ContactType In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/ContactType Modified Files: ContactType.pm Log Message: new Index: ContactType.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/ContactType/ContactType.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 |
From: <jas...@us...> - 2002-11-07 14:55:56
|
Update of /cvsroot/genex/genex-server/Genex/Contact In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/Contact Modified Files: Contact.pm Log Message: new Index: Contact.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/Contact/Contact.pm,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 |
From: <jas...@us...> - 2002-11-07 14:55:56
|
Update of /cvsroot/genex/genex-server/Genex/Citation In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/Citation Modified Files: Citation.pm Log Message: new Index: Citation.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/Citation/Citation.pm,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 |
From: <jas...@us...> - 2002-11-07 14:55:56
|
Update of /cvsroot/genex/genex-server/Genex/Chromosome In directory usw-pr-cvs1:/tmp/cvs-serv15488/Genex/Chromosome Modified Files: Chromosome.pm Log Message: new Index: Chromosome.pm =================================================================== RCS file: /cvsroot/genex/genex-server/Genex/Chromosome/Chromosome.pm,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 |