Diff for /MPIWGWeb/bibliography.py between versions 1.7.2.3 and 1.7.2.10

version 1.7.2.3, 2005/11/16 19:09:28 version 1.7.2.10, 2008/12/17 08:02:19
Line 23  def formatBiblHelp(self,found,table,id,f Line 23  def formatBiblHelp(self,found,table,id,f
     ret=""      ret=""
     if not foundIB:      if not foundIB:
         try:          try:
             foundIB=self.ZSQLInlineSearch(_table=table,id=id)[0]              foundIB=self.ZSQLInlineSearch(_table=table,id=id,_op_id="eq")[0]
   
         except:          except:
             return ret              return ret
Line 32  def formatBiblHelp(self,found,table,id,f Line 32  def formatBiblHelp(self,found,table,id,f
         ret+=getBib(CRListToSemicolon(foundIB.author))+". &quot;"+getBib(foundIB.title)+". &quot; "+"<i>%s</i>"%getBib(foundIB.secondary_title)+" "+getBib(foundIB.volume)+" ("          ret+=getBib(CRListToSemicolon(foundIB.author))+". &quot;"+getBib(foundIB.title)+". &quot; "+"<i>%s</i>"%getBib(foundIB.secondary_title)+" "+getBib(foundIB.volume)+" ("
         if not self.ZSQLisEmpty(foundIB.number):          if not self.ZSQLisEmpty(foundIB.number):
             ret+=foundIB.number+"&nbsp;"              ret+=foundIB.number+"&nbsp;"
         ret+=foundIB.year+")"  
           if foundIB.year:
               ret+=getattr(foundIB,'year','')
           ret+=")"
         if foundIB.pages and (not foundIB.pages)=='':          if foundIB.pages and (not foundIB.pages)=='':
             ret+=": "+foundIB.pages+"."              ret+=": "+foundIB.pages+"."
   
     elif foundIB.reference_type.lower()=='edited book':      elif foundIB.reference_type.lower()=='edited book':
         ret+=CRListToSemicolon(foundIB.author)+" (Editor/s). <i>"+foundIB.title+"</i>."          if foundIB.author:
               ret+=CRListToSemicolon(foundIB.author)+" (Editor/s). " 
           if foundIB.title and (not foundIB.title==""):
               ret+="<i>"+foundIB.title+"</i>. "
         if foundIB.place_published and (not foundIB.place_published==''):          if foundIB.place_published and (not foundIB.place_published==''):
             ret+=foundIB.place_published+": "              ret+=foundIB.place_published+": "
         if foundIB.publisher and (not foundIB.publisher==''):          if foundIB.publisher and (not foundIB.publisher==''):
Line 45  def formatBiblHelp(self,found,table,id,f Line 51  def formatBiblHelp(self,found,table,id,f
         ret+=getBib(foundIB.year)+"."          ret+=getBib(foundIB.year)+"."
   
     elif foundIB.reference_type.lower()=='book section' or foundIB.reference_type.lower()=='in book':      elif foundIB.reference_type.lower()=='book section' or foundIB.reference_type.lower()=='in book':
         ret+=getBib(CRListToSemicolon(foundIB.author))+". &quot;"+getBib(foundIB.title)+".&quot; In <i>"+getBib(foundIB.secondary_title)+"</i>"          ret+=getBib(CRListToSemicolon(foundIB.author))+". &quot;"+getBib(foundIB.title)+".&quot; In: <i>"+getBib(foundIB.secondary_title)+"</i>"
         if (CRListToSemicolon(foundIB.secondary_author)) and (not CRListToSemicolon(foundIB.secondary_author)==''):          if (CRListToSemicolon(foundIB.secondary_author)) and (not CRListToSemicolon(foundIB.secondary_author)==''):
             ret+=", eds.: "+CRListToSemicolon(foundIB.secondary_author)              ret+=", eds.: "+CRListToSemicolon(foundIB.secondary_author)
         ret+=". "          ret+=". "
Line 57  def formatBiblHelp(self,found,table,id,f Line 63  def formatBiblHelp(self,found,table,id,f
             ret+=foundIB.publisher+", "              ret+=foundIB.publisher+", "
         ret+=getBib(foundIB.year)+"."          ret+=getBib(foundIB.year)+"."
                   
      
     elif foundIB.reference_type.lower()=='book':      elif foundIB.reference_type.lower()=='book':
         ret+=getBib(CRListToSemicolon(foundIB.author))+". <i>"+getBib(foundIB.title)+"</i>. "          ret+=getBib(CRListToSemicolon(foundIB.author))+". <i>"+getBib(foundIB.title)+"</i>. "
         if foundIB.pages and (not foundIB.pages==''):  #       if foundIB.pages and (not foundIB.pages==''):
             ret+=foundIB.pages+". "  #%            ret+=foundIB.pages+". "
         if foundIB.place_published and (not foundIB.place_published==''):          if foundIB.place_published and (not foundIB.place_published==''):
             ret+=foundIB.place_published+": "              ret+=foundIB.place_published+": "
         if foundIB.publisher and (not foundIB.publisher==''):          if foundIB.publisher and (not foundIB.publisher==''):
Line 71  def formatBiblHelp(self,found,table,id,f Line 78  def formatBiblHelp(self,found,table,id,f
         ret+=CRListToSemicolon(foundIB.author)+". &quot;"+foundIB.title+".&quot; <i>"+foundIB.secondary_title+"</i>, "          ret+=CRListToSemicolon(foundIB.author)+". &quot;"+foundIB.title+".&quot; <i>"+foundIB.secondary_title+"</i>, "
         ret+=foundIB.date+"."+foundIB.year+","          ret+=foundIB.date+"."+foundIB.year+","
         if foundIB.pages and (not foundIB.pages==''):          if foundIB.pages and (not foundIB.pages==''):
               ret+=foundIB.pages+". "
       elif foundIB.reference_type.lower()=='magazine article':
           ret+=CRListToSemicolon(foundIB.author)+". &quot;"+foundIB.title+".&quot; <i>"+foundIB.secondary_title+"</i>, "
           ret+=foundIB.date+"."+foundIB.year+","
           if foundIB.pages and (not foundIB.pages==''):
             ret+=foundIB.pages+". "              ret+=foundIB.pages+". "
   
   

Removed from v.1.7.2.3  
changed lines
  Added in v.1.7.2.10


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>