Changeset 1763 for ZMS/trunk


Ignore:
Timestamp:
13.12.2011 16:47:56 (5 months ago)
Author:
zmsdev
Message:

applied minor performance-fixes (3)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • ZMS/trunk/_versionmanager.py

    r1761 r1763  
    971971    # -------------------------------------------------------------------------- 
    972972    def getObjVersion(self, REQUEST={}): 
    973         ob = None 
    974         id = REQUEST.get( 'ZMS_VERSION_%s'%self.id, None) 
    975         if id is not None: 
    976             return getattr( self, id) 
    977         elif REQUEST.get('preview') == 'preview': 
    978             if self.version_work_id is not None: 
    979                 ob = getattr(self, self.version_work_id, None) 
    980         else: 
    981             if self.version_live_id is not None: 
    982                 ob = getattr(self, self.version_live_id, None) 
    983         if ob is None: 
    984             if self.version_work_id is not None: 
    985                 ob = getattr(self, self.version_work_id, None) 
    986         if ob is None: 
    987             if self.version_live_id is not None: 
    988                 ob = getattr(self, self.version_live_id, None) 
    989         return ob 
     973        try: 
     974            ob = None 
     975            id = REQUEST.get( 'ZMS_VERSION_%s'%self.id, None) 
     976            if id is not None: 
     977                return getattr( self, id) 
     978            elif REQUEST.get('preview') == 'preview': 
     979                if self.version_work_id is not None: 
     980                    ob = getattr(self, self.version_work_id, None) 
     981            else: 
     982                if self.version_live_id is not None: 
     983                    ob = getattr(self, self.version_live_id, None) 
     984            if ob is None: 
     985                if self.version_work_id is not None: 
     986                    ob = getattr(self, self.version_work_id, None) 
     987            if ob is None: 
     988                if self.version_live_id is not None: 
     989                    ob = getattr(self, self.version_live_id, None) 
     990            s = ob.id # Never delete this line! 
     991            return ob 
     992        except: 
     993            raise zExceptions.InternalError(_globals.writeError( self, '[getObjVersion]: an unexpected error occured!')) 
    990994 
    991995 
Note: See TracChangeset for help on using the changeset viewer.