tracker r2680 - in branches/turtle/src: libtracker-data tracker-indexer
- From: pvanhoof svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r2680 - in branches/turtle/src: libtracker-data tracker-indexer
- Date: Tue, 9 Dec 2008 14:32:52 +0000 (UTC)
Author: pvanhoof
Date: Tue Dec 9 14:32:52 2008
New Revision: 2680
URL: http://svn.gnome.org/viewvc/tracker?rev=2680&view=rev
Log:
Fixes after Martyn's comments
Modified:
branches/turtle/src/libtracker-data/tracker-turtle.c
branches/turtle/src/libtracker-data/tracker-turtle.h
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-turtle.c
==============================================================================
--- branches/turtle/src/libtracker-data/tracker-turtle.c (original)
+++ branches/turtle/src/libtracker-data/tracker-turtle.c Tue Dec 9 14:32:52 2008
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia
*
* This library is free software; you can redistribute it and/or
@@ -23,18 +22,14 @@
#include "config.h"
-#include "tracker-turtle.h"
-
#include <stdlib.h>
#include <string.h>
#include <sys/statvfs.h>
-#include <glib/gstdio.h>
#include <gio/gio.h>
+#include <glib/gstdio.h>
-#ifdef HAVE_RAPTOR
-#include <raptor.h>
-#endif /* HAVE_RAPTOR */
+#include "tracker-turtle.h"
static gboolean initialized = FALSE;
@@ -48,9 +43,9 @@
#ifdef HAVE_RAPTOR
typedef struct {
- gchar *last_subject;
+ gchar *last_subject;
raptor_serializer *serializer;
- GHashTable *hash;
+ GHashTable *hash;
} TurtleOptimizerInfo;
#endif /* HAVE_RAPTOR */
@@ -175,11 +170,11 @@
static void
foreach_in_metadata (TrackerField *field, gpointer value, gpointer user_data)
{
- raptor_statement *statement;
- MetadataItem *item = user_data;
- const gchar *about_uri = item->about_uri;
- TurtleFile *turtle = item->turtle;
- raptor_serializer *serializer = turtle->serializer;
+ raptor_statement *statement;
+ TrackerTurtleMetadataItem *item = user_data;
+ const gchar *about_uri = item->about_uri;
+ TurtleFile *turtle = item->turtle;
+ raptor_serializer *serializer = turtle->serializer;
/* TODO: cope with group values
*
@@ -218,19 +213,17 @@
TurtleFile *
tracker_turtle_open (const gchar *turtle_file)
{
- if (!initialized) {
- g_critical ("Using tracker_turtle module without initialization");
- }
+ g_return_val_if_fail (initialized, NULL);
#ifdef HAVE_RAPTOR
TurtleFile *turtle;
turtle = g_new0 (TurtleFile, 1);
- turtle->file = fopen (turtle_file, "a");
+ turtle->file = g_fopen (turtle_file, "a");
/* Similar to a+ */
if (!turtle->file)
- turtle->file = fopen (turtle_file, "w");
+ turtle->file = g_fopen (turtle_file, "w");
turtle->serializer = raptor_new_serializer ("turtle");
turtle->uri = raptor_new_uri ("/");
@@ -249,7 +242,7 @@
TrackerDataMetadata *metadata)
{
#ifdef HAVE_RAPTOR
- MetadataItem *info = g_slice_new (MetadataItem);
+ TrackerTurtleMetadataItem *info = g_slice_new (TrackerTurtleMetadataItem);
info->about_uri = (gchar *) uri;
info->metadata = metadata;
@@ -259,7 +252,7 @@
foreach_in_metadata,
info);
- g_slice_free (MetadataItem, info);
+ g_slice_free (TrackerTurtleMetadataItem, info);
#endif /* HAVE_RAPTOR */
}
@@ -268,10 +261,10 @@
GPtrArray *metadata_items)
{
#ifdef HAVE_RAPTOR
- guint cnt;
+ guint count;
- for (cnt = 0; cnt < metadata_items->len; cnt++) {
- MetadataItem *item = g_ptr_array_index (metadata_items, cnt);
+ for (count = 0; count < metadata_items->len; count++) {
+ TrackerTurtleMetadataItem *item = g_ptr_array_index (metadata_items, count);
item->turtle = turtle;
@@ -290,11 +283,11 @@
const gchar *value)
{
#ifdef HAVE_RAPTOR
- MetadataItem *item = g_slice_new (MetadataItem);
+ TrackerTurtleMetadataItem *item = g_slice_new (TrackerTurtleMetadataItem);
item->about_uri = (gchar *) uri;
item->turtle = turtle;
foreach_in_metadata (property, (gpointer) value, item);
- g_slice_free (MetadataItem, item);
+ g_slice_free (TrackerTurtleMetadataItem, item);
#endif
}
@@ -378,10 +371,10 @@
#ifdef HAVE_RAPTOR
tmp_file = g_strdup_printf ("%s.tmp", turtle_file);
- target_file = fopen (tmp_file, "a");
+ target_file = g_fopen (tmp_file, "a");
/* Similar to a+ */
if (!target_file)
- target_file = fopen (tmp_file, "w");
+ target_file = g_fopen (tmp_file, "w");
if (!target_file) {
g_free (target_file);
Modified: branches/turtle/src/libtracker-data/tracker-turtle.h
==============================================================================
--- branches/turtle/src/libtracker-data/tracker-turtle.h (original)
+++ branches/turtle/src/libtracker-data/tracker-turtle.h Tue Dec 9 14:32:52 2008
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia
*
* This library is free software; you can redistribute it and/or
@@ -27,25 +26,31 @@
#include <libtracker-data/tracker-data-metadata.h>
#include <stdio.h>
+#ifdef HAVE_RAPTOR
+#include <raptor.h>
+#endif
+
/*
* TODO: Is it possible to do this in the .c file? Dont expose raptor here.
*/
+
#ifdef HAVE_RAPTOR
-#include <raptor.h>
typedef raptor_statement stmt;
#else
typedef struct {
- const void *subject;
- int subject_type;
- const void *predicate;
- int predicate_type;
- const void *object;
- int object_type;
- void *object_literal_datatype;
- const unsigned char *object_literal_language;
+ gconstpointer subject;
+ gint subject_type;
+ gconstpointer predicate;
+ gint predicate_type;
+ gconstpointer object;
+ gint object_type;
+ gpointer object_literal_datatype;
+ const guchar *object_literal_language;
} stmt;
#endif
+G_BEGIN_DECLS
+
typedef void (* TurtleTripleCallback) (void *user_data, const stmt *triple);
typedef struct TurtleFile TurtleFile;
@@ -56,7 +61,7 @@
gchar *about_uri;
TrackerDataMetadata *metadata;
TurtleFile *turtle; /* For internal use only */
-} MetadataItem;
+} TrackerTurtleMetadataItem;
/* Initialization (use in both cases) */
void tracker_turtle_init (void);
@@ -72,7 +77,7 @@
const gchar *uri,
TrackerDataMetadata *metadata);
void tracker_turtle_add_metadatas (TurtleFile *turtle,
- GPtrArray /* <MetadataItem> */ *metadata_items);
+ GPtrArray /* <TrackerTurtleMetadataItem> */ *metadata_items);
void tracker_turtle_close (TurtleFile *turtle);
/* Reading functions */
@@ -85,5 +90,6 @@
/* Optimizer, reparser */
void tracker_turtle_optimize (const gchar *turtle_file);
+G_END_DECLS
#endif /* __TRACKER_TURTLE_H__ */
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 Tue Dec 9 14:32:52 2008
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia
*
* This library is free software; you can redistribute it and/or
@@ -50,20 +49,6 @@
#include <raptor.h>
-#include <libtracker-common/tracker-config.h>
-#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-hal.h>
-#include <libtracker-common/tracker-language.h>
-#include <libtracker-common/tracker-parser.h>
-#include <libtracker-common/tracker-ontology.h>
-#include <libtracker-common/tracker-module-config.h>
-#include <libtracker-common/tracker-utils.h>
-
-#include <libtracker-db/tracker-db-manager.h>
-#include <libtracker-db/tracker-db-index-manager.h>
-#include <libtracker-db/tracker-db-interface-sqlite.h>
-
#include <libtracker-data/tracker-data-query.h>
#include <libtracker-data/tracker-data-update.h>
#include <libtracker-data/tracker-turtle.h>
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 Tue Dec 9 14:32:52 2008
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia
*
* This library is free software; you can redistribute it and/or
@@ -24,9 +23,12 @@
#ifndef __TRACKER_REMOVABLE_DEVICE_H__
#define __TRACKER_REMOVABLE_DEVICE_H__
-#include "tracker-indexer.h"
#include <libtracker-data/tracker-data-metadata.h>
+#include "tracker-indexer.h"
+
+G_BEGIN_DECLS
+
void tracker_removable_device_load (TrackerIndexer *indexer,
const gchar *mount_point);
void tracker_removable_device_optimize (TrackerIndexer *indexer,
@@ -46,6 +48,7 @@
const gchar *to_path,
const gchar *rdf_type);
+G_END_DECLS
#endif /* __TRACKER_REMOVABLE_DEVICE_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]