Index: trunk/ippMonitor/czartool/czarDbSchema.sql
===================================================================
--- trunk/ippMonitor/czartool/czarDbSchema.sql	(revision 38223)
+++ trunk/ippMonitor/czartool/czarDbSchema.sql	(revision 38250)
@@ -26,8 +26,9 @@
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
   `label` varchar(128) default 'NONE',
+  `dbname` varchar(128) default 'NONE',
   `pending` bigint(20) NOT NULL,
   `processed` bigint(20) NOT NULL,
   `faults` bigint(20) NOT NULL,
-  KEY `burntoolIndex` (`timestamp`,`label`)
+  KEY `burntoolIndex` (`timestamp`,`label`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -43,8 +44,9 @@
   `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`)
+  `dbname` 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`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -60,8 +62,9 @@
   `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`)
+  `dbname` 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`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -160,8 +163,9 @@
   `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`)
+  `dbname` 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`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -177,8 +181,9 @@
   `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`)
+  `dbname` 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`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -194,8 +199,9 @@
   `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`)
+  `dbname` 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`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -262,8 +268,9 @@
   `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`)
+  `dbname` 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`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -279,8 +286,9 @@
   `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`)
+  `dbname` 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`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -360,8 +368,9 @@
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
   `label` varchar(128) default 'NONE',
+  `dbname` varchar(128) default 'NONE',
   `pending` bigint(20) NOT NULL,
   `processed` bigint(20) NOT NULL,
   `faults` bigint(20) NOT NULL,
-  KEY `pubIndex` (`timestamp`,`label`)
+  KEY `pubIndex` (`timestamp`,`label`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -434,8 +443,9 @@
   `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`)
+  `dbname` 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`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -451,8 +461,61 @@
   `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`)
