--- MPIWGWeb/MPIWGProjects.py	2004/07/29 16:39:20	1.18
+++ MPIWGWeb/MPIWGProjects.py	2004/08/28 14:14:44	1.23
@@ -84,20 +84,22 @@ class MPIWGRoot(ZSQLExtendFolder):
         """format"""
         return formatBibliography(here,found)
     
-    def getValue(self,field):
+    def getValue(self,fieldStr):
         """Inhalt des Feldes"""
-
-        if type(field)==StringType:
-            try:
-                if field[len(field)-1]==";":
-                    field=field[0:len(text)-1]
-            except:
-                    """nothing"""
-            
-            return field.encode('utf-8')
         
+        if type(fieldStr)==StringType:
+            field=fieldStr
         else:
-            return field[0].encode('utf-8')
+            field=fieldStr[0]
+        try:
+            if field[len(field)-1]==";":
+                field=field[0:len(field)-1]
+        except:
+
+            """nothing"""
+        field=re.sub(r';([^\s])','; \g<1>',field)
+        return field.encode('utf-8')
+
 
     
     def sortedNames(self,list):
@@ -426,13 +428,17 @@ class MPIWGRoot(ZSQLExtendFolder):
     def formatElementForOverview(self,element):
         """format the element for output in overview"""
         if element[0]==1: #department
-            return "<h2>Department %s: %s</h2>"%(element[3].getContent('xdata_05'),element[3].getContent('WEB_title'))
+            print element[3].getContent('xdata_05')
+            if element[3].getContent('xdata_05') == "4":
+                return """<h2><a href="%s">Ind. Research Group II: %s</a></h2>"""%(element[3].absolute_url(),element[3].getContent('WEB_title'))
+            
+            return """<h2><a href="%s">Department %s: %s</a></h2>"""%(element[3].absolute_url(),element[3].getContent('xdata_05'),element[3].getContent('WEB_title'))
 
         elif element[0]==2: #mainprojects
-            return "<h3>%s</h3><p>"%(element[3].getContent('WEB_title'))
+            return """<h3><a href="%s">%s</a></h3><p>"""%(element[3].absolute_url(),element[3].getContent('WEB_title'))
 
         elif element[0]==3:
-            return "<br>%s"%(element[3].getContent('WEB_title'))
+            return """<p><a href="%s">%s</a></p>"""%(element[3].absolute_url(),element[3].getContent('WEB_title'))
         
     def changePosition(self,treeId,select,RESPONSE=None):
         """Change Postion Entry"""
@@ -793,17 +799,20 @@ class MPIWGProject(Folder):
                     text=x.decode('latin-1').encode('utf-8')
         
         #delete separator (;) if  is there is one
+        ## try:
+##             print text, text[len(text)-1]
+##         except:
+##             print "error:",text
         try:
             if text[len(text)-1]==";":
-                text=text[0:len(text)-1].encode('utf-8')
+                text=text[0:len(text)-1]
+          
+                
         except:
             """nothing"""
 
-        if (type(text)==StringType) or (type(text)==UnicodeType):
-            return text
-        else:
-            return text[0]
-
+        text2=re.sub(r';([^\s])','; \g<1>',text)
+        return text2
     
     def show_html(self):
         """simple index"""
@@ -818,7 +827,7 @@ class MPIWGProject(Folder):
 
     def editMPIWGProject(self,RESPONSE=None):
         """edit the project"""
-        
+
         #return self.REQUEST
         for x in definedFields:
             if self.REQUEST.has_key(x):
@@ -916,15 +925,15 @@ def manage_addMPIWGProjectForm(self):
 def manage_addMPIWGProject(self,id,RESPONSE=None):
     """method to add a project"""
     #print argv
-    if self.REQUEST.has_key('fileupload'):
-        fileupload=self.REQUEST['fileupload']
-        if fileupload:
-            file_name=fileupload.filename
-            filedata=fileupload.read()
-
-            argv=xmlhelper.proj2hash(filedata)
-
-            #print argv
+    fileupload=self.REQUEST.get('fileupload',None)
+    if fileupload:
+        print fileupload
+        file_name=fileupload.filename
+        filedata=fileupload.read()
+        
+        argv=xmlhelper.proj2hash(filedata)
+        
+        #print argv
         newObj=MPIWGProject(id,argv)
     else:
         newObj=MPIWGProject(id)