use tagtree in queries

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

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 33d3ccd..68218ed 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -23,6 +23,7 @@ sub new
     my $self={};
     bless($self,$class);
 
+    $self->{elements}=[];
     $self->{db}=shift;
     $self->{path}=shift;
     $self->parse();
@@ -297,16 +298,21 @@ sub parse
            $self->state($STATE_INVALID);
        }
     }
+    # remove trailing boolean
+    if(@{$self->{elements}} &&
+       ref($self->{elements}->[$#{$self->{elements}}]) eq "ID3FS::PathElement::Boolean")
+    {
+       $self->{lastop}=pop @{$self->{elements}};
+    }
     # sort elements by precedence
     @{$self->{elements}}=$self->sort_elements(@{$self->{elements}});
-    my $thing=$self->elements_to_tree([ @{$self->{elements}} ]);
     $self->{tagtree}=$self->elements_to_tree([ @{$self->{elements}} ]);
     if($self->{tagtree})
     {
        ($self->{sqlconditions},
         $self->{andsneeded}) = $self->{tagtree}->to_sql();
-       print("SQL CONDITION(", $self->{andsneeded}, "): ",
-             $self->{sqlconditions}, "\n");
+#      print("SQL CONDITION(", $self->{andsneeded}, "): ",
+#            $self->{sqlconditions}, "\n");
 #      use Data::Dumper;
 #      print Dumper $self->{tagtree};
     }
@@ -389,4 +395,12 @@ sub sort_elements
     return @output;
 }
 
+sub used_tags
+{
+    my($self)=@_;
+    print "TAGTREE UNDEF\n" unless(defined($self->{tagtree}));
+    return undef unless(defined($self->{tagtree}));
+    return($self->{tagtree}->used_tags());
+}
+
 1;