Changeset 16638

Timestamp:

Feb 24, 2008, 11:53:29 AM (18 years ago)

Author:

eugene

Message:

update for summit copy

Location:

trunk/ippMonitor/def

Files:

• pzDoneExp.d (modified) (1 diff)
• pzDoneImfile.d (modified) (1 diff)
• pzDoneImfile_failed.d (modified) (1 diff)
• pzPendingExp.d (modified) (1 diff)
• pzPendingImfile.d (modified) (1 diff)

trunk/ippMonitor/def/pzDoneExp.d

@@ -1 @@
-TABLE pzDoneExp, summitExp
+TABLE pzDownloadExp, summitExp
 TITLE done exposures
-FILE  pzDoneExp.php
+FILE  pzDownloadExp.php
 MENU  ipp.load.dat
 
-WHERE pzDoneExp.exp_name  = summitExp.exp_name
-WHERE pzDoneExp.camera    = summitExp.camera
-WHERE pzDoneExp.telescope = summitExp.telescope
+WHERE pzDownloadExp.exp_name  = summitExp.exp_name
+WHERE pzDownloadExp.camera    = summitExp.camera
+WHERE pzDownloadExp.telescope = summitExp.telescope
+WHERE pzDownloadExp.state     = 'stop'
 
 #        field                  size format  name           show     link to         extras

trunk/ippMonitor/def/pzDoneImfile.d

@@ -1 @@
-TABLE pzDoneImfile, summitImfile
+TABLE pzDownloadImfile
 TITLE done exposures
 FILE  pzDoneImfile.php
 MENU  ipp.load.dat
 
-WHERE pzDoneImfile.exp_name  = summitImfile.exp_name
-WHERE pzDoneImfile.camera    = summitImfile.camera
-WHERE pzDoneImfile.telescope = summitImfile.telescope
-WHERE pzDoneImfile.class     = summitImfile.class
-WHERE pzDoneImfile.class_id  = summitImfile.class_id
+WHERE pzDownloadImfile.fault     = 0
 
-#        field                   size   format  name           show     link to         extras
-FIELD    summitImfile.exp_name,  5,     %s,     exposures ID
-FIELD    summitImfile.camera,    5,     %s,     camera
-FIELD    summitImfile.telescope, 5,     %s,     telescope
-FIELD    pzDoneImfile.class,     5,     %s,     class
-FIELD    pzDoneImfile.class_id,  5,     %s,     class ID
-FIELD    summitImfile.uri,       5,     %s,     summit
-FIELD    pzDoneImfile.uri,       5,     %s,     filename
+#        field                       size       format  name           show     link to         extras
+FIELD    pzDownloadImfile.exp_name,  5,         %s,     exposures ID
+FIELD    pzDownloadImfile.camera,    5,         %s,     camera
+FIELD    pzDownloadImfile.telescope, 5,         %s,     telescope
+FIELD    pzDownloadImfile.class,     5,         %s,     class
+FIELD    pzDownloadImfile.class_id,  5,         %s,     class ID
+FIELD    pzDownloadImfile.uri,       5,         %s,     filename

trunk/ippMonitor/def/pzDoneImfile_failed.d

@@ -1 @@
-TABLE pzDoneExp, summitExp, pzDoneImfile
-TITLE failed summit copy imfiles
+TABLE pzDownloadImfile
+TITLE done exposures
 FILE  pzDoneImfile_failed.php
 MENU  ipp.load.dat
 
-WHERE pzDoneExp.exp_name  = summitExp.exp_name
-WHERE pzDoneExp.camera    = summitExp.camera
-WHERE pzDoneExp.telescope = summitExp.telescope
-WHERE pzDoneExp.exp_name  = pzDoneImfile.exp_name
-WHERE pzDoneExp.camera    = pzDoneImfile.camera
-WHERE pzDoneExp.telescope = pzDoneImfile.telescope
-WHERE pzDoneImfile.fault > 0
+WHERE pzDownloadImfile.fault     != 0
 
-#        field                  size format  name           show     link to         extras
-FIELD    summitExp.exp_name,    5,   %s,     exposures ID
-FIELD    pzDoneImfile.class_id, 5,   %s,     class ID
-FIELD    summitExp.camera,      5,   %s,     camera
-FIELD    summitExp.telescope,   5,   %s,     telescope
-FIELD    summitExp.dateobs,     5,   %s,     date/time
-FIELD    summitExp.exp_type,    5,   %s,     type
-FIELD    summitExp.uri,         5,   %s,     URI
-FIELD    pzDoneImfile.fault,    5,   %s,     fault
+#        field                       size       format  name           show     link to         extras
+FIELD    pzDownloadImfile.exp_name,  5,         %s,     exposures ID
+FIELD    pzDownloadImfile.camera,    5,         %s,     camera
+FIELD    pzDownloadImfile.telescope, 5,         %s,     telescope
+FIELD    pzDownloadImfile.class,     5,         %s,     class
+FIELD    pzDownloadImfile.class_id,  5,         %s,     class ID
+FIELD    pzDownloadImfile.uri,       5,         %s,     filename

trunk/ippMonitor/def/pzPendingExp.d

@@ -1 @@
-TABLE pzPendingExp, summitExp
+TABLE pzDownloadExp, summitExp
 TITLE pending exposures
 FILE  pzPendingExp.php
 MENU  ipp.load.dat
 
-WHERE pzPendingExp.exp_name  = summitExp.exp_name
-WHERE pzPendingExp.camera    = summitExp.camera
-WHERE pzPendingExp.telescope = summitExp.telescope
+WHERE pzDownloadExp.exp_name  = summitExp.exp_name
+WHERE pzDownloadExp.camera    = summitExp.camera
+WHERE pzDownloadExp.telescope = summitExp.telescope
+WHERE pzDownloadExp.state     = 'run'
 
 #        field                  size format  name           show     link to         extras

trunk/ippMonitor/def/pzPendingImfile.d

@@ -1 @@
-TABLE pzPendingImfile
-TITLE Pending Image Files
+TABLE summitImfile, pzDownloadExp
+TITLE pending imfiles
 FILE  pzPendingImfile.php
 MENU  ipp.load.dat
 
-#        field     size  format  name             show   link to         extras
-FIELD    exp_name,    5, %s,      Exp Name
-FIELD    camera,      5, %s,      camera
-FIELD    telescope,   5, %s,      telescope
-FIELD    class,       5, %s,      class
-FIELD    class_id,    5, %s,      class ID 
+WHERE summitImfile.exp_name  = pzDownloadExp.exp_name 
+WHERE summitImfile.camera    = pzDownloadExp.camera   
+WHERE summitImfile.telescope = pzDownloadExp.telescope
+WHERE pzDownloadExp.state     = 'run'
+
+#        field                    size  format  name             show   link to         extras
+FIELD    summitImfile.exp_name,    5, %s,      Exp Name
+FIELD    summitImfile.camera,      5, %s,      camera
+FIELD    summitImfile.telescope,   5, %s,      telescope
+FIELD    summitImfile.class,       5, %s,      class
+FIELD    summitImfile.class_id,    5, %s,      class ID