fixes from testing

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 67277c20b78387e799079c83bef50511df4b2293..62c1f5e6e94dd21d468d19923d5ea3e4840a7dbd 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -23,6 +23,7 @@
 package Commods;
 use IO::File;
 use HTTP::Request::Common ();
 package Commods;
 use IO::File;
 use HTTP::Request::Common ();

+use POSIX;

 
 use strict;
 use warnings;
 
 use strict;
 use warnings;


@@ -32,7 +33,7 @@ BEGIN {
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);

-    @EXPORT      = qw(&parse_info_clientside
+    @EXPORT      = qw(&parse_info_clientside &fetch_with_rsync

                      &parse_info_serverside &parse_info_serverside_ocean
                      %oceans %commods %clients %routes %route_mysteries
                      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
                      &parse_info_serverside &parse_info_serverside_ocean
                      %oceans %commods %clients %routes %route_mysteries
                      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap


@@ -144,7 +145,12 @@ sub parse_info_clientside () {
     return unless $yarrg;
     my $master= fetch_with_rsync('info');
     parse_info1($master,'s');
     return unless $yarrg;
     my $master= fetch_with_rsync('info');
     parse_info1($master,'s');

-    parse_info1('_local-info.txt','s');
+    my $local= '_local-info.txt';
+    if (stat $local) {
+       parse_info1($local,'s');
+    } else {
+       die "$local $!" unless $! == &ENOENT;
+    }

 }
 
 sub fetch_with_rsync ($) {
 }
 
 sub fetch_with_rsync ($) {


@@ -160,6 +166,7 @@ sub fetch_with_rsync ($) {
        $!=0; system 'rsync','-Lt','--',$remote,$local;
        die "$? $!" if $! or $?;
     }
        $!=0; system 'rsync','-Lt','--',$remote,$local;
        die "$? $!" if $! or $?;
     }

+    return $local;

 }
 
 sub parse_info_maproutes ($$$) {
 }
 
 sub parse_info_maproutes ($$$) {


@@ -256,7 +263,8 @@ sub yarrgpostform ($$) {
     my ($ua, $form) = @_;
     my $dest= $ENV{'YPPSC_YARRG_YARRG'};
     get_our_version($form, 'client');
     my ($ua, $form) = @_;
     my $dest= $ENV{'YPPSC_YARRG_YARRG'};
     get_our_version($form, 'client');

-    return cgipostform($ua, "$dest/commod-update-receiver", $form);
+    die unless $dest =~ m,/$,;
+    return cgipostform($ua, "${dest}commod-update-receiver", $form);

 }    
 
 sub cgipostform ($$$) {
 }    
 
 sub cgipostform ($$$) {


@@ -290,7 +298,7 @@ sub cgipostform ($$$) {
        $out =~ m,^Content-Type: text/plain.*\n\n, or die "$out ?";
        return $';
     } else {
        $out =~ m,^Content-Type: text/plain.*\n\n, or die "$out ?";
        return $';
     } else {

-       my $resp= $ua->request($url,$req);
+       my $resp= $ua->request($req);

        die $resp->status_line unless $resp->is_success;
        return $resp->content();
     }
        die $resp->status_line unless $resp->is_success;
        return $resp->content();
     }

diff --git a/yarrg/convert.c b/yarrg/convert.c
index 49fc3ed7151d879c2a69201662d42168dc26114e..3c9ae9c85cecfd48dea317975a4d17e8f869ed79 100644 (file)
--- a/yarrg/convert.c
+++ b/yarrg/convert.c
@@ -336,8 +336,8 @@ int main(int argc, char **argv) {
             o_serv_pctb,        o_flags & ff_use_pctb);
             
   set_server("YPPSC_YARRG_DICT_UPDATE",
             o_serv_pctb,        o_flags & ff_use_pctb);
             
   set_server("YPPSC_YARRG_DICT_UPDATE",

-            "rsync://",         "rsync.yarrg.chiark.net/pctb",
-                                "rsync.yarrg.chiark.net/pctb/test",
+            "rsync://",         "rsync.yarrg.chiark.net/yarrg",
+                                "rsync.yarrg.chiark.net/yarrg/test",

             o_serv_dict_fetch,   o_flags & ff_dict_fetch);
 
   set_server("YPPSC_YARRG_DICT_SUBMIT",
             o_serv_dict_fetch,   o_flags & ff_dict_fetch);
 
   set_server("YPPSC_YARRG_DICT_SUBMIT",