Index: branches/czw_branch/20110406/tools/mysql-dump/gpc1_dump.sh
===================================================================
--- branches/czw_branch/20110406/tools/mysql-dump/gpc1_dump.sh	(revision 31215)
+++ branches/czw_branch/20110406/tools/mysql-dump/gpc1_dump.sh	(revision 31253)
@@ -15,4 +15,6 @@
 . /home/panstarrs/ipp/mysql-dump/functions.sh
 . /home/panstarrs/ipp/mysql-dump/password.sh
+
+EMAILTO=schastel@ifa.hawaii.edu
 
 HOST=ippc02
@@ -43,5 +45,5 @@
 if [ "$dump_status" -ne "0" ]; then
 	log ERROR "Sending warning e-mail"
-	email "Gpc1 dump failed" schastel@ifa.hawaii.edu "Check log file: /export/$HOST.0/mysql-dumps/gpc1_dump.log"
+	email "Gpc1 dump failed" $EMAILTO "Check log file: /export/$HOST.0/mysql-dumps/gpc1_dump.log"
 	log INFO "End of gpc1 dump (Error)"
 	exit 1
Index: branches/czw_branch/20110406/tools/mysql-dump/gpc1_install.sh
===================================================================
--- branches/czw_branch/20110406/tools/mysql-dump/gpc1_install.sh	(revision 31215)
+++ branches/czw_branch/20110406/tools/mysql-dump/gpc1_install.sh	(revision 31253)
@@ -9,8 +9,8 @@
 #      iterates up to $MAX_ITERATIONS times.
 # 2) Check the gpc1 dump file against its checksum.
-# 3) Import gpc1 into gpc1_0 or gpc1_1 (ensured by gpc1Import.py utility)
-# 4) Distribute the validated files, that is:
+# 3) Distribute the validated files, that is:
 #    - Hard-links the gzipped MySQL dump in the distribution directory
 #    - Moves the MD5 checksum to the distribution directory
+# 4) Import gpc1 into gpc1_0 or gpc1_1 (ensured by gpc1Import.py utility)
 . /home/panstarrs/ipp/mysql-dump/functions.sh
 
@@ -30,14 +30,20 @@
 
 ITERATION=1
-if [ ! -s $TARGET/$MD5FILE ]; then
-	log WARNING "MD5 file not found [$TARGET/$MD5FILE]. Waiting $SLEEPING_TIME seconds (Attempt: $ITERATION out of $MAX_ITERATIONS)"
-	sleep $SLEEPING_TIME
-	let ITERATION=ITERATION+1
-	if [ "$ITERATION" -ge "$MAX_ITERATIONS" ]; then
-		log ERROR "Copy of $TARGET/$MD5FILE failed after $ITERATION iterations. Giving up"
-		email "Too many failures when attempting to copy $TARGET/$MD5FILE" $EMAILTO "Check log"
-		exit 1
+MD5_STATUS=1
+while [ "$MD5_STATUS" -ne "0" ]; do
+	if [ ! -s $TARGET/$MD5FILE ]; then
+		log WARNING "MD5 file not found [$TARGET/$MD5FILE]. Waiting $SLEEPING_TIME seconds (Attempt: $ITERATION out of $MAX_ITERATIONS)"
+		sleep $SLEEPING_TIME
+		let ITERATION=ITERATION+1
+		if [ "$ITERATION" -ge "$MAX_ITERATIONS" ]; then
+			log ERROR "Copy of $TARGET/$MD5FILE failed after $ITERATION iterations. Giving up"
+			email "Too many failures when attempting to copy $TARGET/$MD5FILE" $EMAILTO "Check log"
+			log INFO "End of gpc1_install.sh (Failure)"
+			exit 1
+		fi
+	else
+		MD5_STATUS=0
 	fi
-fi
+done
 
 log INFO "Checking gpc1 backup file checksum"
@@ -45,14 +51,12 @@
 BACKUP_FILE=`cat $TARGET/$MD5FILE | sed 's/^.* \//\//'`
 BACKUP_FILE=`basename $BACKUP_FILE`
-
+log INFO "Backup file is [$TARGET/$BACKUP_FILE]"
 ACTUAL_MD5SUM=`/usr/bin/md5sum $TARGET/$BACKUP_FILE | sed 's/ .*$//'`
 if [ "$ACTUAL_MD5SUM" != "$EXPECTED_MD5SUM" ]; then
         log ERROR "Checksums are different: actual=[$ACTUAL_MD5SUM], expected=[$EXPECTED_MD5SUM]"
 	email "Invalid checksum for gpc1 backup" $EMAILTO "Checksums are different: actual=[$ACTUAL_MD5SUM], expected=[$EXPECTED_MD5SUM]"
+	log INFO "End of gpc1_install.sh (Failure)"
         exit 2
 fi
-
-log INFO "Importing gpc1 backup file to gpc1_0 or gpc1_1"
-/usr/bin/python /home/panstarrs/ipp/mysql-dump/gpc1Import.py
 
 log INFO "Symlinking backup file [$TARGET/$BACKUP_FILE] to distribution [$DISTRIBUTION_TARGET]"
@@ -60,2 +64,13 @@
 /usr/bin/mv -f $TARGET/$MD5FILE $DISTRIBUTION_MD5
 
+# if it is between 0 and 4, ingest into gpc1_0 or gpc1_1
+HOUR=`date +"%H"`
+if [ "$HOUR" -lt "4" ]; then
+	log INFO "Importing gpc1 backup file to gpc1_0 or gpc1_1"
+	/usr/bin/python /home/panstarrs/ipp/mysql-dump/gpc1Import.py
+else
+	log DEBUG "No gpc1 backup importation"
+fi
+
+log INFO "End of gpc1_install.sh (Success)"
+
Index: branches/czw_branch/20110406/tools/mysql-dump/neb_dump.sh
===================================================================
--- branches/czw_branch/20110406/tools/mysql-dump/neb_dump.sh	(revision 31215)
+++ branches/czw_branch/20110406/tools/mysql-dump/neb_dump.sh	(revision 31253)
@@ -12,4 +12,5 @@
 . /home/panstarrs/ipp/mysql-dump/password.sh
 
