tracker r1511 - in branches/indexer-split: . src/trackerd

[mr svn gnome org]

Author: mr
Date: Wed May 28 10:52:12 2008
New Revision: 1511
URL: http://svn.gnome.org/viewvc/tracker?rev=1511&view=rev

Log:
	* src/trackerd/Makefile.am:
	* src/trackerd/tracker-apps.c:
	* src/trackerd/tracker-apps.h:
	* src/trackerd/tracker-db.h:
	* src/trackerd/tracker-process-files.c: Removed the
	src/trackerd/tracker-apps.[ch] files because there is a module to
	do that now in the src/tracker-indexer code. The process-files
	module now won't try to index applications, but the process-files
	module is obsolete now anyway. All commented out code is
	marked with the comment FIXME-indexer-split.


Removed:
   branches/indexer-split/src/trackerd/tracker-apps.c
   branches/indexer-split/src/trackerd/tracker-apps.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/Makefile.am
   branches/indexer-split/src/trackerd/tracker-db.h
   branches/indexer-split/src/trackerd/tracker-process-files.c

Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am	(original)
+++ branches/indexer-split/src/trackerd/Makefile.am	Wed May 28 10:52:12 2008
@@ -64,8 +64,6 @@
 	$(watch_sources)						\
 	$(win_sources)							\
 	$(unix_sources)							\
-	tracker-apps.c							\
-	tracker-apps.h							\
 	tracker-cache.c							\
 	tracker-cache.h							\
 	tracker-db.c							\

Modified: branches/indexer-split/src/trackerd/tracker-db.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-db.h	Wed May 28 10:52:12 2008
@@ -85,8 +85,6 @@
 						    const gchar          *attachment_service);
 void               tracker_db_index_conversation   (DBConnection         *db_con,
 						    TrackerDBFileInfo    *info);
-void               tracker_db_index_application    (DBConnection         *db_con,
-						    TrackerDBFileInfo    *info);
 void               tracker_db_index_webhistory     (DBConnection         *db_con,
 						    TrackerDBFileInfo    *info);
 void               tracker_db_file_change_free     (TrackerDBFileChange **change);

Modified: branches/indexer-split/src/trackerd/tracker-process-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-process-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-process-files.c	Wed May 28 10:52:12 2008
@@ -41,7 +41,6 @@
 
 #include "../xdgmime/xdgmime.h"
 
-#include "tracker-apps.h"
 #include "tracker-db.h"
 #include "tracker-dbus.h"
 #include "tracker-dbus-daemon.h"
@@ -541,7 +540,16 @@
 	} else if (g_str_has_suffix (service_info, "Conversations")) {
 		tracker_db_index_conversation (db_con, info);
 	} else if (strcmp (service_info, "Applications") == 0) {
+#if 0
+                /* FIXME-indexer-split: This has been commented out as a
+                 * result of moving the tracker-apps.[ch] code to the indexer
+                 * directory. This code will be removed when this function is
+                 * updated to work correctly in the indexer application.
+                 *
+                 * -Martyn
+                 */ 
 		tracker_db_index_application (db_con, info);
+#endif
 	} else {
 		tracker_db_index_service (db_con, info, NULL, NULL, NULL, FALSE, TRUE, TRUE, TRUE);
 	}
@@ -688,8 +696,17 @@
        
         tracker_db_start_index_transaction (db_con);
         tracker_db_interface_start_transaction (db_con->cache->db);
-        
+
+#if 0        
+        /* FIXME-indexer-split: This has been commented out as a
+         * result of moving the tracker-apps.[ch] code to the indexer
+         * directory. This code will be removed when this function is
+         * updated to work correctly in the indexer application.
+         *
+         * -Martyn
+         */ 
         tracker_applications_add_service_directories ();
+#endif
         
         list = tracker_ontology_get_dirs_for_service_type ("Applications");
         process_directory_list (tracker, list, FALSE, db_con);