X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=6263190043f60f2f6317c8634466bf625e6acf10;hb=14cb55073f64836f3f2a1aaf3a86207dec4fa103;hp=0f52e39b4023285ad994ad533feb18d66ad11f19;hpb=b463dee2efa3edb72fab9bf1c64364ea38408bec;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index 0f52e39b..62631900 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -22,10 +22,8 @@ use strict;
 
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 use vars qw(%list %valid $filterdef);
 
@@ -141,9 +139,11 @@ sub is_empty
 # These can be called in various ways:-
 #
 # Route::here or $ref->here returns 1 or 0 depending on value of the here flag
-# Route::here(1) returns 2 (the bit value of the here flag)
+# Route::here(1) returns 1 (the bit value of the here flag)
 # $ref->here(1) or $ref->here(0) sets the here flag
 #
+# these are now redundant really as we are not interested in conferences
+# and here is back to being '1'.
 
 sub here
 {
@@ -151,7 +151,7 @@ sub here
 	my $r = shift;
 	return $self ? 2 : 0 unless ref $self;
 	return ($self->{flags} & 2) ? 1 : 0 unless defined $r;
-	$self->{flags} = (($self->{flags} & ~2) | ($r ? 2 : 0));
+	$self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0));
 	return $r ? 1 : 0;
 }
 
@@ -159,10 +159,10 @@ sub conf
 {
 	my $self = shift;
 	my $r = shift;
-	return $self ? 1 : 0 unless ref $self;
+	return $self ? 2 : 0 unless ref $self;
 	return ($self->{flags} & 1) ? 1 : 0 unless defined $r;
-	$self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0));
-	return $r ? 1 : 0;
+	$self->{flags} = (($self->{flags} & ~2) | ($r ? 2 : 0));
+	return $r ? 2 : 0;
 }
 
 sub parents