[hamster-applet/gnome-2-30] don't eliminate overlapping entries - it's better to have overlaps than to miss data

[Toms Baugis <tbaugis src gnome org>]

commit 580af1088a381fb5570e5a9d51f370ed1941b534
Author: Toms Bauģis <toms baugis gmail com>
Date:   Sun Jul 18 14:14:21 2010 +0100

    don't eliminate overlapping entries - it's better to have overlaps than to miss data

 src/hamster/db.py |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/src/hamster/db.py b/src/hamster/db.py
index e0dee2e..e629d0e 100644
--- a/src/hamster/db.py
+++ b/src/hamster/db.py
@@ -414,6 +414,8 @@ class Storage(storage.Storage):
                                           end_time, start_time, end_time, start_time))
 
         for fact in conflicts:
+            # won't eliminate as it is better to have overlapping entries than loosing data
+
             # split - truncate until beginning of new entry and create new activity for end
             if fact["start_time"] < start_time < fact["end_time"] and \
                fact["start_time"] < end_time < fact["end_time"]:
@@ -435,13 +437,6 @@ class Storage(storage.Storage):
                                       WHERE fact_id = ?"""
                 self.execute(tag_update, (new_fact["id"], fact["id"])) #clone tags
 
-            #eliminate
-            elif fact["end_time"] and \
-                 start_time < fact["start_time"] < end_time and \
-                 start_time < fact["end_time"] < end_time:
-                logging.info("eliminating %s" % fact["name"])
-                self.__remove_fact(fact["id"])
-
             # overlap start
             elif start_time < fact["start_time"] < end_time:
                 logging.info("Overlapping start of %s" % fact["name"])