Changeset fe06c0 in indico

Timestamp:

02/14/11 15:37:17 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

f9e2b0

Parents:

83db8b

git-author:

Leszek Syroka <leszek.marek.syroka@…> (08/12/10 16:31:06)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/14/11 15:37:17)

Message:

[OPT] Contribution list optimization

• filters are not checked when not necessary
• material links are not fetched from database at the display page
• filters data are not calculated when filter menu is closed
• list creation optimized
• optimization of url.py, made in registrant list optimization ticket, will enchance performance
• schedule check removed - exception is thrown instead
• fixes #507

Location:

indico

Files:

• MaKaC/webinterface/common/contribFilters.py (modified) (5 diffs)
• MaKaC/webinterface/pages/conferences.py (modified) (4 diffs)
• MaKaC/webinterface/rh/materialDisplay.py (modified) (1 diff)
• MaKaC/webinterface/urlHandlers.py (modified) (1 diff)
• htdocs/materialDisplay.py (modified) (1 diff)

indico/MaKaC/webinterface/common/contribFilters.py

@@ -31 +31 @@
         """
         """
-        if contribution.getType() is None:
-            return self._showNoValue
-        return contribution.getType().getId() in self._values
+        if len(self._conf._contribTypes) == self._values:
+            return True
+        elif contribution.getType() is None:
+            return self._showNoValue
+        else:
+            return contribution.getType().getId() in self._values
 
 
@@ -51 +54 @@
         """
         """
-        if contribution.getTrack():
+        if len(self._conf.program) == len(self._values):
+            return True
+        elif contribution.getTrack():
             if contribution.getTrack().getId() in self._values:
                 return True
@@ -74 +79 @@
         """
         """
-        if contribution.getSession():
+        if len(self._conf.sessions) == len(self._values):
+            return True
+        elif contribution.getSession():
             if contribution.getSession().getId() in self._values:
                 return True
@@ -112 +119 @@
         """
         """
+        if len(ContribStatusList._statusIds) == len(self._values):
+            return True
         stKlass=contribution.getCurrentStatus().__class__
         return ContribStatusList().getId(stKlass) in self._values
@@ -145 +154 @@
         """
         """
+        #all options selected
+        if len(self._values) == 4:
+            return True
         from MaKaC.webinterface.materialFactories import PaperFactory
         paper=contribution.getPaper()

indico/MaKaC/webinterface/pages/conferences.py

@@ -6915 +6915 @@
         return url
 
+
+    def _createMaterialURL(self, contrib):
+        """ Creates link to material management menu of given contribution.
+            This method is faster than fetching material object from the
+            database and getting link from it """
+
+        url = urlHandlers.UHContribModifMaterials._getURL()
+        url.addParam('returnURL','')
+        url.addParam('contribId',contrib.getId())
+        url.addParam('confId',contrib.getConference().getId())
+        return url
+
+
     def _getMaterialsHTML(self, contrib):
         materials=[]
         if contrib.getPaper() is not None:
-            url=urlHandlers.UHMaterialModification.getURL(contrib.getPaper())
-            iconHTML="""<img border="0" src=%s alt="paper">"""%quoteattr(str(PaperFactory().getIconURL()))
-            if len(contrib.getPaper().getResourceList())>0:
-                r=contrib.getPaper().getResourceList()[0]
-                if isinstance(r,conference.Link):
-                    iconHTML="""<a href=%s>%s</a>"""%(quoteattr(str(r.getURL())),iconHTML)
-                elif isinstance(r,conference.LocalFile):
-                    iconHTML="""<a href=%s>%s</a>"""%(quoteattr(str(urlHandlers.UHFileAccess.getURL(r))),iconHTML)
-            materials.append("""%s<a href=%s>%s</a>"""%(iconHTML,quoteattr(str(url)),self.htmlText(PaperFactory().getTitle().lower())))
+            url= urlHandlers.UHMaterialBrowse.getURL()
+            url.addParams({'contribId' : contrib.getId(), 'confId' : contrib.getConference().getId(), 'materialId' : 'paper'})
+            materials.append("""<a href=%s>%s</a>"""%(quoteattr(str(url)),self.htmlText(PaperFactory().getTitle().lower())))
         if contrib.getSlides() is not None:
