MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

version 1.47.2.73, 2007/04/19 12:18:50	version 1.47.2.74, 2007/04/19 13:32:35
Line 891 class MPIWGRoot(ZSQLExtendFolder):	Line 891 class MPIWGRoot(ZSQLExtendFolder):

columns=data.keys()	columns=data.keys()
for x in ignoreEntries:	for x in ignoreEntries:
	logging.info("ign rem: %s"%x)
	try: #falls in ignore entries felder sind, die nicht in columns sind, fange den fehler ab
columns.remove(x)	columns.remove(x)
	except:
	pass


insert=[]	insert=[]
Line 946 class MPIWGRoot(ZSQLExtendFolder):	Line 949 class MPIWGRoot(ZSQLExtendFolder):
ret+="<h2>Bei €nderung belassen</h2>"	ret+="<h2>Bei €nderung belassen</h2>"
ret+="<p>Bitte die Filemaker-db entsprehchend Šndern</p>"	ret+="<p>Bitte die Filemaker-db entsprehchend Šndern</p>"

	# konflicte
for conflict in conflicts.keys():	for conflict in conflicts.keys():
ignoreEntries=[]	ignoreEntries=[]
displayIgnored=[]	displayIgnored=[]
Line 964 class MPIWGRoot(ZSQLExtendFolder):	Line 967 class MPIWGRoot(ZSQLExtendFolder):

self.updatePersonEntry(resultSet[conflict],ignoreEntries=ignoreEntries)	self.updatePersonEntry(resultSet[conflict],ignoreEntries=ignoreEntries)

	# rest
	cl=list(conflicts.keys())

	for key in resultSet.keys():
	if key not in cl:
	self.updatePersonEntry(resultSet[key])
return ret+"</body></html>"	return ret+"</body></html>"

def updateInstitutsbiliography(self):	def updateInstitutsbiliography(self):