Changeset 172

Show
Ignore:
Timestamp:
Sat Aug 26 00:19:58 2006
Author:
Brian
Message:

Alex's change to merge/delete duplicate records

Files:

Legend:

Unmodified
Added
Removed
Modified

  • server/trunk/update/client/Share Changes with Server.py

    r170 r172  
    31 31 # 060821 - fixes to logic that applies changes from server  
    32 32 # 060823 - fixed lost aliases bug; added progress display  
      33 # 060825 - Alex - merge/delete duplicated records  
    33 34  
    34 35 debug = 1  
    …… 
    418 419         # None so that they won't be found by mistake. We could clear all  
    419 420         # 'xxxID' columns and 'Period'.  
    420           #for k, v in changeids.iteritems():  
    421           #    pass  
      421  
      422         # merge duplicate records  
      423         # give preference to lowest id - should be server copy  
      424         for (table, source), dest in changeids.iteritems():  
      425             t = Data.Database[table]  
      426             for k, v in t[source].iteritems():  
      427                 if k.startswith('_'): continue  
      428                 t[dest]['__' + k] = v  
      429             del t[source]  
    422 430          
    423 431         # Data.SetUndo("Commit Processing - Check for duplicates")