Changeset 224

Show
Ignore:
Timestamp:
Wed Oct 11 09:31:40 2006
Author:
Alexander
Message:

Server: some underscore fixes to client scripts

Files:

Legend:

Unmodified
Added
Removed
Modified

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

    r219 r224  
    221 221  
    222 222         for k, v in new_server_nextid.iteritems():  # update our understanding of ids  
      223             if k[0] == "_": continue  
    223 224             Data.NextID[k] = v  # our next id  
    224 225             Data.NextID["_" + k] = v  # the server's next id (same as ours now)  
    …… 
    300 301  
    301 302                 row = database[table][id]  # change applies to this row  
    302                   row_old, row_new = SplitOldNew(c)  
      303                 row_old, row_new = SplitOldNew(row)  
    302 303  
    303 304                 # change Data.Update to ignore "_" columns, but for not just apply them???  
    …… 
    322 323                     elif k in row:  
    323 324                         del row[k]  # delete new value  
    324                                
      325    
      326                     if row.has_key("_" + k):  
      327                         del row["_" + k]  # remove 'changed' flag from updated records  
      328  
    325 329                 #Data.Update(c_new, 0)  # should we not use update to apply changes?  
    326 330                                        # PROBLEM - will the changes from the server be mistaken later  
    …… 
    328 332                                        # We don't want them to be picked up by FindChanges  
    329 333  
    330                   for k in c_old:  
    331                       if row.has_key("_" + k):  # so script can be used with v0.6  
    332                           del row["_" + k]  # remove 'changed' flag from updated records  
    333           # Data.SetUndo("Applied Changes from Server")  # To refresh display, but shouldn't allow undo???  <-- TO DO  
      334        # Data.SetUndo("Applied Changes from Server")  # To refresh display, but shouldn't allow undo???  <-- TO DO  
    334 335         # PROBLEM <- if this adds rows? I don't want to add rows until after we send updates to server.  
    335 336  

  • server/trunk/update/client/Download Database from Server.py

    r216 r224  
    110 110         next = database['NextID']  
    111 111         for k, v in next.items():  
      112             if k[0] == "_": del next[k]  
    112 113             next["_" + k] = v  # the server knows about all these rows  
    113 114