Index: branches/eam_branches/ipp-20111122/ippMonitor/czartool/czarDbSchema.sql =================================================================== --- branches/eam_branches/ipp-20111122/ippMonitor/czartool/czarDbSchema.sql (revision 33638) +++ branches/eam_branches/ipp-20111122/ippMonitor/czartool/czarDbSchema.sql (revision 33638) @@ -0,0 +1,468 @@ +-- MySQL dump 10.11 +-- +-- Host: ippdb01 Database: czardb +-- ------------------------------------------------------ +-- Server version 5.0.77-log + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `burntool` +-- + +DROP TABLE IF EXISTS `burntool`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `burntool` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + KEY `burntoolIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `cam` +-- + +DROP TABLE IF EXISTS `cam`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `cam` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `camIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `chip` +-- + +DROP TABLE IF EXISTS `chip`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `chip` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `chipIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `cluster_space` +-- + +DROP TABLE IF EXISTS `cluster_space`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `cluster_space` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `total` float default NULL, + `available` float default NULL, + `used` float default NULL, + `hostsOver98` smallint(6) default NULL, + KEY `clusterSpaceIndex` (`timestamp`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `current_labels` +-- + +DROP TABLE IF EXISTS `current_labels`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `current_labels` ( + `server` varchar(128) default NULL, + `label` varchar(128) default NULL, + `priority` int(11) NOT NULL default '0' +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `deleted_datastore` +-- + +DROP TABLE IF EXISTS `deleted_datastore`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `deleted_datastore` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `ipptopsps_deleted_datastoreIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `deleted_dxlayer` +-- + +DROP TABLE IF EXISTS `deleted_dxlayer`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `deleted_dxlayer` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `ipptopsps_deleted_dxlayerIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `deleted_local` +-- + +DROP TABLE IF EXISTS `deleted_local`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `deleted_local` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `ipptopsps_deleted_local` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `diff` +-- + +DROP TABLE IF EXISTS `diff`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `diff` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `diffIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `dist` +-- + +DROP TABLE IF EXISTS `dist`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `dist` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `distIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `fake` +-- + +DROP TABLE IF EXISTS `fake`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `fake` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `fakeIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `hosts` +-- + +DROP TABLE IF EXISTS `hosts`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `hosts` ( + `host` varchar(128) default NULL, + `total` float default NULL, + `available` float default NULL, + `used` float default NULL, + `writable` tinyint(4) NOT NULL default '0', + `readable` tinyint(4) NOT NULL default '0' +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `loaded_to_ODM` +-- + +DROP TABLE IF EXISTS `loaded_to_ODM`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `loaded_to_ODM` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `ipptopsps_loaded_to_ODMIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `loaded_to_datastore` +-- + +DROP TABLE IF EXISTS `loaded_to_datastore`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `loaded_to_datastore` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `ipptopsps_loaded_to_datastoreIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `magic` +-- + +DROP TABLE IF EXISTS `magic`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `magic` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `magicIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `magicDS` +-- + +DROP TABLE IF EXISTS `magicDS`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `magicDS` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `magicDSIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `merge_worthy` +-- + +DROP TABLE IF EXISTS `merge_worthy`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `merge_worthy` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `ipptopsps_merge_worthyIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `merged` +-- + +DROP TABLE IF EXISTS `merged`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `merged` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `ipptopsps_mergedIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `nightlyscience` +-- + +DROP TABLE IF EXISTS `nightlyscience`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `nightlyscience` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `status` varchar(128) default 'NONE' +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `processed` +-- + +DROP TABLE IF EXISTS `processed`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `processed` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `ipptopsps_processedIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `pub` +-- + +DROP TABLE IF EXISTS `pub`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `pub` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + KEY `pubIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `reverts` +-- + +DROP TABLE IF EXISTS `reverts`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `reverts` ( + `stage` varchar(128) default NULL, + `reverting` tinyint(4) default NULL +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `revision` +-- + +DROP TABLE IF EXISTS `revision`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `revision` ( + `revision` int(11) NOT NULL default '0', + `created` timestamp NOT NULL default CURRENT_TIMESTAMP, + PRIMARY KEY (`revision`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `server_dates` +-- + +DROP TABLE IF EXISTS `server_dates`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `server_dates` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `server` varchar(64) default 'NONE', + `date` varchar(64) default 'NONE' +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `servers` +-- + +DROP TABLE IF EXISTS `servers`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `servers` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `server` varchar(128) default NULL, + `alive` tinyint(4) default NULL, + `running` tinyint(4) default NULL, + KEY `serverIndex` (`timestamp`,`server`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `stack` +-- + +DROP TABLE IF EXISTS `stack`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `stack` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `stackIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `warp` +-- + +DROP TABLE IF EXISTS `warp`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `warp` ( + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `label` varchar(128) default 'NONE', + `pending` bigint(20) NOT NULL, + `faults` bigint(20) NOT NULL, + `processed` bigint(20) NOT NULL default '0', + KEY `warpIndex` (`timestamp`,`label`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +SET character_set_client = @saved_cs_client; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2012-03-06 6:00:30 Index: branches/eam_branches/ipp-20111122/ippMonitor/czartool/czartool/czarconfig.xml =================================================================== --- branches/eam_branches/ipp-20111122/ippMonitor/czartool/czartool/czarconfig.xml (revision 32851) +++ branches/eam_branches/ipp-20111122/ippMonitor/czartool/czartool/czarconfig.xml (revision 33638) @@ -21,5 +21,5 @@ gpc1 - ippdb03 + ippdb01 ippMonitor ippMonitor Index: branches/eam_branches/ipp-20111122/ippMonitor/def/lapExposures.d =================================================================== --- branches/eam_branches/ipp-20111122/ippMonitor/def/lapExposures.d (revision 32851) +++ branches/eam_branches/ipp-20111122/ippMonitor/def/lapExposures.d (revision 33638) @@ -6,54 +6,55 @@ UNRESTRICTED WHERE 0=1 -ARGS ARG1 rawImfile.exp_id=$lapExp.exp_id -ARGS ARG2 chipRun.chip_id=$lapExp.chip_id -ARGS ARG3 chipRun.chip_id=$lapExp.pair_id -ARGS ARG4 camRun.cam_id=$camRun1.cam_id -ARGS ARG5 camRun.cam_id=$camRun2.cam_id -ARGS ARG6 fakeRun.fake_id=$fakeRun1.fake_id -ARGS ARG7 fakeRun.fake_id=$fakeRun2.fake_id -ARGS ARG8 warpRun.warp_id=$warpRun1.warp_id -ARGS ARG9 warpRun.warp_id=$warpRun2.warp_id -ARGS ARG10 diffRun.diff_id=$diffRun.diff_id +ARGS ARG1 rawImfile.exp_id=$lapExp.exp_id +ARGS ARG2 chipRun.chip_id=$lapExp.chip_id +ARGS ARG3 chipRun.chip_id=$lapExp.pair_id +ARGS ARG4 camRun.cam_id=$camRun1.cam_id +ARGS ARG5 camRun.cam_id=$camRun2.cam_id +ARGS ARG6 fakeRun.fake_id=$fakeRun1.fake_id +ARGS ARG7 fakeRun.fake_id=$fakeRun2.fake_id +ARGS ARG8 warpRun.warp_id=$warpRun1.warp_id +ARGS ARG9 warpRun.warp_id=$warpRun2.warp_id +ARGS ARG10 diffRun.diff_id=$diffRun.diff_id -# field size format name show link to extras -FIELD lapRun.seq_id, 6, %d, seq_id -FIELD lapExp.lap_id, 6, %d, lap_id -FIELD lapExp.data_state, 6, %s, State (lapExp) -FIELD lapExp.exp_id, 6, %d, Exp ID, value, rawImfile.php, ARG1 -FIELD lapExp.chip_id, 6, %d, Chip1 (lapExp.chip_id), value, chipStageExp.php, ARG2 -FIELD chipRun1.state AS ch1state, 6, %s, Chip1 State -FIELD camRun1.cam_id AS cam_id_1, 6, %d, Cam1 ID, value, camStageExp.php, ARG4 -FIELD camRun1.state AS ca1state, 6, %s, Cam1 State -FIELD fakeRun1.fake_id AS fake_id_1, 6, %d, Fake1 ID, value, fakeStageExp.php, ARG6 -FIELD fakeRun1.state AS fa1state, 6, %s, Fake1 State -FIELD warpRun1.warp_id AS warp_id_1, 6, %d, Warp1 ID, value, warpStageExp.php, ARG8 -FIELD warpRun1.state AS wa1state, 6, %s, Warp1 State -FIELD lapExp.pair_id, 6, %d, Chip2 ID (lapExp.chip_id), value, chipStageExp.php, ARG3 -FIELD chipRun2.state AS ch2state, 6, %s, Chip2 State -FIELD camRun2.cam_id AS cam_id_2, 6, %d, Cam2 ID, value, camStageExp.php, ARG5 -FIELD camRun2.state AS ca2state, 6, %s, Cam2 State -FIELD fakeRun2.fake_id AS fake_id_2, 6, %d, Fake2 ID, value, fakeStageExp.php, ARG7 -FIELD fakeRun2.state AS fa2state, 6, %s, Fake2 State -FIELD warpRun2.warp_id AS warp_id_2, 6, %d, Warp2 ID, value, warpStageExp.php, ARG9 -FIELD warpRun2.state AS wa2state, 6, %s, Warp2 State -FIELD diffRun.diff_id, 6, %d, Diff ID, value, diffStageExp.php, ARG10 -FIELD diffRun.state AS diState, 6, %s, Diff State -FIELD lapRun.tess_id, 8, %s, tess_id -FIELD lapRun.projection_cell, 10, %s, ProjCell -FIELD lapRun.filter, 7, %s, Filter -FIELD lapRun.state, 15, %s, State (lapRun) -FIELD lapRun.label, 15, %s, Label -FIELD lapRun.dist_group, 15, %s, Dist Group -FIELD lapRun.registered, 19, %T, Registered -FIELD lapRun.fault, 3, %d, fault -FIELD lapRun.quick_sass_id, 6, %d, quick_sass_id -FIELD lapRun.final_sass_id, 6, %d, final_sass_id -FIELD lapExp.private, 2, %d, Private -FIELD lapExp.pairwise, 2, %d, Pairwise -FIELD lapExp.active, 2, %d, Active -FIELD rawExp.dateobs, 19, %T, Date/Time -FIELD rawExp.object, 8, %s, Object -FIELD rawExp.comment, 80, %s, Comment +# field size format name show link to extras +FIELD lapRun.seq_id, 6, %d, seq_id +FIELD lapExp.lap_id, 6, %d, lap_id +FIELD lapExp.data_state, 6, %s, State (lapExp) +FIELD lapExp.exp_id, 6, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD lapExp.chip_id, 6, %d, Chip1 (lapExp.chip_id), value, chipStageExp.php, ARG2 +FIELD chipRun1.state AS ch1state, 6, %s, Chip1 State +FIELD camRun1.cam_id AS cam_id_1, 6, %d, Cam1 ID, value, camStageExp.php, ARG4 +FIELD camRun1.state AS ca1state, 6, %s, Cam1 State +FIELD fakeRun1.fake_id AS fake_id_1, 6, %d, Fake1 ID, value, fakeStageExp.php, ARG6 +FIELD fakeRun1.state AS fa1state, 6, %s, Fake1 State +FIELD warpRun1.warp_id AS warp_id_1, 6, %d, Warp1 ID, value, warpStageExp.php, ARG8 +FIELD warpRun1.state AS wa1state, 6, %s, Warp1 State +FIELD lapExp.pair_id, 6, %d, Chip2 ID (lapExp.chip_id), value, chipStageExp.php, ARG3 +FIELD chipRun2.state AS ch2state, 6, %s, Chip2 State +FIELD camRun2.cam_id AS cam_id_2, 6, %d, Cam2 ID, value, camStageExp.php, ARG5 +FIELD camRun2.state AS ca2state, 6, %s, Cam2 State +FIELD fakeRun2.fake_id AS fake_id_2, 6, %d, Fake2 ID, value, fakeStageExp.php, ARG7 +FIELD fakeRun2.state AS fa2state, 6, %s, Fake2 State +FIELD warpRun2.warp_id AS warp_id_2, 6, %d, Warp2 ID, value, warpStageExp.php, ARG9 +FIELD warpRun2.state AS wa2state, 6, %s, Warp2 State +FIELD diffRun.diff_id, 6, %d, Diff ID, value, diffStageExp.php, ARG10 +FIELD diffRun.state AS diState, 6, %s, Diff State +FIELD lapRun.tess_id, 8, %s, tess_id +FIELD lapRun.projection_cell, 10, %s, ProjCell +FIELD diffInputSkyfile.skycell_id, 10, %s, Skycell ID +FIELD lapRun.filter, 7, %s, Filter +FIELD lapRun.state, 15, %s, State (lapRun) +FIELD lapRun.label, 15, %s, Label +FIELD lapRun.dist_group, 15, %s, Dist Group +FIELD lapRun.registered, 19, %T, Registered +FIELD lapRun.fault, 3, %d, fault +FIELD lapRun.quick_sass_id, 6, %d, quick_sass_id +FIELD lapRun.final_sass_id, 6, %d, final_sass_id +FIELD lapExp.private, 2, %d, Private +FIELD lapExp.pairwise, 2, %d, Pairwise +FIELD lapExp.active, 2, %d, Active +FIELD rawExp.dateobs, 19, %T, Date/Time +FIELD rawExp.object, 8, %s, Object +FIELD rawExp.comment, 80, %s, Comment # MODE summary Index: branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_getplot.php =================================================================== --- branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_getplot.php (revision 32851) +++ branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_getplot.php (revision 33638) @@ -30,4 +30,6 @@ else if ($type=="st") $filePath = "$path/czarplot_cluster.png"; +else if ($type=="id") +$filePath = "$path/ippToPsps_density_".$label.".png"; Index: branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_ipptopsps.php =================================================================== --- branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_ipptopsps.php (revision 32851) +++ branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_ipptopsps.php (revision 33638) @@ -155,4 +155,8 @@ echo "
"; +echo "
"; + echo "
"; +echo "
"; + echo ""; Index: branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_labels.php =================================================================== --- branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_labels.php (revision 32851) +++ branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_labels.php (revision 33638) @@ -169,5 +169,5 @@ echo "Postage stamp server statushere"; echo "Documentationhere"; -echo "Cluster loadhere"; +echo "Cluster loadhere cpu_report"; echo "Who's using the cluster?here"; echo "IPP metricshere"; @@ -492,5 +492,5 @@ createFormattedTableCell(($selectedLabel != "all"), $link, "All labels", 0, null); - createFormattedTableCell(0, null, "Reverts:", 0, "$columnHeaderColor"); + createFormattedTableCell(0, null, "Reverting?", 0, "$columnHeaderColor"); foreach ($stages as &$stage) { @@ -498,18 +498,21 @@ if ($stage == "burntool") continue; $reverting = getRevertStatus($db, $stage); - $link = - "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&mode=" .$selectedMode - ."&label=".$selectedLabel - ."&stage=".$selectedStage - ."&plottype=".$plotType - ."&revertstage=".$stage - ."&revertmode="; - - if(!$reverting) {$label = "Start";$link = $link . "on";} - if($reverting) {$label = "Stop";$link = $link . "off";} + #$link = + # "czartool_labels.php?pass=".$pass + # ."&proj=".$proj + # ."&mode=" .$selectedMode + # ."&label=".$selectedLabel + # ."&stage=".$selectedStage + # ."&plottype=".$plotType + # ."&revertstage=".$stage + # ."&revertmode="; +# + #if(!$reverting) {$label = "Start";$link = $link . "on";} + #if($reverting) {$label = "Stop";$link = $link . "off";} + if(!$reverting) {$label = "no";} + if($reverting) {$label = "yes";} unset($reverting); - createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor"); + #createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor"); + createFormattedTableCell(0, null, $label, 0, "$columnHeaderColor"); #echo "$label"; Index: branches/eam_branches/ipp-20111122/ippMonitor/scripts/skyplot.dvo =================================================================== --- branches/eam_branches/ipp-20111122/ippMonitor/scripts/skyplot.dvo (revision 32851) +++ branches/eam_branches/ipp-20111122/ippMonitor/scripts/skyplot.dvo (revision 33638) @@ -8,4 +8,5 @@ black gold + orange end @@ -17,4 +18,5 @@ 7 3 + 0 end @@ -26,4 +28,5 @@ 0.9 1.3 + 0.5 end