fix elements_to_tree (needs array ref not array) and misc tag fixes

[id3fs.git] / lib / ID3FS / Path / Node.pm

diff --git a/lib/ID3FS/Path/Node.pm b/lib/ID3FS/Path/Node.pm
index 8adb076..f4e6931 100644 (file)
--- a/lib/ID3FS/Path/Node.pm
+++ b/lib/ID3FS/Path/Node.pm
@@ -67,12 +67,14 @@ sub to_sql
     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(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 $str=$leftstr;
     $str .= (" " . $op->{name} . " ") if($op);
     $str .= $rightstr;
@@ -89,9 +91,12 @@ sub node_to_sql
     return ("", $andlevel) unless(defined($node));
     return $node->to_sql($parent, $andlevel) if(ref($node) eq "ID3FS::Path::Node");
     my $sql;
+#    print("Hit node: " . $node->{name}. "(" .
+#        (defined($node->{parents_id}) ? $node->{parents_id} : "") .
+#        ")\n");
     if(defined($node->{parents_id}))
     {
-       print "HIT PARENTS_ID: $node->{parents_id}\n";
+#      print "HIT PARENTS_ID: $node->{parents_id}\n";
        $sql= "(t$andlevel.parents_id='$node->{parents_id}'";
        $sql .= " AND fxt${andlevel}.tags_id='" . $node->{id} . "')";
     }