Index: trunk/www/dch/download.php
===================================================================
--- trunk/www/dch/download.php (revision 19047)
+++ trunk/www/dch/download.php (revision 19058)
@@ -11,14 +11,21 @@
-
\n";
+ echo "alert(\"".$text."\")\n";
+ echo "\n";
+}
+$maintenance=0;
+//$maintenance=1;
+
+if ($maintenance)
+{
+ echo "
\n MAINTENANCE ONGOING
\n";
+ echo "check again in a few hours...
\n\n
\n\n
\n";
+}
+
$tables=array(
@@ -28,5 +35,5 @@
$times=array(
- "time" => "timestamp",
+ "timestamp" => "timestamp",
"unix" => "unixtime",
"mjd" => "MJD",
@@ -220,14 +227,24 @@
mysql_free_result($result);
+if (strpos($email, "@")!= false && $source<0)
+ print_popup("Please select a source.");
+
+if (strpos($email, "@")!= false && $time=="novalue")
+ print_popup("Please select a time format.");
+
+if (strpos($email, "@")!= false && $timebin=="novalue")
+ print_popup("Please select a time binning.");
+
+if (empty($email) && $time!="novalue" && $timebin!="novalue" && $source>0)
+ print_popup("Please provide an email address.");
+
+
if (strpos($email, "@")!= false && $source>0)
{
echo "
Sending data...
\n";
- printf("Sent email to %s containing the data of %s from %d till %d for %s binning.
\n", $email, $sources[$source], $start, $stop, $timebins[$timebin]);
- //printf("Sending email to %s containing the data of %s from %d till %d for %s binning...
\n", $email, $sources[$source], $start, $stop, $timebins[$timebin]);
- //echo "
\n";
- //echo $start." ".$stop." ".$source." ".$timebin." ".$email." ".$table." ".$time." ".$expert." ".$dch." ".$zd." ".$th." ".$light." ".$dust."
\n";
+ //print_popup("Sent email to ".$email." containing the data of ".$sources[$source]." from ".$start." till ".$stop." for ".$timebins[$timebin]." binning.");
+ print_popup("Email with data sent to ".$email);
+ if ($maintenance)
+ echo $start." ".$stop." ".$source." ".$timebin." ".$email." ".$table." ".$time." ".$expert." ".$dch." ".$zd." ".$th." ".$light." ".$dust."
\n";
$sent=shell_exec("/users/fact/SW.automatic.processing/DataCheck/Tools/get_data.sh ".$start." ".$stop." ".$source." ".$timebin." ".$email." ".$table." ".$time." ".$expert." ".$dch." ".$zd." ".$th." ".$light." ".$dust);
echo $sent;
@@ -340,5 +357,5 @@
//ZD
- echo "