--- MPIWGWeb/MPIWGProjects.py	2005/09/15 13:50:55	1.47.2.24
+++ MPIWGWeb/MPIWGProjects.py	2005/10/10 08:42:49	1.47.2.25
@@ -95,7 +95,7 @@ class MPIWGLink(SimpleItem):
         splitted=self.link.lstrip().split("/")
         obj=self
         for x in splitted:
-	    if not x=="":
+            if not x=="":
               obj=getattr(obj,x)
             
         return obj
@@ -188,7 +188,7 @@ class MPIWGTemplate(ZopePageTemplate):
             return "aktiv"
         else:
             return ""
-	
+        
 def manage_addMPIWGTemplateForm(self):
     """Form for adding"""
     pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddMPIWGTemplate.zpt')).__of__(self)
@@ -274,20 +274,20 @@ class MPIWGRoot(ZSQLExtendFolder):
         return "%s?%s"%(link,self.REQUEST.get('QUERY_STRING',''))
 
     def getKategory(self,url):
-	"""kategorie"""
-	splitted=url.split("/")
-	return splitted[4]
+        """kategorie"""
+        splitted=url.split("/")
+        return splitted[4]
 
     def generateUrlProject(self,url,project=None):
         """erzeuge aus absoluter url, relative des Projektes"""
-	if project:
+        if project:
             splitted=url.split("/")
             length=len(splitted)
             short=splitted[length-2:length]
             
             base=self.REQUEST['URL3']+"/"+"/".join(short)
 
-	else:
+        else:
             findPart=url.find("/projects/")
             base=self.REQUEST['URL1']+"/"+url[findPart:]
 
