X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FPath%2FNode.pm;h=a0a6b707706075cec46008800ad343a211f17d8c;hb=4d9a3e779039ded464b86ddec75994b540ced90a;hp=bdc403fda57f238972315a9b5ba1c5ae33beb73a;hpb=fc30364efa6a07b2065f0f54e6792f17970535b8;p=id3fs.git diff --git a/lib/ID3FS/Path/Node.pm b/lib/ID3FS/Path/Node.pm index bdc403f..a0a6b70 100644 --- a/lib/ID3FS/Path/Node.pm +++ b/lib/ID3FS/Path/Node.pm @@ -19,6 +19,12 @@ package ID3FS::Path::Node; 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; @@ -30,10 +36,13 @@ sub new $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})); } @@ -57,50 +66,24 @@ sub type { return shift->set("type", shift); } 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; + print $self->{id}, " = ", $self->{name}, "\n"; $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); } @@ -108,82 +91,54 @@ sub to_sql 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)) { - # if we are ANDing, add an inner join - # also if we are NOTing, but we are looking for a tag *value* + # if we are ANDing add an inner join 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") - { +# unless($right && $right->name() && $right->name() eq "NOT") +# { push(@joins, "INNER"); push(@outjoins, "INNER"); - } +# } } 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); - } - 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"); - } + # return an extra join, but don't pass it down to $right->to_sql + # if we are looking for a tag *value*, use INNER join rather than LEFT + push(@outjoins, ($hasvals ? "INNER" : "LEFT")); } } 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); +# print "LEFT (", scalar(@$leftjoins), "): "; +# print $leftstr if $leftstr; +# print "\n"; +# print "OP: $op\n" if $op; +# print "RIGHT (", scalar(@$rightjoins), "): "; +# print $rightstr if $rightstr; +# print "\n"; + print "OUT(", scalar(@outjoins), "): $str\n"; 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()); @@ -193,4 +148,20 @@ sub used_tags return $self->id(); } +# does the bottom right-most expression end in a NOT? +sub right_ends_in_not +{ + my($self, $node)=@_; + return 0 unless($node); + my $right=$node->right(); + if($right && $right->type() == $TYPE_BOOL) + { + return $self->right_ends_in_not($right); + } + my $op=$node->name(); + return 0 unless($op); + return 1 if($op eq "NOT"); + return 0; +} + 1;