tracker r3077 - in trunk: . data/db src/libtracker-data src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Fri Mar 13 13:53:21 2009
New Revision: 3077
URL: http://svn.gnome.org/viewvc/tracker?rev=3077&view=rev

Log:
2009-03-13  Philip Van Hoof  <philip codeminded be>

        * src/libtracker-data/tracker-data-update.c:
        * src/libtracker-data/tracker-data-update.h:
	* src/trackerd/tracker-volume-cleanup.c:
        * data/db/sqlite-stored-procs.sql: fixes a bug in cleaning up thumbnails 
        from removed devices



Modified:
   trunk/ChangeLog
   trunk/data/db/sqlite-stored-procs.sql
   trunk/src/libtracker-data/tracker-data-update.c
   trunk/src/libtracker-data/tracker-data-update.h
   trunk/src/trackerd/tracker-volume-cleanup.c

Modified: trunk/data/db/sqlite-stored-procs.sql
==============================================================================
--- trunk/data/db/sqlite-stored-procs.sql	(original)
+++ trunk/data/db/sqlite-stored-procs.sql	Fri Mar 13 13:53:21 2009
@@ -128,12 +128,12 @@
 
 GetVolumeID                    SELECT VolumeID FROM Volumes WHERE UDI = ?;
 GetVolumeByPath                SELECT VolumeID FROM Volumes WHERE Enabled = 1 AND (? = MountPath OR ? LIKE (MountPath || '/%'));
-GetVolumesToClean              SELECT MountPath FROM Volumes WHERE DisabledDate < date('now', '-3 day');
+GetVolumesToClean              SELECT MountPath, VolumeID FROM Volumes WHERE DisabledDate < date('now', '-3 day');
 InsertVolume                   INSERT INTO Volumes (MountPath, UDI, Enabled, DisabledDate) VALUES (?, ?, 1, date('now'));
 EnableVolume                   UPDATE Volumes SET MountPath = ?, Enabled = 1 WHERE UDI = ?;
 DisableVolume                  UPDATE Volumes SET Enabled = 0, DisabledDate = date ('now') WHERE UDI = ?;
 DisableAllVolumes              UPDATE Volumes SET Enabled = 0 WHERE VolumeID > 1;
-
+UpdateVolumeDisabledDate       UPDATE Volumes SET DisabledDate = date ('now') WHERE VolumeID = ?;
 
 /*
  * Turtle importing

Modified: trunk/src/libtracker-data/tracker-data-update.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-update.c	(original)
+++ trunk/src/libtracker-data/tracker-data-update.c	Fri Mar 13 13:53:21 2009
@@ -825,6 +825,20 @@
 }
 
 void
+tracker_data_update_reset_volume (guint32 volume_id)
+{
+	TrackerDBInterface *iface;
+
+	iface = tracker_db_manager_get_db_interface (TRACKER_DB_COMMON);
+
+	tracker_db_interface_execute_procedure (iface, NULL,
+						"UpdateVolumeDisabledDate",
+						volume_id,
+						NULL);
+}
+
+
+void
 tracker_data_update_disable_volume (const gchar *udi)
 {
 	TrackerDBInterface *iface;

Modified: trunk/src/libtracker-data/tracker-data-update.h
==============================================================================
--- trunk/src/libtracker-data/tracker-data-update.h	(original)
+++ trunk/src/libtracker-data/tracker-data-update.h	Fri Mar 13 13:53:21 2009
@@ -85,6 +85,7 @@
                                                          const gchar         *mount_path);
 void tracker_data_update_disable_volume                 (const gchar         *udi);
 void tracker_data_update_disable_all_volumes            (void);
+void tracker_data_update_reset_volume                   (guint32              volume_id);
 
 G_END_DECLS
 

Modified: trunk/src/trackerd/tracker-volume-cleanup.c
==============================================================================
--- trunk/src/trackerd/tracker-volume-cleanup.c	(original)
+++ trunk/src/trackerd/tracker-volume-cleanup.c	Fri Mar 13 13:53:21 2009
@@ -80,9 +80,11 @@
 
 		while (is_valid) {
 			GValue       value = { 0, };
+			GValue       idvalue = { 0, };
 			const gchar *mount_point_path;
 
 			_tracker_db_result_set_get_value (result_set, 0, &value);
+			_tracker_db_result_set_get_value (result_set, 1, &idvalue);
 
 			mount_point_path = g_value_get_string (&value);
 
@@ -102,7 +104,10 @@
 				g_object_unref (file);
 			}
 
+			tracker_data_update_reset_volume (g_value_get_uint (&idvalue));
+
 			g_value_unset (&value);
+			g_value_unset (&idvalue);
 
 			is_valid = tracker_db_result_set_iter_next (result_set);
 		}