Node::to_sql: NOT: only return an extra join, don't pass it to $right->to_sql()

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

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 7e6c71d..c683101 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -20,9 +20,8 @@ use strict;
 use warnings;
 use ID3FS::Path::Node;
 
-our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_TAGVAL,
-     $STATE_BOOLEAN, $STATE_ALBUMS, $STATE_TRACKLIST,
-     $STATE_FILE, $STATE_ALL)=(0..8);
+our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_BOOLEAN,
+     $STATE_ALBUMS, $STATE_TRACKLIST, $STATE_FILE, $STATE_ALL)=(0..7);
 
 # operator precedence
 our %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
@@ -98,11 +97,10 @@ sub dirents
     {
        @dents=($self->filter($PATH_ALLTRACKS, $PATH_NOARTIST), $self->artists());
     }
-    elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+    elsif($state==$STATE_TAG)
     {
        my $tail=$self->tail();
-       if($state==$STATE_TAG && $self->is($TYPE_TAG, $tail) &&
-          $self->{db}->tag_has_values($tail->id()))
+       if($self->is($TYPE_TAG, $tail) && $self->{db}->tag_has_values($tail->id()))
        {
            @dents=$self->tags();
        }
@@ -196,18 +194,16 @@ sub parse
                }
            }
        }
-       elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+       elsif($state==$STATE_TAG)
        {
            my $tag=$self->tail();
 #          print "SM: TAG/TAGVAL($state): $name\n";
-           if($state==$STATE_TAG && $self->is($TYPE_TAG, $tag) &&
-              $self->{db}->tag_has_values($tag->id()))
+           if($self->is($TYPE_TAG, $tag) && $self->{db}->tag_has_values($tag->id()))
            {
 #              print "Parsing: parent: $tag->id()\n";
                my $tagval=ID3FS::Path::Node->new($self->{db}, $TYPE_TAG, $name, $tag->id());
                if(defined($tagval))
                {
-                   $self->state($STATE_TAGVAL);
                    # stay in tag state
                    push(@{$self->{elements}}, $tagval);
                }
@@ -402,7 +398,6 @@ sub sort_elements
     my ($self, @input)=@_;
     my @opstack=();
     my @output=();
-#    print "INPUT: ", join(', ', map { $_->{name}; } @input), "\n";
     while(my $thing = shift @input)
     {
        if($self->is($TYPE_TAG, $thing))
@@ -428,7 +423,6 @@ sub sort_elements
     {
        push(@output, pop(@opstack));
     }
-#    print "STACK: ", join(', ', map { $_->{name}; } @output), "\n";
     return @output;
 }
 
@@ -504,12 +498,8 @@ sub tags
        return($self->{db}->cmd_firstcol($sql));
     }
     my $hasvals=$self->expecting_values();
-    my $parent=$self->trailing_tag_parent();
-#    print "THASVALS: $hasvals\n";
-#    print "TPARENT: ", (defined($parent)? $parent : "NO"), "\n";
-    my @ids=();
     my $sql="SELECT tags.name FROM ";
-    if($self->in_or())
+    if($self->want_all_tags())
     {
        $sql .= "files_x_tags\n";
     }
@@ -525,14 +515,7 @@ sub tags
     my $id=$self->trailing_tag_id();
 
     my $parentclause= "tags.parents_id='";
-    if($hasvals)
-    {
-       $parentclause .= $id;
-    }
-    elsif($parent)
-    {
-       $parentclause .= $parent;
-    }
+    $parentclause .= $id if($hasvals);
     $parentclause .= "'";
     push(@andclauses, $parentclause);
 
@@ -561,7 +544,6 @@ sub artists
        my $sql="SELECT DISTINCT name FROM artists WHERE name!='';";
        return($self->{db}->cmd_firstcol($sql));
     }
-    my @ids=();
     my $sql=$self->sql_start("artists.name");
     $sql .= ("INNER JOIN artists ON files.artists_id=artists.id\n" .
             "WHERE artists.name != ''\n" .
@@ -575,7 +557,6 @@ sub artists
 sub albums
 {
     my($self)=@_;
-    my @ids=();
     my $tail=$self->tail();
     if($self->is($TYPE_ARTIST, $tail))
     {
@@ -689,21 +670,12 @@ sub tags_subselect
     my($self)=@_;
     my $hasvals=$self->expecting_values();
     my $tree=$self->{tagtree};
-    my $parent=$self->trailing_tag_parent();
-
-    my $tag=undef;
-    if($hasvals)
-    {
-       $tag=$self->trailing_tag_id();
-#      print "Trailing id: $tag\n";
-    }
-    my ($sqlclause, @joins)=(undef, ());
-    ($sqlclause, @joins) = $tree->to_sql($hasvals) if($tree);
-#    print "SQL(" . scalar(@joins) ."): $sqlclause\n";
+    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=();
-#    $joinsneeded++ if($tag);
     for(my $i=0; $i <= $#joins; $i++)
     {
        my $cnt=$i+1;
@@ -720,10 +692,6 @@ sub tags_subselect
     $sql .= ("\n\t" . join(" ", @crosses)) if(@crosses);
     $sql .= ("\n" . join("\n", @inners)) if(@inners);
     $sql .= "\n\tWHERE $sqlclause" if($sqlclause);
-#    if($tag)
-#    {
-#      $sql .= " AND t${joinsneeded}.parents_id='$tag'";
-#    }
     $sql .= "\n\tGROUP BY fxt1.files_id\n";
     return $sql;
 }
@@ -773,19 +741,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;
 }