25232ea095a9222e0c63a940d12557ca6db6122c hiram Wed Jul 30 15:34:46 2025 -0700 remove the testing grep -v statement refs #34917 diff --git src/hg/utils/otto/genArk/quickPush.pl src/hg/utils/otto/genArk/quickPush.pl index 7bdd054c9b9..17eaeb47af1 100755 --- src/hg/utils/otto/genArk/quickPush.pl +++ src/hg/utils/otto/genArk/quickPush.pl @@ -1,23 +1,28 @@ #!/usr/bin/env perl ############################################################################# ### The 'stat' file listings used here: dev.todayList.gz, hgw1.todayList.gz ### and hgwbeta.todayList.gz are made by cron jobs previous to this ### script running. They are a listing of files in /gbdb/genark/GC[AF]/ ### with the 'mtime' - last modified time. This time will be compared ### to decide if anything needs to go out. +### +### This source is from the source tree: +### ~/kent/src/hg/utils/otto/genArk/quickPush.pl +### do *not* edit this in the otto directory /hive/data/inside/GenArk/pushRR/ +### where this is used. ############################################################################# use strict; use warnings; use File::Basename; my @machList = qw( hgw0 hgw1 hgw2 Genome-Browser-Mirror-3.dhcp.uni-bielefeld.de ); my $lf; # going to become the output handle for the logfile my $expectName = "hgwdev"; my $hostName = `hostname -s`; chomp $hostName; if ($hostName ne $expectName) { printf STDERR "ERROR: must run this on %s ! This is: %s\n", ${expectName}, ${hostName}; @@ -212,31 +217,31 @@ my $publicContribCount = scalar keys %contribPublic; my $betaContribCount = scalar keys %contribBeta; printf $lf "# %d contrib files available for 'public' release\n", $publicContribCount; printf $lf "# %d contrib files available for 'beta' release\n", $betaContribCount; ### establish the list of hgw1 files with their mtime ### the %hgw1Accession list is going to be the set of 'accession' directories ### on hgw1 to allow verifying it is the same set as exists on hgwdev my %hgw1List; # key is file name, value is mtime == last modified time my %hgw1Accession; # key is an assembly 'accession' found on hgw1, value # is the 'mtime' of the hub.txt file on hgw1 # this list only has /hub.txt files and /contrib/ files -open ($fh, "-|", "zegrep '/contrib/|hub.txt' hgw1.todayList.gz | grep -v GCA_019395325.1") or die "can not read hgw1.todayList.gz"; +open ($fh, "-|", "zegrep '/contrib/|hub.txt' hgw1.todayList.gz") or die "can not read hgw1.todayList.gz"; while (my $line = <$fh>) { chomp $line; my ($mtime, $fileName) = split('\t', $line); $hgw1List{$fileName} = $mtime; if ($fileName =~ m#/hub.txt#) { my $dirName = dirname($fileName); my $accession = basename($dirName); $hgw1Accession{$accession} = $mtime; } } close ($fh); ### check which accessions do not exist on hgw1 my $toPushCount = 0; foreach my $accession (keys %devAccession) { @@ -244,31 +249,31 @@ } ### check if there are extra accessions on hgw1, should not be my $extraExisting = 0; foreach my $accession (keys %hgw1Accession) { ++$extraExisting if (! defined($devAccession{$accession})); } printf $lf "### %d assemblies to push from hgwdev out\n", $toPushCount; printf $lf "### %d assemblies on hgw1 not on hgwdev - ERROR should not be present.\n", $extraExisting if ($extraExisting); ### establish the list of hgwbeta files with their mtime my %betaList; # key is file name, value is mtime == last modified time # this list only has /hub.txt files and /contrib/ files -open ($fh, "-|", "zegrep '/contrib/|hub.txt' hgwbeta.todayList.gz | grep -v GCA_019395325.1") or die "can not read hgwbeta.todayList.gz"; +open ($fh, "-|", "zegrep '/contrib/|hub.txt' hgwbeta.todayList.gz") or die "can not read hgwbeta.todayList.gz"; while (my $line = <$fh>) { chomp $line; my ($mtime, $fileName) = split('\t', $line); $betaList{$fileName} = $mtime; } close ($fh); ### check for updated or new 'contig' directory files, public and beta my %publicContribList; # key is contig directory name, value is number of files # check /contrib/... files on the 'public' release list foreach my $fileName (keys %contribPublic) { my $devTime = $contribPublic{$fileName}; my $yesUpdate = 0;