+  `dbname` 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`, `dbname`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `staticsky`
+--
+
+DROP TABLE IF EXISTS `staticsky`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `staticsky` (
+  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
+  `label` varchar(128) default 'NONE',
+  `dbname` varchar(128) default 'NONE',
+  `pending` bigint(20) NOT NULL,
+  `faults` bigint(20) NOT NULL,
+  `processed` bigint(20) NOT NULL default '0',
+  KEY `staticskyIndex` (`timestamp`,`label`, `dbname`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+--
+-- Table structure for table `fullforce`
+--
+
+DROP TABLE IF EXISTS `fullforce`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `fullforce` (
+  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
+  `label` varchar(128) default 'NONE',
+  `dbname` varchar(128) default 'NONE',
+  `pending` bigint(20) NOT NULL,
+  `faults` bigint(20) NOT NULL,
+  `processed` bigint(20) NOT NULL default '0',
+  KEY `fullforceIndex` (`timestamp`,`label`, `dbname`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @ssaved_cs_client;
+--
+-- Table structure for table `chipbackground`
+--
+
+DROP TABLE IF EXISTS `chipbackground`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `chipbackground` (
+  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
+  `label` varchar(128) default 'NONE',
+  `dbname` varchar(128) default 'NONE',
+  `pending` bigint(20) NOT NULL,
+  `faults` bigint(20) NOT NULL,
+  `processed` bigint(20) NOT NULL default '0',
+  KEY `chipbackgroundIndex` (`timestamp`,`label`, `dbname`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -476,4 +539,2 @@
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2012-03-06  6:00:30
Index: trunk/ippMonitor/czartool/czarpoll.pl
===================================================================
--- trunk/ippMonitor/czartool/czarpoll.pl	(revision 38223)
+++ trunk/ippMonitor/czartool/czarpoll.pl	(revision 38250)
@@ -32,4 +32,5 @@
 my $czarDb = $config->getCzarDbInstance();
 my $gpc1Db = $config->getGpc1Instance;
+my $gpc2Db = $config->getGpc2Instance;
 my $nebulous = new czartool::Nebulous($czarDb);
 my $pantasks = new czartool::Pantasks();
@@ -47,4 +48,5 @@
         "fullforce",
         "dist",
+        "fullforce",
         "pub");
 
@@ -331,7 +333,10 @@
 
     print "* Updating stage data\n";
-    my $totalNew = undef;
-    my $totalFaults = undef;
-    my $totalFull = undef;
+    my $totalNew1 = 0;
+    my $totalFaults1 = 0;
+    my $totalFull1 = 0;
+    my $totalNew2 = 0;
+    my $totalFaults2 = 0;
+    my $totalFull2 = 0;
     my $stage = undef;
     my $reverting = 0;
@@ -352,5 +357,6 @@
         print "* Checking labels for $stage stage\n";
 
-        $totalNew=$totalFaults=$totalFull=0;
+        $totalNew1=$totalFaults1=$totalFull1=0;
+        $totalNew2=$totalFaults2=$totalFull2=0;
         foreach $row ( @{$rows} ) {
             my ($label) = @{$row};
@@ -358,28 +364,28 @@
             chomp($label);
 
-            if ($stage eq "burntool") {
-
-                $new = $full = $faults = 0;
-                if ($labelServer eq "stdscience") {
-
-                    $full = $gpc1Db->countRegisteredExposures($label, $today);
-                }
-            }
-            else {
-
-                $new = $gpc1Db->countExposures($label, $stage, $newState);
-                $full = $gpc1Db->countExposures($label, $stage, "full");
-                $faults = $gpc1Db->countFaults($label, $stage, $newState);
-            }
+            $new = $gpc1Db->countExposures($label, $stage, $newState);
+            $full = $gpc1Db->countExposures($label, $stage, "full");
+            $faults = $gpc1Db->countFaults($label, $stage, $newState);
             #printf("%s  %s, %s, %d, %d\n", $labelServer, $label, $stage, $new, $faults);
-            $totalNew += $new;
-            $totalFull += $full;
-            $totalFaults += $faults;
-
-            $czarDb->insertNewTimeData($stage, $label, $new, $full, $faults);
-        }
-
-        $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", $totalNew, $totalFull, $totalFaults);
-    }
-}
-
+            $totalNew1 += $new;
+            $totalFull1 += $full;
+            $totalFaults1 += $faults;
+
+            $czarDb->insertNewTimeData($stage, $label, 'gpc1', $new, $full, $faults);
+
+            $new = $gpc2Db->countExposures($label, $stage, $newState);
+            $full = $gpc2Db->countExposures($label, $stage, "full");
+            $faults = $gpc2Db->countFaults($label, $stage, $newState);
+            #printf("%s  %s, %s, %d, %d\n", $labelServer, $label, $stage, $new, $faults);
+            $totalNew2 += $new;
+            $totalFull2 += $full;
+            $totalFaults2 += $faults;
+
+            $czarDb->insertNewTimeData($stage, $label, 'gpc2', $new, $full, $faults);
+        }
+
+        $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", 'gpc1', $totalNew1, $totalFull1, $totalFaults1);
+        $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", 'gpc2', $totalNew2, $totalFull2, $totalFaults2);
+    }
+}
+
Index: trunk/ippMonitor/czartool/czartool/Config.pm
===================================================================
--- trunk/ippMonitor/czartool/czartool/Config.pm	(revision 38223)
+++ trunk/ippMonitor/czartool/czartool/Config.pm	(revision 38250)
@@ -56,4 +56,10 @@
     $self->{gpc1user} = $xc->findvalue('//gpc1database/user');
     $self->{gpc1password} = $xc->findvalue('//gpc1database/password');
+
+    # gpc2 db
+    $self->{gpc2name} = $xc->findvalue('//gpc2database/name');
+    $self->{gpc2host} = $xc->findvalue('//gpc2database/host');
+    $self->{gpc2user} = $xc->findvalue('//gpc2database/user');
+    $self->{gpc2password} = $xc->findvalue('//gpc2database/password');
 
     # czar db
@@ -103,4 +109,18 @@
             $self->{gpc1password});
 }
+###########################################################################
+#
+# Returns an instance of the gpc2 database 
+#
+###########################################################################
+sub getGpc2Instance {
+    my ($self) = @_;
+
+    return new czartool::Gpc1Db(
+            $self->{gpc2name}, 
+            $self->{gpc2host}, 
+            $self->{gpc2user},
+            $self->{gpc2password});
+}
 
 ###########################################################################
Index: trunk/ippMonitor/czartool/czartool/CzarDb.pm
===================================================================
--- trunk/ippMonitor/czartool/czartool/CzarDb.pm	(revision 38223)
+++ trunk/ippMonitor/czartool/czartool/CzarDb.pm	(revision 38250)
@@ -360,11 +360,11 @@
 ###########################################################################
 sub insertNewTimeData {
-    my ($self, $stage, $label, $pending, $processed, $faults) = @_;
+    my ($self, $stage, $label, $dbname, $pending, $processed, $faults) = @_;
 
     my $query = $self->{_db}->prepare(<<SQL);
     INSERT INTO $stage
-        (label, pending, processed, faults)
+        (label, dbname, pending, processed, faults)
         VALUES
-        ('$label', $pending, $processed, $faults);
+        ('$label', '$dbname', $pending, $processed, $faults);
 SQL
 
Index: trunk/ippMonitor/czartool/czartool/DayMetrics.pm
===================================================================
--- trunk/ippMonitor/czartool/czartool/DayMetrics.pm	(revision 38223)
+++ trunk/ippMonitor/czartool/czartool/DayMetrics.pm	(revision 38250)
@@ -78,6 +78,6 @@
     print $htmlFile "<a href=\"../$previousDay/index.html\"> \< previous day</a> | <a href=\"../index.html\">all</a> | <a href=\"../$nextDay/index.html\">next day \></a><br>\n";
     print $htmlFile "Measured from $self->{begin} to $self->{end} HST<br>\n";
-    printf ( $htmlFile "%d exposures taken on summit last night, %d through chip today</h5>\n",
-            $summitExposures, $chipMetrics->getProcessed() ? $chipMetrics->getProcessed() : 0 );
+    printf $htmlFile "%d exposures taken on summit last night, %d through chip today</h5>\n", 
+            $summitExposures, $chipMetrics->getProcessed() ? $chipMetrics->getProcessed() : 0 ;
     print $htmlFile "</head>\n";
     print $htmlFile "<body>\n";