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

[mr svn gnome org]

Author: mr
Date: Tue May 20 08:27:01 2008
New Revision: 1450
URL: http://svn.gnome.org/viewvc/tracker?rev=1450&view=rev

Log:
	* src/trackerd/tracker-email-kmail.c:
	* src/trackerd/tracker-email-thunderbird.c: Fixed some
	tracker_log() calls to use g_message() and the same for
	tracker_error(), etc.

	* src/trackerd/tracker-ontology.h: Renamed the header #define to
	ONTOLOGY and lined up functions.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/tracker-email-kmail.c
   branches/indexer-split/src/trackerd/tracker-email-thunderbird.c
   branches/indexer-split/src/trackerd/tracker-field.h
   branches/indexer-split/src/trackerd/tracker-ontology.h

Modified: branches/indexer-split/src/trackerd/tracker-email-kmail.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-kmail.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email-kmail.c	Tue May 20 08:27:01 2008
@@ -233,7 +233,7 @@
 
                                 MailStore *store = tracker_db_email_get_mbox_details (db_con, info->uri);
                                 if (!store) {
-                                        tracker_error ("ERROR: could not retrieve store for file %s", info->uri);
+                                        g_critical ("Could not retrieve store for file:'%s'", info->uri);
                                         return FALSE;
                                 }
 
@@ -391,7 +391,7 @@
         return TRUE;
 
  error:
-        tracker_error ("ERROR: file \"%s\" cannot be loaded", m_conf->kmailrc_path);
+        g_critical ("File:'%s' can not be loaded", m_conf->kmailrc_path);
         free_kmail_config (*conf);
         *conf = NULL;
         return FALSE;
@@ -719,17 +719,17 @@
 
         store = tracker_db_email_get_mbox_details (db_con, dir);
         if (!store) {
-                tracker_error ("ERROR: could not retrieve store for directory %s", dir);
+                g_warning ("Could not retrieve store for directory:'%s'", dir);
                 return FALSE;
         }
 
-        tracker_log ("Looking for email file \"%s\"", info->uri);
+        g_message ("Looking for email file:'%s'", info->uri);
 
         if (!tracker_db_email_is_saved_email_file (db_con, info->uri)) {
                 MailMessage *mail_msg = email_parse_mail_message_by_path (MAIL_APP_KMAIL, info->uri, NULL, NULL, NULL);
 
                 if (!mail_msg) {
-                        tracker_log ("WARNING: email %s not found", info->uri);
+                        g_warning ("Email:'%s' not found", info->uri);
                         tracker_db_email_free_mail_store (store);
                         return FALSE;
                 }
@@ -752,7 +752,7 @@
                    suffix ":2,S"... For us it just means that trackerd will see a file being deleted and it
                    will remove it from its database.
                 */
-                tracker_log ("Nothing need to be done, email file \"%s\" is already up to date", info->uri) ;
+                g_message ("Nothing need to be done, email file:'%s' is already up to date", info->uri) ;
         }
 
         tracker_db_email_free_mail_store (store);

Modified: branches/indexer-split/src/trackerd/tracker-email-thunderbird.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-thunderbird.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email-thunderbird.c	Tue May 20 08:27:01 2008
@@ -131,7 +131,7 @@
 tracker_email_watch_emails (DBConnection *db_con)
 {
         if( thunderbird_mail_dir != NULL ) {
-            tracker_log("Thunderbird directory lookup: \"%s\"", thunderbird_mail_dir);
+            g_message ("Thunderbird directory lookup: \"%s\"", thunderbird_mail_dir);
             email_watch_directory(thunderbird_mail_dir, "ThunderbirdEmails");
         }
 }
@@ -146,7 +146,7 @@
 	if (!thunderbird_file_is_interesting (info))
 		return FALSE;
 
-        tracker_log ("Thunderbird file index: \"%s\"\n",info->uri);
+        g_message ("Thunderbird file being index:'%s'",info->uri);
         if (email_parse_mail_tms_file_and_save_new_emails (db_con, MAIL_APP_THUNDERBIRD, info->uri)) {
                 unlink(info->uri);
         }
@@ -214,7 +214,8 @@
         mail_msg->parent_mail_file->path = g_strdup (path);
 
 	if (!g_file_get_contents(path, &contents, &length, &error)) {
-                tracker_log ("Error reading Thunderbird message summary %s\n", error->message);
+                g_warning ("Could not read Thunderbird message summary, %s", 
+                           error->message);
 		g_error_free (error);
 		return mail_msg;
 	}
@@ -223,12 +224,12 @@
                                               parser_data, free_parser_data);
 
         if (!g_markup_parse_context_parse(context, contents, length, NULL)) {
-		tracker_log ("Error parsing context with length \n");
+		g_warning ("Could not parse markup context with length:%d", length);
                 goto end;
 	}
 
 	if (!g_markup_parse_context_end_parse(context, NULL)) {
-                tracker_log ("Error parsing context \n");
+                g_warning ("Could not parse markup context");
                 goto end;
 	}
 

Modified: branches/indexer-split/src/trackerd/tracker-field.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-field.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-field.h	Tue May 20 08:27:01 2008
@@ -43,8 +43,6 @@
 
 GType tracker_field_type_get_type (void) G_GNUC_CONST;
 
