Mercurial > hg > MPIWGWeb

changeset 215:c0dcb747cc41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
handle problem of MPIWG: keys, MPIWG: in the keys is now removed.
author dwinter
date Thu, 29 Aug 2013 09:10:01 +0200
parents f7d8d12b203b
children 3b517b412f77
files MPIWGRoot.py updatePersonalWWW.py
diffstat 2 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MPIWGRoot.py	Wed Aug 07 12:03:58 2013 +0200
+++ b/MPIWGRoot.py	Thu Aug 29 09:10:01 2013 +0200
@@ -296,7 +296,7 @@
         #create the new entry in the database
         
         
-        result,msg=self.members.createNewDBEntry(data['publish_the_data'],data['key'],data['last_name'],
+        result,msg=self.members.createNewDBEntry(data['publish_the_data'],data['key'].replace("MPIWG:",""),data['last_name'],
                                   data['first_name'],data['titles_new'],data['status'],"",
                                   "",data['date_from'],data['date_to'],
                                   data['department'],'',data['funded_by'],
@@ -335,9 +335,13 @@
         member.changeData(data)
         
 
+  
+    
     def updatePersonalwww_doIt(self):
         """do the update"""
         args=self.REQUEST.form
+
+       
         resultSet=self.REQUEST.SESSION['personal_www']['resultSet']
         news=self.REQUEST.SESSION['personal_www']['news']
         conflicts=self.REQUEST.SESSION['personal_www']['conflicts']
@@ -419,9 +423,15 @@
         """
         dsn=self.getConnectionObj().connection_string
         #dsn="dbname=personalwww"
-        resultSet=updatePersonalWWW.importFMPXML(uploadfile)
+        resultSetTmp=updatePersonalWWW.importFMPXML(uploadfile)
+        
+
+        resultSet={}
+        for key in resultSetTmp.keys():
+            resultSet[key.replace("MPIWG:","")]=resultSetTmp[key];
+        
         news,conflicts=updatePersonalWWW.checkImport(dsn, resultSet)
-
+        
         self.REQUEST.SESSION['personal_www'] = {'resultSet': resultSet, 'news': news, 'conflicts': conflicts}
         
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','updatePersonalwww_check.zpt')).__of__(self)
--- a/updatePersonalWWW.py	Wed Aug 07 12:03:58 2013 +0200
+++ b/updatePersonalWWW.py	Thu Aug 29 09:10:01 2013 +0200
@@ -12,7 +12,8 @@
 
 # list of fields that are taken from XML and checked against DB as conflicts
 #checkFields=['key','first_name','last_name','title','home_inst','current_work','e_mail2']
-checkFields=['key','first_name','last_name','title','titles_new','home_inst','current_work']
+#checkFields=['key','first_name','last_name','title','titles_new','home_inst','current_work']
+checkFields=['first_name','last_name','title','titles_new','home_inst','current_work']
 
 
 def sql_quote(v):
@@ -250,6 +251,7 @@
 
 def checkImport(dsn,resultSet):
     #now connect to the database
+    #remove the MPIWG: in all keys
     logging.info("dsn: %s"%dsn)
     dbCon = psycopg.connect(dsn)
     db = dbCon.cursor()