commit a2f77e991886cf71446713bb5db6047033b7df07
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 03 22:46:52 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 03 22:46:52 2013 -0800
tree 31e3692833e0e98429c44f6af68527824912d74c
parent ee7e613a13332dea614de38f38d80a63c79257d8

The current view of FileState is now fully maintained, including handling of "conflict resolution"

src/db-helper.cc

diff --git a/src/db-helper.cc b/src/db-helper.cc
index 7b6c091..bb4fa04 100644
--- a/src/db-helper.cc
+++ b/src/db-helper.cc
@@ -140,7 +140,7 @@
     BEGIN                                                               \n\
         SELECT apply_action ((SELECT device_name FROM SyncNodes where device_id=NEW.device_id), \
                              NEW.action,NEW.filename,NEW.file_hash,     \
-                             NEW.file_atime,NEW.file_mtime,NEW.file_ctime, \
+                             strftime('%s', NEW.file_atime),strftime('%s', NEW.file_mtime),strftime('%s', NEW.file_ctime), \
                              NEW.file_chmod); /* function that applies action and adds record the FileState */  \n \
     END;                                                                \n\
                                                                         \n\