Diff for /MPIWGWeb/bibliography.py between versions 1.7.2.1 and 1.7.2.2

version 1.7.2.1, 2005/10/10 08:42:49 version 1.7.2.2, 2005/10/11 13:14:01
Line 1 Line 1
   #TO DO author_semi_kolon etc. ersetzen durch Funktionen
 def formatBibliography(self,found):  def formatBibliography(self,found):
     ret=""      ret=""
     if found.id_institutsbibliographie and (not found.id_institutsbibliographie==''):      if found.id_institutsbibliographie and (not found.id_institutsbibliographie==''):
Line 7  def formatBibliography(self,found): Line 7  def formatBibliography(self,found):
         ret+=formatBiblHelp(self,found,table='bibliography',id=found.id_gen_bib)          ret+=formatBiblHelp(self,found,table='bibliography',id=found.id_gen_bib)
     return ret      return ret
   
   def CRListToSemicolon(list):
       if list:
           return "; ".join(list.split("\n"))
       else:
           return None
       
 def getBib(value):  def getBib(value):
     if value:      if value:
         return value          return value
Line 23  def formatBiblHelp(self,found,table,id,f Line 29  def formatBiblHelp(self,found,table,id,f
           
     if foundIB.reference_type.lower()=='journal article':      if foundIB.reference_type.lower()=='journal article':
                   
         ret+=getBib(foundIB.author_semi_colon)+". &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+")"          ret+=foundIB.year+")"
Line 31  def formatBiblHelp(self,found,table,id,f Line 37  def formatBiblHelp(self,found,table,id,f
             ret+=": "+foundIB.pages+"."              ret+=": "+foundIB.pages+"."
   
     elif foundIB.reference_type.lower()=='edited book':      elif foundIB.reference_type.lower()=='edited book':
         ret+=foundIB.author_semi_colon+" (Editor/s). <i>"+foundIB.title+"</i>."          ret+=CRListToSemicolon(foundIB.author)+" (Editor/s). <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 39  def formatBiblHelp(self,found,table,id,f Line 45  def formatBiblHelp(self,found,table,id,f
         ret+=foundIB.year+"."          ret+=foundIB.year+"."
   
     elif foundIB.reference_type.lower()=='book section':      elif foundIB.reference_type.lower()=='book section':
         ret+=getBib(foundIB.author_semi_colon)+". &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 (foundIB.secondary_author_semi_colon) and (not foundIB.secondary_author_semi_colon==''):          if (CRListToSemicolon(foundIB.secondary_author)) and (not CRListToSemicolon(foundIB.secondary_author)==''):
             ret+=", eds.: "+foundIB.secondary_author_semi_colon              ret+=", eds.: "+CRListToSemicolon(foundIB.secondary_author)
         ret+=". "          ret+=". "
         if foundIB.pages and (not foundIB.pages)=='':          if foundIB.pages and (not foundIB.pages)=='':
             ret+=foundIB.pages+". "              ret+=foundIB.pages+". "
Line 51  def formatBiblHelp(self,found,table,id,f Line 57  def formatBiblHelp(self,found,table,id,f
             ret+=foundIB.publisher+", "              ret+=foundIB.publisher+", "
         ret+=foundIB.year+"."          ret+=foundIB.year+"."
     elif foundIB.reference_type.lower()=='book':      elif foundIB.reference_type.lower()=='book':
         ret+=foundIB.author_semi_colon+". <i>"+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==''):
             ret+=foundIB.publisher+", "              ret+=foundIB.publisher+", "
         ret+=foundIB.year+"."          ret+=getBib(foundIB.year)+"."
   
     elif foundIB.reference_type.lower()=='newspaper article':      elif foundIB.reference_type.lower()=='newspaper article':
         ret+=foundIB.author_semi_colon+". &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+". "              ret+=foundIB.pages+". "

Removed from v.1.7.2.1  
changed lines
  Added in v.1.7.2.2


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