--- MPIWGWeb/MPIWGProjects.py 2010/09/14 06:46:33 1.47.2.119 +++ MPIWGWeb/MPIWGProjects.py 2010/09/14 13:23:46 1.47.2.121 @@ -309,7 +309,7 @@ class MPIWGProject(CatalogAware,Folder,C """test ob es digital sources gibt""" - ret = (self.getContent('xdata_11')=='' and self.getContent('xdata_13')=='') + ret = (self.getContent('xdata_11').lstrip().rstrip()=='') @@ -519,8 +519,11 @@ class MPIWGProject(CatalogAware,Folder,C def addPublication(self,text,RESPONSE=None): """add an MPIWG_Publication""" - - name="publication_"+str(self.getLastPublicationNumber()+1) + number=self.getLastPublicationNumber()+1 + name="publication_"+str(number) + while hasattr(self,name): + number+=1 + name="publication_"+str(number) newPublication=MPIWGProject_publication(name) @@ -543,7 +546,13 @@ class MPIWGProject(CatalogAware,Folder,C def addRelatedProject(self,link,RESPONSE=None): """add an MPIWG_Publication""" - name="RelatedProject"+str(self.getLastRelatedProjectNumber()+1) + + + number=self.getLastPublicationNumber()+1 + name="RelatedProject"+str(number) + while hasattr(self,name): + number+=1 + name="RelatedProject_"+str(number) # hole die id des projektes splitted=link.split("/") @@ -580,7 +589,7 @@ class MPIWGProject(CatalogAware,Folder,C def getLastPublicationNumber(self): publications=self.getPublications() - + if not publications: return 0 else: