use tagtree in queries

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

diff --git a/lib/ID3FS/Path/Node.pm b/lib/ID3FS/Path/Node.pm
index 771a15a..9fc4570 100644 (file)
--- a/lib/ID3FS/Path/Node.pm
+++ b/lib/ID3FS/Path/Node.pm
@@ -89,11 +89,28 @@ sub node_to_sql
     my($self, $node, $andlevel)=@_;
     return ("", $andlevel) unless(defined($node));
     return $node->to_sql($andlevel) if(ref($node) eq "ID3FS::Path::Node");
-    # FIXME: switch to id when debugged
-#    return( ( "fxt" . $andlevel . "=\"" . $node->{id} . "\""), $andlevel);
-    return( ( "fxt" . $andlevel . "=\"" . $node->{name} . "\""), $andlevel);
+    return( ( "fxt${andlevel}.tags_id=\"" . $node->{id} . "\""), $andlevel);
 }
 
+sub used_tags
+{
+    my($self)=@_;
+    my @used=(grep { defined; }  ($self->node_used_tags($self->left()),
+                                 $self->node_used_tags($self->right())));
+    print "used_tags: ", join(", ", @used), "\n";
+    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");
+    print $node->{id}, "\n";
+    return($node->{id});
+}
+
+
 sub max
 {
     my($self, $a, $b)=@_;