+EMAILTO=schastel@ifa.hawaii.edu
 HOST=ippdb02
 
@@ -36,5 +37,5 @@
 if [ "$dump_status" -ne "0" ]; then
 	log ERROR "Sending warning e-mail"
-	email "Nebulous dump failed" schastel@ifa.hawaii.edu "Check log file: /export/ippdb02.0/mysql-dumps/neb-dump.log"
+	email "Nebulous dump failed" $EMAILTO "Check log file: /export/ippdb02.0/mysql-dumps/neb-dump.log"
 	log INFO "End of nebulous dump (Error)"
 	exit 1
Index: branches/czw_branch/20110406/tools/mysql-dump/ops_dump.csh
===================================================================
--- branches/czw_branch/20110406/tools/mysql-dump/ops_dump.csh	(revision 31215)
+++ branches/czw_branch/20110406/tools/mysql-dump/ops_dump.csh	(revision 31253)
@@ -2,4 +2,6 @@
 
 echo "## `/bin/date +%FT%T`"
+
+set EMAILTO = schastel@ifa.hawaii.edu
 
 # dump ippRequestServer from ippc19
@@ -7,5 +9,5 @@
 mysqldump --compress -hippc19 -uipp -pipp --flush-logs --single-transaction --log-error=RS-err ippRequestServer | gzip -9 > $DUMP_PATH/mysql-RS-ippc19-`date +%FT%T`.dump.gz
 if ($status != 0) then
-   /bin/mail -s "Warning RS dump failed" schastel@ifa.hawaii.edu < msg
+   /bin/mail -s "Warning ippRequestServer/RS dump failed" $EMAILTO < msg
 endif
 
@@ -16,5 +18,5 @@
 mysqldump --compress -hippdb01 -uipp -pipp --flush-logs --single-transaction ippadmin | gzip -9 > $FILENAME
 if ($status != 0) then
-   /bin/mail -s "Warning ippadmin dump failed" schastel@ifa.hawaii.edu < msg  
+   /bin/mail -s "Warning ippadmin dump failed" $EMAILTO < msg  
 endif
 
@@ -31,5 +33,5 @@
 mysqldump --compress -hippdb01 -uipp -pipp --flush-logs --single-transaction isp | gzip -9 > $FILENAME
 if ($status != 0) then
-   /bin/mail -s "Warning isp dump failed" schastel@ifa.hawaii.edu < msg  
+   /bin/mail -s "Warning isp dump failed" $EMAILTO < msg  
 endif
 
@@ -39,40 +41,2 @@
 ln -f  ../mysql-isp-ippdb01-$DATEVAR.dump.gz ippdb01-isp.dump.gz
 
-# dump gpc1 from ippdb01
-#set DUMP_PATH = /data/ipp001.0/ipp/mysql-dumps               #path(SAB)
-#set DATEVAR=`date +%FT%T`                                    #date
-#set FILENAME = $DUMP_PATH/mysql-gpc1-ippc02-$DATEVAR.dump.gz #dump file name
-#mysqldump --compress -hippc -P3302 -uipp -pipp --flush-logs --single-transaction gpc1 | gzip -9 > $FILENAME
-#if ($status != 0) then
-#   /bin/mail -s "Warning gpc1 dump failed" schastel@ifa.hawaii.edu < msg  
-#endif
-
-# simlink to gpc1 ippdb01 dump
-#set DUMP_PATH = /data/ipp001.0/ipp/mysql-dumps       #path(SAB)
-#cd $DUMP_PATH/distribution/                          #link dir
-#ln -f  ../mysql-gpc1-ippc02-$DATEVAR.dump.gz ippdb01-gpc1.dump.gz   #hard link
-
-
-# dump the ippdb02 database
-#set DUMP_PATH = /data/ipp001.0/ipp/mysql-dumps             #path
-#set DATEVAR = `date +%FT%T`                                #date	
-#set FILENAME = $DUMP_PATH/mysql-neb-ippdb02-$DATEVAR.dump.gz   #dump file name
-#mysqldump --compress -hippdb02 -ujhipp -pjhipp --flush-logs --single-transaction nebulous | gzip -9 > $FILENAME
-#if ($status != 0) then
-#   /bin/mail -s "Warning nebulous dump failed" schastel@ifa.hawaii.edu < msg  
-#endif
-
-# simlink to latest ippdb02 dump
-#set DUMP_PATH = /data/ipp001.0/ipp/mysql-dumps	           #path (SAB)
-#cd $DUMP_PATH/distribution/                                #link dir
-#ln -f  ../mysql-neb-ippdb02-$DATEVAR.dump.gz ippdb02.dump.gz   #hard link
-
-# dump the ippdb00 database
-#set DUMP_PATH = /data/ipp001.0/ipp/mysql-dumps             #path
-#set DATEVAR = `date +%FT%T`                                #date	
-#set FILENAME = $DUMP_PATH/mysql-neb-ippdb00-$DATEVAR.dump.gz   #dump file name
-#mysqldump --compress -hippdb00 -ujhipp -pjhipp --flush-logs --single-transaction nebulous | gzip -9 > $FILENAME
-#if ($status != 0) then
-#   /bin/mail -s "Warning nebulous dump failed" schastel@ifa.hawaii.edu < msg  
-#endif
-