--- MPIWGWeb/bibliography.py	2005/05/09 10:01:54	1.7
+++ MPIWGWeb/bibliography.py	2009/02/18 13:01:17	1.8
@@ -1,4 +1,4 @@
-
+#TO DO author_semi_kolon etc. ersetzen durch Funktionen
 def formatBibliography(self,found):
     ret=""
     if found.id_institutsbibliographie and (not found.id_institutsbibliographie==''):
@@ -7,63 +7,87 @@ def formatBibliography(self,found):
         ret+=formatBiblHelp(self,found,table='bibliography',id=found.id_gen_bib)
     return ret
 
+def CRListToSemicolon(list):
+    if list:
+        return "; ".join(list.split("\n"))
+    else:
+        return None
+    
 def getBib(value):
     if value:
         return value
     else:
         return ""
-def formatBiblHelp(self,found,table,id):
+    
+def formatBiblHelp(self,found,table,id,foundIB=None):
     ret=""
-    try:
-        foundIB=self.ZSQLInlineSearch(_table=table,id=id)[0]
+    if not foundIB:
+        try:
+            foundIB=self.ZSQLInlineSearch(_table=table,id=id,_op_id="eq")[0]
 
-    except:
-        return ret
+        except:
+            return ret
     
     if foundIB.reference_type.lower()=='journal article':
-        
-        ret+=getBib(foundIB.author_semi_colon)+". &quot;"+getBib(foundIB.title)+". &quot; "+"<i>%s</i>"%getBib(foundIB.secondary_title)+" "+getBib(foundIB.volume)+" ("
+        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+=foundIB.author_semi_colon+" (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(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
+    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+=". "
-	if foundIB.pages and (not 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==''):
             ret+=foundIB.publisher+", "
-        ret+=foundIB.year+"."
+        ret+=getBib(foundIB.year)+"."
+
+   
     elif foundIB.reference_type.lower()=='book':
-        ret+=foundIB.author_semi_colon+". <i>"+foundIB.title+"</i>. "
-        if foundIB.pages and (not foundIB.pages==''):
-            ret+=foundIB.pages+". "
-        if not foundIB.place_published=='':
+        ret+=getBib(CRListToSemicolon(foundIB.author))+". <i>"+getBib(foundIB.title)+"</i>. "
+#       if foundIB.pages and (not foundIB.pages==''):
+#%            ret+=foundIB.pages+". "
+        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+"."
+        ret+=getBib(foundIB.year)+"."
 
     elif foundIB.reference_type.lower()=='newspaper article':
-        ret+=foundIB.author_semi_colon+". &quot;"+foundIB.title+".&quot; <i>"+foundIB.secondary_title+"</i>, "
+        ret+=CRListToSemicolon(foundIB.author)+". &quot;"+foundIB.title+".&quot; <i>"+foundIB.secondary_title+"</i>, "
         ret+=foundIB.date+"."+foundIB.year+","
-        if not foundIB.pages=='':
+        if foundIB.pages and (not foundIB.pages==''):
             ret+=foundIB.pages+". "
+    elif foundIB.reference_type.lower()=='magazine article':
+        ret+=CRListToSemicolon(foundIB.author)+". &quot;"+foundIB.title+".&quot; <i>"+foundIB.secondary_title+"</i>, "
+	if foundIB.date:
+	        ret+=foundIB.date+"."
+	if foundIB.year:
+		ret+=foundIB.year+","
+        if foundIB.pages and (not foundIB.pages==''):
+            ret+=foundIB.pages+". "
+