eliminate STATE_TAGVAL

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 7e6c71d..01b1234 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -20,9 +20,8 @@ use strict;
 use warnings;
 use ID3FS::Path::Node;
 
-our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_TAGVAL,
-     $STATE_BOOLEAN, $STATE_ALBUMS, $STATE_TRACKLIST,
-     $STATE_FILE, $STATE_ALL)=(0..8);
+our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_BOOLEAN,
+     $STATE_ALBUMS, $STATE_TRACKLIST, $STATE_FILE, $STATE_ALL)=(0..7);
 
 # operator precedence
 our %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
@@ -98,11 +97,10 @@ sub dirents
     {
        @dents=($self->filter($PATH_ALLTRACKS, $PATH_NOARTIST), $self->artists());
     }
-    elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+    elsif($state==$STATE_TAG)
     {
        my $tail=$self->tail();
-       if($state==$STATE_TAG && $self->is($TYPE_TAG, $tail) &&
-          $self->{db}->tag_has_values($tail->id()))
+       if($self->is($TYPE_TAG, $tail) && $self->{db}->tag_has_values($tail->id()))
        {
            @dents=$self->tags();
        }
@@ -196,18 +194,16 @@ sub parse
                }
            }
        }
-       elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+       elsif($state==$STATE_TAG)
        {
            my $tag=$self->tail();
 #          print "SM: TAG/TAGVAL($state): $name\n";
-           if($state==$STATE_TAG && $self->is($TYPE_TAG, $tag) &&
-              $self->{db}->tag_has_values($tag->id()))
+           if($self->is($TYPE_TAG, $tag) && $self->{db}->tag_has_values($tag->id()))
            {
 #              print "Parsing: parent: $tag->id()\n";
                my $tagval=ID3FS::Path::Node->new($self->{db}, $TYPE_TAG, $name, $tag->id());
                if(defined($tagval))
                {
-                   $self->state($STATE_TAGVAL);
                    # stay in tag state
                    push(@{$self->{elements}}, $tagval);
                }