assemble tag expression into binary tree, respecting precedence

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

diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm
index a9d01c7..e986f36 100644 (file)
--- a/lib/ID3FS/DB.pm
+++ b/lib/ID3FS/DB.pm
@@ -203,18 +203,17 @@ sub tags
     use Data::Dumper;
     print "TAGS: ", Dumper \@tags;
     print "VALS: ", Dumper \@tags_vals;
-    if(defined($parent))
-    {
-       push(@andclauses, "( t2.parents_id=$parent )");
-    }
+
+    push(@andclauses, "( t2.parents_id=" . (defined($parent) ? $parent : "''") . " )");
     if(@tags)
     {
-       push(@orclauses, "( t2.parents_id='' AND t2.id NOT IN ( " . join(', ', @tags) ." ) )");
+       push(@orclauses, "( t2.id NOT IN ( " . join(', ', @tags) ." ) )");
     }
     for my $pair (@tags_vals)
     {
        my($tag, $val)=@$pair;
-       push(@orclauses, "( NOT (t2.parents_id=$tag AND t2.id=$val ) )");
+#      push(@orclauses, "( NOT ( t2.parents_id=$tag AND t2.id=$val ) )");
+       push(@andclauses, "( NOT ( t2.id=$tag ) )");
     }
     if(@orclauses)
     {
@@ -226,7 +225,7 @@ sub tags
        $sql .= join("\n\tAND ", @andclauses) . "\n";
     }
     $sql .= "GROUP BY t2.name;";
-    print "SQL: $sql\n";
+#    print "SQL: $sql\n";
     my $result=$self->cmd_rows($sql);
     my @tagnames=map { $_->[0]; } @$result;
     print "SUBNAMES: ", join(', ', @tagnames), "\n";
@@ -260,7 +259,7 @@ sub artists
             "INNER JOIN files ON subselect.files_id=files.id\n" .
             "INNER JOIN artists ON files.artists_id=artists.id\n" .
             "GROUP BY artists.name;");
-    print "SQL: $sql\n";
+#    print "SQL: $sql\n";
     my $result=$self->cmd_rows($sql);
     my @tagnames=map { $_->[0]; } @$result;
     print "ARTISTS: ", join(', ', @tagnames), "\n";
@@ -300,7 +299,7 @@ sub artist_albums
             "INNER JOIN artists ON artists.id=files.artists_id\n\t" .
             "WHERE artists.id=? and albums.name <> ''\n\t" .
             "GROUP BY albums.name\n");
-    print "ARTIST_ALBUMS SQL: $sql\n";
+#    print "ARTIST_ALBUMS SQL: $sql\n";
     my $result=$self->cmd_rows($sql, $artist_id);
     my @albums=map { $_->[0]; } @$result;
     print "ALBUMS: ", join(', ', @albums), "\n";
@@ -318,7 +317,7 @@ sub artist_tracks
             "INNER JOIN albums  ON albums.id=files.albums_id\n\t" .
             "WHERE artists.id=? AND albums.name=''\n\t" .
             "GROUP BY files.name\n");
-    print "ARTIST_TRACKS SQL: $sql\n";
+#    print "ARTIST_TRACKS SQL: $sql\n";
     my $result=$self->cmd_rows($sql, $artist_id);
     my @names=map { $_->[0]; } @$result;
     print "ARTISTTRACKS: ", join(', ', @names), "\n";
@@ -333,7 +332,7 @@ sub album_tracks
             "INNER JOIN artists ON artists.id=files.artists_id\n\t" .
             "WHERE artists.id=? AND albums.id=?\n\t" .
             "GROUP BY files.name\n");
-    print "ALBUM_TRACKS SQL($artist_id, $album_id): $sql\n";
+#    print "ALBUM_TRACKS SQL($artist_id, $album_id): $sql\n";
     my $result=$self->cmd_rows($sql, $artist_id, $album_id);
     my @names=map { $_->[0]; } @$result;
     print "TRACKS: ", join(', ', @names), "\n";
@@ -366,7 +365,7 @@ sub tracks
             "\t) AS subselect\n" .
             "INNER JOIN files ON files.id=subselect.files_id\n" .
             "GROUP BY files.name;");
-    print "SQL: $sql\n";
+#    print "SQL: $sql\n";
     my $result=$self->cmd_rows($sql);
     my @names=map { $_->[0]; } @$result;
     print "TRACKS: ", join(', ', @names), "\n";
@@ -383,7 +382,7 @@ sub filename
                 "INNER JOIN paths ON files.paths_id=paths.id\n" .
                 "WHERE files.id=?\n" .
                 "GROUP BY paths.name, files.name");
-       print "FILENAME SQL: $sql\n";
+#      print "FILENAME SQL: $sql\n";
        my ($path, $name)=$self->cmd_onerow($sql, $id);
        my $id3fs_path=join('/', map { $_->{name}; }  @constraints);
        return($self->relativise($path, $name, $mountpoint, $id3fs_path));
@@ -404,17 +403,15 @@ sub tags_subselect
     my @andclauses=();
     if(@tags)
     {
-       push(@orclauses, "( t1.parents_id='' AND t1.id IN ( " . join(', ', @tags) ." ) )");
+       push(@orclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
+       push(@orclauses, "( t1.id IN ( " . join(', ', @tags) ." ) )");
     }
     for my $pair (@tags_vals)
     {
        my($tag, $val)=@$pair;
        push(@orclauses, "( t1.parents_id=$tag AND t1.id=$val )");
     }
-    if($parent)
-    {
-       push(@andclauses, "( t1.parents_id=$parent )");
-    }
+#    push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
     if(@orclauses)
     {
        push(@andclauses, join("\n\t\tOR ", @orclauses));
@@ -542,7 +539,7 @@ sub add
     my $relpath=$path;
     $relpath =~ s/^\Q$self->{base}\E\/?//;
     my($filepart,$pathpart);
-    if($path !~ /\//)
+    if($relpath !~ /\//)
     {
        $pathpart='';
        $filepart=$relpath;
@@ -706,7 +703,7 @@ sub prune_paths
     return unless(@ids);
     my $sql=("DELETE FROM files WHERE paths_id IN (\n\t" .
             join(', ', map { "\"$_\""; } @ids). "\n\t)");
-    print "SQL: \n", $sql, "\n";
+#    print "SQL: \n", $sql, "\n";
     $self->cmd($sql);
 }