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 2d96265..c683101 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -498,10 +498,8 @@ sub tags
        return($self->{db}->cmd_firstcol($sql));
     }
     my $hasvals=$self->expecting_values();
-    my $parent=$self->trailing_tag_parent();
-    my @ids=();
     my $sql="SELECT tags.name FROM ";
-    if($self->in_or())
+    if($self->want_all_tags())
     {
        $sql .= "files_x_tags\n";
     }
@@ -517,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);
 
@@ -553,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" .
@@ -567,7 +557,6 @@ sub artists
 sub albums
 {
     my($self)=@_;
-    my @ids=();
     my $tail=$self->tail();
     if($self->is($TYPE_ARTIST, $tail))
     {
@@ -681,6 +670,8 @@ 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=();
@@ -750,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;
 }