projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put pc16/17 handling back the way it was
[spider.git]
/
perl
/
Route.pm
diff --git
a/perl/Route.pm
b/perl/Route.pm
index 0f52e39b4023285ad994ad533feb18d66ad11f19..6263190043f60f2f6317c8634466bf625e6acf10 100644
(file)
--- a/
perl/Route.pm
+++ b/
perl/Route.pm
@@
-22,10
+22,8
@@
use strict;
use vars qw($VERSION $BRANCH);
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);
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
# 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
#
# $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
{
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;
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;
}
return $r ? 1 : 0;
}
@@
-159,10
+159,10
@@
sub conf
{
my $self = shift;
my $r = shift;
{
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;
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
}
sub parents