Changeset 228

Timestamp:

07/31/08 08:45:46

Author:

dan

Message:

Changes: Added handling of time zones. The data is stamped in GMT in the database, so we want to be able to move the time frame to be EST for us east coasters.
Added command line option -TimeZone? to allow for compensation away from GMT.

Sub: TabulatePlatformResults()
Changes: Added a query URL to allow the ability to drill down on a sensor/platform to see the data for the time period.

Files:

• obskml/trunk/QAQC/CalcPlatformUptimePercentage.pl (modified) (16 diffs)

obskml/trunk/QAQC/CalcPlatformUptimePercentage.pl

@@ -1 +1 @@
-#######################################################################################################
-#Revisions
+#Rev: 1.2.0.0
+#Author: DWR
+#Changes: Added handling of time zones. The data is stamped in GMT in the database, so we want to be able to move the time
+# frame to be EST for us east coasters.
+# Added command line option -TimeZone to allow for compensation away from GMT.
+#
+#Sub: TabulatePlatformResults()
+#Changes: Added a query URL to allow the ability to drill down on a sensor/platform to see the data for the time period.
+#
-#Rev: 1.1.0.0
-#Author: DWR
@@ -30 +39 @@
-#of shell commands.
-
-1
+0
-
-#1 enables the various debug print statements, 0 turns them off.
-use constant USE_DEBUG_PRINTS   => 0;
-
+use constant SECONDS_PER_DAY => ( 24 * 60 * 60 );
-###path config#############################################
-my $strDBName     = '';
@@ -59 +69 @@
-            "TstProfFeed=s",
-            "UpdateDatabase:s",
-
+
+
-
-my $strWorkingDir   = $CommandLineOptions{"WorkingDir"};
@@ -72 +83 @@
-              "--TstProfFeed provides the url where the test_profiles.xml file resides.\n".
-              "--UpdateDatabase specifies if the metrics table in the database is to be updated. Values are \"yes\" to update, or \"no\". This value is optional, default is \"no\" \n".
-
+
+
+
-}
-#Optional command line arguments.
@@ -82 +95 @@
-
-my $strDate         = $CommandLineOptions{"Date"};
+#DWR v1.2.0.0
+my $strEndDate;
-if( !length( $strDate ) )
-{
@@ -88 +103 @@
-    $strDate = `date --d=\"1 days ago\" +%Y-%m-%d`;
-    chomp( $strDate );
+    
+    $strEndDate = `date +%Y-%m-%d`;
+    chomp( $strEndDate );
-  }
-  else
@@ -93 +111 @@
-    $strDate = `\\UnixUtils\\usr\\local\\wbin\\date.exe --d=\"1 days ago\" +%Y-%m-%d`;
-    chomp( $strDate );   
+
+    $strEndDate = `\\UnixUtils\\usr\\local\\wbin\\date.exe +%Y-%m-%d`;
+    chomp( $strEndDate );
-  }  
-}
-
+
+
+
+
+
-###########################################################
-
@@ -179 +204 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-my %PlatformIDs;
@@ -205 +287 @@
-                my $iUpdateInterval = sprintf( "%d", $obs->find('UpdateInterval') );
-      
-
-
-
+
+
+
+
+
-    }#obstypes
-    #PlotPlatformResults( $DB, $strPlatformID, \%PlatformIDs, $strWorkingDir );
@@ -244 +328 @@
-# 5. $SensorIDs is a reference to a hash which will be populated as: key=Sensor ID from sensor.m_type_id column, value=Sensor Name from sensor.short_name column.
-########################################################################################################################
-
+
+
-{
-  my $DBI           = shift @_;
@@ -251 +336 @@
-  my $strEndDate    = shift @_;
-  my $SensorIDs     = shift @_;
-
+
+
+
+
-  my $strSQL = "SELECT DISTINCT(sensor.m_type_id), sensor.short_name 
-                FROM multi_obs
-                LEFT JOIN sensor on sensor.row_id=multi_obs.sensor_id
-
+
+
+
+
-                ORDER BY sensor.row_id ASC;";
-  
@@ -277 +368 @@
-  return( $iCnt );
-}
-
+
-########################################################################################################################
-# QueryPlatformSensorReportCount
@@ -288 +379 @@
-# 6. $PlatformInfo is a reference to a hash which will be populated with per platform/sensor information.
-########################################################################################################################
-
-
-
+, $iTimeZoneShift
+
+,$iTimeZoneShift
-     
-  #This query will return the number of entries of the sensor type given for the given platform and date range.
-  #In other words how many times do we have an entry for that sensor for that platform during that date/time interval.
+  # m_date >= '$strStart' AND m_date < '$strEnd'      AND 
+
+  #DWR v1.2.0.0
+  #Added time zone adjustment into WHERE clause for start/end date range.
-  my $strSQL = "SELECT COUNT( sensor.m_type_id )
-                FROM multi_obs 
-                LEFT JOIN sensor on sensor.row_id=multi_obs.sensor_id
-
+
+
+
+
+
-
-  my $hSt = $DB->prepare( $strSQL );
@@ -514 +613 @@
-      my $fSensorAvg  = 0;
-      my $iMaxCnt     = 0;
+
+      #DWR v1.2.0.0
+      #Build link to query data for sensor
+      my $strURL = 'http://nautilus.baruch.sc.edu/~dramage_prod/cgi-bin/DumpPlatformSensorReport.php?';
+      
-      if( $iRowCnt == 0 )
-      {
@@ -552 +656 @@
-      #DWR v1.1.0.0
-      my $fAvg = $fSensorAvg / $iDayCnt;
+      if( $iUpdateInterval == 0 )
+      {
+        $iUpdateInterval = 1;
+      }
-      $fSensorAvg = ($fAvg / $iUpdateInterval) * 100.0 ;
-      if( $iSensorCnt == 0 )
@@ -561 +669 @@
-        $strRow = $strRow.',';
-      } 
+      #DWR v1.2.0.0
+      #Build the url for our drill down into the database for this platform/sensor data.
+      my $iUpdatesInSeconds = SECONDS_PER_DAY / $iUpdateInterval;
+      $strURL .= "PLATFORMID=$strPlatformID&OBSERVATION=$Sensor&UPDATEINTERVAL=$iUpdatesInSeconds&STARTDATE=$strDate&ENDDATE=$strEndDate&TIMEZONE=EASTERN";
-      my $strSensorAvg = sprintf( "%.2f",$fSensorAvg );
-
+
+
-      if( $iUpdateDatabase )
-      {
-        AddRecordToDatabase( $DB, $strPlatformID, $Sensor, $strSensorAvg, $strStartDate );
-      }
+      
-      $iSensorCnt++;
-    }#foreach sensor