Changeset 32

Timestamp:

05/07/09 19:39:02 (3 years ago)

Author:

235

Message:

optimized bannerplaces (no cache)

Files:

• .project (modified) (1 diff)
• plesonet_banners/trunk/models.py (modified) (3 diffs)
• plesonet_banners/trunk/templatetags/banners_tags.py (modified) (3 diffs)

.project

@@ -6 +6 @@
         </projects>
         <buildSpec>
+                <buildCommand>
+                        <name>org.python.pydev.PyDevBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>
+                <nature>org.python.pydev.pythonNature</nature>
         </natures>
 </projectDescription>

plesonet_banners/trunk/models.py

@@ -14 +14 @@
     is_published = models.BooleanField(_('Published'), default=True)    
     
+    class Admin:
+        list_display = ('url', 'is_published')
+        list_filter = ('is_published',)
+        search_fields = ('url', )    
+    
     class Meta:
         db_table = 'plesonet_bannerpage'
@@ -26 +31 @@
 class Banners(models.Model):
     BANNER_TYPE = (
-                     (1, 'Top'),
-                     (2, 'Premium left'),
-                     (3, 'Premium right'),
-                     (4, 'Below news'),                     
-                     (5, 'Counters'),
-                     (6, 'Ad links'),
-                     (7, 'Technical Script')
+                     (101, 'Premium Top'),
+                     (100, 'Premium center'),
+                     (110, 'Premium left'),
+                     (120, 'Premium right'),
+                     (210, 'Left under events(links) - index page'),                     
+                     (220, 'Right under tags - index page'),
+                     (300, 'Center bottom'),
+                     (310, 'Left bottom'),
+                     (320, 'Right bottom'),
+                     (600, 'Ad links'),
+                     (605, 'Ad links - personal blogs'),
+                     (700, 'Technical Script')
     )
     BANNERS = 6
     
-    bannerplace = models.ForeignKey(Bannerpage) #, edit_inline=models.TABULAR, min_num_in_admin=BANNERS, max_num_in_admin=BANNERS)    
+    bannerplace = models.ForeignKey(Bannerpage, edit_inline=models.TABULAR, min_num_in_admin=BANNERS, max_num_in_admin=BANNERS)    
     bannertype = models.SmallIntegerField(_('Banner place'), choices=BANNER_TYPE)
-    bannercode = models.TextField(_('Code'), blank=True) #, core=True
-    is_published = models.BooleanField(_('Published')) #, core=True
-    one_page_only = models.BooleanField(_('Only in this URL')) #, core=True
+    bannercode = models.TextField(_('Code'), blank=True, core=True)
+    is_published = models.BooleanField(_('Published'), core=True)
+    one_page_only = models.BooleanField(_('Only in this URL'), core=True)
+    child_page_only = models.BooleanField(_('Only on childrens'), core=True)
     
     class Meta:
@@ -47 +58 @@
         verbose_name_plural = _('banners')
         unique_together = (('bannerplace', 'bannertype'),)
-        
+    
     def __unicode__(self):
             return str(self.bannertype)
 
-class BannerInline(admin.TabularInline):
-    model = Banners
-
-
-class BannerpageAdmin(admin.ModelAdmin):
-    list_display = ('url', 'is_published')
-    list_filter = ('is_published',)
-    search_fields = ('url', )    
-    inlines = [ BannerInline, ]
-admin.site.register(Bannerpage, BannerpageAdmin)
+#class BannerInline(admin.TabularInline):
+#    model = Banners
+#
+#
+#class BannerpageAdmin(admin.ModelAdmin):
+#    list_display = ('url', 'is_published')
+#    list_filter = ('is_published',)
+#    search_fields = ('url', )    
+#    inlines = [ BannerInline, ]
+#admin.site.register(Bannerpage, BannerpageAdmin)

plesonet_banners/trunk/templatetags/banners_tags.py

@@ -2 +2 @@
 from apps.plesonet_banners.models import Bannerpage, Banners 
 from django.template import Library
+from apps.lib.threadlocals import get_request
+
+from scache.tags import cached_inclusion_tag
+from django.db.models import signals 
 
 register = Library()
+
 
 @register.inclusion_tag('plesonet_banners/show_banner.html', takes_context=True)
@@ -11 +16 @@
     url = context['request'].path
     
-    # banner only this page
     banners = Banners.objects.filter(
                                     bannerplace__is_published=True, 
-                                    bannerplace__url__iexact=url, 
                                     is_published=True, 
                                     bannertype=banner_type)
     
-    if banners:
-        return {'banner': banners[0]}
+    
+    #better to find proper banner on client-side, than making a dozen of sql requests
+    for b in banners:
+        if b.bannerplace.url == url and b.child_page_only == False:
+            return {'banner': b}    
     
     # last word
     url = url.rsplit('/',1)[0]
+    if url == "":
+        return {'banner': None}
     
     # parent banners
@@ -28 +36 @@
        url = url.rsplit('/',1)[0]
        select_url = url + '/'
-       
-       banners = Banners.objects.filter(
-                                        bannerplace__is_published=True, 
-                                        bannerplace__url__iexact=select_url, 
-                                        is_published=True, 
-                                        bannertype=banner_type)
-       
-       if banners:
-           if not banners[0].one_page_only:
-               banner = banners[0]
-               break
+              
+       for b in banners:
+           if b.bannerplace.url == select_url and not b.one_page_only:
+               return {'banner': b}
        
        if url.find('/') : break  
         
-    return {'banner': banner}
+    return {'banner': None}