more schema change/tagval fixes

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

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index fdef5c3..0be7c45 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -53,10 +53,10 @@ sub isvalid
 
 sub dest
 {
-    my($self)=@_;
+    my($self, $mountpoint)=@_;
     if($self->state() == $STATE_FILE)
     {
-       return $self->{db}->filename(@{$self->{elements}});
+       return $self->{db}->filename($mountpoint, @{$self->{elements}});
     }
     return "ERROR"; #should never happen?
 }
@@ -67,6 +67,7 @@ sub dirents
     my @dents=();
     my $state=$self->state();
 #    print "DIRENTS: STATE: $state\n";
+#    print "DIRENTS: FILE: $self->{path}\n";
     if($state==$STATE_TAG || $state==$STATE_TAGVAL)
     {
        my $tag=$self->{elements}->[$#{$self->{elements}}];
@@ -142,7 +143,7 @@ sub parse
            }
            elsif($name eq "NOT")
            {
-               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
                $self->state($STATE_BOOLEAN);
            }
            else
@@ -168,7 +169,7 @@ sub parse
               ref($tag) eq "ID3FS::PathElement::Tag" &&
               $self->{db}->tag_has_values($tag->{id}))
            {
-               my $tagval=ID3FS::PathElement::Tagval->new($name);
+               my $tagval=ID3FS::PathElement::Tag->new($self->{db}, $name, $tag->{id});
                if(defined($tagval))
                {
                    $self->state($STATE_TAGVAL);
@@ -191,12 +192,12 @@ sub parse
            elsif($name eq "AND")
            {
                $self->state($STATE_BOOLEAN);
-               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
            }
            elsif($name eq "OR")
            {
                $self->state($STATE_BOOLEAN);
-               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
            }
            else
            {
@@ -226,7 +227,7 @@ sub parse
            if($allownot && $name eq "NOT")
            {
                $self->state($STATE_BOOLEAN);
-               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
            }
            else
            {
@@ -271,7 +272,6 @@ sub parse
        {
 #          print "SM: TRACKLIST: $name\n";
            my $track=ID3FS::PathElement::File->new($self->{db}, $name);
-           push(@{$self->{elements}}, $track);
            if($track)
            {
                push(@{$self->{elements}}, $track);