sort_elements: ignore everything except tags and booleans

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

diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm
index bbb1be5..3c4f468 100644 (file)
--- a/lib/ID3FS/DB.pm
+++ b/lib/ID3FS/DB.pm
@@ -201,8 +201,8 @@ sub tags
     my @orclauses=();
     my @andclauses=();
     use Data::Dumper;
-    print "TAGS: ", Dumper \@tags;
-    print "VALS: ", Dumper \@tags_vals;
+#    print "TAGS: ", Dumper \@tags;
+#    print "VALS: ", Dumper \@tags_vals;
 
     push(@andclauses, "( t2.parents_id=" . (defined($parent) ? $parent : "''") . " )");
     if(@tags)
@@ -282,6 +282,7 @@ sub albums
             "INNER JOIN files ON subselect.files_id=files.id\n" .
             "INNER JOIN albums ON files.albums_id=albums.id\n" .
             "GROUP BY albums.name;");
+    print "SQL(ALBUMS): \n$sql\n";
     my $result=$self->cmd_rows($sql);
     my @names=map { $_->[0]; } @$result;
     print "ALBUMS: ", join(', ', @names), "\n";
@@ -403,8 +404,8 @@ sub tags_subselect
     my @andclauses=();
     if(@tags)
     {
-       push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
-       push(@andclauses, "( 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)
     {
@@ -433,23 +434,23 @@ sub constraints_tag_list
     my @tags_vals=();
     for my $constraint (@constraints)
     {
-       print ref($constraint), ": ", $constraint->{name}, "\n";
+#      print ref($constraint), ": ", $constraint->{name}, "\n";
        if(ref($constraint) eq "ID3FS::PathElement::Tag")
        {
            if(defined($lasttag))
            {
-               print "TAGVAL\n";
+#              print "TAGVAL\n";
                push(@tags_vals, [$lasttag, $constraint->{id}]) if defined($constraint->{id});
                $lasttag=undef;
            }
            elsif($self->tag_has_values($constraint->{id}))
            {
-               print "HASVALUES\n";
+#              print "HASVALUES\n";
                $lasttag=$constraint->{id} if defined($constraint->{id});
            }
            else
            {
-               print "NOVALUES\n";
+#              print "NOVALUES\n";
                push(@tags, $constraint->{id}) if(defined($constraint->{id}));
            }
        }
@@ -487,9 +488,9 @@ sub relativise
     {
        shift(@path);
        shift(@rel);
-       print "POP ";
+#      print "POP ";
     }
-    print "\n";
+#    print "\n";
     my $upcount=scalar(@rel);
     my $result="../" x $upcount;
     $result .= join("/",@path);
@@ -515,7 +516,7 @@ sub tags_with_values
     my $sql=("SELECT p.name, t.name  FROM tags t\n" .
             "INNER JOIN tags p ON t.parents_id=p.id\n" .
             "GROUP BY p.name, t.name\n");
-#    print "SQL: $sql\n";
+    print "SQL: $sql\n";
     my $result=$self->cmd_rows($sql);
     my $tags={};
     for my $pair (@$result)
@@ -737,7 +738,7 @@ sub remove_unused
        WHERE files_x_tags.files_id IS NULL);
 
 EOT
-#    print "SQL: $sql\n";
+    print "SQL: $sql\n";
     my @sql=split(/\n\n/, $sql);
     $self->cmd($_) for (@sql);
 }