if(!@constraints) # /
{
# FIXME: add ALL?
- my $sql="SELECT DISTINCT name FROM tags;";
+ my $sql="SELECT DISTINCT name FROM tags WHERE parents_id='';";
my $tags=$self->cmd_rows($sql);
return(map { $_->[0]; } @$tags);
}
my @ids=();
- my $main_sql_start=("SELECT t2.name\n" .
- "\tFROM (\n" .
- $self->tags_subselect(@constraints) .
- ") AS subselect\n" .
- "INNER JOIN files_x_tags ON subselect.files_id=files_x_tags.files_id\n" .
- "INNER JOIN tags t2 ON files_x_tags.tags_id=t2.id\n" .
- "WHERE t2.id NOT IN (");
- my $main_sql_end=")\nGROUP BY t2.name;";
- # FIXME: generalise more?
-
- while(my $constraint=shift @constraints)
- {
- my $cid=$constraint->{id};
- push(@ids, $cid);
- }
- @ids = map( { "\"$_\""; } grep { defined; } @ids) unless($self->{postgres});
- my $tagstr=join(", ", @ids);
- my $sql = ($main_sql_start . $tagstr .
- $main_sql_end);
+ my $sql=("SELECT t2.name FROM (\n" .
+ $self->tags_subselect(@constraints) .
+ ") AS subselect\n" .
+ "INNER JOIN files_x_tags ON subselect.files_id=files_x_tags.files_id\n" .
+ "INNER JOIN tags t2 ON files_x_tags.tags_id=t2.id\n");
+ my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
+ my @tags=@$tags;
+ my @tags_vals=@$tags_vals;;
+ my @orclauses=();
+ my @andclauses=();
+ use Data::Dumper;
+# print "TAGS: ", Dumper \@tags;
+# print "VALS: ", Dumper \@tags_vals;
+
+ push(@andclauses, "( t2.parents_id=" . (defined($parent) ? $parent : "''") . " )");
+ if(@tags)
+ {
+ push(@orclauses, "( t2.id NOT IN ( " . join(', ', @tags) ." ) )");
+ }
+ for my $pair (@tags_vals)
+ {
+ my($tag, $val)=@$pair;
+# push(@orclauses, "( NOT ( t2.parents_id=$tag AND t2.id=$val ) )");
+ push(@andclauses, "( NOT ( t2.id=$tag ) )");
+ }
+ if(@orclauses)
+ {
+ push(@andclauses, join("\n\tOR ", @orclauses));
+ }
+ if(@andclauses)
+ {
+ $sql .= "\tWHERE\n\t\t";
+ $sql .= join("\n\tAND ", @andclauses) . "\n";
+ }
+ $sql .= "GROUP BY t2.name;";
print "SQL: $sql\n";
my $result=$self->cmd_rows($sql);
my @tagnames=map { $_->[0]; } @$result;
"INNER JOIN files ON subselect.files_id=files.id\n" .
"INNER JOIN albums ON files.albums_id=albums.id\n" .
"GROUP BY albums.name;");
+ print "SQL(ALBUMS): \n$sql\n";
my $result=$self->cmd_rows($sql);
my @names=map { $_->[0]; } @$result;
print "ALBUMS: ", join(', ', @names), "\n";
sub tags_subselect
{
+ return shift->tags_subselect_and(@_);
+}
+
+
+sub tags_subselect_and_not
+{
my($self,@constraints)=@_;
- use Data::Dumper;
+ my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
+ my @tags=@$tags;
+ my @tags_vals=@$tags_vals;;
+ my $cnt=1;
+ my @andclauses=();
+ my $sql='';
+ for my $tag (@tags)
+ {
+ if($cnt == 1)
+ {
+ $sql="\tSELECT fxt" . scalar(@tags) . ".files_id FROM files_x_tags fxt1\n";
+ push(@andclauses, "\t\tfxt${cnt}.tags_id=$tag");
+ }
+ else
+ {
+ $sql .= ("\tLEFT JOIN files_x_tags fxt$cnt ON fxt" .
+ ($cnt-1) . ".files_id=fxt${cnt}.files_id\n");
+ push(@andclauses, "\t\tfxt${cnt}.tags_id IS NULL");
+ }
+ print "AND: @andclauses\n";
+ $cnt++;
+ }
+ if(@andclauses)
+ {
+ $sql .= "\tWHERE\n\t\t";
+ $sql .= join(" AND\n\t\t", @andclauses) . "\n";
+ }
+ $sql .= "\tGROUP BY fxt". scalar(@tags).".files_id\n";
+ return $sql;
+}
+
+
+sub tags_subselect_and
+{
+ my($self,@constraints)=@_;
+ my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
+ my @tags=@$tags;
+ my @tags_vals=@$tags_vals;;
+ my $cnt=1;
+ my @andclauses=();
+ my $sql='';
+ for my $tag (@tags)
+ {
+ if($cnt == 1)
+ {
+ $sql="\tSELECT fxt" . scalar(@tags) . ".files_id FROM files_x_tags fxt1\n";
+ }
+ else
+ {
+ $sql .= ("\tINNER JOIN files_x_tags fxt$cnt ON fxt" .
+ ($cnt-1) . ".files_id=fxt${cnt}.files_id\n");
+ }
+ push(@andclauses, "\t\tfxt${cnt}.tags_id = $tag");
+ print "AND: @andclauses\n";
+ $cnt++;
+ }
+ if(@andclauses)
+ {
+ $sql .= "\tWHERE\n\t\t";
+ $sql .= join(" AND\n\t\t", @andclauses) . "\n";
+ }
+ $sql .= "\tGROUP BY fxt". scalar(@tags).".files_id\n";
+ return $sql;
+}
+
+sub tags_subselect_or
+{
+ my($self,@constraints)=@_;
+ my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
+ my @tags=@$tags;
+ my @tags_vals=@$tags_vals;;
+
+ my $sql=("\tSELECT files_x_tags.files_id FROM tags t1\n" .
+ "\tINNER JOIN files_x_tags ON t1.id=files_x_tags.tags_id\n");
+ my @orclauses=();
+ my @andclauses=();
+ # FIXME: and / or?
+ if(@tags)
+ {
+ push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
+ push(@andclauses, "( t1.id IN ( " . join(', ', @tags) ." ) )");
+ }
+ for my $pair (@tags_vals)
+ {
+ my($tag, $val)=@$pair;
+ push(@orclauses, "( t1.parents_id=$tag AND t1.id=$val )");
+ }
+# push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
+ if(@orclauses)
+ {
+ push(@andclauses, join("\n\t\tOR ", @orclauses));
+ }
+ if(@andclauses)
+ {
+ $sql .= "\tWHERE\n\t\t";
+ $sql .= join("\n\t\tAND ", @andclauses) . "\n";
+ }
+ $sql .= "\tGROUP BY files_x_tags.files_id\n";
+ return $sql;
+}
+
+sub constraints_tag_list
+{
+ my($self, @constraints)=@_;
+ my $lasttag=undef;
my @tags=();
my @tags_vals=();
- my $lasttag='';
-# print "CONSTRAINTS: \n", Dumper \@constraints;
for my $constraint (@constraints)
{
-# print ref($constraint),"\n";
+# print ref($constraint), ": ", $constraint->{name}, "\n";
if(ref($constraint) eq "ID3FS::PathElement::Tag")
{
- if($self->tag_has_values($constraint->{id}))
+ if(defined($lasttag))
+ {
+# print "TAGVAL\n";
+ push(@tags_vals, [$lasttag, $constraint->{id}]) if defined($constraint->{id});
+ $lasttag=undef;
+ }
+ elsif($self->tag_has_values($constraint->{id}))
{
# print "HASVALUES\n";
$lasttag=$constraint->{id} if defined($constraint->{id});
push(@tags, $constraint->{id}) if(defined($constraint->{id}));
}
}
- elsif(ref($constraint) eq "ID3FS::PathElement::Tagval")
- {
-# print "TAGVAL\n";
- push(@tags_vals, [$lasttag, $constraint->{id}]) if defined($constraint->{id});
- }
}
unless($self->{postgres})
{
@tags=map{ "\"$_\""; } @tags;
@tags_vals=map( { [ map({ "\"$_\""; } @$_ ) ] } @tags_vals);
+ $lasttag="\"$lasttag\"" if defined($lasttag);
}
-# print "TAGS\n", Dumper \@tags;
-# print "\nVALS\n", Dumper(\@tags_vals), "\n";
- my $sql=("\tSELECT files_x_tags.files_id FROM tags t1\n" .
- "\tINNER JOIN files_x_tags ON t1.id=files_x_tags.tags_id\n");
- my @clauses=();
- if(@tags)
- {
- push(@clauses, "(t1.id IN ( " . join(', ', @tags) ." ) )");
- }
- for my $pair (@tags_vals)
- {
- my($tag, $val)=@$pair;
- push(@clauses, "( t1.parents_id=$tag AND t1.id=$val )");
- }
- if(@clauses)
- {
- $sql .= "\tWHERE\n\t\t" . join("\n\t\tOR ", @clauses) . "\n";
- }
- return $sql;
+ return(\@tags, \@tags_vals, $lasttag);
}
{
shift(@path);
shift(@rel);
- print "POP ";
+# print "POP ";
}
- print "\n";
+# print "\n";
my $upcount=scalar(@rel);
my $result="../" x $upcount;
$result .= join("/",@path);
my $sql=("SELECT p.name, t.name FROM tags t\n" .
"INNER JOIN tags p ON t.parents_id=p.id\n" .
"GROUP BY p.name, t.name\n");
-# print "SQL: $sql\n";
+ print "SQL: $sql\n";
my $result=$self->cmd_rows($sql);
my $tags={};
for my $pair (@$result)
my $relpath=$path;
$relpath =~ s/^\Q$self->{base}\E\/?//;
my($filepart,$pathpart);
- if($path !~ /\//)
+ if($relpath !~ /\//)
{
$pathpart='';
$filepart=$relpath;
sub add_tag
{
- my($self, $file_id, @tags)=@_;
- my $parent_id=undef;
- for my $tag (@tags)
+ my($self, $file_id, $tag, $value)=@_;
+ my $tag_id=$self->add_to_table("tags", $tag,
+ { "parents_id" => undef });
+ $self->add_relation("files_x_tags",
+ { "files_id" => $file_id,
+ "tags_id" => $tag_id });
+ if(defined($value) && length($value))
{
- my $tag_id=$self->add_to_table("tags", $tag,
- { "parents_id" => $parent_id });
+ my $val_id=$self->add_to_table("tags", $value,
+ { "parents_id" => $tag_id });
$self->add_relation("files_x_tags",
{ "files_id" => $file_id,
- "tags_id" => $tag_id });
- $parent_id=$tag_id;
+ "tags_id" => $val_id });
}
}
projects / id3fs.git / blobdiff