--- MPIWGWeb/bibliography.py	2005/10/11 13:14:01	1.7.2.2
+++ MPIWGWeb/bibliography.py	2012/12/07 10:12:56	1.7.2.12
@@ -18,34 +18,40 @@ def getBib(value):
         return value
     else:
         return ""
+    
 def formatBiblHelp(self,found,table,id,foundIB=None):
     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
     
     if foundIB.reference_type.lower()=='journal article':
-        
         ret+=getBib(CRListToSemicolon(foundIB.author))+". &quot;"+getBib(foundIB.title)+". &quot; "+"<i>%s</i>"%getBib(foundIB.secondary_title)+" "+getBib(foundIB.volume)+" ("
         if not self.ZSQLisEmpty(foundIB.number):
             ret+=foundIB.number+"&nbsp;"
-        ret+=foundIB.year+")"
+
+        if foundIB.year:
+            ret+=getattr(foundIB,'year','')
+        ret+=")"
         if foundIB.pages and (not foundIB.pages)=='':
             ret+=": "+foundIB.pages+"."
 
     elif foundIB.reference_type.lower()=='edited book':
-        ret+=CRListToSemicolon(foundIB.author)+" (Editor/s). <i>"+foundIB.title+"</i>."
+        if foundIB.author:
+            ret+=CRListToSemicolon(foundIB.author)+" (Editor/s). " 
+        if foundIB.title and (not foundIB.title==""):
+            ret+="<i>"+foundIB.title+"</i>. "
         if foundIB.place_published and (not foundIB.place_published==''):
             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':
-        ret+=getBib(CRListToSemicolon(foundIB.author))+". &quot;"+getBib(foundIB.title)+".&quot; In <i>"+getBib(foundIB.secondary_title)+"</i>"
+    elif foundIB.reference_type.lower()=='book section' or foundIB.reference_type.lower()=='in book':
+        ret+=getBib(CRListToSemicolon(foundIB.author))+". &quot;"+getBib(foundIB.title)+".&quot; In: <i>"+getBib(foundIB.secondary_title)+"</i>"
         if (CRListToSemicolon(foundIB.secondary_author)) and (not CRListToSemicolon(foundIB.secondary_author)==''):
             ret+=", eds.: "+CRListToSemicolon(foundIB.secondary_author)
         ret+=". "
@@ -55,11 +61,13 @@ 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))+". <i>"+getBib(foundIB.title)+"</i>. "
-        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==''):
@@ -71,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))+". &quot;"+getBib(foundIB.title)+".&quot; <i>"+getBib(foundIB.secondary_title)+"</i>, "
+	if foundIB.date:
+	        ret+=getBib(foundIB.date)+"."
+	if foundIB.year:
+		ret+=foundIB.year+","
+        if foundIB.pages and (not getBib(foundIB.pages)==''):
+            ret+=foundIB.pages+". "
+