tracker r2179 - in branches/indexer-split: . data src/libtracker-db

[carlosg svn gnome org]

Author: carlosg
Date: Thu Aug 28 10:29:12 2008
New Revision: 2179
URL: http://svn.gnome.org/viewvc/tracker?rev=2179&view=rev

Log:
2008-08-28  Carlos Garnacho  <carlos imendio com>

        * data/sqlite-stored-procs.sql: Use '#' to begin comments.
        * src/libtracker-db/tracker-db-manager.c (load_prepared_queries): Skip
        lines that begin with '#'.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/data/sqlite-stored-procs.sql
   branches/indexer-split/src/libtracker-db/tracker-db-manager.c

Modified: branches/indexer-split/data/sqlite-stored-procs.sql
==============================================================================
--- branches/indexer-split/data/sqlite-stored-procs.sql	(original)
+++ branches/indexer-split/data/sqlite-stored-procs.sql	Thu Aug 28 10:29:12 2008
@@ -22,7 +22,7 @@
 GetServices SELECT TypeName, Description, Parent  FROM ServiceTypes ORDER BY TypeID;
 GetAllServices SELECT TypeID, TypeName, Parent, PropertyPrefix, Enabled, Embedded, HasMetadata, HasFullText, HasThumbs, ContentMetadata, Database, ShowServiceFiles, ShowServiceDirectories, KeyMetadata1, KeyMetadata2, KeyMetadata3, KeyMetadata4, KeyMetadata5, KeyMetadata6, KeyMetadata7, KeyMetadata8, KeyMetadata9, KeyMetadata10, KeyMetadata11  FROM ServiceTypes;
 
-/* GetNewID and UpdateNewID are deprecated !! */
+# GetNewID and UpdateNewID are deprecated !!
 GetNewID SELECT OptionValue FROM Options WHERE OptionKey = 'Sequence';
 UpdateNewID UPDATE Options set OptionValue = ? WHERE OptionKey = 'Sequence';
 CreateEvent INSERT INTO Events (ServiceID, EventType) VALUES (?,?); 
@@ -36,7 +36,7 @@
 GetLiveSearchHitCount SELECT count(*) FROM cache.LiveSearches WHERE SearchID = ?;
 LiveSearchStopSearch DELETE FROM cache.LiveSearches WHERE SearchID = ?
 
-/* GetNewEventID and UpdateNewEventID are deprecated !! */
+# GetNewEventID and UpdateNewEventID are deprecated !!
 GetNewEventID SELECT OptionValue FROM Options WHERE OptionKey = 'EventSequence';
 UpdateNewEventID UPDATE Options set OptionValue = ? WHERE OptionKey = 'EventSequence';
 

Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.c	Thu Aug 28 10:29:12 2008
@@ -207,7 +207,7 @@
 
 		/* Skip white space, including control characters */
 		for (sql = queries[i]; sql && g_ascii_isspace (sql[0]); sql++);
-		
+
 		if (!sql || sql[0] == '\0') {
 			continue;
 		}
@@ -913,6 +913,10 @@
 		for (p = queries; *p; p++) {
 			GStrv details;
 
+			if (**p == '#') {
+				continue;
+			}
+
 			details = g_strsplit (*p, " ", 2);
 
 			if (!details) {