--- MPIWGWeb/bibliography.py 2005/11/23 14:05:10 1.7.2.6
+++ MPIWGWeb/bibliography.py 2012/12/07 10:12:56 1.7.2.12
@@ -23,7 +23,7 @@ def formatBiblHelp(self,found,table,id,f
ret=""
if not foundIB:
try:
- foundIB=self.ZSQLInlineSearch(_table=table,id=id)[0]
+ foundIB=self.ZSQLInlineSearch(_table=table,id=id,_op_id="eq")[0]
except:
return ret
@@ -41,9 +41,9 @@ def formatBiblHelp(self,found,table,id,f
elif foundIB.reference_type.lower()=='edited book':
if foundIB.author:
- ret+=CRListToSemicolon(foundIB.author)+" (Editor/s)."
+ ret+=CRListToSemicolon(foundIB.author)+" (Editor/s). "
if foundIB.title and (not foundIB.title==""):
- ret+=""+foundIB.title+"."
+ ret+=""+foundIB.title+". "
if foundIB.place_published and (not foundIB.place_published==''):
ret+=foundIB.place_published+": "
if foundIB.publisher and (not foundIB.publisher==''):
@@ -51,7 +51,7 @@ 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)+""
+ 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)
ret+=". "
@@ -66,8 +66,8 @@ def formatBiblHelp(self,found,table,id,f
elif foundIB.reference_type.lower()=='book':
ret+=getBib(CRListToSemicolon(foundIB.author))+". "+getBib(foundIB.title)+". "
- if foundIB.pages and (not foundIB.pages==''):
- ret+=foundIB.pages+". "
+# if foundIB.pages and (not foundIB.pages==''):
+#% ret+=foundIB.pages+". "
if foundIB.place_published and (not foundIB.place_published==''):
ret+=foundIB.place_published+": "
if foundIB.publisher and (not foundIB.publisher==''):
@@ -79,6 +79,15 @@ def formatBiblHelp(self,found,table,id,f
ret+=foundIB.date+"."+foundIB.year+","
if foundIB.pages and (not foundIB.pages==''):
ret+=foundIB.pages+". "
+ elif foundIB.reference_type.lower()=='magazine article':
+ ret+=CRListToSemicolon(getBib(foundIB.author))+". ""+getBib(foundIB.title)+"." "+getBib(foundIB.secondary_title)+", "
+ if foundIB.date:
+ ret+=getBib(foundIB.date)+"."
+ if foundIB.year:
+ ret+=foundIB.year+","
+ if foundIB.pages and (not getBib(foundIB.pages)==''):
+ ret+=foundIB.pages+". "
+