our $PATH_NOARTIST = "NOARTIST";
our $PATH_NOALBUM = "NOALBUM";
-our $ENABLE_FILTER = 1;
+our $ENABLE_FILTER = 0;
sub new
{
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");
}
my $parent=$self->tail();
my $allownot=1;
if($self->is($TYPE_BOOL, $parent) &&
- $parent->{name} eq "NOT")
+ $parent->name() eq "NOT")
{
$allownot=0;
}
{
pop @elements;
}
+# print "\nELEMENTS: ", join(' ', map { $_->name(); } @elements), "\n";
+ my @joins=$self->number_joins(@elements);
+ @joins=qw(INNER) unless(@joins);
+ $self->{joins}=\@joins;
+# print "AFTER: ", join(' ', map { $_->name() . "(" . $_->{table} . ")"; } @elements), "\n";
+# print "JOINS: ", join(', ', @joins), "\n";
# sort elements by precedence
@elements=$self->sort_elements(@elements);
$self->{tagtree}=$self->elements_to_tree(\@elements);
}
+sub number_joins
+{
+ my($self, @elements)=@_;
+ my @joins=("INNER");
+ my $table=1;
+ my $nextjoin=undef;
+ my $lastop=undef;
+ return (@joins) unless(@elements);
+ while(my $node=shift @elements)
+ {
+ if($node->type() == $TYPE_BOOL)
+ {
+ my $op=$node->name();
+ if($op eq "AND")
+ {
+ $nextjoin="INNER";
+ }
+ elsif($op eq "NOT")
+ {
+ $nextjoin="LEFT";
+ }
+ elsif($op eq "OR")
+ {
+ # NOT/foo/OR needs an extra join
+ $nextjoin="INNER" if($lastop && $lastop eq "NOT");
+ }
+ $lastop=$op;
+ }
+ else
+ {
+ if(@elements)
+ {
+ # if tag has a value, eat the tag, shifting to the value
+ if($elements[0]->type() == $TYPE_TAG)
+ {
+ $node->hasvals(1);
+ $node=shift(@elements);
+ }
+ else
+ {
+ $node->hasvals(0);
+ }
+ }
+ elsif($self->{db}->tag_has_values($node->id()))
+ {
+ # if the expression ends in a tag that has a value
+ # (ie we have the tag and want the value)
+ # use an INNER join even if we were in a NOT
+ $nextjoin="INNER" if($nextjoin);
+ }
+ if($nextjoin)
+ {
+ $table++;
+ push(@joins, $nextjoin);
+ $nextjoin=undef;
+ }
+ $node->table($table);
+ }
+ }
+ return @joins;
+}
+
sub state
{
my($self, $newstate)=@_;
my($self, $elements)=@_;
return undef unless(@$elements);
my ($left, $right, $op)=(undef, undef, undef);
- my $thing=pop @$elements;
- if($self->is($TYPE_BOOL, $thing))
+ my $node=pop @$elements;
+ if($self->is($TYPE_BOOL, $node))
{
$right=$self->elements_to_tree($elements);
- if($thing->{name} ne "NOT")
+ if($node->name() ne "NOT")
{
$left=$self->elements_to_tree($elements);
}
- $thing->left($left);
- $thing->right($right);
+ $node->left($left);
+ $node->right($right);
}
- return $thing;
+ return $node;
}
# Dijkstra's shunting-yard algorithm
my ($self, @input)=@_;
my @opstack=();
my @output=();
- while(my $thing = shift @input)
+ while(my $node = shift @input)
{
- if($self->is($TYPE_TAG, $thing))
+ if($self->is($TYPE_TAG, $node))
{
# Handle tag values by dropping parent
if(@input && $self->is($TYPE_TAG, $input[0]))
{
- $thing=shift @input;
+ $node=shift @input;
}
- push(@output, $thing);
+ push(@output, $node);
}
- elsif($self->is($TYPE_BOOL, $thing))
+ elsif($self->is($TYPE_BOOL, $node))
{
while(@opstack &&
- ($priorities{$thing->{name}} <= $priorities{$opstack[$#opstack]->{name}}))
+ ($priorities{$node->name()} <= $priorities{$opstack[$#opstack]->name()}))
{
push(@output, pop(@opstack));
}
- push(@opstack, $thing);
+ push(@opstack, $node);
}
}
while(@opstack)
sub is
{
- my($self, $type, $thing)=@_;
- return 0 unless($thing);
- return 0 unless($thing->type());
- return 1 if($type == $thing->type());
+ my($self, $type, $node)=@_;
+ return 0 unless($node);
+ return 0 unless($node->type());
+ return 1 if($type == $node->type());
return 0;
}
my $sql="SELECT DISTINCT name FROM tags WHERE parents_id='';";
return($self->{db}->cmd_firstcol($sql));
}
- my $hasvals=$self->expecting_values();
my $sql="SELECT tags.name FROM ";
- if($self->in_or())
+ if($self->want_all_tags())
{
$sql .= "files_x_tags\n";
}
my $id=$self->trailing_tag_id();
my $parentclause= "tags.parents_id='";
- $parentclause .= $id if($hasvals);
+ $parentclause .= $id if($self->expecting_values());
$parentclause .= "'";
push(@andclauses, $parentclause);
sub tags_subselect
{
my($self)=@_;
- my $hasvals=$self->expecting_values();
my $tree=$self->{tagtree};
- my ($sqlclause, @joins)=$tree->to_sql($hasvals) if($tree);
+# use Data::Dumper;
+# print Dumper $tree;
+ my ($sqlclause, @joins)=$tree->to_sql() if($tree);
my $sql="\tSELECT fxt1.files_id FROM tags t1";
my @crosses=();
my @inners=();
+ @joins=@{$self->{joins}};
for(my $i=0; $i <= $#joins; $i++)
{
my $cnt=$i+1;
return 1;
}
-# if path is .../OR/ or .../OR/NOT
-sub in_or
+# if path is .../OR/ or .../OR/NOT or .../AND/NOT
+sub want_all_tags
{
my($self)=@_;
my $tail=$self->tail();
return 0 unless($tail);
- return 0 unless($tail->type() == $TYPE_BOOL);
- return 1 if($tail->name() eq "OR");
- return 0 unless($tail->name() eq "NOT");
my $parent=$self->tail_parent();
- return 0 unless($parent);
- return 0 unless($parent->type() == $TYPE_BOOL);
- return 1 if($parent->name() eq "OR");
+ my $parent_valid = ($parent && $parent->type() == $TYPE_BOOL);
+ if($tail->type() == $TYPE_BOOL)
+ {
+ return 1 if($tail->name() eq "OR");
+ return 0 unless($tail->name() eq "NOT");
+ return 0 unless($parent_valid);
+ return 1 if($parent->name() eq "OR");
+ return 1 if($parent->name() eq "AND");
+ }
+ elsif($tail->type() == $TYPE_TAG)
+ {
+ return 0 unless($parent_valid);
+ return 1 if($parent->name() eq "NOT");
+ }
return 0;
}
projects / id3fs.git / blobdiff