--- MPIWGWeb/bibliography.py	2004/07/06 16:54:33	1.1
+++ MPIWGWeb/bibliography.py	2005/05/09 10:01:54	1.7
@@ -26,32 +26,32 @@ def formatBiblHelp(self,found,table,id):
         if not self.ZSQLisEmpty(foundIB.number):
             ret+=foundIB.number+" "
         ret+=foundIB.year+")"
-        if not foundIB.pages=='':
+        if foundIB.pages and (not foundIB.pages)=='':
             ret+=": "+foundIB.pages+"."
 
     elif foundIB.reference_type.lower()=='edited book':
         ret+=foundIB.author_semi_colon+" (Editor/s). <i>"+foundIB.title+"</i>."
-        if not foundIB.place_published=='':
+        if foundIB.place_published and (not foundIB.place_published==''):
             ret+=foundIB.place_published+": "
-        if not foundIB.publisher=='':
+        if foundIB.publisher and (not foundIB.publisher==''):
             ret+=foundIB.publisher+", "
         ret+=foundIB.year+"."
 
     elif foundIB.reference_type.lower()=='book section':
-        ret+=foundIB.author_semi_colon+". &quot;"+foundIB.title+".&quot; In <i>"+foundIB.secondary_title+"</i>"
-        if not foundIB.secondary_author_semi_colon=='':
+        ret+=getBib(foundIB.author_semi_colon)+". &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==''):
             ret+=", eds.: "+foundIB.secondary_author_semi_colon
         ret+=". "
-        if not foundIB.pages=='':
+	if foundIB.pages and (not foundIB.pages)=='':
             ret+=foundIB.pages+". "
-        if not foundIB.place_published=='':
+        if foundIB.place_published and (not foundIB.place_published==''):
             ret+=foundIB.place_published+": "
-        if not foundIB.publisher=='':
+        if foundIB.publisher and (not foundIB.publisher==''):
             ret+=foundIB.publisher+", "
         ret+=foundIB.year+"."
     elif foundIB.reference_type.lower()=='book':
         ret+=foundIB.author_semi_colon+". <i>"+foundIB.title+"</i>. "
-        if not foundIB.pages=='':
+        if foundIB.pages and (not foundIB.pages==''):
             ret+=foundIB.pages+". "
         if not foundIB.place_published=='':
             ret+=foundIB.place_published+": "