X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FPath%2FNode.pm;h=377e8dd68f53582d40ae0abceba55cc1e818e430;hb=1c7e55d34956f90d235632995acf1238878db2a3;hp=52804786e18c20e9472edfeafeecad45e2654a39;hpb=48e272547d3d0d88617c8c2d45f2a7485b6ba1b7;p=id3fs.git diff --git a/lib/ID3FS/Path/Node.pm b/lib/ID3FS/Path/Node.pm index 5280478..377e8dd 100644 --- a/lib/ID3FS/Path/Node.pm +++ b/lib/ID3FS/Path/Node.pm @@ -10,10 +10,17 @@ sub new my $self={}; bless($self,$class); - $self->left(shift); - $self->op(shift); - $self->right(shift); - + my $db=shift; + $self->{type}=shift; + $self->{name}=shift; + $self->{parents_id}=shift; + if($self->{type} ne "boolean") + { + my $table=ucfirst($self->{type}); + $table .= "s" unless($table=~/s$/); + $self->{id}=$db->lookup_id($table, $self->{name}, $self->{parents_id}); + return undef unless(defined($self->{id})); + } return $self; } @@ -27,19 +34,22 @@ sub set return $self->{$name}; } -sub left { return shift->set("left", shift); } -sub right { return shift->set("right", shift); } -sub op { return shift->set("op", shift); } +sub left { return shift->set("left", shift); } +sub right { return shift->set("right", shift); } +sub name { return shift->set("name", shift); } +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->op(); + my $op=$self->name(); my $left=$self->left(); my $right=$self->right(); return "" unless($left || $right); my $str .= $self->print_node($left); - $str .= (" " . $op->{name} . " ") if($op); + $str .= (" " . $op . " ") if($op); $str .= $self->print_node($right); if($op || ($left && $right)) { @@ -58,101 +68,100 @@ sub print_node sub to_sql { - my($self, $parent, $andlevel)=@_; - $andlevel=1 unless(defined($andlevel)); - my ($leftandlevel, $rightandlevel); - my ($leftstr, $rightstr); - my $op=$self->op(); + my($self, $hasvals, $not, @joins)=@_; + $not=0 unless(defined($not)); + my @outjoins=(); + # init + unless(@joins) + { + @outjoins = @joins = ("INNER"); + } my $left=$self->left(); my $right=$self->right(); - return ("", $andlevel) unless($left || $right); - ($leftstr, $leftandlevel) = $self->node_to_sql($left, $parent, $andlevel); -# print "LEFT: $leftstr\n"; - $andlevel=$self->max($andlevel, $leftandlevel); - if($op) + return ("", @outjoins) unless($left || $right); + my ($leftstr, @leftjoins) = $self->node_to_sql($left, $hasvals, $not, @joins); + push(@joins, @leftjoins); + push(@outjoins, @leftjoins); + my $op=$self->name(); + if(defined($op) && $self->type() eq "boolean") { - if(ref($op) eq "ID3FS::PathElement::Boolean") + # 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") || ($hasvals && ($op eq "NOT"))) { -# print "Op: Bool: ", $op->{name}, "\n"; + # hack - 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"); + } } - else + elsif($op eq "NOT") { -# print "Op: $op\n"; + $not=1; + push(@joins, "LEFT"); + push(@outjoins, "LEFT"); +# print("LEFT: ", $left->print(), "\n") if ($left); +# print("RIGHT: ", $right->print(), "\n") if($right); } } - if(defined($op) && (($op->{name} eq "AND") || ($op->{name} eq "NOT"))) - { - $andlevel++; - } - ($rightstr, $rightandlevel) = $self->node_to_sql($right, $parent, $andlevel); -# print "RIGHT: $rightstr\n"; + my ($rightstr, @rightjoins) = $self->node_to_sql($right, $hasvals, $not, @joins); + push(@outjoins, @rightjoins); +# print "LEFT (", scalar(@leftjoins), "): $leftstr\n"; +# print "RIGHT (", scalar(@rightjoins), "): $rightstr\n"; my $str=$leftstr; - $str .= (" " . $op->{name} . " ") if($op); + $str .= " $op " if($op && !$not); $str .= $rightstr; if($op || ($left && $right)) { $str="(" . $str . ")"; } # print "STR: $str\n"; - return($str, $self->max($leftandlevel, $rightandlevel)); + return($str, @outjoins); } sub node_to_sql { - my($self, $node, $parent, $andlevel)=@_; - return ("", $andlevel) unless(defined($node)); - return $node->to_sql($parent, $andlevel) if(ref($node) eq "ID3FS::Path::Node"); -# if((ref($node->op()) ne "ID3FS::Path::Element") && -# $node->op() eq " + my($self, $node, $hasvals, $not, @joins)=@_; + return ("", ()) unless(defined($node)); + return $node->to_sql($hasvals, $not, @joins) if($node->type() eq "boolean"); my $sql; -# print("Hit node: " . $node->{name}. "(" . -# (defined($node->{parents_id}) ? $node->{parents_id} : "") . -# ")\n"); + my $cnt=scalar(@joins)+1; if(defined($node->{parents_id})) { -# print "HIT PARENTS_ID: $node->{parents_id}\n"; - $sql= "(t$andlevel.parents_id='$node->{parents_id}'"; - $sql .= " AND fxt${andlevel}.tags_id='" . $node->{id} . "')"; + $sql= "(t" . scalar(@joins) . ".parents_id='$node->{parents_id}'"; + $sql .= " AND t" . scalar(@joins) . ".id='" . $node->{id} . "'"; } -# elsif($parent) -# { -# print "HIT \$parent\n"; -# $sql= "(t$andlevel.parents_id='$parent')"; -# } else { -# print "HIT NORMAL\n"; - $sql= "(t$andlevel.parents_id=''"; - $sql .= " AND fxt${andlevel}.tags_id='" . $node->{id} . "')"; + $sql= "(t" . scalar(@joins) .".parents_id=''"; + $sql .= " AND t" . scalar(@joins) . ".id='" . $node->{id} . "'"; } - return ($sql, $andlevel); + if($not && !$hasvals) + { + $sql .= " AND fxt" . scalar(@joins) . ".files_id IS NULL"; + } + $sql .= ")"; + return ($sql, ()); } sub used_tags { my($self)=@_; - my @used=(grep { defined; } ($self->node_used_tags($self->left()), - $self->node_used_tags($self->right()))); - return(@used); -} - -sub node_used_tags -{ - my($self, $node)=@_; - return (undef) unless(defined($node)); - return $node->used_tags() if(ref($node) eq "ID3FS::Path::Node"); - if(defined($node->{parents_id})) + if($self->type() eq "boolean") { - return([ $node->{parents_id}, $node->{id} ]); + my @used=(); + push(@used, $self->left()->used_tags()) if($self->left()); + push(@used, $self->right()->used_tags()) if($self->right()); + print "BOOL: ", $self->name(), join(', ', grep { defined; } @used), "\n"; + return(grep { defined; } @used); } - return $node->{id}; -} - - -sub max -{ - my($self, $a, $b)=@_; - return(($a > $b) ? $a : $b); + elsif($self->parents_id()) + { + return([ $self->parents_id(), $self->id() ]); + } + return $self->id(); } 1;