--- MPIWGWeb/bibliography.py	2005/05/09 10:01:54	1.7
+++ MPIWGWeb/bibliography.py	2006/09/07 11:06:41	1.7.2.7
@@ -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,65 +7,113 @@ def formatBibliography(self,found):
         ret+=formatBiblHelp(self,found,table='bibliography',id=found.id_gen_bib)
     return ret
 
+def CRListToSemicolon(self,listStr,showall=False):
+    if listStr:
+	listStr.replace(";","\n")
+	list=listStr.split("\n")
+	if not showall: #filter eigentuemer der hoempage
+		for x in list:
+
+			if x==self.title: # loesche den Eigentuemer der Hoempage aus der Liste
+				del(list[list.index(x)])
+
+	if len(list)==0: # kein anderer Autor
+		return None
+	elif showall:
+		return "; ".join(list)
+	else:
+		return "(joint with %s)"%"; ".join(list)
+    else:
+        return None
+    
 def getBib(value):
     if value:
         return value
     else:
         return ""
-def formatBiblHelp(self,found,table,id):
+
+    return ret
+def cleanPunctuation(teststr):
+    """clean up punktuation"""
+    ret=""
+    signs="!:;.,?"
+    for x in teststr:
+        if x in signs:
+                if (len(ret)>0) and (ret[-1]==' '):
+                        ret=ret[0:-1]
+        ret+=x
+    return ret
+
+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)[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)+" ("
+	if CRListToSemicolon(foundIB.author):
+	        ret+=getBib(CRListToSemicolon(foundIB.author))+". &quot;"
+	ret+=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 CRListToSemicolon(self,foundIB.author):
+            ret+=CRListToSemicolon(self,foundIB.author)+" (Editor/s). &quot;" 
+        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':
+	if CRListToSemicolon(self,foundIB.author):
+	        ret+=getBib(CRListToSemicolon(self,foundIB.author))+". &quot;"
+	ret+=getBib(foundIB.title)+".&quot; In: <i>"+getBib(foundIB.secondary_title)+"</i>"
+        if (CRListToSemicolon(self,foundIB.secondary_author,showall=True)) and (not CRListToSemicolon(self,foundIB.secondary_author,showall=True)==''):
+            ret+=", eds.: "+CRListToSemicolon(self,foundIB.secondary_author,showall=True)
         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 CRListToSemicolon(self,foundIB.author):
+	        ret+=getBib(CRListToSemicolon(self,foundIB.author))+". "
+	ret+="<i>"+getBib(foundIB.title)+"</i>. "
         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+"."
+        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>, "
+        if CRListToSemicolon(self,foundIB.author):
+	        ret+=CRListToSemicolon(self,foundIB.author)+". &quot;"
+	ret+=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+". "
 
 
             
             
-    return ret
+    return cleanPunctuation(ret)