version 1.47.2.71, 2007/04/18 10:03:13
|
version 1.47.2.74, 2007/04/19 13:32:35
|
Line 813 class MPIWGRoot(ZSQLExtendFolder):
|
Line 813 class MPIWGRoot(ZSQLExtendFolder):
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','showNewDBEntries.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','showNewDBEntries.zpt')).__of__(self) |
return pt(newEntries=res) |
return pt(newEntries=res) |
|
|
def createNewStaffObjects(self): |
def createNewStaffObjects(self,RESPONSE): |
"""create new staff object""" |
"""create new staff object""" |
|
|
memberFolder=getattr(self,'members') |
memberFolder=getattr(self,'members') |
Line 823 class MPIWGRoot(ZSQLExtendFolder):
|
Line 823 class MPIWGRoot(ZSQLExtendFolder):
|
ret="" |
ret="" |
for key in arg_k: |
for key in arg_k: |
k=self.urlUnQuote(key) |
k=self.urlUnQuote(key) |
logging.error("XXXXX %s"%k) |
|
qstr="select * from personal_www where key=%s"%self.ZSQLQuote(k) |
qstr="select * from personal_www where key=%s"%self.ZSQLQuote(k) |
res=self.ZSQLQuery(qstr)[0] |
res=self.ZSQLQuery(qstr)[0] |
if args[key]!="": #email-adresse wurde eingetragen |
if args[key]!="": #email-adresse wurde eingetragen |
Line 832 class MPIWGRoot(ZSQLExtendFolder):
|
Line 832 class MPIWGRoot(ZSQLExtendFolder):
|
try: |
try: |
newObj=MPIWGStaff.MPIWGStaff(e_mail,res.last_name.encode('utf-8'),res.first_name.encode('utf-8'),k) |
newObj=MPIWGStaff.MPIWGStaff(e_mail,res.last_name.encode('utf-8'),res.first_name.encode('utf-8'),k) |
memberFolder._setObject(e_mail,newObj) |
memberFolder._setObject(e_mail,newObj) |
|
obj=getattr(memberFolder,e_mail) |
|
obj.reindex_object() |
ret+="Created %s \n"%e_mail |
ret+="Created %s \n"%e_mail |
created=True |
created=True |
except: |
except: |
Line 844 class MPIWGRoot(ZSQLExtendFolder):
|
Line 846 class MPIWGRoot(ZSQLExtendFolder):
|
if created: |
if created: |
qstr="update personal_www set web_object_created='yes',e_mail='%s' where key=%s"%(e_mail,self.ZSQLQuote(k)) |
qstr="update personal_www set web_object_created='yes',e_mail='%s' where key=%s"%(e_mail,self.ZSQLQuote(k)) |
self.ZSQLQuery(qstr) |
self.ZSQLQuery(qstr) |
|
|
return ret |
return ret |
|
|
|
|
Line 888 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 943 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 961 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): |
Line 976 class MPIWGRoot(ZSQLExtendFolder):
|
Line 988 class MPIWGRoot(ZSQLExtendFolder):
|
"""update personalwww |
"""update personalwww |
@param uploadfile: file handle auf das file |
@param uploadfile: file handle auf das file |
""" |
""" |
dsn="dbname=personalwww" |
dsn=self.getConnectionObj().connection_string |
|
#dsn="dbname=personalwww" |
resultSet=updatePersonalWWW.importFMPXML(uploadfile) |
resultSet=updatePersonalWWW.importFMPXML(uploadfile) |
news,conflicts=updatePersonalWWW.checkImport(dsn, resultSet) |
news,conflicts=updatePersonalWWW.checkImport(dsn, resultSet) |
|
|
Line 995 class MPIWGRoot(ZSQLExtendFolder):
|
Line 1008 class MPIWGRoot(ZSQLExtendFolder):
|
|
|
|
|
try: |
try: |
self.MembersCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1']) |
|
self.ProjectCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1']) |
self.ProjectCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1']) |
except: |
except: |
logger("MPIWG Root (updatehomepage)",logging.WARNING," %s %s"%sys.exc_info()[:2]) |
logger("MPIWG Root (updatehomepage)",logging.WARNING," %s %s"%sys.exc_info()[:2]) |