Diff for /MPIWGWeb/bibliography.py between versions 1.7 and 1.8

version 1.7, 2005/05/09 10:01:54 version 1.8, 2009/02/18 13:01:17
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
     else:      else:
         return ""          return ""
 def formatBiblHelp(self,found,table,id):      
   def formatBiblHelp(self,found,table,id,foundIB=None):
     ret=""      ret=""
       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
           
     if foundIB.reference_type.lower()=='journal article':      if foundIB.reference_type.lower()=='journal article':
                   ret+=getBib(CRListToSemicolon(foundIB.author))+". &quot;"+getBib(foundIB.title)+". &quot; "+"<i>%s</i>"%getBib(foundIB.secondary_title)+" "+getBib(foundIB.volume)+" ("
         ret+=getBib(foundIB.author_semi_colon)+". &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+=foundIB.author_semi_colon+" (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==''):
             ret+=foundIB.publisher+", "              ret+=foundIB.publisher+", "
         ret+=foundIB.year+"."          ret+=getBib(foundIB.year)+"."
   
     elif foundIB.reference_type.lower()=='book section':      elif foundIB.reference_type.lower()=='book section' or foundIB.reference_type.lower()=='in book':
         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 48  def formatBiblHelp(self,found,table,id): Line 61  def formatBiblHelp(self,found,table,id):
             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()=='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 not foundIB.place_published=='':          if foundIB.place_published and (not foundIB.place_published==''):
             ret+=foundIB.place_published+": "              ret+=foundIB.place_published+": "
         if 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 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>, "
       if foundIB.date:
               ret+=foundIB.date+"."
       if foundIB.year:
           ret+=foundIB.year+","
           if foundIB.pages and (not foundIB.pages==''):
             ret+=foundIB.pages+". "              ret+=foundIB.pages+". "
   
   
                           
               
                           
     return ret      return ret

Removed from v.1.7  
changed lines
  Added in v.1.8


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