GNOME.org
 

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

Author: mr
Date: Wed Aug  6 15:37:15 2008
New Revision: 2017
URL: http://svn.gnome.org/viewvc/tracker?rev=2017&view=rev

Log:
	* src/libtracker-common/tracker-index-item.[ch]:
	* src/libtracker-db/Makefile.am:
	* src/libtracker-db/tracker-db-index-manager.[ch]:
	* src/libtracker-db/tracker-index-manager.[ch]:
	* src/trackerd/Makefile.am:
	* src/trackerd/tracker-index.[ch]: Moved tracker-index.[ch] from
	the trackerd directory to the libtracker-db library.


Added:
   branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c
      - copied, changed from r2016, /branches/indexer-split/src/libtracker-db/tracker-index-manager.c
   branches/indexer-split/src/libtracker-db/tracker-db-index-manager.h
      - copied, changed from r2016, /branches/indexer-split/src/libtracker-db/tracker-index-manager.h
   branches/indexer-split/src/libtracker-db/tracker-db-index.c
      - copied unchanged from r2015, /branches/indexer-split/src/trackerd/tracker-index.c
   branches/indexer-split/src/libtracker-db/tracker-db-index.h
      - copied unchanged from r2015, /branches/indexer-split/src/trackerd/tracker-index.h
Removed:
   branches/indexer-split/src/libtracker-db/tracker-index-manager.c
   branches/indexer-split/src/libtracker-db/tracker-index-manager.h
   branches/indexer-split/src/trackerd/tracker-index.c
   branches/indexer-split/src/trackerd/tracker-index.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-common/tracker-index-item.c
   branches/indexer-split/src/libtracker-common/tracker-index-item.h
   branches/indexer-split/src/libtracker-db/Makefile.am
   branches/indexer-split/src/trackerd/Makefile.am

Modified: branches/indexer-split/src/libtracker-common/tracker-index-item.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-index-item.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-index-item.c	Wed Aug  6 15:37:15 2008
@@ -1,7 +1,28 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2008, Nokia
+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
 #include "tracker-index-item.h"
 
 guint32 
-tracker_index_item_calc_amalgamated (gint service_type, gint score)
+tracker_index_item_calc_amalgamated (gint service_type, 
+                                     gint score)
 {
 	unsigned char a[4];
 	gint16        score16;
@@ -34,7 +55,6 @@
 	return (details->amalgamated >> 24) & 0xFF;
 }
 
-
 gint16  
 tracker_index_item_get_score (TrackerIndexItem *details)
 {

Modified: branches/indexer-split/src/libtracker-common/tracker-index-item.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-index-item.h	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-index-item.h	Wed Aug  6 15:37:15 2008
@@ -1,3 +1,23 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2008, Nokia
+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
 #ifndef __TRACKER_INDEX_ITEM_H__
 #define __TRACKER_INDEX_ITEM_H__
 
@@ -23,4 +43,4 @@
 
 G_END_DECLS
 
-#endif
+#endif /* __TRACKER_INDEX_ITEM_H__ */

Modified: branches/indexer-split/src/libtracker-db/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker-db/Makefile.am	(original)
+++ branches/indexer-split/src/libtracker-db/Makefile.am	Wed Aug  6 15:37:15 2008
@@ -10,14 +10,16 @@
 noinst_LTLIBRARIES = libtracker-db.la
 
 libtracker_db_la_SOURCES = 						\
-	tracker-index-manager.c						\
-	tracker-index-manager.h						\
 	tracker-db-action.c						\
 	tracker-db-action.h						\
 	tracker-db-dbus.c						\
 	tracker-db-dbus.h						\
 	tracker-db-file-info.c						\
 	tracker-db-file-info.h						\
+	tracker-db-index.c						\
+	tracker-db-index.h						\
+	tracker-db-index-manager.c					\
+	tracker-db-index-manager.h					\
 	tracker-db-interface.c						\
 	tracker-db-interface.h						\
 	tracker-db-interface-sqlite.c					\

Copied: branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c (from r2016, /branches/indexer-split/src/libtracker-db/tracker-index-manager.c)
==============================================================================
--- /branches/indexer-split/src/libtracker-db/tracker-index-manager.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c	Wed Aug  6 15:37:15 2008
@@ -26,7 +26,7 @@
 
 #include <libtracker-common/tracker-file-utils.h>
 
-#include "tracker-index-manager.h"
+#include "tracker-db-index-manager.h"
 
 #define MIN_BUCKET_DEFAULT 10
 #define MAX_BUCKET_DEFAULT 20

Copied: branches/indexer-split/src/libtracker-db/tracker-db-index-manager.h (from r2016, /branches/indexer-split/src/libtracker-db/tracker-index-manager.h)
==============================================================================
--- /branches/indexer-split/src/libtracker-db/tracker-index-manager.h	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index-manager.h	Wed Aug  6 15:37:15 2008
@@ -29,22 +29,22 @@
 #include "tracker-index.h"
 
 typedef enum {
-	TRACKER_INDEX_TYPE_INDEX,
-	TRACKER_INDEX_TYPE_INDEX_UPDATE
-} TrackerIndexType;
+	TRACKER_DB_INDEX_TYPE_INDEX,
+	TRACKER_DB_INDEX_TYPE_INDEX_UPDATE
+} TrackerDBIndexType;
 
 typedef enum {
-	TRACKER_INDEX_MANAGER_FORCE_REINDEX    = 1 << 1,
-} TrackerIndexManagerFlags;
+	TRACKER_DB_INDEX_MANAGER_FORCE_REINDEX = 1 << 1,
+} TrackerDBIndexManagerFlags;
 
-gboolean      tracker_index_manager_init                (TrackerIndexManagerFlags  flags,
-							 const gchar              *data_dir,
-							 gint                      min_bucket,
-							 gint                      max_bucket);
-void          tracker_index_manager_shutdown            (void);
-const gchar * tracker_index_manager_get_filename        (TrackerIndexType          index);
-TrackerIndex *tracker_index_manager_get_index           (TrackerIndexType          index);
-gboolean      tracker_index_manager_are_indexes_too_big (void);
+gboolean      tracker_db_index_manager_init                (TrackerDBIndexManagerFlags  flags,
+							    const gchar                *data_dir,
+							    gint                        min_bucket,
+							    gint                        max_bucket);
+void          tracker_db_index_manager_shutdown            (void);
+const gchar * tracker_db_index_manager_get_filename        (TrackerDBIndexType          index);
+TrackerIndex *tracker_db_index_manager_get_index           (TrackerDBIndexType          index);
+gboolean      tracker_db_index_manager_are_indexes_too_big (void);
 
 G_END_DECLS
 

Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am	(original)
+++ branches/indexer-split/src/trackerd/Makefile.am	Wed Aug  6 15:37:15 2008
@@ -36,8 +36,6 @@
 	tracker-files.h							\
 	tracker-keywords.c						\
 	tracker-keywords.h						\
-	tracker-index.c							\
-	tracker-index.h							\
 	tracker-processor.c						\
 	tracker-processor.h						\
 	tracker-main.c							\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]