tweak number_joins

[id3fs.git] / lib / ID3FS / Path.pm

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index a961792..e54c7e2 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -30,7 +30,7 @@ our $PATH_ALLTRACKS= "TRACKS";
 our $PATH_NOARTIST = "NOARTIST";
 our $PATH_NOALBUM  = "NOALBUM";
 
-our $ENABLE_FILTER = 1;
+our $ENABLE_FILTER = 0;
 
 sub new
 {
@@ -356,11 +356,71 @@ sub parse
     {
        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 $thing=shift @elements)
+    {
+       if($thing->type() == $TYPE_BOOL)
+       {
+           my $op=$thing->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
+               $thing=shift(@elements) if($elements[0]->type() == $TYPE_TAG);
+           }
+           elsif($self->{db}->tag_has_values($thing->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;
+           }
+           $thing->table($table);
+       }
+    }
+    return @joins;
+}
+
 sub state
 {
     my($self, $newstate)=@_;
@@ -499,7 +559,7 @@ sub tags
     }
     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";
     }
@@ -670,10 +730,13 @@ sub tags_subselect
     my($self)=@_;
     my $hasvals=$self->expecting_values();
     my $tree=$self->{tagtree};
+#    use Data::Dumper;
+#    print Dumper $tree;
     my ($sqlclause, @joins)=$tree->to_sql($hasvals) 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;
@@ -739,19 +802,27 @@ sub empty
     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;
 }