sql formatting tweaks

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

diff --git a/lib/ID3FS/Path/Node.pm b/lib/ID3FS/Path/Node.pm
index bdc403f..6254600 100644 (file)
--- a/lib/ID3FS/Path/Node.pm
+++ b/lib/ID3FS/Path/Node.pm
@@ -19,6 +19,12 @@ package ID3FS::Path::Node;
 use strict;
 use warnings;
 
+require Exporter;
+use vars qw(@ISA @EXPORT $TYPE_BOOL $TYPE_TAG $TYPE_ARTIST $TYPE_ALBUM $TYPE_FILE);
+@ISA=qw(Exporter);
+@EXPORT=qw($TYPE_BOOL $TYPE_TAG $TYPE_ARTIST $TYPE_ALBUM $TYPE_FILE);
+($TYPE_BOOL, $TYPE_TAG, $TYPE_ARTIST, $TYPE_ALBUM, $TYPE_FILE)=(1..5);
+
 sub new
 {
     my $proto=shift;
@@ -30,10 +36,13 @@ sub new
     $self->{type}=shift;
     $self->{name}=shift;
     $self->{parents_id}=shift;
-    if($self->{type} ne "boolean")
+    if($self->{type} != $TYPE_BOOL)
     {
-       my $table=ucfirst($self->{type});
-       $table .= "s" unless($table=~/s$/);
+       my $table='';
+       if   ($self->{type} == $TYPE_TAG)    { $table="tags";    }
+       elsif($self->{type} == $TYPE_ARTIST) { $table="artists"; }
+       elsif($self->{type} == $TYPE_ALBUM)  { $table="albums";  }
+       elsif($self->{type} == $TYPE_FILE)   { $table="files";   }
        $self->{id}=$db->lookup_id($table, $self->{name}, $self->{parents_id});
        return undef unless(defined($self->{id}));
     }
@@ -57,50 +66,23 @@ sub type       { return shift->set("type",       shift); }
 sub id         { return shift->set("id",         shift); }
 sub parents_id { return shift->set("parents_id", shift); }
 
-sub print
-{
-    my($self)=@_;
-    my $op=$self->name();
-    my $left=$self->left();
-    my $right=$self->right();
-    return "" unless($left || $right);
-    my $str .= $self->print_node($left);
-    $str .= (" " . $op . " ") if($op);
-    $str .= $self->print_node($right);
-    if($op || ($left && $right))
-    {
-       $str="(" . $str . ")";
-    }
-    return $str;
-}
-
-sub print_node
-{
-    my($self, $node)=@_;
-    return "" unless(defined($node));
-    return $node->print() if(ref($node) eq "ID3FS::Path::Node");
-    return $node->{name};
-}
-
 sub to_sql
 {
     my($self, $hasvals, $not, @joins)=@_;
     $not=0 unless(defined($not));
     my @outjoins=();
-    my $str='';
-    # init
     unless(@joins)
     {
        @outjoins = @joins = ("INNER");
     }
+    my $str='';
 
-    if($self->type() ne "boolean")
+    if($self->type() != $TYPE_BOOL)
     {
-       my $cnt=scalar(@joins)+1;
        $str .= "t" . scalar(@joins) . ".id='" . $self->{id} . "'";
        if($not && !$hasvals)
        {
-           $str .= " AND fxt" . scalar(@joins) . ".files_id IS NULL";
+           $str = "(" . $str . " AND fxt" . scalar(@joins) . ".files_id IS NULL)";
        }
        return ($str, @outjoins);
     }
@@ -147,8 +129,6 @@ sub to_sql
                    push(@outjoins, "LEFT");
                }
            }
-#          print("LEFT: ", $left->print(), "\n") if ($left);
-#          print("RIGHT: ", $right->print(), "\n") if($right);
        }
        elsif($op eq "OR")
        {
@@ -170,7 +150,7 @@ sub to_sql
     $str=$leftstr;
     $str .= " $op " if($op && !$not);
     $str .= $rightstr;
-    if($op || ($left && $right))
+    if($op && $left && $right)
     {
        $str="(" . $str . ")";
     }
@@ -183,7 +163,7 @@ sub to_sql
 sub used_tags
 {
     my($self)=@_;
-    if($self->type() eq "boolean")
+    if($self->type() == $TYPE_BOOL)
     {
        my @used=();
        push(@used, $self->left()->used_tags())  if($self->left());