[BACK]Return to updatePersonalWWW.py CVS log [TXT] [DIR] Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/Attic/updatePersonalWWW.py between versions 1.1.2.6 and 1.1.2.11

version 1.1.2.6, 2009/04/28 13:35:17 version 1.1.2.11, 2012/01/09 07:33:31
Line 1 Line 1
 try:  
     import psycopg2 as psycopg      import psycopg2 as psycopg
     psyco = 2      psyco = 2
 except:  
     import psycopg  
     psyco = 1  
           
 import logging  import logging
   from MPIWGHelper import unicodify, utf8ify
   
 from xml import sax  from xml import sax
 from amara import saxtools  from amara import saxtools
Line 15  fm_ns = 'http://www.filemaker.com/fmpxml Line 12  fm_ns = 'http://www.filemaker.com/fmpxml
   
 # list of fields that are taken from XML and checked against DB as conflicts  # 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','home_inst','current_work','e_mail2']
 checkFields=['key','first_name','last_name','titles_new','home_inst','e_mail2']  checkFields=['key','first_name','last_name','title','titles_new','home_inst','current_work']
   
   
 def sql_quote(v):  def sql_quote(v):
     # quote dictionary      # quote dictionary
Line 225  def checkImport(dsn,resultSet): Line 223  def checkImport(dsn,resultSet):
     keys=[]      keys=[]
     for x in results:      for x in results:
         if x[0]:          if x[0]:
             keys.append(x[0].decode('utf-8'))              keys.append(unicodify(x[0]))
                           
       
     #first step detect new entries and conflicts      #first step detect new entries and conflicts
Line 287  def checkForConflicts(cursor,dataSet,key Line 285  def checkForConflicts(cursor,dataSet,key
     for checkField in checkFields:      for checkField in checkFields:
         dbValueR=sr[0][i]          dbValueR=sr[0][i]
         if dbValueR:          if dbValueR:
             dbValue=dbValueR.decode('utf-8')              dbValue=unicodify(dbValueR)
         else:          else:
             dbValue=""              dbValue=""
                           
           if checkField in dataSet:
         setValue=dataSet[checkField]          setValue=dataSet[checkField]
         logging.debug( "             %s %s %s %s"%(repr(key),checkField,repr(dbValue),repr(setValue)))          logging.debug( "             %s %s %s %s"%(repr(key),checkField,repr(dbValue),repr(setValue)))
         if dbValue.strip().rstrip()!=setValue.lstrip().rstrip():          if dbValue.strip().rstrip()!=setValue.lstrip().rstrip():
             ret.append((checkField,dbValue,setValue))              ret.append((checkField,dbValue,setValue))
             retValue=True              retValue=True
                   
           else:
               logging.warning("unknown field %s in data file!"%checkField)
               
         i+=1          i+=1
           
     return retValue,ret      return retValue,ret
Removed from v.1.1.2.6  
changed lines
  Added in v.1.1.2.11

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>