X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FPath.pm;h=e3aac80d8112cf0a9adab7a2ce8e5a92dbcb4724;hb=b3f06e92d5f9414dff01989e8b38253d43507f48;hp=49472568a4584406f2f8a43eb4dbbc09fcd4b71e;hpb=1c7e55d34956f90d235632995acf1238878db2a3;p=id3fs.git

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 4947256..e3aac80 100644
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -10,9 +10,9 @@ our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_TAGVAL,
 
 our %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
 
-our $PATH_ALLTRACKS="TRACKS";
-our $PATH_NOARTIST="NOARTIST";
-our $PATH_NOALBUM="NOALBUM";
+our $PATH_ALLTRACKS= "TRACKS";
+our $PATH_NOARTIST = "NOARTIST";
+our $PATH_NOALBUM  = "NOALBUM";
 
 sub new
 {
@@ -136,7 +136,6 @@ sub parse
     my @parts=@{$self->{components}};
     my($tag, $tagval);
     $self->{elements}=[];
-    $self->{bare_not}=0;
     $self->{in_all}=0;
     my $root_not=0;
     my $tags_seen=0;
@@ -336,11 +335,6 @@ sub parse
 	}
     }
 
-    if($root_not && ($tags_seen < 2))
-    {
-	$self->{bare_not}=1;
-    }
-
     # remove trailing boolean
     my @elements=@{$self->{elements}};
     while(@elements && $self->is("boolean", $elements[$#elements]))
@@ -352,13 +346,8 @@ sub parse
     $self->{tagtree}=$self->elements_to_tree(\@elements);
     if($self->{tagtree})
     {
-	my ($conditions, @joins)=$self->{tagtree}->to_sql();
+#	my ($conditions, @joins)=$self->{tagtree}->to_sql();
 #	print "CONDITIONS(", scalar(@joins), "): ", $conditions, "\n";
-#	print "TREE: ",  $self->{tagtree}->print(), "\n";
-#	print("SQL CONDITION(", scalar(@{$self->{joins}}), "): ",
-#	      $self->{sqlconditions}, "\n");
-#	use Data::Dumper;
-#	print Dumper $self->{tagtree};
     }
 }
 
@@ -516,40 +505,10 @@ sub tags
 	     ") AS subselect\n" .
 	     "INNER JOIN files_x_tags ON subselect.files_id=files_x_tags.files_id\n" .
 	     "INNER JOIN tags ON files_x_tags.tags_id=tags.id\n");
-    my @allused=$self->used_tags();
-    my @used=grep { ref($_) ne "ARRAY"; } @allused;
-    my @used_with_vals=grep { ref($_) eq "ARRAY"; } @allused;
-#    print "tags(): USED: ", join(", ", @used), "\n";
-#    print "tags(): USED_WITH_VALS: ", join(", ", map { "[".$_->[0]. ", ".$_->[1]."]";} @used_with_vals), "\n";
-    my @orclauses=();
     my @andclauses=();
     my $id=$self->trailing_tag_id();
-    if($hasvals)
-    {
-#	print "HAS_VALUES\n";
-	my @values=map { "'".$_->[1]."'"; } grep { $_->[0] == $id; } @used_with_vals;
-	my $clause="(tags.parents_id='$id'";
-	if(@values)
-	{
-	    $clause .= " AND tags.id NOT IN (" . join(', ', @values) . ")";
-	}
-	$clause .= ")";
-	push(@andclauses, $clause);
-    }
-    else
-    {
-#	print "HASNT VALUES\n";;
-	if(@used)
-	{
-	    push(@andclauses, "(NOT (tags.parents_id='' AND tags.id IN (" . join(', ', @used) . ")))");
-	}
-	for my $pair (@used_with_vals)
-	{
-	    push(@andclauses, "(NOT (tags.parents_id='" . $pair->[0] . "' AND tags.id='" . $pair->[1] . "'))");
-	}
-    }
 
-    my $parentclause= "(tags.parents_id='";
+    my $parentclause= "tags.parents_id='";
     if($hasvals)
     {
 	$parentclause .= $id;
@@ -558,17 +517,19 @@ sub tags
     {
 	$parentclause .= $parent;
     }
-    $parentclause .= "')";
+    $parentclause .= "'";
     push(@andclauses, $parentclause);
 
-    if(@orclauses)
+    my @used=$self->used_tags();
+    if(@used)
     {
-	push(@andclauses, '( ' . join(' OR ', @orclauses) . ' )');
+	push(@andclauses, "tags.id NOT IN (" . join(', ', @used) . ")");
     }
     if(@andclauses)
     {
 	$sql .= "WHERE " . join(' AND ', @andclauses) . "\n";
     }
+
     $sql .= "GROUP BY tags.name;";
     print "SQL(TAGS): $sql\n" if($self->{verbose});
     my @tagnames=$self->{db}->cmd_firstcol($sql);
@@ -712,20 +673,12 @@ sub tags_subselect
 {
     my($self)=@_;
     my $hasvals=$self->expecting_values();
-    # we need to specially handle a bare /NOT/tag with no other clauses,
-    # using a simple WHERE id !='tagid' instead of a LEFT JOIN
-    if($self->{bare_not})
-    {
-	return $self->bare_not_subselect();
-    }
     if($self->{in_all})
     {
 	return "\tSELECT id FROM files AS files_id\n";
     }
     my $tree=$self->{tagtree};
     print "UNDEF!!\n" unless($self->{tagtree});
-    use Data::Dumper;
-    print Dumper $tree;
     my $parent=$self->trailing_tag_parent();
 
 #    print "ELEMENTS: ", join('/', map { $_->{name}; } @{$self->{elements}}), "\n";
@@ -767,27 +720,6 @@ sub tags_subselect
     return $sql;
 }
 
-sub bare_not_subselect
-{
-    my($self)=@_;
-    my @tags=grep { $self->is("tag", $_); } @{$self->{elements}};
-    my $sql=("\tSELECT f1.id AS files_id FROM files f1 WHERE f1.id NOT IN (\n" .
-	     "\t\tSELECT fxt1.files_id FROM tags t1\n" .
-	     "\t\tINNER JOIN files_x_tags fxt1 ON t1.id=fxt1.tags_id\n" .
-	     "\t\tWHERE ");
-    if(scalar(@tags) > 1)
-    {
-	$sql .= ("(t1.parents_id='" . $tags[0]->id() . "' AND t1.id='" .
-		 $tags[1]->id() . "')");
-    }
-    else
-    {
-	$sql .= ("(t1.parents_id='' AND t1.id='" . $tags[0]->id() . "')");
-    }
-    $sql .= "\n\t\tGROUP BY fxt1.files_id\n\t)\n";
-    return($sql);
-}
-
 sub sql_start
 {
     my($self, $tables)=@_;
@@ -848,18 +780,20 @@ sub constraints_tag_list
 sub filter
 {
     my($self, @dirs)=@_;
+    # FIXME: disabled - too slow
+    return @dirs;
     my $base=$self->{path};
     my @outdirs=();
     for my $dir (@dirs)
     {
-	print "\nFILTER (",$self->state(), "): $base / $dir\n";
+#	print "\nFILTER (",$self->state(), "): $base / $dir\n";
 	if($self->empty("$base/$dir"))
 	{
-	    print "empty: $base / $dir\n";
+#	    print "empty: $base / $dir\n";
 	}
 	else
 	{
-	    print "non-empty, accepting: $base / $dir\n";
+#	    print "non-empty, accepting: $base / $dir\n";
 	    push(@outdirs, $dir);
 	}
     }