timestamp processing

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 9b190c4b3a88d5236cc1e9ff9f41058a12118be2..67277c20b78387e799079c83bef50511df4b2293 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -32,7 +32,7 @@ BEGIN {
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw(&parse_info1 &rsync_master
+    @EXPORT      = qw(&parse_info_clientside
                      &parse_info_serverside &parse_info_serverside_ocean
                      %oceans %commods %clients %routes %route_mysteries
                      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
@@ -40,7 +40,7 @@ BEGIN {
                      &pipethrough_prep &pipethrough_run
                      &pipethrough_run_along &pipethrough_run_finish
                      &pipethrough_run_gzip
-                     &cgipostform);
+                     &cgipostform &yarrgpostform);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
@@ -252,6 +252,13 @@ sub pipethrough_run_gzip ($) {
     pipethrough_run($_[0],undef,'gzip','gzip');
 }
 
+sub yarrgpostform ($$) {
+    my ($ua, $form) = @_;
+    my $dest= $ENV{'YPPSC_YARRG_YARRG'};
+    get_our_version($form, 'client');
+    return cgipostform($ua, "$dest/commod-update-receiver", $form);
+}    
+
 sub cgipostform ($$$) {
     my ($ua, $url, $form) = @_;
     my $req= HTTP::Request::Common::POST($url,

diff --git a/yarrg/commod-results-processor b/yarrg/commod-results-processor
index 7cd4e0457b6f438398ffa55f46dcdb035d834ed7..e53bbb58c1351283043d6371abfc4bc0589fe9d5 100755 (executable)
--- a/yarrg/commod-results-processor
+++ b/yarrg/commod-results-processor
@@ -429,15 +429,14 @@ sub gzip ($) {
     return pipethrough_run($tf,undef,'gzip','gzip');
 }
 
-sub main__uploadyaarg () {
+sub main__uploadyarrg () {
     my %o;
 
     parse_info_clientside();
 
     $o{'ocean'}= $ENV{'YPPSC_OCEAN'} or die;
     $o{'island'}= $ENV{'YPPSC_ISLAND'} or die;
-    $o{'timestamp'}= 10;
-    get_our_version(\%o, 'client');
+    $o{'timestamp'}= $ENV{'YPPSC_DATA_TIMESTAMP'} or die;
 
     my $tf= pipethrough_prep();
     write_tsv($tf);
@@ -446,9 +445,7 @@ sub main__uploadyaarg () {
                    Content_Type => 'application/octet-stream',
                    Content => $oz ];
 
-    my $dest= $ENV{'YPPSC_YARRG_YARRG'};
-
-    my $respcontent= cgipostform($ua, "$dest/commod-update-receiver", \%o);
+    my $respcontent= yarrgpostform($ua, \%o);
     $respcontent =~ m/^OK\b/ or die "$respcontent ?";
 }
 

diff --git a/yarrg/commod-update-receiver b/yarrg/commod-update-receiver
index 70cf36a93bdfe96aa51446172f2b53349786439f..16a9ac65dc852e8af2b8b32672edece894fd2818 100755 (executable)
--- a/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@ -25,13 +25,17 @@
 # are used without permission.  This program is not endorsed or
 # sponsored by Three Rings.
 
-
-# Uploads contain:
-#  ocean                       canonical mixed case
-#  island                      canonical mixed case
+# All calls contain:
 #  clientname                  "ypp-sc-tools"
 #  clientversion               2.1-g2e06a26  [from git-describe --tags HEAD]
 #  clientfixes                 "lastpage"  [space separated list]
+#
+# Timestamp requests contain:
+#  requesttimestamp
+#
+# Uploads contain:
+#  ocean                       canonical mixed case
+#  island                      canonical mixed case
 #  data filename=deduped.tsv.gz        output of yarrg --tsv
 
 
@@ -84,6 +88,12 @@ foreach my $bug (@$clientinfo) {
 
 $o{'clientversion'}= must_param('clientversion', "^(\\d[-+._0-9a-zA-Z]+)\$");
 
+if (param('requesttimestamp')) {
+    my $now= time; defined $now or die;
+    print header(-type=>'text/plain', -charset=>'us-ascii'), "OK $now.\n";
+    exit(0);
+}
+
 $o{'ocean'}= must_param('ocean', $re_any);
 $o{'island'}= must_param('island', $re_any);
 

diff --git a/yarrg/convert.c b/yarrg/convert.c
index 42467f2fe773fe44646d9e804acef067d429f8bc..49fc3ed7151d879c2a69201662d42168dc26114e 100644 (file)
--- a/yarrg/convert.c
+++ b/yarrg/convert.c
@@ -152,6 +152,32 @@ static void rsync_core(const char *stem, const char *suffix,
 void fetch_with_rsync_gz(const char *stem) { rsync_core(stem,".gz",""); }
 void fetch_with_rsync(const char *stem) { rsync_core(stem,"","z"); }
 
+static void get_timestamp(void) {
+  FILE *tf;
+  pid_t child;
+  sysassert( tf= tmpfile() );
+
+  sysassert( (child= fork()) != -1 );
+  if (!child) {
+    sysassert( dup2(fileno(tf),1)==1 );
+    EXECLP_HELPER("database-info-fetch","timestamp",(char*)0);
+  }
+  waitpid_check_exitstatus(child,"timestamp request",0);
+
+  sysassert( fseek(tf,0,SEEK_SET) == 0 );
+  static char lbuf[30];
+  int l= fread(lbuf,1,sizeof(lbuf),tf);
+  sysassert( !ferror(tf) );
+  assert( feof(tf) );
+  assert( l>1 );
+  l--;
+  assert( lbuf[l]=='\n' );
+  lbuf[l]= 0;
+
+  sysassert(! setenv("YPPSC_DATA_TIMESTAMP",lbuf,1) );
+  fclose(tf);
+}
+
 static void set_server(const char *envname, const char *defprotocol,
                       const char *defvalue, const char *defvalue_test,
                       const char *userspecified,
@@ -323,6 +349,9 @@ int main(int argc, char **argv) {
     o_screenshot_fn= masprintf("%s/_pages.ppm.gz", get_vardir());
 
   /* Actually do the work */
+
+  if ((o_flags & ff_upload) && (o_flags & ff_use_yarrg))
+    get_timestamp();
             
   canon_colour_prepare();
   

diff --git a/yarrg/database-info-fetch b/yarrg/database-info-fetch
index c56fda42e2d4f871fea5f256d46c6ad858657432..1e789b88fcb389686675f07393e1d0fab7a48ac1 100755 (executable)
--- a/yarrg/database-info-fetch
+++ b/yarrg/database-info-fetch
@@ -184,6 +184,15 @@ sub main__island () {
                });
 }
 
+sub main__timestamp () {
+    my %o;
+    $o{'requesttimestamp'}= '1';
+    my $respcontent= yarrgpostform($ua, \%o);
+    $respcontent =~ m/^OK ([1-9]\d{1,20})\./ or die "$respcontent ?";
+    print "$1\n";
+    exit(0);
+}
+
 sub main__sunshinewidget () {
     print <<END
 Land {On land} {