projects
/
id3fs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
control filters via $ENABLE_FILTER at the top of ID3FS::Path
[id3fs.git]
/
lib
/
ID3FS
/
Path.pm
diff --git
a/lib/ID3FS/Path.pm
b/lib/ID3FS/Path.pm
index
e81f585
..
e99a801
100644
(file)
--- a/
lib/ID3FS/Path.pm
+++ b/
lib/ID3FS/Path.pm
@@
-14,6
+14,8
@@
our $PATH_ALLTRACKS= "TRACKS";
our $PATH_NOARTIST = "NOARTIST";
our $PATH_NOALBUM = "NOALBUM";
our $PATH_NOARTIST = "NOARTIST";
our $PATH_NOALBUM = "NOALBUM";
+our $ENABLE_FILTER = 1;
+
sub new
{
my $proto=shift;
sub new
{
my $proto=shift;
@@
-92,7
+94,9
@@
sub dirents
{
@dents=qw(AND OR);
}
{
@dents=qw(AND OR);
}
- push(@dents, $self->filter($PATH_ALLTRACKS, $PATH_NOARTIST));
+ push(@dents, ($ENABLE_FILTER ?
+ $self->filter($PATH_ALLTRACKS, $PATH_NOARTIST) :
+ ($PATH_ALLTRACKS, $PATH_NOARTIST)));
push(@dents, $self->artists());
}
}
push(@dents, $self->artists());
}
}
@@
-680,8
+684,6
@@
sub tags_subselect
my $tree=$self->{tagtree};
# FIXME
print "UNDEF!!\n" unless($self->{tagtree});
my $tree=$self->{tagtree};
# FIXME
print "UNDEF!!\n" unless($self->{tagtree});
- use Data::Dumper;
- print Dumper $self->{tagtree};
my $parent=$self->trailing_tag_parent();
# print "ELEMENTS: ", join('/', map { $_->{name}; } @{$self->{elements}}), "\n";
my $parent=$self->trailing_tag_parent();
# print "ELEMENTS: ", join('/', map { $_->{name}; } @{$self->{elements}}), "\n";
@@
-694,7
+696,7
@@
sub tags_subselect
}
my ($sqlclause, @joins)=(undef, ());
($sqlclause, @joins) = $tree->to_sql($hasvals) if($tree);
}
my ($sqlclause, @joins)=(undef, ());
($sqlclause, @joins) = $tree->to_sql($hasvals) if($tree);
-
print "SQL(" . scalar(@joins) ."
: $sqlclause\n";
+
# print "SQL(" . scalar(@joins) .")
: $sqlclause\n";
my $sql="\tSELECT fxt1.files_id FROM tags t1";
my @crosses=();
my @inners=();
my $sql="\tSELECT fxt1.files_id FROM tags t1";
my @crosses=();
my @inners=();
@@
-783,8
+785,6
@@
sub constraints_tag_list
sub filter
{
my($self, @dirs)=@_;
sub filter
{
my($self, @dirs)=@_;
- # FIXME: disabled - too slow
- return @dirs;
my $base=$self->{path};
my @outdirs=();
for my $dir (@dirs)
my $base=$self->{path};
my @outdirs=();
for my $dir (@dirs)