tracker r1587 - in branches/indexer-split: . src/libtracker-db src/trackerd

[ifrade svn gnome org]

Author: ifrade
Date: Thu Jun  5 10:48:27 2008
New Revision: 1587
URL: http://svn.gnome.org/viewvc/tracker?rev=1587&view=rev

Log:
tracker_process_files_is_file_info_valid is no tracker_db_file_info_is_valid

Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-db/tracker-db-file-info.c
   branches/indexer-split/src/libtracker-db/tracker-db-file-info.h
   branches/indexer-split/src/trackerd/tracker-db.c
   branches/indexer-split/src/trackerd/tracker-process-files.c
   branches/indexer-split/src/trackerd/tracker-process-files.h
   branches/indexer-split/src/trackerd/tracker-watcher-inotify.c

Modified: branches/indexer-split/src/libtracker-db/tracker-db-file-info.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-file-info.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-file-info.c	Thu Jun  5 10:48:27 2008
@@ -326,4 +326,21 @@
 	return info;
 }
 
+gboolean
+tracker_db_file_info_is_valid (TrackerDBFileInfo *info)
+{
+        g_return_val_if_fail (info != NULL, FALSE);
+        g_return_val_if_fail (info->uri != NULL, FALSE);
+
+        if (!g_utf8_validate (info->uri, -1, NULL)) {
+                g_warning ("Expected UTF-8 validation of TrackerDBFileInfo URI");
+                return FALSE;
+        }
+
+        if (info->action == TRACKER_DB_ACTION_IGNORE) {
+                return FALSE;
+        }
+                               
+        return TRUE;
+}
 

Modified: branches/indexer-split/src/libtracker-db/tracker-db-file-info.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-file-info.h	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-file-info.h	Thu Jun  5 10:48:27 2008
@@ -94,13 +94,15 @@
 	gint             ref_count;
 };
 
-TrackerDBFileInfo *tracker_db_file_info_new   (const gchar       *uri,
-					       TrackerDBAction    action,
-					       gint               counter,
-					       TrackerDBWatch     watch);
-void               tracker_db_file_info_free  (TrackerDBFileInfo *info);
-TrackerDBFileInfo *tracker_db_file_info_ref   (TrackerDBFileInfo *info);
-TrackerDBFileInfo *tracker_db_file_info_unref (TrackerDBFileInfo *info);
-TrackerDBFileInfo *tracker_db_file_info_get   (TrackerDBFileInfo *info);
+TrackerDBFileInfo *tracker_db_file_info_new      (const gchar       *uri,
+						  TrackerDBAction    action,
+						  gint               counter,
+						  TrackerDBWatch     watch);
+void               tracker_db_file_info_free     (TrackerDBFileInfo *info);
+TrackerDBFileInfo *tracker_db_file_info_ref      (TrackerDBFileInfo *info);
+TrackerDBFileInfo *tracker_db_file_info_unref    (TrackerDBFileInfo *info);
+TrackerDBFileInfo *tracker_db_file_info_get      (TrackerDBFileInfo *info);
+gboolean           tracker_db_file_info_is_valid (TrackerDBFileInfo *info);
+
 
 #endif /* __TRACKER_DB_FILE_INFO_H__ */

Modified: branches/indexer-split/src/trackerd/tracker-db.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db.c	Thu Jun  5 10:48:27 2008
@@ -119,7 +119,7 @@
 	g_return_val_if_fail (db_con != NULL, info);
 	g_return_val_if_fail (info != NULL, info);
 
-	if (!tracker_process_files_is_file_info_valid (info)) {
+	if (!tracker_db_file_info_is_valid (info)) {
 		return NULL;
 	}
 

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	Thu Jun  5 10:48:27 2008
@@ -366,7 +366,7 @@
 	/* Info struct may have been deleted in transit here so check
          * if still valid and intact.
          */
-	g_return_if_fail (tracker_process_files_is_file_info_valid (info));
+	g_return_if_fail (tracker_db_file_info_is_valid (info));
 
 	/* If we dont have an entry in the db for the deleted file, we
          * ignore it.
@@ -387,7 +387,7 @@
 	/* Info struct may have been deleted in transit here so check
          * if still valid and intact.
          */
-	g_return_if_fail (tracker_process_files_is_file_info_valid (info));
+	g_return_if_fail (tracker_db_file_info_is_valid (info));
 
 	/* If we dont have an entry in the db for the deleted
          * directory, we ignore it.
@@ -1145,24 +1145,6 @@
 	return process_get_files (dir, FALSE, FALSE, prefix);
 }
 
-gboolean
-tracker_process_files_is_file_info_valid (TrackerDBFileInfo *info)
-{
-        g_return_val_if_fail (info != NULL, FALSE);
-        g_return_val_if_fail (info->uri != NULL, FALSE);
-
-        if (!g_utf8_validate (info->uri, -1, NULL)) {
-                g_warning ("Expected UTF-8 validation of TrackerDBFileInfo URI");
-                return FALSE;
-        }
-
-        if (info->action == TRACKER_DB_ACTION_IGNORE) {
-                return FALSE;
-        }
-                               
-        return TRUE;
-}
-
 gint
 tracker_process_files_metadata_queue_length (void)
 {

Modified: branches/indexer-split/src/trackerd/tracker-process-files.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-process-files.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-process-files.h	Thu Jun  5 10:48:27 2008
@@ -49,7 +49,6 @@
 							GSList            **files);
 GSList * tracker_process_files_get_files_with_prefix   (const char         *dir,
 							const char         *prefix);
-gboolean tracker_process_files_is_file_info_valid      (TrackerDBFileInfo  *info);
 
 /* Metadata Queue API */
 gint     tracker_process_files_metadata_queue_length   (void);

Modified: branches/indexer-split/src/trackerd/tracker-watcher-inotify.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-watcher-inotify.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-watcher-inotify.c	Thu Jun  5 10:48:27 2008
@@ -40,6 +40,7 @@
 #include <libtracker-common/tracker-utils.h>
 
 #include <libtracker-db/tracker-db-action.h>
+#include <libtracker-db/tracker-db-file-info.h>
 
 #include "tracker-watcher.h"
 #include "tracker-process-files.h"
@@ -143,7 +144,7 @@
 
 	info = tracker_db_file_info_new (uri, action, 1, TRACKER_DB_WATCH_OTHER);
 
-	if (!tracker_process_files_is_file_info_valid (info)) {
+	if (!tracker_db_file_info_is_valid (info)) {
 		return;
 	}