support new version numbering of scripts
authorAndrew Dunstan <andrew@dunslane.net>
Sun, 7 Nov 2010 21:32:54 +0000 (21:32 +0000)
committerAndrew Dunstan <andrew@dunslane.net>
Sun, 7 Nov 2010 21:32:54 +0000 (21:32 +0000)
trunk/cgi-bin/pgstatus.pl

index 7d2f7872dbf88e6aebc6ea2b74b57d6efa562cbe..a416f2700dc570e6e0af3665a1e28649ef41fefa 100755 (executable)
@@ -223,8 +223,10 @@ else
 if ($min_script_version)
 {
        $client_conf->{script_version} ||= '0.0';
+       my $cli_ver = $client_conf->{script_version} ;
+       $cli_ver =~ s/^REL_//;
        my ($minmajor,$minminor) = split(/\./,$min_script_version);
-       my ($smajor,$sminor) = split(/\./,$client_conf->{script_version});
+       my ($smajor,$sminor) = split(/\./,$cli_ver);
        if ($minmajor > $smajor || ($minmajor == $smajor && $minminor > $sminor))
        {
                print "Status: 460 script version too low\nContent-Type: text/plain\n\n";
@@ -240,8 +242,10 @@ if ($min_script_version)
 if ($min_web_script_version)
 {
        $client_conf->{web_script_version} ||= '0.0';
+       my $cli_ver = $client_conf->{web_script_version} ;
+       $cli_ver =~ s/^REL_//;
        my ($minmajor,$minminor) = split(/\./,$min_script_version);
-       my ($smajor,$sminor) = split(/\./,$client_conf->{script_version});
+       my ($smajor,$sminor) = split(/\./,$cli_ver);
        if ($minmajor > $smajor || ($minmajor == $smajor && $minminor > $sminor))
        {
                print "Status: 461 web script version too low\nContent-Type: text/plain\n\n";