--- MPIWGWeb/MPIWGProjects.py	2010/09/14 06:46:33	1.47.2.119
+++ MPIWGWeb/MPIWGProjects.py	2012/01/09 07:33:30	1.47.2.124
@@ -237,6 +237,7 @@ class MPIWGProject(CatalogAware,Folder,C
     security=ClassSecurityInfo()
     meta_type='MPIWGProject'
     default_catalog='ProjectCatalog'
+    
     def redirect(self,RESPONSE,url):
         """mache ein redirect mit einem angehaengten time stamp um ein reload zu erzwingen"""
         
@@ -309,7 +310,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 +520,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 +547,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 +590,7 @@ class MPIWGProject(CatalogAware,Folder,C
     
     def getLastPublicationNumber(self):
         publications=self.getPublications()
-        
+       
         if not publications:
             return 0
         else:
@@ -750,6 +760,17 @@ class MPIWGProject(CatalogAware,Folder,C
         else:
             return 1
         
+    def isActualForIndex(self): #isActual kann nicht indiziert werden, da intern fom ZCAtalog verwendete Funktion
+        """gibt 1 zurueck wenn aktuell, 0 sonst"""
+        actualTime=time.localtime()
+        
+        
+        #print getattr(self,'archiveTime',actualTime)
+        if getattr(self,'archiveTime',actualTime)< actualTime:
+            return 0
+        else:
+            return 1
+        
     def copyObjectToArchive(self):
         """kopiere aktuelles objekt ins archiv"""
         logging.info("copytoarchive 1")
@@ -1022,7 +1043,7 @@ class MPIWGProject(CatalogAware,Folder,C
         return pt()
     
   
-    def harvest_page(self,context=None):
+    def harvest_page(self,context=None,mode="normal"):
         """seite fuer harvesting fuer die Projektsuche"""
         if not context:
             context=self
@@ -1658,6 +1679,14 @@ class MPIWGProject(CatalogAware,Folder,C
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
+    def tagTheProject(self,RESPONSE=None):
+        """TAG"""
+        id=self.getId();
+        tmpl =getattr(self.thesaurus,"main.html")
+        if RESPONSE:
+            RESPONSE.redirect("./thesaurus/main.html?project="+id)
+        return
+        
 def manage_addMPIWGProjectForm(self):
     """form for adding the project"""
     pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMPIWGProjectForm.zpt')).__of__(self)