$STATE_BOOLEAN, $STATE_ALBUMS, $STATE_TRACKLIST,
$STATE_FILE, $STATE_ALL)=(0..8);
+# operator precedence
our %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
our $PATH_ALLTRACKS= "TRACKS";
elsif($state==$STATE_BOOLEAN)
{
my $parent=$self->tail();
- unless($self->is($TYPE_BOOL, $parent) &&
- $parent->{name} eq "NOT")
+ unless($self->is($TYPE_BOOL, $parent) && $parent->{name} eq "NOT")
{
@dents=("NOT");
}
}
else
{
- print "DIRENTS: UNHANDLED STATE: $state\n";
+ print "id3fsd: INTERNAL ERROR: DIRENTS: UNHANDLED STATE: $state\n";
}
return(\@dents, \@fents);
}
sub parse
{
my($self)=@_;
+ $self->state($STATE_ROOT);
+ return if($self->{path} eq "/");
@{$self->{components}}=split(/\//, $self->{path});
shift @{$self->{components}}; # drop empty field before leading /
# print "PATH: $self->{path}\n";
- $self->state($STATE_ROOT);
- return if($self->{path} eq "/");
my @parts=@{$self->{components}};
my($tag, $tagval);
$self->{elements}=[];
}
}
- # remove trailing boolean
my @elements=@{$self->{elements}};
+ # remove trailing boolean
while(@elements && $self->is($TYPE_BOOL, $elements[$#elements]))
{
pop @elements;
# sort elements by precedence
@elements=$self->sort_elements(@elements);
$self->{tagtree}=$self->elements_to_tree(\@elements);
- if($self->{tagtree})
- {
-# use Data::Dumper;
-# print "TREE\n";
-# print Dumper $self->{tagtree};
-# my ($conditions, @joins)=$self->{tagtree}->to_sql();
-# print "CONDITIONS(", scalar(@joins), "): ", $conditions, "\n";
- }
}
sub state
return $self->{state};
}
+# link up precedence-sorted list into a binary tree
sub elements_to_tree
{
my($self, $elements)=@_;
}
elsif($self->is($TYPE_BOOL, $thing))
{
- # bool
while(@opstack &&
($priorities{$thing->{name}} <= $priorities{$opstack[$#opstack]->{name}}))
{
"GROUP BY paths.name, files.name");
print "FILENAME SQL: $sql\n" if($self->{verbose});
my ($path, $name)=$self->{db}->cmd_onerow($sql, $id);
- my $id3fs_path=join('/', map { $_->{name}; } @{$self->{elements}});
return($self->{db}->relativise($path, $name, $mountpoint, $self->{path}));
}
# should never happen
my @outdirs=();
for my $dir (@dirs)
{
-# print "\nFILTER (",$self->state(), "): $base / $dir\n";
- if($self->empty("$base/$dir"))
- {
-# print "empty: $base / $dir\n";
- }
- else
- {
-# print "non-empty, accepting: $base / $dir\n";
- push(@outdirs, $dir);
- }
+ push(@outdirs, $dir) unless($self->empty("$base/$dir"));
}
return(@outdirs);
}