Changeset 69

Timestamp:

06/15/07 16:52:28 (1 year ago)

Author:

digitalspaghetti

Message:

Added tagcloud, added tagging behaviour to models. Some other minor tag fixes, and cleaned SQL

Files:

• branch/controllers/tags_controller.php (modified) (1 diff)
• branch/db.sql (modified) (30 diffs)
• branch/models/event.php (modified) (1 diff)
• branch/models/gallery.php (modified) (1 diff)
• branch/models/page.php (modified) (1 diff)
• branch/models/playlist.php (modified) (1 diff)
• branch/models/post.php (modified) (1 diff)
• branch/models/tag.php (modified) (1 diff)
• branch/models/track.php (modified) (1 diff)
• branch/models/user.php (modified) (1 diff)
• branch/models/video.php (modified) (1 diff)
• branch/views/elements/tagcloud.ctp (added)
• branch/views/galleries/view.ctp (modified) (1 diff)
• branch/views/layouts/default.ctp (modified) (1 diff)

branch/controllers/tags_controller.php

@@ -153 +153 @@
-        {
-                $this->layout = 'ajax';
-
+
+
+
+
+
+
+
+
+
+
-        }
-

branch/db.sql

@@ -4 +4 @@
--- 
--- Host: localhost
-3, 2007 at 05:52
+5, 2007 at 05:01
--- Server version: 5.0.38
--- PHP Version: 5.2.1
@@ -23 +23 @@
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- 
--- Dumping data for table `cake_sessions`
--- 
-
-INSERT INTO `cake_sessions` (`id`, `data`, `expires`) VALUES 
-('82ce680e0006d4e798e3df504cf5485d', 'Config|a:3:{s:9:"userAgent";s:32:"268042ced84746041c45b952d0ba6110";s:4:"time";i:1181580767;s:4:"rand";i:577418356;}othAuth|a:1:{s:41:"ADYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi";a:2:{s:4:"User";a:18:{s:2:"id";s:1:"1";s:8:"username";s:14:"WebrocketAdmin";s:6:"passwd";s:32:"fdfedc01c66e9ea2817508ca1097df2f";s:4:"name";s:15:"Webrocket Admin";s:5:"email";s:19:"admin@webrocket.com";s:10:"last_visit";s:19:"2007-06-08 15:46:17";s:8:"group_id";s:1:"1";s:10:"profile_id";s:1:"1";s:11:"posts_count";s:1:"4";s:11:"pages_count";s:1:"2";s:14:"comments_count";s:1:"2";s:12:"videos_count";s:1:"0";s:4:"tags";s:0:"";s:6:"active";s:1:"1";s:7:"created";s:19:"2007-03-26 00:00:00";s:8:"modified";s:19:"0000-00-00 00:00:00";s:10:"login_hash";s:32:"9959667d54c2bb525ab6b832bdd90c14";s:7:"hashkey";s:41:"ADYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi";}s:5:"Group";a:9:{s:2:"id";s:1:"1";s:4:"name";s:11:"Site Admins";s:5:"level";s:3:"999";s:8:"redirect";s:0:"";s:9:"perm_type";s:5:"allow";s:11:"users_count";s:1:"0";s:7:"created";s:19:"2007-03-26 00:00:00";s:8:"modified";s:19:"0000-00-00 00:00:00";s:10:"Permission";a:1:{i:0;a:4:{s:2:"id";s:1:"1";s:4:"name";s:1:"*";s:7:"created";s:19:"2007-03-26 00:00:00";s:8:"modified";s:19:"0000-00-00 00:00:00";}}}}}Message|a:0:{}', 1181580767);
-
--- --------------------------------------------------------
@@ -47 +40 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
-
-
-
-
-
-
-
-
-
-
+
--- --------------------------------------------------------
-
@@ -78 +62 @@
-(1, 'general', 'Site Options', 'These are the main options that control the site'),
-(2, 'video', 'Video Options', 'These are options that control video on the site'),
-', '
+Post Options', 'These are options that control how posts appear on the site
-
--- --------------------------------------------------------
@@ -445 +429 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=4 
+
-
--- 
@@ -451 +435 @@
--- 
-
-INSERT INTO `events` (`id`, `venue`, `address`, `city`, `country_id`, `postcode`, `event_type_id`, `event_date`, `event_time`, `event_url`, `body`, `tags`, `user_id`, `subject_id`, `published`, `created`, `modified`) VALUES 
-(3, 'T In The Park', 'N/A', 'Balado', 1, 'KY', 3, '2007-07-08', '12:00:18', 'http://www.tinthepark.com', '<p>The Hedrons @ T In The Park<br /></p>', 'The Hedrons, T In The Park', 1, 1, 1, '2007-06-12 14:50:18', '2007-06-12 14:50:18');
-
--- --------------------------------------------------------
@@ -486 +468 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=1 
+
-
--- 
@@ -510 +492 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=5 
+
-
--- 
@@ -516 +498 @@
--- 
-
-INSERT INTO `galleries` (`id`, `title`, `stub`, `primary_image`, `subject_id`, `published`, `tags`, `created`, `modified`) VALUES 
-(4, 'The Hedrons @ Download', 'the_hedrons_download', 73, 1, 1, 'The Hedrons, Download, Festival, Slash', '2007-06-13 14:25:42', '2007-06-13 14:25:42');
-
--- --------------------------------------------------------
@@ -534 +514 @@
--- 
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
--- --------------------------------------------------------
@@ -614 +607 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=77 
+
-
--- 
@@ -620 +613 @@
--- 
-
-INSERT INTO `images` (`id`, `filename`, `dir`, `mimetype`, `alt`, `subject_id`, `copyright_owner`, `copyright_id`, `image_location`, `image_date`, `image_notes`, `filesize`, `tags`, `user_id`, `created`, `modified`) VALUES 
-(76, 'IMG_0312.jpg', 'files/images', 'image/jpeg', 'The Hedrons @ Download', 2, 'The Hedrons', 1, 'Download Festival', '2007-06-08', '<p>Tippi being carried by the crowd<br /></p>', 3137664, 'The Hedrons, Download, Festival, Live, Gig', 1, '2007-06-13 15:21:26', '2007-06-13 17:15:52'),
-(73, 'IMG_0331.jpg', 'files/images', 'image/jpeg', 'The Hedrons @ Download 3', 1, 'The Hedrons', 1, 'Download Festival', '2007-06-08', '<p>Rosie &amp; Soup meet Slash!<br /></p>', 3469173, 'The Hedrons, Download, Festival, Live, Gig, Slash', NULL, '2007-06-13 14:25:13', '2007-06-13 14:25:13'),
-(71, 'IMG_0256.jpg', 'files/images', 'image/jpeg', 'The Hedrons @ Download 1', 1, 'The Hedrons', 1, 'Download Festival', '2007-06-08', '<p>The Hedrons preparing to go on stage at Download.<br /></p>', 3881221, 'The Hedrons, Download, Festival, Live, Gig', NULL, '2007-06-13 14:22:28', '2007-06-13 14:22:28');
-
--- --------------------------------------------------------
@@ -640 +629 @@
--- Dumping data for table `images_tags`
--- 
-
-INSERT INTO `images_tags` (`image_id`, `tag_id`) VALUES 
-(37, 29),
-(37, 30),
-(38, 29),
-(38, 30),
-(54, 37),
-(54, 39),
-(54, 40),
-(65, 4),
-(65, 5),
-(65, 6),
-(65, 8),
-(65, 41),
-(66, 4),
-(66, 5),
-(66, 6),
-(66, 8),
-(66, 41),
-(67, 4),
-(67, 5),
-(67, 6),
-(67, 8),
-(67, 41),
-(68, 4),
-(68, 5),
-(68, 6),
-(68, 8),
-(68, 41),
-(69, 4),
-(69, 5),
-(69, 6),
-(69, 8),
-(69, 41),
-(70, 4),
-(70, 5),
-(70, 6),
-(70, 8),
-(70, 41),
-(70, 42),
-(71, 4),
-(71, 5),
-(71, 6),
-(71, 8),
-(71, 41),
-(73, 4),
-(73, 5),
-(73, 6),
-(73, 8),
-(73, 41),
-(73, 42),
-(76, 4),
-(76, 5),
-(76, 6),
-(76, 8),
-(76, 41);
-
--- --------------------------------------------------------
@@ -803 +736 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=5 
+
-
--- 
--- Dumping data for table `pages`
--- 
-
-INSERT INTO `pages` (`id`, `stub`, `title`, `body`, `published`, `user_id`, `subject_id`, `tags`, `access_level`, `comments_count`, `created`, `modified`) VALUES 
-(3, '', 'Test Page', '<p>Test Page<img alt="Test Image" title="Test Image" src="http://www.measuredrecords.com/news/images/hedrons-tpark.jpg"/><br /></p>', 1, 1, 1, 'Test Page', 0, 0, '2007-06-12 13:43:26', '2007-06-12 13:43:26'),
-(4, 'test_page', 'Test Page', '<p>Test Page<img alt="Test Image" title="Test Image" src="http://www.measuredrecords.com/news/images/hedrons-tpark.jpg"/><br /></p>', 1, 1, 1, 'Test Page', 0, 0, '2007-06-12 13:44:26', '2007-06-12 13:44:26');
-
--- --------------------------------------------------------
@@ -872 +801 @@
-  `comments` varchar(255) collate utf8_unicode_ci NOT NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=15 
+
-
--- 
@@ -919 +848 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=27 
+
-
--- 
@@ -925 +854 @@
--- 
-
-INSERT INTO `posts` (`id`, `title`, `byline`, `body`, `post_date`, `comments_count`, `user_id`, `subject_id`, `access_level`, `stub`, `tags`, `frontpage`, `published`, `created`, `modified`) VALUES 
-(26, 'About our Sun', 'Some information', '<p><img alt="Our Sun" title="Our Sun" src="/files/images/thumb.medium.sun_full_disk_soho_09_14_1997.jpg" style="margin: 10px; float: left;"/>\r\nThe Sun (Latin: Sol) is the star at the center of the Solar System. The Earth and other matter (including other planets, asteroids, meteoroids, comets and dust) orbit the Sun, which by itself accounts for about 99.8% of the solar system''s mass. Energy from the Sun—in the form of sunlight—supports almost all life on Earth via photosynthesis, and drives the Earth''s climate and weather.</p>\r\n\r\n<p>The Sun is composed of hydrogen (about 74% of its mass, or 92% of its volume), helium (about 25% of mass, 7% of volume), and trace quantities of other elements. The Sun has a spectral class of G2V. G2 implies that it has a surface temperature of approximately 5,500 K (or approximately 9,600 degrees Fahrenheit / 5,315 Celsius), giving it a white color which, because of atmospheric scattering, appears yellow as seen from the surface of the Earth. This is a subtractive effect, as the preferential scattering of blue photons (causing the sky color) removes enough blue light to leave a residual reddishness that is perceived as yellow. (If low enough in the sky, the Sun appears orange or red, due to this scattering.)</p>\r\n\r\n<p>Its spectrum contains lines of ionized and neutral metals as well as very weak hydrogen lines. The V (Roman five) suffix indicates that the Sun, like most stars, is a main sequence star. This means that it generates its energy by nuclear fusion of hydrogen nuclei into helium and is in a state of hydrostatic balance, neither contracting nor expanding over time. There are more than 100 million G2 class stars in our galaxy. Because of logarithmic size distribution, the Sun is actually brighter than 85% of the stars in the galaxy, most of which are red dwarfs.[1]</p>\r\n\r\n<p>The Sun orbits the center of the Milky Way galaxy at a distance of approximately 26,000 light-years from the galactic center, completing one revolution in about 225–250 million years. The orbital speed is 217 km/s (135 mi/s), equivalent to one light-year every 1,400 years, and one AU every 8 days.[2]</p>', '2007-06-13 12:07:43', NULL, 1, 1, 0, 'about_our_sun', 'Sun, Sol, Space, Hot, Star', 1, 1, '2007-06-13 12:10:43', '2007-06-13 12:10:43');
-
--- --------------------------------------------------------
@@ -943 +870 @@
--- Dumping data for table `posts_tags`
--- 
-
-INSERT INTO `posts_tags` (`post_id`, `tag_id`) VALUES 
-(2, 3),
-(3, 4),
-(3, 5),
-(3, 6),
-(3, 7),
-(3, 8),
-(3, 16),
-(7, 3);
-
--- --------------------------------------------------------
@@ -970 +887 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=1 
+
-
--- 
@@ -987 +904 @@
-  `name` varchar(50) NOT NULL,
-  PRIMARY KEY  (`id`)
-4
+2
-
--- 
@@ -994 +911 @@
-
-INSERT INTO `sections` (`id`, `name`) VALUES 
-
-
-
+
-
--- --------------------------------------------------------
@@ -1103 +1018 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
-3
+2
-
--- 
@@ -1110 +1025 @@
-
-INSERT INTO `subjects` (`id`, `title`, `posts_count`, `pages_count`, `events_count`, `feeds_count`, `images_count`, `galleries_count`, `videos_count`, `created`, `modified`) VALUES 
-
-
+
-
--- --------------------------------------------------------
@@ -1123 +1037 @@
-  `tag` varchar(255) collate utf8_unicode_ci NOT NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=44 
+
-
--- 
--- Dumping data for table `tags`
--- 
-
-INSERT INTO `tags` (`id`, `tag`) VALUES 
-(1, 'Test 1'),
-(2, 'Test 2'),
-(3, 'Test'),
-(4, 'The Hedrons'),
-(5, 'Download'),
-(6, 'Festival'),
-(7, 'Summer'),
-(8, 'Gig'),
-(9, 'Wet Wet Wet'),
-(10, 'Newmarket Races'),
-(11, 'Hue  Cry'),
-(12, 'Retrofest'),
-(13, 'Tour'),
-(14, 'Video'),
-(15, 'Single'),
-(16, 'Isle Of Wight'),
-(17, 'No Half Measures'),
-(18, 'Epk'),
-(19, 'Biography'),
-(20, 'Be My Friend'),
-(21, 'I Need You'),
-(22, 'Couldnt Leave Her Alone'),
-(23, 'Heatseeker'),
-(24, 'Fake Latin'),
-(25, 'Test Post'),
-(26, 'Holiday'),
-(27, 'Tane'),
-(28, 'Mailing List'),
-(29, 'Test Upload'),
-(30, 'Behaviour'),
-(31, 'Ubuntu'),
-(32, 'Geek'),
-(33, 'Die Windows'),
-(34, 'T In The Park'),
-(35, 'Logo'),
-(36, 'Sun'),
-(37, 'Space'),
-(38, 'Hot'),
-(39, 'The Sun'),
-(40, 'Star'),
-(41, 'Live'),
-(42, 'Slash'),
-(43, '1');
-
--- --------------------------------------------------------
@@ -1188 +1057 @@
--- Dumping data for table `tags_tracks`
--- 
-
-INSERT INTO `tags_tracks` (`tag_id`, `track_id`) VALUES 
-(4, 4),
-(4, 3),
-(4, 5),
-(4, 6);
-
--- --------------------------------------------------------
@@ -1227 +1090 @@
--- Dumping data for table `tags_videos`
--- 
-
-INSERT INTO `tags_videos` (`tag_id`, `video_id`) VALUES 
-(23, 20),
-(22, 20),
-(21, 20),
-(20, 20),
-(4, 15),
-(4, 14),
-(4, 13),
-(4, 12),
-(19, 20),
-(18, 20),
-(14, 20),
-(4, 20);
-
--- --------------------------------------------------------
@@ -1262 +1111 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=7 
+
-
--- 
--- Dumping data for table `tracks`
--- 
-
-INSERT INTO `tracks` (`id`, `filename`, `dir`, `mimetype`, `filesize`, `trackname`, `artist`, `infourl`, `tags`, `image_id`, `created`, `modified`) VALUES 
-(3, '01__Heatseeker.mp3', 'files/Media', 'audio/mpeg', 1399270, 'Heatseeker', 'The Hedrons', 'http://www.7digital.com/stores/productDetail.aspx?shop=34&amp;product=55080&amp;sid=639775', 'The Hedrons', 45, '2007-06-05 15:49:11', '2007-06-05 15:49:11'),
-(4, '02__Couldnt_Leave_Her_Alone.mp3', 'files/Media', 'audio/mpeg', 1078158, 'Couldn''t Leave Her Alone', 'The Hedrons', 'http://www.7digital.com/stores/productDetail.aspx?shop=34&amp;product=55080&amp;sid=639775', 'The Hedrons', 45, '2007-06-05 15:51:51', '2007-06-05 15:51:51'),
-(5, '03__I_Need_You.mp3', 'files/Media', 'audio/mpeg', 1185184, 'I Need You', 'The Hedrons', 'http://www.7digital.com/stores/productDetail.aspx?shop=34&amp;product=55080&amp;sid=639775', 'The Hedrons', 45, '2007-06-05 15:53:54', '2007-06-05 15:53:54'),
-(6, '04__Be_My_Friend.mp3', 'files/Media', 'audio/mpeg', 1054441, 'Be My Friend', 'The Hedrons', 'http://www.7digital.com/stores/productDetail.aspx?shop=34&amp;product=55080&amp;sid=639775', 'The Hedrons', 45, '2007-06-05 15:59:45', '2007-06-05 15:59:45');
-
--- --------------------------------------------------------
@@ -1287 +1130 @@
-  `visitdate` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=1 
+
-
--- 
@@ -1321 +1164 @@
-  UNIQUE KEY `email` (`email`,`username`),
-  KEY `group_id` (`group_id`)
-5
+4
-
--- 
@@ -1354 +1197 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
- AUTO_INCREMENT=21 
+
-
--- 
--- Dumping data for table `videos`
--- 
-
-INSERT INTO `videos` (`id`, `title`, `url`, `video_location`, `video_date`, `body`, `copyright_owner`, `copyright_id`, `published`, `user_id`, `subject_id`, `tags`, `created`, `modified`) VALUES 
-(20, 'The Hedrons EPK', 'http://www.youtube.com/v/28u-swVWo9Q', 'N/A', '2007-05-17', 'The Hedrons EPK', 'The Hedrons', 1, 0, 0, 1, 'The Hedrons, Video, Epk, Biography, Be My Friend, I Need You, Couldnt Leave Her Alone, Heatseeker', '2007-05-17 16:18:11', '2007-05-17 16:24:36');

