tracker r3050 - in trunk: . data/db src/libtracker-data src/tracker-indexer tests/scripts/data

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Wed Mar 11 11:50:17 2009
New Revision: 3050
URL: http://svn.gnome.org/viewvc/tracker?rev=3050&view=rev

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

        * src/tracker-indexer/tracker-indexer.c:
        * src/libtracker-data/tracker-data-update.c:
        * src/libtracker-data/tracker-data-update.h:
        * data/db/sqlite-cache.sql:
        * data/db/sqlite-stored-procs.sql:
        * tests/scripts/data/xesam.sql: Removed some more Xesam traces that
        were burried deeper



Removed:
   trunk/tests/scripts/data/xesam.sql
Modified:
   trunk/ChangeLog
   trunk/data/db/sqlite-cache.sql
   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/tracker-indexer/tracker-indexer.c

Modified: trunk/data/db/sqlite-cache.sql
==============================================================================
--- trunk/data/db/sqlite-cache.sql	(original)
+++ trunk/data/db/sqlite-cache.sql	Wed Mar 11 11:50:17 2009
@@ -68,19 +68,3 @@
 	unique (URI)
 );
 
-
-CREATE TABLE Events
-(
-	ID		Integer primary key autoincrement,
-	ServiceID	Integer not null,
-	BeingHandled	Integer default 0,
-	EventType	Text
-);
-
-CREATE TABLE LiveSearches
-(
-	ServiceID	Integer not null,
-	SearchID	Text,
-
-	Unique (ServiceID, SearchID)
-);

Modified: trunk/data/db/sqlite-stored-procs.sql
==============================================================================
--- trunk/data/db/sqlite-stored-procs.sql	(original)
+++ trunk/data/db/sqlite-stored-procs.sql	Wed Mar 11 11:50:17 2009
@@ -15,18 +15,7 @@
 GetServices                    SELECT TypeName, Description, Parent FROM ServiceTypes ORDER BY TypeID;
 GetFileChildren                SELECT ID, Path, Name, IsDirectory FROM Services WHERE Path = ?;
 
-/*
- * Live search queries
- */
-CreateEvent                    INSERT INTO Events (ServiceID, EventType) VALUES (?,?); 
-
-GetLiveSearchAllIDs            SELECT X.ServiceID FROM cache.LiveSearches AS X WHERE X.SearchID = ?
-GetLiveSearchDeletedIDs        SELECT E.ServiceID FROM Events AS E, cache.LiveSearches AS X WHERE E.ServiceID = X.ServiceID AND X.SearchID = ? AND E.EventType = 'Delete';
-GetLiveSearchHitCount          SELECT count(*) FROM cache.LiveSearches WHERE SearchID = ?;
-
-DeleteLiveSearchDeletedIDs     DELETE FROM cache.LiveSearches AS Y WHERE Y.ServiceID IN SELECT ServiceID FROM Events AS E, cache.LiveSearches AS X WHERE E.ServiceID = X.ServiceID AND X.SearchID = ? AND E.EventType = 'Delete'
 
-LiveSearchStopSearch           DELETE FROM cache.LiveSearches WHERE SearchID = ?
 
 /*
  * Option queries

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	Wed Mar 11 11:50:17 2009
@@ -89,23 +89,6 @@
 	return ++max;
 }
 
-void
-tracker_data_update_create_event (TrackerDBInterface *iface,
-				  guint32 service_id,
-				  const gchar *type)
-{
-	gchar *service_id_str;
-
-	service_id_str = tracker_guint32_to_string (service_id);
-
-	tracker_db_interface_execute_procedure (iface, NULL, "CreateEvent",
-						service_id_str,
-						type,
-						NULL);
-
-	g_free (service_id_str);
-}
-
 gboolean
 tracker_data_update_create_service (TrackerService *service,
 				    guint32	    service_id,
@@ -543,14 +526,6 @@
 }
 
 void
-tracker_data_update_delete_handled_events (TrackerDBInterface *iface)
-{
-	g_return_if_fail (TRACKER_IS_DB_INTERFACE (iface));
-
-	tracker_data_manager_exec (iface, "DELETE FROM Events WHERE BeingHandled = 1");
-}
-
-void
 tracker_data_update_delete_service_by_path (const gchar *path,
 					    const gchar *rdf_type)
 {

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	Wed Mar 11 11:50:17 2009
@@ -79,12 +79,6 @@
 void     tracker_data_update_delete_content             (TrackerService      *service,
 							 guint32              service_id);
 
-/* Events */
-void     tracker_data_update_create_event               (TrackerDBInterface  *iface,
-							 guint32              service_id,
-							 const gchar         *type);
-
-void     tracker_data_update_delete_handled_events      (TrackerDBInterface  *iface);
 
 /* Volume handling */
 void tracker_data_update_enable_volume                  (const gchar         *udi,

Modified: trunk/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-indexer.c	(original)
+++ trunk/src/tracker-indexer/tracker-indexer.c	Wed Mar 11 11:50:17 2009
@@ -1546,8 +1546,6 @@
 						    basename,
 						    data);
 
-		tracker_data_update_create_event (indexer->private->cache, id, "Create");
-
 		index_metadata (indexer, id, service, metadata);
 
 		text = tracker_module_file_get_text (info->module_file);