tracker r3021 - in trunk: . data/db src/libtracker-data
- From: carlosg svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r3021 - in trunk: . data/db src/libtracker-data
- Date: Thu, 5 Mar 2009 11:19:00 +0000 (UTC)
Author: carlosg
Date: Thu Mar 5 11:19:00 2009
New Revision: 3021
URL: http://svn.gnome.org/viewvc/tracker?rev=3021&view=rev
Log:
2009-03-05 Carlos Garnacho <carlos imendio com>
Merge together the GetFileChildren and SelectFileChild stored
procedures.
* data/db/sqlite-stored-procs.sql: Only one can stand.
* src/libtracker-data/tracker-data-query.c
(tracker_data_query_service_children):
* src/libtracker-data/tracker-data-search.c
(tracker_data_search_files_get): Adapt to stored procedures change.
Modified:
trunk/ChangeLog
trunk/data/db/sqlite-stored-procs.sql
trunk/src/libtracker-data/tracker-data-query.c
trunk/src/libtracker-data/tracker-data-search.c
Modified: trunk/data/db/sqlite-stored-procs.sql
==============================================================================
--- trunk/data/db/sqlite-stored-procs.sql (original)
+++ trunk/data/db/sqlite-stored-procs.sql Thu Mar 5 11:19:00 2009
@@ -13,7 +13,7 @@
GetFileByID2 SELECT (S.Path || '/' || S.Name) AS uri, GetServiceName (ServiceTypeID), S.Mime FROM Services AS S WHERE S.ID = ? AND S.Enabled = 1 AND (S.AuxilaryID = 0 OR S.AuxilaryID IN (SELECT VolumeID FROM Volumes WHERE Enabled = 1));
GetFileMTime SELECT M.MetaDataValue FROM Services AS S INNER JOIN ServiceNumericMetaData M ON S.ID = M.ServiceID WHERE S.Path = ? AND S.Name = ? AND M.MetaDataID = (SELECT ID FROM MetaDataTypes WHERE MetaName ='File:Modified');
GetServices SELECT TypeName, Description, Parent FROM ServiceTypes ORDER BY TypeID;
-GetFileChildren SELECT ID, Name FROM Services WHERE Path = ?;
+GetFileChildren SELECT ID, Path, Name, IsDirectory FROM Services WHERE Path = ?;
/*
* Live search queries
@@ -45,8 +45,6 @@
MoveService UPDATE Services SET Path = ?, Name = ? WHERE Path = ? AND Name = ?;
MoveServiceChildren UPDATE Services SET Path = replace (Path, ?, ?) WHERE Path = ? OR Path LIKE (? || '/%');
-SelectFileChild SELECT ID, Path, Name, IsDirectory FROM Services WHERE Path = ?;
-
DeleteContent DELETE FROM ServiceContents WHERE ServiceID = ? AND MetadataId = ?;
DeleteService1 DELETE FROM Services WHERE ID = ?;
DeleteServiceRecursively DELETE FROM Services WHERE Path = ? OR Path LIKE (? || '/%');
Modified: trunk/src/libtracker-data/tracker-data-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-query.c (original)
+++ trunk/src/libtracker-data/tracker-data-query.c Thu Mar 5 11:19:00 2009
@@ -394,7 +394,6 @@
result_set = tracker_db_interface_execute_procedure (iface, NULL,
"GetFileChildren",
dirname,
- dirname,
NULL);
if (!result_set) {
@@ -408,14 +407,14 @@
while (valid) {
guint32 id;
- gchar *child_path;
+ gchar *child_name;
tracker_db_result_set_get (result_set,
0, &id,
- 1, &child_path,
+ 2, &child_name,
-1);
- g_hash_table_insert (children, GUINT_TO_POINTER (id), child_path);
+ g_hash_table_insert (children, GUINT_TO_POINTER (id), child_name);
valid = tracker_db_result_set_iter_next (result_set);
}
Modified: trunk/src/libtracker-data/tracker-data-search.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-search.c (original)
+++ trunk/src/libtracker-data/tracker-data-search.c Thu Mar 5 11:19:00 2009
@@ -509,9 +509,9 @@
g_return_val_if_fail (folder_path != NULL, NULL);
result_set = tracker_data_manager_exec_proc (iface,
- "SelectFileChild",
- folder_path,
- NULL);
+ "GetFileChildren",
+ folder_path,
+ NULL);
array = g_ptr_array_new ();
if (result_set) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]