branch/models/event.php

@@ -3 +3 @@
-
-        var $name = 'Event';
+        
+        var $actsAs = array('CounterCache','Tag');
+        
-        var $validate = array(
-                'venue' => VALID_NOT_EMPTY,

branch/models/gallery.php

@@ -3 +3 @@
-
-        var $name = 'Gallery';
+        
+        var $actsAs = array('CounterCache','Tag');
+        
-        var $validate = array(
-                'title' => VALID_NOT_EMPTY,

branch/models/page.php

@@ -3 +3 @@
-
-        var $name = 'Page';
+        
+        var $actsAs = array('CounterCache','Tag');
+        
-        var $validate = array(
-                'title' => VALID_NOT_EMPTY,

branch/models/playlist.php

@@ -3 +3 @@
-
-        var $name = 'Playlist';
+        
+        var $actsAs = array('CounterCache','Tag');
+        
-        var $validate = array(
-                'title' => VALID_NOT_EMPTY,

branch/models/post.php

@@ -3 +3 @@
-
-        var $name = 'Post';
+        
+        var $actsAs = array('CounterCache','Tag');
+        
-        var $validate = array(
-                'title' => VALID_NOT_EMPTY,

branch/models/tag.php

@@ -102 +102 @@
-        );
-
+/**
+         * Function tagcloud()
+         * This function generates the tagcloud data to be displayed.
+         */
+        function tagcloud()
+        {
+                return $this->query("SELECT `Tag`.`id`, `Tag`.`tag`,
+                                        (SELECT COUNT(`pages_tags`.`page_id`) FROM `pages_tags` WHERE `pages_tags`.`tag_id` = `Tag`.`id`) +
+                                        (SELECT COUNT(`posts_tags`.`post_id`) FROM `posts_tags` WHERE `posts_tags`.`tag_id` = `Tag`.`id`) +
+                                        (SELECT COUNT(`events_tags`.`event_id`) FROM `events_tags` WHERE `events_tags`.`tag_id` = `Tag`.`id`) +
+                                        (SELECT COUNT(`tags_videos`.`video_id`) FROM `tags_videos` WHERE `tags_videos`.`tag_id` = `Tag`.`id`) +
+                                        (SELECT COUNT(`images_tags`.`image_id`) FROM `images_tags` WHERE `images_tags`.`tag_id` = `Tag`.`id`) AS `count`
+                                        FROM `tags` AS `Tag` ORDER BY RAND() LIMIT 30;");
+        }
+        
+        function findTag($tag, $limit=10)
+        {
+                return $this->query('SELECT `Tag`.`tag` FROM `tags` AS `Tag` WHERE `Tag`.`tag` LIKE "' . $tag . '%" LIMIT ' . $limit);
+        }
+        
-}
-?>

branch/models/track.php

@@ -3 +3 @@
-
-        var $name = 'Track';
+        
+        var $actsAs = array('CounterCache','Tag');
+        
-        var $validate = array(
-                'filename' => VALID_NOT_EMPTY,

branch/models/user.php

@@ -3 +3 @@
-
-        var $name = 'User';
+        
+        var $actsAs = array('CounterCache','Tag');
+        
-        var $validate = array(
-                'username' => VALID_NOT_EMPTY,

branch/models/video.php

@@ -3 +3 @@
-
-        var $name = 'Video';
+        
+        var $actsAs = array('CounterCache','Tag');
+        
-        var $validate = array(
-                'title' => VALID_NOT_EMPTY,

branch/views/galleries/view.ctp

@@ -8 +8 @@
-<?php endforeach; ?>
-</ul>
-
+
-<?php endif; ?>

branch/views/layouts/default.ctp

@@ -32 +32 @@
-    <div class="yui-gb first">
-        <div class="yui-u first">
-<!-- YOUR DATA GOES HERE --
+               <?php e($this->element('tagcloud'));?
-                </div>
-        <div class="yui-u">