Mercurial > hg > MPIWGWeb

changeset 210:7791d4fc8a0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove "set datestyle" as it confuses psycopg date parsing. make sure postgresql default is set accordingly.
author casties
date Fri, 12 Jul 2013 14:44:52 +0200
parents e0cc46205395
children 37c2c29ab7ed
files MPIWGRoot.py MPIWGStaff.py
diffstat 2 files changed, 4 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/MPIWGRoot.py	Fri Jul 05 11:28:50 2013 +0200
+++ b/MPIWGRoot.py	Fri Jul 12 14:44:52 2013 +0200
@@ -304,6 +304,7 @@
         
         return result,msg
  
+
     def updatePersonEntry(self,newdata,ignoreEntries=None):
         """update an person entry from newdata. but ignore all fields in ignore Entries"""
         data = newdata.copy()
@@ -319,9 +320,7 @@
         if data['date_from']=="": # wenn date_fromleer
             data['date_from']=None
            
-        #eintragen
-         
-        columns=data.keys()
+        #eintragen         
         for x in ignoreEntries:
             logging.debug("updatePersonEntry: ignoring %s"%x)
             if x in data:
@@ -332,25 +331,9 @@
             logging.error("updatePersonEntry: member (key=%s) not found!"%repr(data['key']))
             return
         
-        # TODO: change date handling
-        self.getStaffFolder().executeZSQL("SET DATESTYLE TO 'German'")
+        # TODO: make sure default datestyle is DMY
         member.changeData(data)
         
-#        msg=""
-#         insert=[]
-#         for key in columns:
-#             if data[key]=="date_none": # date_none eintrag wird zu null uebersetzt
-#                 insert.append('%s=null'%key)
-#             else:
-#                 insert.append(""" "%s"=%s"""%(key,self.ZSQLQuote(data[key])))
-#             
-#         insertStr=",".join(insert)
-#         queryStr="update personal_www SET %s where key='%s'"%(insertStr,data['key'])
-#         self.ZSQLQuery("SET DATESTYLE TO 'German'")
-#         self.ZSQLQuery(queryStr)
-#        
-#         return True,msg
-
 
     def updatePersonalwww_doIt(self):
         """do the update"""
--- a/MPIWGStaff.py	Fri Jul 05 11:28:50 2013 +0200
+++ b/MPIWGStaff.py	Fri Jul 12 14:44:52 2013 +0200
@@ -261,7 +261,7 @@
             
         insertStr=",".join(insert)
         queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr)
-        self.ZSQLQuery("SET DATESTYLE TO 'German'")
+        #self.ZSQLQuery("SET DATESTYLE TO 'German'")
         self.ZSQLQuery(queryStr)
         logging.info("createNewDBEntry %s:"%queryStr)
         #currentwork