use strict;
use warnings;
+require Exporter;
+use vars qw(@ISA @EXPORT $TYPE_BOOL $TYPE_TAG $TYPE_ARTIST $TYPE_ALBUM $TYPE_FILE);
+@ISA=qw(Exporter);
+@EXPORT=qw($TYPE_BOOL $TYPE_TAG $TYPE_ARTIST $TYPE_ALBUM $TYPE_FILE);
+($TYPE_BOOL, $TYPE_TAG, $TYPE_ARTIST, $TYPE_ALBUM, $TYPE_FILE)=(1..5);
+
sub new
{
my $proto=shift;
$self->{type}=shift;
$self->{name}=shift;
$self->{parents_id}=shift;
- if($self->{type} ne "boolean")
+ if($self->{type} != $TYPE_BOOL)
{
- my $table=ucfirst($self->{type});
- $table .= "s" unless($table=~/s$/);
+ my $table='';
+ if ($self->{type} == $TYPE_TAG) { $table="tags"; }
+ elsif($self->{type} == $TYPE_ARTIST) { $table="artists"; }
+ elsif($self->{type} == $TYPE_ALBUM) { $table="albums"; }
+ elsif($self->{type} == $TYPE_FILE) { $table="files"; }
$self->{id}=$db->lookup_id($table, $self->{name}, $self->{parents_id});
return undef unless(defined($self->{id}));
}
sub id { return shift->set("id", shift); }
sub parents_id { return shift->set("parents_id", shift); }
-sub print
-{
- my($self)=@_;
- my $op=$self->name();
- my $left=$self->left();
- my $right=$self->right();
- return "" unless($left || $right);
- my $str .= $self->print_node($left);
- $str .= (" " . $op . " ") if($op);
- $str .= $self->print_node($right);
- if($op || ($left && $right))
- {
- $str="(" . $str . ")";
- }
- return $str;
-}
-
-sub print_node
-{
- my($self, $node)=@_;
- return "" unless(defined($node));
- return $node->print() if(ref($node) eq "ID3FS::Path::Node");
- return $node->{name};
-}
-
sub to_sql
{
my($self, $hasvals, $not, @joins)=@_;
$not=0 unless(defined($not));
my @outjoins=();
- my $str='';
- # init
unless(@joins)
{
@outjoins = @joins = ("INNER");
}
+ my $str='';
- if($self->type() ne "boolean")
+ if($self->type() != $TYPE_BOOL)
{
- my $cnt=scalar(@joins)+1;
$str .= "t" . scalar(@joins) . ".id='" . $self->{id} . "'";
if($not && !$hasvals)
{
- $str .= " AND fxt" . scalar(@joins) . ".files_id IS NULL";
+ $str = "(" . $str . " AND fxt" . scalar(@joins) . ".files_id IS NULL)";
}
return ($str, @outjoins);
}
my $left=$self->left();
my $right=$self->right();
return ("", @outjoins) unless($left || $right);
+
my ($leftstr, @leftjoins) = $left->to_sql($hasvals, $not, @joins) if($left);
push(@joins, @leftjoins);
push(@outjoins, @leftjoins);
+
my $op=$self->name();
- print "op: $op type: ", $self->type(), " not: $not\n";
if(defined($op))
{
+ my $left_is_not =($left && $left->name() && $left->name() eq "NOT");
+ my $right_is_not=($right && $right->name() && $right->name() eq "NOT");
+ my $join=undef;
# if we are ANDing, add an inner join
# also if we are NOTing, but we are looking for a tag *value*
if($op eq "AND")
{
- print "AND\n";
- # hack - if right child is a NOT, we don't need extra join/brackets
+ # if right child is a NOT, we don't need extra join/brackets
# NOT will do the same and we will end up with an extra one
- unless($right && $right->name() && $right->name() eq "NOT")
- {
- push(@joins, "INNER");
- push(@outjoins, "INNER");
- }
+ $join= "INNER" unless($right_is_not);
}
elsif($op eq "NOT")
{
- print "NOT (was $not)\n";
$not=1;
# as above - if right child is a NOT, we don't need extra join/brackets
# NOT will do the same and we will end up with an extra one
- unless($right && $right->name() && $right->name() eq "NOT")
- {
- if($hasvals)
- {
- push(@joins, "INNER");
- push(@outjoins, "INNER");
- }
- else
- {
- push(@joins, "LEFT");
- push(@outjoins, "LEFT");
- }
- }
-# print("LEFT: ", $left->print(), "\n") if ($left);
-# print("RIGHT: ", $right->print(), "\n") if($right);
+ $join = ($hasvals ? "INNER" : "LEFT") unless($right_is_not);
}
elsif($op eq "OR")
{
- print "OR\n";
# if left child is a NOT, we need an extra (inner) join
# unless right child is also a NOT
- if(($left && $left->name() && $left->name() eq "NOT") &&
- !($right && $right->name() && $right->name() eq "NOT"))
- {
- push(@joins, "INNER");
- push(@outjoins, "INNER");
- }
+ $join="INNER" if($left_is_not && ! $right_is_not)
+ }
+ if($join)
+ {
+ push(@joins, $join);
+ push(@outjoins, $join);
}
}
my ($rightstr, @rightjoins) = $right->to_sql($hasvals, $not, @joins) if($right);
push(@outjoins, @rightjoins);
-# print "LEFT (", scalar(@leftjoins), "): $leftstr\n";
-# print "RIGHT (", scalar(@rightjoins), "): $rightstr\n";
- $str=$leftstr;
+ $str = $leftstr;
$str .= " $op " if($op && !$not);
$str .= $rightstr;
- if($op || ($left && $right))
- {
- $str="(" . $str . ")";
- }
-# print "STR: $str\n";
-# my @all=(@joins, @rightjoins);
-# print "JOINS: RETURN ", scalar(@outjoins), " ALL ", scalar(@all), "\n";
+ $str=("(" . $str . ")") if($op && $left && $right);
return($str, @outjoins);
}
sub used_tags
{
my($self)=@_;
- if($self->type() eq "boolean")
+ if($self->type() == $TYPE_BOOL)
{
my @used=();
push(@used, $self->left()->used_tags()) if($self->left());