start of support for NOT queries

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

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 46bac15..319e147 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -338,9 +338,9 @@ sub parse
     if($self->{tagtree})
     {
        ($self->{sqlconditions},
-        $self->{andsneeded}) = $self->{tagtree}->to_sql();
+        $self->{joins}) = $self->{tagtree}->to_sql();
 #      print "TREE: ",  $self->{tagtree}->print(), "\n";
-#      print("SQL CONDITION(", $self->{andsneeded}, "): ",
+#      print("SQL CONDITION(", scalar(@{$self->{joins}}), "): ",
 #            $self->{sqlconditions}, "\n");
 #      use Data::Dumper;
 #      print Dumper $self->{tagtree};
@@ -721,21 +721,24 @@ sub tags_subselect
        $tag=$self->trailing_tag_id();
 #      print "Trailing id: $tag\n";
     }
-    my ($sqlclause, $joinsneeded)=(undef, 1);
-    ($sqlclause, $joinsneeded) = $tree->to_sql($tag) if($tree);
-#    print "SQL($joinsneeded): $sqlclause\n";
+    my ($sqlclause, @joins)=(undef, ());
+    ($sqlclause, @joins) = $tree->to_sql($tag) if($tree);
+    print "JOINS: ", join(", ", @joins), "\n";
+#    print "SQL(" . scalar(@joins) .": $sqlclause\n";
     my $sql="\tSELECT fxt1.files_id FROM tags t1";
     my @crosses=();
     my @inners=();
 #    $joinsneeded++ if($tag);
-    for(my $i=1; $i <= $joinsneeded; $i++)
+    for(my $i=0; $i <= $#joins; $i++)
     {
-       my $inner=("\tINNER JOIN files_x_tags fxt$i ON " .
-                  "t${i}.id=fxt${i}.tags_id");
-       if($i > 1)
+       my $cnt=$i+1;
+       my $join=$joins[$i];
+       my $inner=("\t$join JOIN files_x_tags fxt$cnt ON " .
+                  "t${cnt}.id=fxt${cnt}.tags_id");
+       if($i > 0)
        {
-           push(@crosses, "CROSS JOIN tags t$i");
-           $inner .= " AND fxt1.files_id=fxt${i}.files_id";
+           push(@crosses, "CROSS JOIN tags t$cnt");
+           $inner .= " AND fxt1.files_id=fxt${cnt}.files_id";
        }
        push(@inners, $inner);
     }