Changeset 30446 for branches/eam_branches/ipp-20101205/tools/czarmetrics.pl

Timestamp:

Jan 31, 2011, 2:51:48 PM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20101205/tools/czarmetrics.pl (modified) (3 diffs)

branches/eam_branches/ipp-20101205/tools/czarmetrics.pl

@@ -8 +8 @@
 use CGI::Pretty qw[:standard];
 
+use czartool::Config;
 use czartool::DayMetrics;
 use czartool::MultiDayMetrics;
 use czartool::MetricsIndex;
-use czartool::CzarDb;
-use czartool::Gpc1Db;
 
 my $czarDbName = "czardb";
@@ -60 +59 @@
 if ($quit) {exit;}
 
-my $gpc1Db = new czartool::Gpc1Db("gpc1", "ippdb01", "ippuser", "ippuser");
-my $czarDb = new czartool::CzarDb($czarDbName, "ippdb01", "ipp", "ipp", $verbose, $save_temps);
-$czarDb->setDateFormat("%Y%m%d-%H%i%s");
+my $config = new czartool::Config();
 
 if ($index) {
 
-    my $metricsIndex = new czartool::MetricsIndex($gpc1Db, $czarDb, "/data/ipp004.0/ipp/ippMetrics/", 1, 0);
+    my $metricsIndex = new czartool::MetricsIndex($config, 1, 0);
     $metricsIndex->writeHTML();
     exit;
@@ -82 +79 @@
 if ($cumulative) {
 
-        my $multiDayMetrics = new czartool::MultiDayMetrics($gpc1Db, $czarDb, "/data/ipp004.0/ipp/ippMetrics/", 1, 0, $begin, $end);
+        my $multiDayMetrics = new czartool::MultiDayMetrics($config, 1, 0, $begin, $end);
         $multiDayMetrics->writeHTML();
 }
 else {
 
+    my $czarDb = $config->getCzarDbInstance();
+
     while (1) {
 
-        my $dayMetrics = new czartool::DayMetrics($gpc1Db, $czarDb, "/data/ipp004.0/ipp/ippMetrics/", 1, 0, $thisDay);
+        my $dayMetrics = new czartool::DayMetrics($config, 1, 0, $thisDay);
         $dayMetrics->writeHTML();