--- MPIWGWeb/bibliography.py 2005/10/11 13:14:01 1.7.2.2
+++ MPIWGWeb/bibliography.py 2005/11/22 17:58:27 1.7.2.4
@@ -18,6 +18,7 @@ def getBib(value):
return value
else:
return ""
+
def formatBiblHelp(self,found,table,id,foundIB=None):
ret=""
if not foundIB:
@@ -28,11 +29,13 @@ 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 not self.ZSQLisEmpty(foundIB.number):
ret+=foundIB.number+" "
- ret+=foundIB.year+")"
+
+ if foundIB.year:
+ ret+=getattr(foundIB,'year','')
+ ret+=")"
if foundIB.pages and (not foundIB.pages)=='':
ret+=": "+foundIB.pages+"."
@@ -42,9 +45,9 @@ def formatBiblHelp(self,found,table,id,f
ret+=foundIB.place_published+": "
if foundIB.publisher and (not 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(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)
@@ -55,7 +58,8 @@ def formatBiblHelp(self,found,table,id,f
ret+=foundIB.place_published+": "
if foundIB.publisher and (not foundIB.publisher==''):
ret+=foundIB.publisher+", "
- ret+=foundIB.year+"."
+ ret+=getBib(foundIB.year)+"."
+
elif foundIB.reference_type.lower()=='book':
ret+=getBib(CRListToSemicolon(foundIB.author))+". "+getBib(foundIB.title)+". "
if foundIB.pages and (not foundIB.pages==''):