@@ -352,16 +352,16 @@ class MPIWGRoot(ZSQLExtendFolder):
         xmlPath=os.path.join(package_home(globals()), "updateSQL/%s"%fileName)
         zLOG.LOG("MPIWG Web",zLOG.INFO,"java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath))
         ret=os.popen("java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath),"r").read()
-	zLOG.LOG("MPIWG Web",zLOG.INFO,"result convert: %s"%ret)
+        zLOG.LOG("MPIWG Web",zLOG.INFO,"result convert: %s"%ret)
         return 1
     
     def patchProjects(self,RESPONSE):
         """patch"""
         projects=self.ZopeFind(self.projects,obj_metatypes=['MPIWGProject'])
         for project in projects:
-		tmp=project[1].WEB_project_description[0].replace("/CD/projects/","")[0:]
-            	setattr(project[1],'WEB_project_description',[tmp[0:]])
-            	RESPONSE.write("<p>%s</p>\n"%project[0])
+                tmp=project[1].WEB_project_description[0].replace("/CD/projects/","")[0:]
+                setattr(project[1],'WEB_project_description',[tmp[0:]])
+                RESPONSE.write("<p>%s</p>\n"%project[0])
             
     def replaceNotEmpty(self,format,field):
         """replace not empty"""
@@ -545,9 +545,9 @@ class MPIWGRoot(ZSQLExtendFolder):
     def getProjectsByFieldContent(self,fieldName,fieldContentsEntry, date=None):
         """gib alle Projekte aus mit Value von field mit fieldName enthält ein Element der Liste fieldContents"""
         def sort(x,y):
-		return cmp(x.WEB_title[0],y.WEB_title[0])
+                return cmp(x.WEB_title[0],y.WEB_title[0])
 
-	if type(fieldContentsEntry) is StringType:
+        if type(fieldContentsEntry) is StringType:
             fieldContentsTmp=[fieldContentsEntry]
         else:
             fieldContentsTmp=fieldContentsEntry
@@ -557,7 +557,7 @@ class MPIWGRoot(ZSQLExtendFolder):
             fieldContents.append(" AND ".join(x.split()))
         projects=self.ProjectCatalog({fieldName:string.join(fieldContents,' AND')})
         #print projects
-	#ret=[x for x in projects]
+        #ret=[x for x in projects]
         ret=[]
         for x in projects:
             obj=x.getObject()
@@ -566,7 +566,7 @@ class MPIWGRoot(ZSQLExtendFolder):
                 #if not (x in ret):
                     ret.append(x)
 
-	ret.sort(sort)
+        ret.sort(sort)
         return ret
 
     def changeMPIWGRootForm(self):
@@ -785,7 +785,7 @@ class MPIWGRoot(ZSQLExtendFolder):
                     #title=project[0].WEB_title
                     title=[project[0].getContent('WEB_title')]
                     #print title
-		    if idNr[0]!="x":
+                    if idNr[0]!="x":
                        returnList.append((depth,nr,title,project[0]))
         
         return returnList
@@ -821,8 +821,8 @@ class MPIWGRoot(ZSQLExtendFolder):
                     department=int(element[3].getContent('xdata_05'))-1
                     
                     ret+="""</ul></div>\n"""
-		    if department==4: #hack
-			department=3
+                    if department==4: #hack
+                        department=3
 
                     ret+="""<div class="bildspalte"><img src="../grafik/dept%i.jpg" width="160" height="120" vspace="40"></div>
                     <div class="dept">\n<ul class="liste">\n
@@ -975,8 +975,8 @@ class MPIWGRoot(ZSQLExtendFolder):
                         proj=None
 
                 if proj:
-		    if person =="Otto Sibum" : person="H. Otto Sibum"
-		    if person =="Norton Wise" : person="M. Norton Wise"
+                    if person =="Otto Sibum" : person="H. Otto Sibum"
+                    if person =="Norton Wise" : person="M. Norton Wise"
                     #ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url,person.encode('utf-8')))
                     ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url+"/index.html",person))
                 else:
@@ -1298,7 +1298,7 @@ class MPIWGProject(CatalogAware,Folder):
         """get all Publications"""
         def sort_images(x,y):
             return cmp(getattr(x[1],'place',0),getattr(y[1],'place',0))
-        print self.getId()
+
         publications=self.ZopeFind(self,obj_metatypes=['MPIWGProject_publication'])
         
         publications.sort(sort_images)
@@ -1340,7 +1340,7 @@ class MPIWGProject(CatalogAware,Folder):
         """get all Images"""
         def sort_images(x,y):
             return cmp(getattr(x[1],'place',0),getattr(y[1],'place',0))
-        print self.getId()
+
         images=self.ZopeFind(self,obj_metatypes=['MPIWGProject_image'])
         
         images.sort(sort_images)
@@ -1519,10 +1519,10 @@ class MPIWGProject(CatalogAware,Folder):
         self.title=id
         if argv:
             for arg in definedFields:
-		try:
-                	setattr(self,arg,argv[arg])
-		except:
-			setattr(self,arg,"")
+                try:
+                        setattr(self,arg,argv[arg])
+                except:
+                        setattr(self,arg,"")
         else:
             for arg in definedFields:
                 setattr(self,arg,'')
@@ -1589,7 +1589,7 @@ class MPIWGProject(CatalogAware,Folder):
             else:
                 self.REQUEST.SESSION['MPI_redirected']=None
         
-	#ext=self.ZopeFind(self.aq_parent,obj_ids=["project_main"])
+        #ext=self.ZopeFind(self.aq_parent,obj_ids=["project_main"])
         ext=getattr(self,"project_main",None)
         if ext:
             return getattr(self,ext.getId())()
@@ -1652,12 +1652,12 @@ class MPIWGProject(CatalogAware,Folder):
             splitted=text2.split("""<p class="picture">""")
             if len(splitted)>1:
                 tmp=splitted[1].split("</p>")
-		#return repr(splitted[1])
+                #return repr(splitted[1])
                 try:
-			self.imageURL=tmp[0].split("\"")[1].encode('utf-8')
-		except:
-			self.imageURL=tmp[0].split("src=")[1].split(" ")[0].encode('utf-8')
-		
+                        self.imageURL=tmp[0].split("\"")[1].encode('utf-8')
+                except:
+                        self.imageURL=tmp[0].split("src=")[1].split(" ")[0].encode('utf-8')
+                
                 split2="</p>".join(tmp[1:])
 
                 text3=splitted[0]+split2
@@ -1665,7 +1665,7 @@ class MPIWGProject(CatalogAware,Folder):
                 splitted=text3.split("""<p class="picturetitle">""")
                 if len(splitted)>1:
                     tmp=splitted[1].split("</p>")
-		    self.imagecap=tmp[0].encode('utf-8')
+                    self.imagecap=tmp[0].encode('utf-8')
                 
                     split4="".join(tmp[1:])