--- MPIWGWeb/bibliography.py 2005/11/23 11:08:41 1.7.2.5
+++ MPIWGWeb/bibliography.py 2008/12/17 08:02:19 1.7.2.10
@@ -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)."
- if foundIB.title and (not foundIB.title)=="":
- ret+=""+foundIB.title+"."
+ ret+=CRListToSemicolon(foundIB.author)+" (Editor/s). "
+ if foundIB.title and (not 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+=". "
@@ -62,11 +62,12 @@ def formatBiblHelp(self,found,table,id,f
if foundIB.publisher and (not foundIB.publisher==''):
ret+=foundIB.publisher+", "
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==''):
- 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==''):
@@ -77,6 +78,11 @@ def formatBiblHelp(self,found,table,id,f
ret+=CRListToSemicolon(foundIB.author)+". ""+foundIB.title+"." "+foundIB.secondary_title+", "
ret+=foundIB.date+"."+foundIB.year+","
if foundIB.pages and (not foundIB.pages==''):
+ ret+=foundIB.pages+". "
+ elif foundIB.reference_type.lower()=='magazine article':
+ ret+=CRListToSemicolon(foundIB.author)+". ""+foundIB.title+"." "+foundIB.secondary_title+", "
+ ret+=foundIB.date+"."+foundIB.year+","
+ if foundIB.pages and (not foundIB.pages==''):
ret+=foundIB.pages+". "