Changeset 656

Timestamp:

2008-06-29 23:06:21 (2 months ago)

Author:

arthus

Message:

Sorted archives by QS string rank
TODO: speed things up

Location:

plugins/magic_archives/trunk

Files:

• archives.php (modified) (1 diff)
• magic_archives.plugin.php (modified) (1 diff)
• magicarchives.css (modified) (2 diffs)
• magicarchives.js (modified) (5 diffs)

plugins/magic_archives/trunk/archives.php

@@ -65 +65 @@
             <span class="tags section"><?php echo _t('Tags'); ?></span>
         </div></li>
-    <?php foreach($magic_archives as $post) { ?>
+    <?php foreach(MagicArchives::get_magic_archives() as $post) { ?>
         <li id="post-<?php echo $post->id; ?>" class="<?php echo Post::type_name($post->content_type); ?> <?php echo Post::status_name($post->status); ?>">
             <a href="<?php echo $post->permalink; ?>" title="<?php echo sprintf( _t('Read %s'), $post->title ); ?>">

plugins/magic_archives/trunk/magic_archives.plugin.php

@@ -21 +21 @@
     }
     
-    public function action_add_template_vars($theme, $handler_vars) {
-        $archives = Posts::get(array('nolimit' => true));
+    public function get_magic_archives() {
+        $cache = 'magicarchives__posts';
         
-        $theme->magic_archives = $archives;
+        if(Cache::has($cache)) {
+            $archives = Cache::get($cache);
+
+        } else {
+            $archives = Posts::get(array('nolimit' => true));
+            Cache::set( $cache, $archives, 4000);
+    
+        }
+        
+        return $archives;
     }
     

plugins/magic_archives/trunk/magicarchives.css

@@ -66 +66 @@
 }
 ol#archiveItems li span.comments {
-    margin-left:5px;
-    width:15px;
+    width:5%;
+    text-align:center;
 }
 ol#archiveItems li span.comments strong {
@@ -84 +84 @@
     display:none;
 }
+ol#archiveItems li span.tags {
+    width:30%;
+}
 ol#archiveItems li.headings {
     background:#DEDCDE;

plugins/magic_archives/trunk/magicarchives.js

@@ -20 +20 @@
         
         magicArchives.search.keyup(function() {
-            magicArchives.filter();
+            magicArchives.doSearch();
         });
+        
+        magicArchives.posts.addClass('unfiltered');
         
         magicArchives.createFilters();
@@ -54 +56 @@
         });
     },
+    doSearch: function() {
+        var scores = [];
+
+        
+        magicArchives.posts.filter('.unfiltered').each(function() {
+            
+            $(this).show();
+            
+            var score = 0;
+
+            score = $(this).text().toLowerCase().score( magicArchives.search.val() );
+
+            if(score == 0) {
+                $(this).hide();
+            }
+            
+            scores.push([score, $(this)]);
+            
+        });
+        
+        magicArchives.posts.remove();
+        
+        scores = scores.sort(function(a, b) {
+            return b[0] - a[0];
+        });
+        
+        $(scores).each(function() {
+            if($(this[1]).is(':visible')) {
+                console.log(this);
+            }
+            $(this[1]).appendTo($('#archiveItems'));
+        });
+        
+    },
     filter: function() {
         var month = $('.active', magicArchives.month);
@@ -60 +96 @@
         var tag = $('.active', magicArchives.tag);
         
-        magicArchives.posts.show();
+        magicArchives.posts.show().addClass('unfiltered');
         
         var i = 0;
@@ -67 +103 @@
             if(month.hasClass('allofthestuff') == false) {
                 if(month.text() != $('.month', $(this)).text()) {
-                    $(this).hide();
+                    $(this).hide().removeClass('unfiltered');
                 }
             }
             if(year.hasClass('allofthestuff') == false) {
                 if(year.text() != $('.year', $(this)).text()) {
-                    $(this).hide();
+                    $(this).hide().removeClass('unfiltered');
                 }
             }
             if(type.hasClass('allofthestuff') == false) {
                 if(type.text() != $('.type', $(this)).text()) {
-                    $(this).hide();
+                    $(this).hide().removeClass('unfiltered');
                 }
             }
@@ -91 +127 @@
                 
                 if(hide) {
-                    $(this).hide();
+                    $(this).hide().removeClass('visible');
                 }
             }
-            
-            var score = 0;
-            
-            $('.tags .tag', $(this)).each(function() {
-                score = score + $(this).text().score(magicArchives.search.val());
-            });
-            
-            score = score + $('.month', $(this)).text().toLowerCase().score(magicArchives.search.val());
-            score = score + $('.title', $(this)).text().toLowerCase().score(magicArchives.search.val());
-            score = score + $('.year', $(this)).text().toLowerCase().score(magicArchives.search.val());
-                        
-            if(score == 0) {
-                $(this).hide();
-            }
+
         });
         
-        
+        magicArchives.doSearch();
+            
     }
 };