--- MPIWGWeb/Attic/MPIWGRoot.py 2012/03/02 14:03:21 1.1.2.40 +++ MPIWGWeb/Attic/MPIWGRoot.py 2012/03/13 07:04:24 1.1.2.41 @@ -723,7 +723,7 @@ class MPIWGRoot(ZSQLExtendFolder): def getAllProjectsAndTagsAsCSV(self,archived=1,RESPONSE=None): """alle projekte auch die nicht getaggten""" retList=[] - headers=['sortingNumber','projectName','scholars','startedAt','completedAt','lastChange thesaurus','last change project','persons','places','objects'] + headers=['projectId','sortingNumber','projectName','scholars','startedAt','completedAt','lastChangeThesaurusAt','lastChangeProjectAt','projectCreatedAt','persons','places','objects'] headers.extend(list(self.thesaurus.tags.keys())) retList.append("\t".join(headers)) if not hasattr(self,'thesaurus'): @@ -735,13 +735,17 @@ class MPIWGRoot(ZSQLExtendFolder): p_name = project[1] retProj=[] #if (not proj.isArchivedProject() and archived==1) or (proj.isArchivedProject() and archived==2): + retProj.append(self.utf8ify(proj.getId())) retProj.append(self.utf8ify(proj.getContent('xdata_05'))) retProj.append(self.utf8ify(p_name)) retProj.append(self.utf8ify(proj.getContent('xdata_01'))) retProj.append(self.utf8ify(proj.getStartedAt())) retProj.append(self.utf8ify(proj.getCompletedAt())) - retProj.append(self.thesaurus.lastChangeInThesaurus.get(proj.getId(),'')) + changeDate=self.thesaurus.lastChangeInThesaurus.get(proj.getId(),'') + n = re.sub("[:\- ]","",str(changeDate)) + retProj.append(n) retProj.append(self.utf8ify(getattr(proj,'creationTime','20050101000000'))) + retProj.append("")#TODO: project created at retProj.append(";".join([person[1] for person in self.thesaurus.getPersonsFromProject(proj.getId())])) retProj.append(";".join([person[1] for person in self.thesaurus.getHistoricalPlacesFromProject(proj.getId())])) retProj.append(";".join([person[1] for person in self.thesaurus.getObjectsFromProject(proj.getId())]))