Index: trunk/dbconfig/changes.txt =================================================================== --- trunk/dbconfig/changes.txt (revision 25417) +++ trunk/dbconfig/changes.txt (revision 25418) @@ -1248,2 +1248,11 @@ PRIMARY KEY(label) ) ENGINE=innodb DEFAULT CHARSET=latin1; + + +ALTER TABLE pzDownloadImfile ADD COLUMN bytes INT; +ALTER TABLE pzDownloadImfile ADD COLUMN md5sum VARCHAR(32); +ALTER TABLE newImfile ADD COLUMN bytes INT; +ALTER TABLE newImfile ADD COLUMN md5sum VARCHAR(32); +ALTER TABLE rawImfile ADD COLUMN bytes INT; +ALTER TABLE rawImfile ADD COLUMN md5sum VARCHAR(32); + Index: trunk/dbconfig/new.md =================================================================== --- trunk/dbconfig/new.md (revision 25417) +++ trunk/dbconfig/new.md (revision 25418) @@ -22,4 +22,6 @@ uri STR 255 epoch UTC 0001-01-01T00:00:00Z + bytes S32 0 + md5sum STR 32 END Index: trunk/dbconfig/raw.md =================================================================== --- trunk/dbconfig/raw.md (revision 25417) +++ trunk/dbconfig/raw.md (revision 25418) @@ -136,3 +136,5 @@ epoch UTC 0001-01-01T00:00:00Z magicked S64 0 + bytes S32 0 + md5sum STR 32 END Index: trunk/dbconfig/summitcopy.md =================================================================== --- trunk/dbconfig/summitcopy.md (revision 25417) +++ trunk/dbconfig/summitcopy.md (revision 25418) @@ -57,4 +57,6 @@ epoch UTC 0001-01-01T00:00:00Z hostname STR 64 + bytes S32 0 + md5sum STR 32 END Index: trunk/ippScripts/scripts/register_imfile.pl =================================================================== --- trunk/ippScripts/scripts/register_imfile.pl (revision 25417) +++ trunk/ippScripts/scripts/register_imfile.pl (revision 25418) @@ -34,5 +34,5 @@ my $ppStatsFromMetadata = can_run( 'ppStatsFromMetadata' ) or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1); -my ($cache, $exp_id, $tmp_class_id, $tmp_exp_name, $uri, $dbname, $verbose, $no_update, $no_op, $logfile); +my ($cache, $exp_id, $tmp_class_id, $tmp_exp_name, $uri, $bytes, $md5sum, $dbname, $verbose, $no_update, $no_op, $logfile); GetOptions( 'caches' => \$cache, @@ -41,4 +41,6 @@ 'tmp_exp_name|n=s' => \$tmp_exp_name, 'uri|u=s' => \$uri, + 'bytes=s' => \$bytes, + 'md5sum=s' => \$md5sum, 'dbname|d=s' => \$dbname, # Database name 'verbose' => \$verbose, # Print to stdout @@ -123,4 +125,6 @@ $command .= " -tmp_class_id $tmp_class_id"; # the original class_id supplied by the user, replace by ppStats CLASS.ID $command .= " -uri $uri "; +$command .= " -bytes $bytes" if $bytes; +$command .= " -md5sum $md5sum" if $md5sum and ($md5sum ne 'NULL'); $command .= " -hostname $host" if defined $host; $command .= " -dbname $dbname" if defined $dbname; Index: trunk/ippScripts/scripts/summit_copy.pl =================================================================== --- trunk/ippScripts/scripts/summit_copy.pl (revision 25417) +++ trunk/ippScripts/scripts/summit_copy.pl (revision 25418) @@ -105,5 +105,5 @@ # if so pass the results to pztool to the results in pzDownloadImfile. # uncomment this to turn on -# my ($new_bytes, $new_md5) = check_instances($filename, $nebulous, $compress); +my ($new_bytes, $new_md5) = check_instances($filename, $nebulous, $compress); # command to update database @@ -121,5 +121,5 @@ # XXX: TODO: see above. Don't do this until pztool and the DB have # been updated -# $command .= " -md5sum $new_md5 -bytes $new_bytes"; +$command .= " -md5sum $new_md5 -bytes $new_bytes"; # update the database @@ -198,5 +198,5 @@ if ($b ne $new_bytes) { $error = "size of $instances[$i] does not match $instances[0]"; - } elsif ($m != $new_md5) { + } elsif ($m ne $new_md5) { $error = "md5sum of $instances[$i] does not match $instances[0]"; } Index: trunk/ippTasks/register.pro =================================================================== --- trunk/ippTasks/register.pro (revision 25417) +++ trunk/ippTasks/register.pro (revision 25418) @@ -217,4 +217,6 @@ book getword regPendingImfile $pageName tmp_class_id -var TMP_CLASS_ID book getword regPendingImfile $pageName uri -var URI + book getword regPendingImfile $pageName bytes -var BYTES + book getword regPendingImfile $pageName md5sum -var MD5SUM book getword regPendingImfile $pageName workdir -var WORKDIR_TEMPLATE book getword regPendingImfile $pageName dbname -var DBNAME @@ -244,5 +246,5 @@ # XXX register_imfile.pl differs from the standard script : it does not have an 'outroot' argument, and it does not take '--redirect' - $run = register_imfile.pl --exp_id $EXP_ID --tmp_class_id $TMP_CLASS_ID --tmp_exp_name $TMP_EXP_NAME --uri $URI --logfile $logfile + $run = register_imfile.pl --exp_id $EXP_ID --tmp_class_id $TMP_CLASS_ID --tmp_exp_name $TMP_EXP_NAME --uri $URI --logfile $logfile --bytes $BYTES --md5sum $MD5SUM add_standard_args run Index: trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_create_tables.sql (revision 25417) +++ trunk/ippTools/share/pxadmin_create_tables.sql (revision 25418) @@ -58,4 +58,6 @@ epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP, hostname VARCHAR(64), + bytes INT, + md5sum VARCHAR(32), PRIMARY KEY(exp_name, camera, telescope, class, class_id), KEY(fault), @@ -94,4 +96,6 @@ uri VARCHAR(255), epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + bytes INT, + md5sum VARCHAR(32), PRIMARY KEY(exp_id, tmp_class_id), FOREIGN KEY(exp_id) REFERENCES newExp(exp_id) @@ -237,4 +241,6 @@ raw_image_id BIGINT AUTO_INCREMENT, magicked BIGINT, + bytes INT, + md5sum VARCHAR(32), PRIMARY KEY(exp_id, class_id), KEY(tmp_class_id), Index: trunk/ippTools/share/regtool_pendingimfile.sql =================================================================== --- trunk/ippTools/share/regtool_pendingimfile.sql (revision 25417) +++ trunk/ippTools/share/regtool_pendingimfile.sql (revision 25418) @@ -6,5 +6,7 @@ newExp.workdir, newImfile.tmp_class_id, - newImfile.uri + newImfile.uri, + newImfile.bytes, + newImfile.md5sum FROM newImfile JOIN newExp Index: trunk/ippTools/src/pxinject.c =================================================================== --- trunk/ippTools/src/pxinject.c (revision 25417) +++ trunk/ippTools/src/pxinject.c (revision 25418) @@ -137,7 +137,9 @@ PXOPT_LOOKUP_STR(tmp_class_id, config->args, "-tmp_class_id", true, false); PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false); + PXOPT_LOOKUP_S32(bytes, config->args, "-bytes", false, false); + PXOPT_LOOKUP_STR(md5sum, config->args, "-md5sum", false, false); // insert with error flag state set to 0 (no errors) - if (!newImfileInsert(config->dbh, exp_id, tmp_class_id, uri, NULL)) { + if (!newImfileInsert(config->dbh, exp_id, tmp_class_id, uri, NULL, bytes, md5sum)) { psError(PS_ERR_UNKNOWN, false, "database error"); return false; Index: trunk/ippTools/src/pxinjectConfig.c =================================================================== --- trunk/ippTools/src/pxinjectConfig.c (revision 25417) +++ trunk/ippTools/src/pxinjectConfig.c (revision 25418) @@ -61,4 +61,6 @@ psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-tmp_class_id", 0, "define the class ID (required)", NULL); psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-uri", 0, "define the URI (required)", NULL); + psMetadataAddS32(newImfileArgs, PS_LIST_TAIL, "-bytes", 0, "define the size of the file", 0); + psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-md5sum", 0, "define the size of the file", NULL); // -updatenewExp Index: trunk/ippTools/src/pztool.c =================================================================== --- trunk/ippTools/src/pztool.c (revision 25417) +++ trunk/ippTools/src/pztool.c (revision 25418) @@ -401,4 +401,6 @@ PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false); PXOPT_LOOKUP_BOOL(row_lock, config->args, "-row_lock", false); + PXOPT_LOOKUP_S32(bytes, config->args, "-bytes", false, false); + PXOPT_LOOKUP_STR(md5sum, config->args, "-md5sum", false, false); // default values @@ -457,5 +459,7 @@ fault, NULL, // epoch - hostname + hostname, + bytes, + md5sum )) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -595,5 +599,7 @@ " pzDownloadImfile.class_id," // tmp_class_id " pzDownloadImfile.uri," // uri - " NULL" // epoch + " NULL," // epoch + " pzDownloadImfile.bytes," // bytes + " pzDownloadImfile.md5sum" // md5sum " FROM pzDownloadImfile" " WHERE" Index: trunk/ippTools/src/pztoolConfig.c =================================================================== --- trunk/ippTools/src/pztoolConfig.c (revision 25417) +++ trunk/ippTools/src/pztoolConfig.c (revision 25418) @@ -95,4 +95,6 @@ psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-label", 0, "define the label for the chip stage", NULL); psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-hostname", 0, "define the host that copied the image", NULL); + psMetadataAddS32(copydoneArgs, PS_LIST_TAIL, "-bytes", 0, "define the size in bytes for the copied image", 0); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-md5sum", 0, "define the md5 sum for the copied image", NULL); psMetadataAddS16(copydoneArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0); psMetadataAddBool(copydoneArgs, PS_LIST_TAIL, "-row_lock", 0, "lock pzDownImfile rows while advancing an exposure", false); Index: trunk/ippTools/src/regtool.c =================================================================== --- trunk/ippTools/src/regtool.c (revision 25417) +++ trunk/ippTools/src/regtool.c (revision 25418) @@ -238,4 +238,6 @@ PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false); PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false); + PXOPT_LOOKUP_S32(bytes, config->args, "-bytes", false, false); + PXOPT_LOOKUP_STR(md5sum, config->args, "-md5sum", false, false); PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); @@ -307,5 +309,7 @@ quality, NULL, - 0 + 0, + bytes, + md5sum )) { psError(PS_ERR_UNKNOWN, false, "database error"); Index: trunk/ippTools/src/regtoolConfig.c =================================================================== --- trunk/ippTools/src/regtoolConfig.c (revision 25417) +++ trunk/ippTools/src/regtoolConfig.c (revision 25418) @@ -125,4 +125,6 @@ ADD_OPT(Time, addprocessedimfileArgs, "-dateobs", "define observation time", NULL); ADD_OPT(Str, addprocessedimfileArgs, "-hostname", "define host name", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-md5sum", "define md5sum", NULL); + ADD_OPT(S32, addprocessedimfileArgs, "-bytes", "define bytes", 0); ADD_OPT(S16, addprocessedimfileArgs, "-fault", "set fault code", 0); ADD_OPT(S16, addprocessedimfileArgs, "-quality", "set quality flag", 0);