-            url=urlHandlers.UHMaterialModification.getURL(contrib.getSlides())
-            iconHTML="""<img border="0" src=%s alt="slides">"""%quoteattr(str(SlidesFactory().getIconURL()))
-            if len(contrib.getSlides().getResourceList())>0:
-                r=contrib.getSlides().getResourceList()[0]
-                if isinstance(r,conference.Link):
-                    iconHTML="""<a href=%s>%s</a>"""%(quoteattr(str(r.getURL())),iconHTML)
-                elif isinstance(r,conference.LocalFile):
-                    iconHTML="""<a href=%s>%s</a>"""%(quoteattr(str(urlHandlers.UHFileAccess.getURL(r))),iconHTML)
-            materials.append("""%s<a href=%s>%s</a>"""%(iconHTML,quoteattr(str(url)),self.htmlText(SlidesFactory().getTitle().lower())))
+            url= urlHandlers.UHMaterialBrowse.getURL()
+            url.addParams({'contribId' : contrib.getId(), 'confId' : contrib.getConference().getId(), 'materialId' : 'slides'})
+            materials.append("""<a href=%s>%s</a>"""%(quoteattr(str(url)),self.htmlText(SlidesFactory().getTitle().lower())))
         if contrib.getPoster() is not None:
-            url=urlHandlers.UHMaterialModification.getURL(contrib.getPoster())
-            iconHTML="""<img border="0" src=%s alt="slides">"""%quoteattr(str(PosterFactory().getIconURL()))
-            if len(contrib.getPoster().getResourceList())>0:
-                r=contrib.getPoster().getResourceList()[0]
-                if isinstance(r,conference.Link):
-                    iconHTML="""<a href=%s>%s</a>"""%(quoteattr(str(r.getURL())),iconHTML)
-                elif isinstance(r,conference.LocalFile):
-                    iconHTML="""<a href=%s>%s</a>"""%(quoteattr(str(urlHandlers.UHFileAccess.getURL(r))),iconHTML)
-            materials.append("""%s<a href=%s>%s</a>"""%(iconHTML,quoteattr(str(url)),self.htmlText(PosterFactory.getTitle().lower())))
-        video=contrib.getVideo()
-        if video is not None:
-            materials.append("""<a href=%s><img src=%s border="0" alt="video"> %s</a>"""%(
-                quoteattr(str(urlHandlers.UHMaterialModification.getURL(video))),
-                quoteattr(str(materialFactories.VideoFactory.getIconURL())),
+            url= urlHandlers.UHMaterialBrowse.getURL()
+            url.addParams({'contribId' : contrib.getId(), 'confId' : contrib.getConference().getId(), 'materialId' : 'poster'})
+            materials.append("""<a href=%s>%s</a>"""%(quoteattr(str(url)),self.htmlText(PosterFactory().getTitle().lower())))
+        if contrib.getVideo() is not None:
+            materials.append("""<a href=%s>%s</a>"""%(
+                quoteattr(str(self._createMaterialURL(contrib))),
                 self.htmlText(materialFactories.VideoFactory.getTitle())))
-        minutes=contrib.getMinutes()
-        if minutes is not None:
-            materials.append("""<a href=%s><img src=%s border="0" alt="minutes"> %s</a>"""%(
-                quoteattr(str(urlHandlers.UHMaterialModification.getURL(minutes))),
-                quoteattr(str(materialFactories.MinutesFactory.getIconURL())),
+        if contrib.getMinutes() is not None:
+            materials.append("""<a href=%s>%s</a>"""%(
+                quoteattr(str(self._createMaterialURL(contrib))),
                 self.htmlText(materialFactories.MinutesFactory.getTitle())))
-        iconURL=quoteattr(str(Config.getInstance().getSystemIconURL("material")))
         for material in contrib.getMaterialList():
-            url=urlHandlers.UHMaterialModification.getURL(material)
-            materials.append("""<a href=%s><img src=%s border="0" alt=""> %s</a>"""%(
-                quoteattr(str(url)),iconURL,self.htmlText(material.getTitle())))
+            url=self._createMaterialURL(contrib)
+            materials.append("""<a href=%s>%s</a>"""%(
+                quoteattr(str(url)),self.htmlText(material.getTitle())))
         return "<br>".join(materials)
 
     def _getContribHTML( self, contrib ):
-        sdate = ""
-        if contrib.isScheduled():
+        try:
             sdate=contrib.getAdjustedStartDate().strftime("%d-%b-%Y %H:%M" )
+        except AttributeError:
+            sdate = ""
         title = """<a href=%s>%s</a>"""%( quoteattr( str( urlHandlers.UHContributionModification.getURL( contrib ) ) ), self.htmlText( contrib.getTitle() ))
         strdur = ""
@@ -6976 +6967 @@
             dur = contrib.getDuration()
             self._totaldur = self._totaldur + dur
-        l = []
-        for spk in contrib.getSpeakerList():
-            l.append( self.htmlText( spk.getFullName() ) )
+
+        l = [self.htmlText( spk.getFullName() ) for spk in contrib.getSpeakerList()]
         speaker = "<br>".join( l )
         session = ""
@@ -7156 +7146 @@
         vars["filterPostURL"]=quoteattr(str(urlHandlers.UHConfModifContribList.getURL(self._conf)))
         authSearch=vars.get("authSearch","").strip()
-        vars["authSearch"]=quoteattr(str(authSearch))
-        vars["types"]=self._getTypeItemsHTML()
-        vars["sessions"]=self._getSessionItemsHTML()
-        vars["tracks"]=self._getTrackItemsHTML()
-        vars["status"]=self._getStatusItemsHTML()
-        vars["materials"]=self._getMaterialItemsHTML()
+        if self._menuStatus == 'open':
+            vars["authSearch"]=quoteattr(str(authSearch))
+            vars["types"]=self._getTypeItemsHTML()
+            vars["sessions"]=self._getSessionItemsHTML()
+            vars["tracks"]=self._getTrackItemsHTML()
+            vars["status"]=self._getStatusItemsHTML()
+            vars["materials"]=self._getMaterialItemsHTML()
         cl=self._conf.getContribsMatchingAuth(authSearch)
 
@@ -7262 +7253 @@
         vars["trackSortingURL"] = quoteattr( str( url ) )
 
-        l=[]
-        numContribs=0
         f=filters.SimpleFilter(self._filterCrit,self._sortingCrit)
-        contribsToPrint = []
-        for contrib in f.apply(cl):
-            l.append(self._getContribHTML(contrib))
-            numContribs+=1
-            contribsToPrint.append("""<input type="hidden" name="contributions" value="%s">"""%contrib.getId())
+        filteredContribs = f.apply(cl)
+        l = [self._getContribHTML(contrib) for contrib in filteredContribs]
+        contribsToPrint = ["""<input type="hidden" name="contributions" value="%s">"""%contrib.getId() for contrib in filteredContribs]
+        numContribs = len(filteredContribs)
+
         if self._order =="up":
             l.reverse()

indico/MaKaC/webinterface/rh/materialDisplay.py

@@ -49 +49 @@
         else:
             raise MaKaCError( _("you are not authorised to manage material for this contribution"))
+
+
+class RHMaterialBrowse( RHMaterialDisplayBase ):
+    _uh = urlHandlers.UHMaterialBrowse
+
+    def _checkParams(self, params):
+        confId = int(params["confId"])
+        contribId = int(params["contribId"])
+        materialId = params["materialId"]
+        conf = conference.ConferenceHolder().getById( confId )
+        contr = conf.getContributionById(contribId)
+
+        self._material = self._target = contr.getMaterialById(materialId)
+
+    def _process( self ):
+
+        # material pages should not be cached, since protection can change
+        self._disableCaching()
+
+        if len(self._material.getResourceList()) == 1:
+            res = self._material.getResourceList()[0]
+            if isinstance(res, conference.Link):
+                url = res.getURL()
+                if url.find(".wmv") != -1:
+                    urlwmv = urlHandlers.UHVideoWmvAccess().getURL(res)
+                    self._redirect( urlwmv )
+                elif url.find(".flv") != -1 or url.find(".f4v") != -1 or url.find("rtmp://") != -1:
+                    urlflash = urlHandlers.UHVideoFlashAccess().getURL(res)
+                    self._redirect( urlflash, noCache=True)
+                else:
+                    self._redirect( res.getURL(), noCache=True )
+            elif isinstance(res, conference.LocalFile):
+                self._redirect( urlHandlers.UHFileAccess.getURL( res ), noCache=True )
+        else:
+            self._redirect( urlHandlers.UHContribModifMaterials.getURL( self._material ))
+
 
 class RHMaterialDisplay( RHMaterialDisplayBase ):

indico/MaKaC/webinterface/urlHandlers.py

@@ -2806 +2806 @@
 class UHMaterialDisplay( URLHandler ):
     _relativeURL = "materialDisplay.py"
+
+class UHMaterialBrowse( URLHandler ):
+    _relativeURL = "materialDisplay.py/browseMaterial"
 
 class UHConferenceProgram( URLHandler ):

indico/htdocs/materialDisplay.py

@@ -29 +29 @@
 def index(req, **params):
     return materialDisplay.RHMaterialDisplay( req ).process( params )
+
+def browseMaterial(req, **params):
+    return materialDisplay.RHMaterialBrowse( req ).process( params )
 
 def removeResource(req, **params):