From: Ian Beckwith <ianb@erislabs.net>
Date: Sun, 3 Oct 2010 19:13:04 +0000 (+0100)
Subject: tags sql tweaks
X-Git-Tag: debian/1.0-1~130
X-Git-Url: http://erislabs.net/gitweb/?p=id3fs.git;a=commitdiff_plain;h=de5fa1639ce1bbd683c79466e9a295e854c4ac08

tags sql tweaks
---

diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm
index a9d01c7..808ff11 100644
--- a/lib/ID3FS/DB.pm
+++ b/lib/ID3FS/DB.pm
@@ -203,10 +203,8 @@ sub tags
     use Data::Dumper;
     print "TAGS: ", Dumper \@tags;
     print "VALS: ", Dumper \@tags_vals;
-    if(defined($parent))
-    {
-	push(@andclauses, "( t2.parents_id=$parent )");
-    }
+
+    push(@andclauses, "( t2.parents_id=" . (defined($parent) ? $parent : "''") . " )");
     if(@tags)
     {
 	push(@orclauses, "( t2.parents_id='' AND t2.id NOT IN ( " . join(', ', @tags) ." ) )");
@@ -411,10 +409,7 @@ sub tags_subselect
 	my($tag, $val)=@$pair;
 	push(@orclauses, "( t1.parents_id=$tag AND t1.id=$val )");
     }
-    if($parent)
-    {
-	push(@andclauses, "( t1.parents_id=$parent )");
-    }
+#    push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
     if(@orclauses)
     {
 	push(@andclauses, join("\n\t\tOR ", @orclauses));