--- MPIWGWeb/MPIWGProjects.py	2004/07/29 07:36:16	1.15
+++ MPIWGWeb/MPIWGProjects.py	2004/08/10 13:27:25	1.20
@@ -29,7 +29,11 @@ def sortF(x,y):
     try:
         return cmp(x[1],y[1])
     except:
-        return 0
+        try:
+            return cmp(str(x[1]),str(y[1]))
+        except:           
+            print "error",x[1],y[1]
+            return 0 
     
 def sortI(x,y):
     xsplit=x[1].split(".")
@@ -381,7 +385,7 @@ class MPIWGRoot(ZSQLExtendFolder):
         for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):
                                ret.append(x[1].title.decode('utf-8'))
             
-        #ret.sort()
+        ret.sort()
         #print ret
   
         return ret
@@ -415,11 +419,21 @@ class MPIWGRoot(ZSQLExtendFolder):
                     #title=project[0].WEB_title
                     title=[project[0].getContent('WEB_title')]
                     #print title
-                    
                     returnList.append((depth,nr,title,project[0]))
         
         return returnList
 
+    def formatElementForOverview(self,element):
+        """format the element for output in overview"""
+        if element[0]==1: #department
+            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><a href="%s">%s</a></h3><p>"""%(element[3].absolute_url(),element[3].getContent('WEB_title'))
+
+        elif element[0]==3:
+            return """<br><a href="%s">%s</a>"""%(element[3].absolute_url(),element[3].getContent('WEB_title'))
+        
     def changePosition(self,treeId,select,RESPONSE=None):
         """Change Postion Entry"""
         numbers=[]
@@ -546,17 +560,17 @@ class MPIWGRoot(ZSQLExtendFolder):
         #return str(members)
         for x in members:
             ret+=self.getProjectsOfMember(name=x)
-
+            
         return ret
 
     def getProjectsOfMember(self,name=None,email=None):
         """get project of a member"""
         def sortP(x,y):
             """sort by sorting number"""
-            
-            return cmp(x.xdata_05,y.xdata_05)
+            #print x.xdata_05,y.xdata_05
+            return cmp(x.WEB_title,y.WEB_title)
         
- 
+       
         ret=[]
         splitNeu=[]
         if email:
@@ -572,16 +586,24 @@ class MPIWGRoot(ZSQLExtendFolder):
         proj=self.ProjectCatalog({'xdata_01':search})
         if proj:
             proj2=[x for x in proj]
-            proj2.sort(sortP)
-            ret.append((y,proj2))
-
+        #    proj2.sort(sortP)
+        #    ret.append((y,proj2))
+        else:
+            proj2=[]
+            
         proj=self.ProjectCatalog({'xdata_08':search})
         if proj:
-            proj2=[x for x in proj]
-            proj2.sort(sortP)
+            names=[x.WEB_title for x in proj]
+            for x in proj:
+                if not x.WEB_title in names:
+                    proj2.append(x)
+
+
+        proj2.sort(sortP)
+
+        if len(proj2)>0:
             ret.append((y,proj2))
 
-        
         return ret
      
     def givePersonList(self,name):
@@ -741,7 +763,8 @@ class MPIWGProject(Folder):
         """giveListofDatafields"""
         ret=[]
         for x in range(1,14):
-            ret.append('xdata_%02i'%x)
+            if not x in [6,10,9]: # not used fields
+                ret.append('xdata_%02i'%x)
         return ret
             
     def getDefinedFields(self):
@@ -775,8 +798,11 @@ class MPIWGProject(Folder):
                 text=text[0:len(text)-1].encode('utf-8')
         except:
             """nothing"""
-            
-        return text
+
+        if (type(text)==StringType) or (type(text)==UnicodeType):
+            return text
+        else:
+            return text[0]
 
     
     def show_html(self):
@@ -890,15 +916,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)