--- MPIWGWeb/bibliography.py 2005/11/23 14:05:10 1.7.2.6
+++ MPIWGWeb/bibliography.py 2006/09/07 11:06:41 1.7.2.7
@@ -7,9 +7,22 @@ def formatBibliography(self,found):
ret+=formatBiblHelp(self,found,table='bibliography',id=found.id_gen_bib)
return ret
-def CRListToSemicolon(list):
- if list:
- return "; ".join(list.split("\n"))
+def CRListToSemicolon(self,listStr,showall=False):
+ if listStr:
+ listStr.replace(";","\n")
+ list=listStr.split("\n")
+ if not showall: #filter eigentuemer der hoempage
+ for x in list:
+
+ if x==self.title: # loesche den Eigentuemer der Hoempage aus der Liste
+ del(list[list.index(x)])
+
+ if len(list)==0: # kein anderer Autor
+ return None
+ elif showall:
+ return "; ".join(list)
+ else:
+ return "(joint with %s)"%"; ".join(list)
else:
return None
@@ -18,7 +31,19 @@ def getBib(value):
return value
else:
return ""
-
+
+ return ret
+def cleanPunctuation(teststr):
+ """clean up punktuation"""
+ ret=""
+ signs="!:;.,?"
+ for x in teststr:
+ if x in signs:
+ if (len(ret)>0) and (ret[-1]==' '):
+ ret=ret[0:-1]
+ ret+=x
+ return ret
+
def formatBiblHelp(self,found,table,id,foundIB=None):
ret=""
if not foundIB:
@@ -29,7 +54,9 @@ def formatBiblHelp(self,found,table,id,f
return ret
if foundIB.reference_type.lower()=='journal article':
- ret+=getBib(CRListToSemicolon(foundIB.author))+". ""+getBib(foundIB.title)+". " "+"%s"%getBib(foundIB.secondary_title)+" "+getBib(foundIB.volume)+" ("
+ if CRListToSemicolon(foundIB.author):
+ ret+=getBib(CRListToSemicolon(foundIB.author))+". ""
+ ret+=getBib(foundIB.title)+". " "+"%s"%getBib(foundIB.secondary_title)+" "+getBib(foundIB.volume)+" ("
if not self.ZSQLisEmpty(foundIB.number):
ret+=foundIB.number+" "
@@ -40,8 +67,8 @@ def formatBiblHelp(self,found,table,id,f
ret+=": "+foundIB.pages+"."
elif foundIB.reference_type.lower()=='edited book':
- if foundIB.author:
- ret+=CRListToSemicolon(foundIB.author)+" (Editor/s)."
+ if CRListToSemicolon(self,foundIB.author):
+ ret+=CRListToSemicolon(self,foundIB.author)+" (Editor/s). ""
if foundIB.title and (not foundIB.title==""):
ret+=""+foundIB.title+"."
if foundIB.place_published and (not foundIB.place_published==''):
@@ -51,9 +78,11 @@ def formatBiblHelp(self,found,table,id,f
ret+=getBib(foundIB.year)+"."
elif foundIB.reference_type.lower()=='book section' or foundIB.reference_type.lower()=='in book':
- ret+=getBib(CRListToSemicolon(foundIB.author))+". ""+getBib(foundIB.title)+"." In "+getBib(foundIB.secondary_title)+""
- if (CRListToSemicolon(foundIB.secondary_author)) and (not CRListToSemicolon(foundIB.secondary_author)==''):
- ret+=", eds.: "+CRListToSemicolon(foundIB.secondary_author)
+ if CRListToSemicolon(self,foundIB.author):
+ ret+=getBib(CRListToSemicolon(self,foundIB.author))+". ""
+ ret+=getBib(foundIB.title)+"." In: "+getBib(foundIB.secondary_title)+""
+ if (CRListToSemicolon(self,foundIB.secondary_author,showall=True)) and (not CRListToSemicolon(self,foundIB.secondary_author,showall=True)==''):
+ ret+=", eds.: "+CRListToSemicolon(self,foundIB.secondary_author,showall=True)
ret+=". "
if foundIB.pages and (not foundIB.pages)=='':
ret+=foundIB.pages+". "
@@ -65,7 +94,9 @@ def formatBiblHelp(self,found,table,id,f
elif foundIB.reference_type.lower()=='book':
- ret+=getBib(CRListToSemicolon(foundIB.author))+". "+getBib(foundIB.title)+". "
+ if CRListToSemicolon(self,foundIB.author):
+ ret+=getBib(CRListToSemicolon(self,foundIB.author))+". "
+ ret+=""+getBib(foundIB.title)+". "
if foundIB.pages and (not foundIB.pages==''):
ret+=foundIB.pages+". "
if foundIB.place_published and (not foundIB.place_published==''):
@@ -75,7 +106,9 @@ def formatBiblHelp(self,found,table,id,f
ret+=getBib(foundIB.year)+"."
elif foundIB.reference_type.lower()=='newspaper article':
- ret+=CRListToSemicolon(foundIB.author)+". ""+foundIB.title+"." "+foundIB.secondary_title+", "
+ if CRListToSemicolon(self,foundIB.author):
+ ret+=CRListToSemicolon(self,foundIB.author)+". ""
+ ret+=foundIB.title+"." "+foundIB.secondary_title+", "
ret+=foundIB.date+"."+foundIB.year+","
if foundIB.pages and (not foundIB.pages==''):
ret+=foundIB.pages+". "
@@ -83,4 +116,4 @@ def formatBiblHelp(self,found,table,id,f
- return ret
+ return cleanPunctuation(ret)