tracker r2588 - in branches/turtle: . src/libtracker-data src/tracker-indexer

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Thu Nov 27 10:56:49 2008
New Revision: 2588
URL: http://svn.gnome.org/viewvc/tracker?rev=2588&view=rev

Log:
2008-11-27  Philip Van Hoof  <philip codeminded be>

	* src/tracker-indexer/tracker-removable-device.c
	* src/tracker-indexer/tracker-removable-device.h: Created stubs for
	adding 'adding', 'moving', 'removing' triples about resources to the
	Turtle file



Modified:
   branches/turtle/ChangeLog
   branches/turtle/src/libtracker-data/tracker-data-update.c
   branches/turtle/src/tracker-indexer/tracker-removable-device.c
   branches/turtle/src/tracker-indexer/tracker-removable-device.h

Modified: branches/turtle/src/libtracker-data/tracker-data-update.c
==============================================================================
--- branches/turtle/src/libtracker-data/tracker-data-update.c	(original)
+++ branches/turtle/src/libtracker-data/tracker-data-update.c	Thu Nov 27 10:56:49 2008
@@ -572,6 +572,7 @@
 }
 
 /* TODO: URI branch path -> uri */
+
 void
 tracker_data_delete_service (const gchar         *path,
 			     const gchar         *rdf_type)
@@ -580,6 +581,9 @@
 	const gchar *service_type = tracker_service_get_name (service);
 	guint32 service_id =  tracker_data_query_file_id (service_type, path);
 
+	/* When merging from the decomposed branch to trunk then this function
+	 * wont exist in the decomposed branch. Create it based on this one. */
+
 	tracker_data_update_delete_service (service, service_id);
 	tracker_data_update_delete_service_recursively (service, (gchar *) path);
 	tracker_data_update_delete_all_metadata (service, service_id);
@@ -602,6 +606,10 @@
 	ForeachInMetadataInfo *info = user_data;
 	gchar *parsed_value;
 
+	/* TODO untested and unfinished port that came from the decomposed 
+	 * branch of JÃrg. When merging from the decomposed branch to trunk
+	 * then pick the version in the decomposed branch for this function */
+
 	parsed_value = tracker_parser_text_to_string (value,
 						      info->language,
 						      tracker_config_get_max_word_length (info->config),
@@ -619,6 +627,7 @@
 	g_free (parsed_value);
 }
 
+/* TODO: URI branch path -> uri */
 
 void 
 tracker_data_replace_service (const gchar         *path,
@@ -633,7 +642,8 @@
 	gchar               *escaped_path;
 
 	/* TODO untested and unfinished port that came from the decomposed 
-	 * branch of JÃrg. */
+	 * branch of JÃrg. When merging from the decomposed branch to trunk
+	 * then pick the version in the decomposed branch for this function */
 
 	if (!rdf_type)
 		return;

Modified: branches/turtle/src/tracker-indexer/tracker-removable-device.c
==============================================================================
--- branches/turtle/src/tracker-indexer/tracker-removable-device.c	(original)
+++ branches/turtle/src/tracker-indexer/tracker-removable-device.c	Thu Nov 27 10:56:49 2008
@@ -21,6 +21,19 @@
  * Author: Philip Van Hoof <philip codeminded be>
  */
 
+/* When merging the decomposed branch to trunk: this filed used to be called
+ * tracker-indexer/tracker-turtle.c. What has happened in trunk is that this
+ * file got renamed to tracker-indexer/tracker-removable-device.c and that
+ * we created a new file libtracker-data/tracker-turtle.c which contains some
+ * of the functions that used to be available in this file. 
+ *
+ * The reason for that is that Ivan's backup support, which runs in trackerd,
+ * needed access to the same Turtle related routines. So we moved it to one of
+ * our internally shared libraries (libtracker-data got elected for this). 
+ *
+ * When merging the decomposed branch, simply pick this file over the file 
+ * tracker-indexer/tracker-turtle.c (in the decomposed branch). */
+
 #include "config.h"
 
 #include "tracker-removable-device.h"
@@ -479,3 +492,45 @@
 #endif /* HAVE_RAPTOR */
 
 }
+
+void
+tracker_removable_device_add_metadata (TrackerIndexer *indexer, 
+				       const gchar *mount_point, 
+				       TrackerDataMetadata *metadata)
+{
+#ifdef HAVE_RAPTOR
+
+	/* Implement adding metadata */
+
+#endif /* HAVE_RAPTOR */
+}
+
+/* TODO URI branch: path -> uri */
+
+void
+tracker_removable_device_add_removal (TrackerIndexer *indexer, 
+				      const gchar *mount_point, 
+				      const gchar *path)
+{
+#ifdef HAVE_RAPTOR
+
+	/* Implement adding metadata */
+
+#endif /* HAVE_RAPTOR */
+}
+
+/* TODO URI branch: path -> uri */
+
+void
+tracker_removable_device_add_move (TrackerIndexer *indexer, 
+				   const gchar *mount_point, 
+				   const gchar *from_path, 
+				   const gchar *to_path)
+{
+#ifdef HAVE_RAPTOR
+
+	/* Implement adding metadata */
+
+#endif /* HAVE_RAPTOR */
+}
+

Modified: branches/turtle/src/tracker-indexer/tracker-removable-device.h
==============================================================================
--- branches/turtle/src/tracker-indexer/tracker-removable-device.h	(original)
+++ branches/turtle/src/tracker-indexer/tracker-removable-device.h	Thu Nov 27 10:56:49 2008
@@ -27,8 +27,20 @@
 #include "tracker-indexer.h"
 #include <libtracker-data/tracker-data-metadata.h>
 
-void    tracker_removable_device_load      (TrackerIndexer *indexer, const gchar *mount_point);
-void    tracker_removable_device_optimize  (TrackerIndexer *indexer, const gchar *mount_point);
+void    tracker_removable_device_load         (TrackerIndexer *indexer, 
+					       const gchar *mount_point);
+void    tracker_removable_device_optimize     (TrackerIndexer *indexer, 
+					       const gchar *mount_point);
+void    tracker_removable_device_add_metadata (TrackerIndexer *indexer, 
+					       const gchar *mount_point, 
+					       TrackerDataMetadata *metadata);
+void    tracker_removable_device_add_removal  (TrackerIndexer *indexer, 
+					       const gchar *mount_point, 
+					       const gchar *path);
+void    tracker_removable_device_add_move     (TrackerIndexer *indexer, 
+					       const gchar *mount_point, 
+					       const gchar *from_path, 
+					       const gchar *to_path);
 
 
 #endif /* __TRACKER_REMOVABLE_DEVICE_H__ */