-
-
 #define TRACKER_TYPE_FIELD         (tracker_field_get_type ())
 #define TRACKER_FIELD(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FIELD, TrackerField))
 #define TRACKER_FIELD_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_FIELD, TrackerFieldClass))
@@ -63,47 +61,46 @@
 	GObjectClass parent_class;
 };
 
-GType           tracker_field_get_type                     (void) G_GNUC_CONST;
+GType            tracker_field_get_type            (void) G_GNUC_CONST;
 
 TrackerField *   tracker_field_new                 (void);
 
-const gchar *    tracker_field_get_id              (const TrackerField     *field);
-const gchar *    tracker_field_get_name            (const TrackerField     *field);
-TrackerFieldType tracker_field_get_data_type       (const TrackerField     *field);
-const gchar *    tracker_field_get_field_name      (const TrackerField     *field);
-gint             tracker_field_get_weight          (const TrackerField     *service);
-gboolean         tracker_field_get_embedded        (const TrackerField     *field);
-gboolean         tracker_field_get_multiple_values (const TrackerField     *field);
-gboolean         tracker_field_get_delimited       (const TrackerField     *field);
-gboolean         tracker_field_get_filtered        (const TrackerField     *field);
-gboolean         tracker_field_get_store_metadata  (const TrackerField     *field);
-const GSList *   tracker_field_get_child_ids       (const TrackerField     *field);
-
-void             tracker_field_set_id              (TrackerField     *field,
-						    const gchar      *value);
-void             tracker_field_set_name            (TrackerField     *field,
-						    const gchar      *value);
-void             tracker_field_set_data_type       (TrackerField     *field,
-						    TrackerFieldType  value);
-void             tracker_field_set_field_name      (TrackerField     *field,
-						    const gchar      *value);
-void             tracker_field_set_weight          (TrackerField *field,
-						    gint value);
-void             tracker_field_set_embedded        (TrackerField     *field,
-						    gboolean          value);
-void             tracker_field_set_multiple_values (TrackerField     *field,
-						    gboolean          value);
-void             tracker_field_set_delimited       (TrackerField     *field,
-						    gboolean          value);
-void             tracker_field_set_filtered        (TrackerField     *field,
-						    gboolean          value);
-void             tracker_field_set_store_metadata  (TrackerField     *field,
-						    gboolean          value);
-
-void            tracker_field_set_child_ids        (TrackerField *field,
-						    const GSList   *value);
-void            tracker_field_append_child_id      (TrackerField *field,
-						    const gchar *id);
+const gchar *    tracker_field_get_id              (const TrackerField *field);
+const gchar *    tracker_field_get_name            (const TrackerField *field);
+TrackerFieldType tracker_field_get_data_type       (const TrackerField *field);
+const gchar *    tracker_field_get_field_name      (const TrackerField *field);
+gint             tracker_field_get_weight          (const TrackerField *service);
+gboolean         tracker_field_get_embedded        (const TrackerField *field);
+gboolean         tracker_field_get_multiple_values (const TrackerField *field);
+gboolean         tracker_field_get_delimited       (const TrackerField *field);
+gboolean         tracker_field_get_filtered        (const TrackerField *field);
+gboolean         tracker_field_get_store_metadata  (const TrackerField *field);
+const GSList *   tracker_field_get_child_ids       (const TrackerField *field);
+void             tracker_field_set_id              (TrackerField       *field,
+						    const gchar        *value);
+
+void             tracker_field_set_name            (TrackerField       *field,
+						    const gchar        *value);
+void             tracker_field_set_data_type       (TrackerField       *field,
+						    TrackerFieldType    value);
+void             tracker_field_set_field_name      (TrackerField       *field,
+						    const gchar        *value);
+void             tracker_field_set_weight          (TrackerField       *field,
+						    gint                value);
+void             tracker_field_set_embedded        (TrackerField       *field,
+						    gboolean            value);
+void             tracker_field_set_multiple_values (TrackerField       *field,
+						    gboolean            value);
+void             tracker_field_set_delimited       (TrackerField       *field,
+						    gboolean            value);
+void             tracker_field_set_filtered        (TrackerField       *field,
+						    gboolean            value);
+void             tracker_field_set_store_metadata  (TrackerField       *field,
+						    gboolean            value);
+void             tracker_field_set_child_ids       (TrackerField       *field,
+						    const GSList       *value);
+void             tracker_field_append_child_id     (TrackerField       *field,
+						    const gchar        *id);
 
 G_END_DECLS
 

Modified: branches/indexer-split/src/trackerd/tracker-ontology.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-ontology.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-ontology.h	Tue May 20 08:27:01 2008
@@ -19,8 +19,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKERD_SERVICE_MANAGER_H__
-#define __TRACKERD_SERVICE_MANAGER_H__
+#ifndef __TRACKERD_ONTOLOGY_H__
+#define __TRACKERD_ONTOLOGY_H__
 
 #include <glib-object.h>
 
@@ -76,9 +76,7 @@
 const gchar *       tracker_ontology_get_field_id                 (const gchar    *name);
 
 
-
-
 G_END_DECLS
 
-#endif /* __TRACKERD_SERVICE_MANAGER_H__ */
+#endif /* __TRACKERD_ONTOLOGY_H__ */