Merge commit 'trunk'

[memories.git] / Memories / SystemTag.pm

diff --git a/Memories/SystemTag.pm b/Memories/SystemTag.pm
index cdb8e14169bb9d360f57977a3f92ccb86a994f50..0383db2f8bb60f325e7d29ca43caa45d47cd696a 100644 (file)
--- a/Memories/SystemTag.pm
+++ b/Memories/SystemTag.pm
@@ -6,10 +6,9 @@ __PACKAGE__->table("system_tag");
 
 Memories::Photo->set_sql(sorted_by_system_tag => q/
 SELECT photo.id as id, title, uploader, uploaded, x, y
-FROM photo, system_tag, system_tagging
+FROM photo, system_tagging
 WHERE system_tagging.photo = photo.id
-    AND system_tagging.tag = system_tag.id
-    AND system_tag.id = ?
+    AND system_tagging.tag = ?
 ORDER BY photo.uploaded DESC
 /
 );
@@ -36,28 +35,4 @@ sub view :Exported {
 package Memories::SystemTagging;
 use base qw(Memories::DBI);
 use Class::DBI::Pager;
-__PACKAGE__->table("system_tagging");
-__PACKAGE__->columns(TEMP => qw/count/);
-__PACKAGE__->columns(Essential => qw/id tag photo/);
-__PACKAGE__->set_sql(summary => qq/
-SELECT  id, system_tag, count(*) AS count
-FROM system_tagging
-GROUP BY system_tag
-ORDER BY count DESC
-LIMIT 50
-    /);
-__PACKAGE__->set_sql(all => qq/
-SELECT  id, tag, count(*) AS count
-FROM system_tagging
-GROUP BY system_tag
-ORDER BY count DESC
-    /);
-Memories::SystemTagging->has_a("photo" => "Memories::Photo");
-Memories::SystemTagging->has_a("tag" => "Memories::SystemTag");
-
-Memories::Photo->has_many(system_tags => ["Memories::SystemTagging" => "system_tag"]);
-Memories::Photo->has_many(system_taggings => "Memories::SystemTagging");
-Memories::SystemTag->has_many(photos => ["Memories::SystemTagging" => "photo"] );
-Memories::SystemTag->has_many(system_taggings => "Memories::SystemTagging");
-
 1;