--- MPIWGWeb/bibliography.py	2005/10/10 08:42:49	1.7.2.1
+++ MPIWGWeb/bibliography.py	2005/10/11 13:14:01	1.7.2.2
@@ -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,6 +7,12 @@ 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
@@ -23,7 +29,7 @@ def formatBiblHelp(self,found,table,id,f
     
     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+")"
@@ -31,7 +37,7 @@ def formatBiblHelp(self,found,table,id,f
             ret+=": "+foundIB.pages+"."
 
     elif foundIB.reference_type.lower()=='edited book':
-        ret+=foundIB.author_semi_colon+" (Editor/s). <i>"+foundIB.title+"</i>."
+        ret+=CRListToSemicolon(foundIB.author)+" (Editor/s). <i>"+foundIB.title+"</i>."
         if foundIB.place_published and (not foundIB.place_published==''):
             ret+=foundIB.place_published+": "
         if foundIB.publisher and (not foundIB.publisher==''):
@@ -39,9 +45,9 @@ def formatBiblHelp(self,found,table,id,f
         ret+=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
+        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)=='':
             ret+=foundIB.pages+". "
@@ -51,17 +57,17 @@ def formatBiblHelp(self,found,table,id,f
             ret+=foundIB.publisher+", "
         ret+=foundIB.year+"."
     elif foundIB.reference_type.lower()=='book':
-        ret+=foundIB.author_semi_colon+". <i>"+foundIB.title+"</i>. "
+        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 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 foundIB.pages and (not foundIB.pages==''):
             ret+=foundIB.pages+". "