tracker r2250 - in branches/indexer-split: . src/libinotify src/libstemmer src/libtracker src/libtracker-common src/libtracker-db src/libtracker-gtk src/tracker-applet src/tracker-extract src/tracker-fts src/tracker-indexer src/tracker-indexer/modules src/tracker-preferences src/tracker-search-tool src/tracker-thumbnailer src/tracker-utils src/trackerd tests/common tests/libtracker-common tests/libtracker-db tests/tracker-fts tests/trackerd tests/trackerd/xesam utils/qdbm
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r2250 - in branches/indexer-split: . src/libinotify src/libstemmer src/libtracker src/libtracker-common src/libtracker-db src/libtracker-gtk src/tracker-applet src/tracker-extract src/tracker-fts src/tracker-indexer src/tracker-indexer/modules src/tracker-preferences src/tracker-search-tool src/tracker-thumbnailer src/tracker-utils src/trackerd tests/common tests/libtracker-common tests/libtracker-db tests/tracker-fts tests/trackerd tests/trackerd/xesam utils/qdbm
- Date: Sat, 20 Sep 2008 14:45:01 +0000 (UTC)
Author: mr
Date: Sat Sep 20 14:45:00 2008
New Revision: 2250
URL: http://svn.gnome.org/viewvc/tracker?rev=2250&view=rev
Log:
Modified:
branches/indexer-split/ChangeLog
branches/indexer-split/src/libinotify/inotify-handle.c
branches/indexer-split/src/libstemmer/api.c
branches/indexer-split/src/libstemmer/api.h
branches/indexer-split/src/libstemmer/header.h
branches/indexer-split/src/libstemmer/libstemmer.c
branches/indexer-split/src/libstemmer/libstemmer.h
branches/indexer-split/src/libstemmer/modules.h
branches/indexer-split/src/libstemmer/stem_UTF_8_danish.c
branches/indexer-split/src/libstemmer/stem_UTF_8_danish.h
branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.c
branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.h
branches/indexer-split/src/libstemmer/stem_UTF_8_english.c
branches/indexer-split/src/libstemmer/stem_UTF_8_english.h
branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.c
branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.h
branches/indexer-split/src/libstemmer/stem_UTF_8_french.c
branches/indexer-split/src/libstemmer/stem_UTF_8_french.h
branches/indexer-split/src/libstemmer/stem_UTF_8_german.c
branches/indexer-split/src/libstemmer/stem_UTF_8_german.h
branches/indexer-split/src/libstemmer/stem_UTF_8_hungarian.c
branches/indexer-split/src/libstemmer/stem_UTF_8_italian.c
branches/indexer-split/src/libstemmer/stem_UTF_8_italian.h
branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.c
branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.h
branches/indexer-split/src/libstemmer/stem_UTF_8_porter.c
branches/indexer-split/src/libstemmer/stem_UTF_8_porter.h
branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.c
branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.h
branches/indexer-split/src/libstemmer/stem_UTF_8_russian.c
branches/indexer-split/src/libstemmer/stem_UTF_8_russian.h
branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.c
branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.h
branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.c
branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.h
branches/indexer-split/src/libstemmer/utilities.c
branches/indexer-split/src/libtracker-common/tracker-config.c
branches/indexer-split/src/libtracker-common/tracker-config.h
branches/indexer-split/src/libtracker-common/tracker-dbus.c
branches/indexer-split/src/libtracker-common/tracker-dbus.h
branches/indexer-split/src/libtracker-common/tracker-field-data.c
branches/indexer-split/src/libtracker-common/tracker-field-data.h
branches/indexer-split/src/libtracker-common/tracker-field.c
branches/indexer-split/src/libtracker-common/tracker-field.h
branches/indexer-split/src/libtracker-common/tracker-file-utils.c
branches/indexer-split/src/libtracker-common/tracker-hal.c
branches/indexer-split/src/libtracker-common/tracker-hal.h
branches/indexer-split/src/libtracker-common/tracker-ioprio.c
branches/indexer-split/src/libtracker-common/tracker-ioprio.h
branches/indexer-split/src/libtracker-common/tracker-language.c
branches/indexer-split/src/libtracker-common/tracker-language.h
branches/indexer-split/src/libtracker-common/tracker-log.c
branches/indexer-split/src/libtracker-common/tracker-module-config.c
branches/indexer-split/src/libtracker-common/tracker-module-config.h
branches/indexer-split/src/libtracker-common/tracker-nfs-lock.c
branches/indexer-split/src/libtracker-common/tracker-nfs-lock.h
branches/indexer-split/src/libtracker-common/tracker-ontology.c
branches/indexer-split/src/libtracker-common/tracker-ontology.h
branches/indexer-split/src/libtracker-common/tracker-os-dependant-unix.c
branches/indexer-split/src/libtracker-common/tracker-os-dependant-win.c
branches/indexer-split/src/libtracker-common/tracker-parser.c
branches/indexer-split/src/libtracker-common/tracker-parser.h
branches/indexer-split/src/libtracker-common/tracker-service.c
branches/indexer-split/src/libtracker-common/tracker-service.h
branches/indexer-split/src/libtracker-common/tracker-type-utils.c
branches/indexer-split/src/libtracker-common/tracker-utils.c
branches/indexer-split/src/libtracker-db/tracker-db-action.c
branches/indexer-split/src/libtracker-db/tracker-db-action.h
branches/indexer-split/src/libtracker-db/tracker-db-dbus.c
branches/indexer-split/src/libtracker-db/tracker-db-dbus.h
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/libtracker-db/tracker-db-index-item.c
branches/indexer-split/src/libtracker-db/tracker-db-index-item.h
branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c
branches/indexer-split/src/libtracker-db/tracker-db-index.c
branches/indexer-split/src/libtracker-db/tracker-db-index.h
branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.c
branches/indexer-split/src/libtracker-db/tracker-db-interface.c
branches/indexer-split/src/libtracker-db/tracker-db-interface.h
branches/indexer-split/src/libtracker-db/tracker-db-manager.c
branches/indexer-split/src/libtracker-gtk/tracker-keyword-store.c
branches/indexer-split/src/libtracker-gtk/tracker-keyword-store.h
branches/indexer-split/src/libtracker-gtk/tracker-metadata-tile.c
branches/indexer-split/src/libtracker-gtk/tracker-metadata-tile.h
branches/indexer-split/src/libtracker-gtk/tracker-tag-bar.c
branches/indexer-split/src/libtracker-gtk/tracker-tag-bar.h
branches/indexer-split/src/libtracker-gtk/tracker-ui.h
branches/indexer-split/src/libtracker-gtk/tracker-utils.c
branches/indexer-split/src/libtracker-gtk/tracker-utils.h
branches/indexer-split/src/libtracker/tracker.c
branches/indexer-split/src/libtracker/tracker.h
branches/indexer-split/src/tracker-applet/tracker-applet.c
branches/indexer-split/src/tracker-applet/tracker-applet.h
branches/indexer-split/src/tracker-extract/tracker-extract-abw.c
branches/indexer-split/src/tracker-extract/tracker-extract-exif.c
branches/indexer-split/src/tracker-extract/tracker-extract-gstreamer.c
branches/indexer-split/src/tracker-extract/tracker-extract-html.c
branches/indexer-split/src/tracker-extract/tracker-extract-jpeg.c
branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c
branches/indexer-split/src/tracker-extract/tracker-extract-mplayer.c
branches/indexer-split/src/tracker-extract/tracker-extract-msoffice.c
branches/indexer-split/src/tracker-extract/tracker-extract-oasis.c
branches/indexer-split/src/tracker-extract/tracker-extract-pdf.c
branches/indexer-split/src/tracker-extract/tracker-extract-png.c
branches/indexer-split/src/tracker-extract/tracker-extract-ps.c
branches/indexer-split/src/tracker-extract/tracker-extract-tiff.c
branches/indexer-split/src/tracker-extract/tracker-extract-totem.c
branches/indexer-split/src/tracker-extract/tracker-extract-vorbis.c
branches/indexer-split/src/tracker-extract/tracker-extract.c
branches/indexer-split/src/tracker-fts/tracker-fts-hash.c
branches/indexer-split/src/tracker-fts/tracker-fts-hash.h
branches/indexer-split/src/tracker-fts/tracker-fts.c
branches/indexer-split/src/tracker-indexer/modules/dummy.c
branches/indexer-split/src/tracker-indexer/modules/evolution.c
branches/indexer-split/src/tracker-indexer/tracker-dbus.c
branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c
branches/indexer-split/src/tracker-indexer/tracker-indexer-db.h
branches/indexer-split/src/tracker-indexer/tracker-indexer.c
branches/indexer-split/src/tracker-indexer/tracker-indexer.h
branches/indexer-split/src/tracker-indexer/tracker-main.c
branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c
branches/indexer-split/src/tracker-preferences/tracker-preferences.c
branches/indexer-split/src/tracker-search-tool/tracker-search-tool-callbacks.c
branches/indexer-split/src/tracker-search-tool/tracker-search-tool-support.c
branches/indexer-split/src/tracker-search-tool/tracker-search-tool.c
branches/indexer-split/src/tracker-search-tool/tracker-search-tool.h
branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c
branches/indexer-split/src/tracker-utils/tracker-files.c
branches/indexer-split/src/tracker-utils/tracker-meta-folder.c
branches/indexer-split/src/tracker-utils/tracker-query.c
branches/indexer-split/src/tracker-utils/tracker-search.c
branches/indexer-split/src/tracker-utils/tracker-stats.c
branches/indexer-split/src/tracker-utils/tracker-status.c
branches/indexer-split/src/tracker-utils/tracker-tag.c
branches/indexer-split/src/tracker-utils/tracker-unique.c
branches/indexer-split/src/trackerd/mingw-compat.h
branches/indexer-split/src/trackerd/tracker-crawler.c
branches/indexer-split/src/trackerd/tracker-crawler.h
branches/indexer-split/src/trackerd/tracker-daemon.c
branches/indexer-split/src/trackerd/tracker-db.c
branches/indexer-split/src/trackerd/tracker-db.h
branches/indexer-split/src/trackerd/tracker-dbus.c
branches/indexer-split/src/trackerd/tracker-files.c
branches/indexer-split/src/trackerd/tracker-keywords.c
branches/indexer-split/src/trackerd/tracker-main.c
branches/indexer-split/src/trackerd/tracker-main.h
branches/indexer-split/src/trackerd/tracker-metadata.c
branches/indexer-split/src/trackerd/tracker-monitor.c
branches/indexer-split/src/trackerd/tracker-monitor.h
branches/indexer-split/src/trackerd/tracker-processor.c
branches/indexer-split/src/trackerd/tracker-processor.h
branches/indexer-split/src/trackerd/tracker-query-tree.c
branches/indexer-split/src/trackerd/tracker-query-tree.h
branches/indexer-split/src/trackerd/tracker-rdf-query.c
branches/indexer-split/src/trackerd/tracker-rdf-query.h
branches/indexer-split/src/trackerd/tracker-search.c
branches/indexer-split/src/trackerd/tracker-status.c
branches/indexer-split/src/trackerd/tracker-status.h
branches/indexer-split/src/trackerd/tracker-utils.c
branches/indexer-split/src/trackerd/tracker-utils.h
branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
branches/indexer-split/src/trackerd/tracker-xesam-live-search.h
branches/indexer-split/src/trackerd/tracker-xesam-manager.c
branches/indexer-split/src/trackerd/tracker-xesam-manager.h
branches/indexer-split/src/trackerd/tracker-xesam-query.c
branches/indexer-split/src/trackerd/tracker-xesam-session.c
branches/indexer-split/src/trackerd/tracker-xesam.c
branches/indexer-split/tests/common/tracker-test-helpers.c
branches/indexer-split/tests/common/tracker-test-helpers.h
branches/indexer-split/tests/libtracker-common/tracker-dbus-test.c
branches/indexer-split/tests/libtracker-common/tracker-field-test.c
branches/indexer-split/tests/libtracker-common/tracker-file-utils-test.c
branches/indexer-split/tests/libtracker-common/tracker-ontology-test.c
branches/indexer-split/tests/libtracker-common/tracker-parser-test.c
branches/indexer-split/tests/libtracker-common/tracker-type-utils-test.c
branches/indexer-split/tests/libtracker-db/tracker-db-dbus-test.c
branches/indexer-split/tests/libtracker-db/tracker-db-manager-common.c
branches/indexer-split/tests/libtracker-db/tracker-db-manager-common.h
branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c
branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-custom.c
branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-unattach.c
branches/indexer-split/tests/libtracker-db/tracker-index-reader-test.c
branches/indexer-split/tests/libtracker-db/tracker-index-writer-test.c
branches/indexer-split/tests/libtracker-db/union-performance.c
branches/indexer-split/tests/tracker-fts/tracker-fts-test.c
branches/indexer-split/tests/trackerd/tracker-xesam-hit-test.c
branches/indexer-split/tests/trackerd/tracker-xesam-hit-test.h
branches/indexer-split/tests/trackerd/tracker-xesam-hits-test.c
branches/indexer-split/tests/trackerd/tracker-xesam-hits-test.h
branches/indexer-split/tests/trackerd/tracker-xesam-session-test.c
branches/indexer-split/tests/trackerd/tracker-xesam-session-test.h
branches/indexer-split/tests/trackerd/tracker-xesam-test.c
branches/indexer-split/tests/trackerd/tracker-xesam-test.h
branches/indexer-split/tests/trackerd/xesam/gtestextensions.c
branches/indexer-split/tests/trackerd/xesam/gtestextensions.h
branches/indexer-split/tests/trackerd/xesam/xesam-g-debug-private.h
branches/indexer-split/tests/trackerd/xesam/xesam-g-globals-private.h
branches/indexer-split/tests/trackerd/xesam/xesam-g-test-query-builder.c
branches/indexer-split/tests/trackerd/xesam/xesam-g-test-query-builder.h
branches/indexer-split/tests/trackerd/xesam/xesam-g-testsearcher.c
branches/indexer-split/tests/trackerd/xesam/xesam-g-testsearcher.h
branches/indexer-split/tests/trackerd/xesam/xesam-g-utils.h
branches/indexer-split/utils/qdbm/print-words.c
branches/indexer-split/utils/qdbm/search-word.c
Modified: branches/indexer-split/src/libinotify/inotify-handle.c
==============================================================================
--- branches/indexer-split/src/libinotify/inotify-handle.c (original)
+++ branches/indexer-split/src/libinotify/inotify-handle.c Sat Sep 20 14:45:00 2008
@@ -98,7 +98,7 @@
{
inh->wd = wd;
}
-
+
guint32
inotify_handle_get_mask( INotifyHandle *inh )
{
Modified: branches/indexer-split/src/libstemmer/api.c
==============================================================================
--- branches/indexer-split/src/libstemmer/api.c (original)
+++ branches/indexer-split/src/libstemmer/api.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/api.h
==============================================================================
--- branches/indexer-split/src/libstemmer/api.h (original)
+++ branches/indexer-split/src/libstemmer/api.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/header.h
==============================================================================
--- branches/indexer-split/src/libstemmer/header.h (original)
+++ branches/indexer-split/src/libstemmer/header.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/libstemmer.c
==============================================================================
--- branches/indexer-split/src/libstemmer/libstemmer.c (original)
+++ branches/indexer-split/src/libstemmer/libstemmer.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
@@ -59,7 +59,7 @@
if (strcmp(module->name, algorithm) == 0 && module->enc == enc) break;
}
if (module->name == NULL) return NULL;
-
+
stemmer->create = module->create;
stemmer->close = module->close;
stemmer->stem = module->stem;
Modified: branches/indexer-split/src/libstemmer/libstemmer.h
==============================================================================
--- branches/indexer-split/src/libstemmer/libstemmer.h (original)
+++ branches/indexer-split/src/libstemmer/libstemmer.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/modules.h
==============================================================================
--- branches/indexer-split/src/libstemmer/modules.h (original)
+++ branches/indexer-split/src/libstemmer/modules.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
@@ -55,7 +55,7 @@
struct stemmer_modules {
const char * name;
- stemmer_encoding enc;
+ stemmer_encoding enc;
struct SN_env * (*create)(void);
void (*close)(struct SN_env *);
int (*stem)(struct SN_env *);
@@ -105,18 +105,18 @@
{0,0,0,0,0}
};
static const char * algorithm_names[] = {
- "danish",
- "dutch",
- "english",
- "finnish",
- "french",
- "german",
- "italian",
- "norwegian",
- "porter",
- "portuguese",
- "russian",
- "spanish",
- "swedish",
+ "danish",
+ "dutch",
+ "english",
+ "finnish",
+ "french",
+ "german",
+ "italian",
+ "norwegian",
+ "porter",
+ "portuguese",
+ "russian",
+ "spanish",
+ "swedish",
0
};
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_danish.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_danish.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_danish.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_danish.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_danish.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_danish.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_english.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_english.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_english.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_english.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_english.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_english.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_french.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_french.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_french.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_french.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_french.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_french.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_german.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_german.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_german.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_german.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_german.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_german.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_hungarian.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_hungarian.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_hungarian.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_italian.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_italian.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_italian.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_italian.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_italian.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_italian.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_porter.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_porter.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_porter.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_porter.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_porter.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_porter.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_russian.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_russian.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_russian.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_russian.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_russian.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_russian.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.c
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.c (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.h
==============================================================================
--- branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.h (original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.h Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libstemmer/utilities.c
==============================================================================
--- branches/indexer-split/src/libstemmer/utilities.c (original)
+++ branches/indexer-split/src/libstemmer/utilities.c Sat Sep 20 14:45:00 2008
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 2001, Dr Martin Porter
* All rights reserved.
*
Modified: branches/indexer-split/src/libtracker-common/tracker-config.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-config.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-config.c Sat Sep 20 14:45:00 2008
@@ -90,7 +90,7 @@
#define DEFAULT_ENABLE_STEMMER TRUE
#define DEFAULT_DISABLE_INDEXING_ON_BATTERY TRUE
#define DEFAULT_DISABLE_INDEXING_ON_BATTERY_INIT FALSE
-#define DEFAULT_INDEX_MOUNTED_DIRECTORIES TRUE
+#define DEFAULT_INDEX_MOUNTED_DIRECTORIES TRUE
#define DEFAULT_INDEX_REMOVABLE_DEVICES TRUE
#define DEFAULT_LOW_DISK_SPACE_LIMIT 1 /* 0->100 / -1 */
#define DEFAULT_MAX_TEXT_TO_INDEX 1048576 /* Bytes */
@@ -674,7 +674,7 @@
tracker_config_set_fast_merges (TRACKER_CONFIG (object),
g_value_get_boolean (value));
break;
- case PROP_NO_INDEX_FILE_TYPES:
+ case PROP_NO_INDEX_FILE_TYPES:
/* Not writable */
break;
case PROP_MIN_WORD_LENGTH:
@@ -1060,9 +1060,9 @@
if (strcmp (property, "watch-directory-roots") == 0) {
if (value) {
- priv->watch_directory_roots = l =
+ priv->watch_directory_roots = l =
config_string_list_to_gslist ((const gchar **) value, TRUE);
- priv->watch_directory_roots =
+ priv->watch_directory_roots =
tracker_path_list_filter_duplicates (priv->watch_directory_roots);
g_slist_foreach (l, (GFunc) g_free, NULL);
@@ -1073,7 +1073,7 @@
if (value) {
priv->crawl_directory_roots = l =
config_string_list_to_gslist ((const gchar **) value, TRUE);
- priv->crawl_directory_roots =
+ priv->crawl_directory_roots =
tracker_path_list_filter_duplicates (priv->crawl_directory_roots);
g_slist_foreach (l, (GFunc) g_free, NULL);
@@ -1082,9 +1082,9 @@
}
else if (strcmp (property, "no-watch-directory-roots") == 0) {
if (value) {
- priv->no_watch_directory_roots = l =
+ priv->no_watch_directory_roots = l =
config_string_list_to_gslist ((const gchar **) value, TRUE);
- priv->no_watch_directory_roots =
+ priv->no_watch_directory_roots =
tracker_path_list_filter_duplicates (priv->no_watch_directory_roots);
g_slist_foreach (l, (GFunc) g_free, NULL);
@@ -1116,7 +1116,7 @@
GFile *file,
GFile *other_file,
GFileMonitorEvent event_type,
- gpointer user_data)
+ gpointer user_data)
{
TrackerConfig *config;
gchar *filename;
@@ -1129,8 +1129,8 @@
case G_FILE_MONITOR_EVENT_CHANGED:
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
filename = g_file_get_path (file);
- g_message ("Config file changed:'%s', reloading settings...",
- filename);
+ g_message ("Config file changed:'%s', reloading settings...",
+ filename);
g_free (filename);
config_load (config);
@@ -1172,16 +1172,16 @@
}
if (!priv->monitor) {
- g_message ("Setting up monitor for changes to config file:'%s'",
+ g_message ("Setting up monitor for changes to config file:'%s'",
filename);
priv->monitor = g_file_monitor_file (priv->file,
G_FILE_MONITOR_NONE,
NULL,
NULL);
-
+
g_signal_connect (priv->monitor, "changed",
- G_CALLBACK (config_changed_cb),
+ G_CALLBACK (config_changed_cb),
config);
}
@@ -1233,13 +1233,13 @@
/* Services */
config_load_boolean (config, "enable-xesam", key_file, GROUP_SERVICES, KEY_ENABLE_XESAM);
- /*
- * Legacy options no longer supported:
+ /*
+ * Legacy options no longer supported:
*/
value = g_key_file_get_boolean (key_file, "Emails", "IndexEvolutionEmails", &error);
if (!error) {
gchar * const modules[2] = { "evolution", NULL };
-
+
g_message ("Legacy config option 'IndexEvolutionEmails' found");
g_message (" This option has been replaced by 'DisabledModules'");
@@ -2080,7 +2080,7 @@
g_slist_foreach (l, (GFunc) g_free, NULL);
g_slist_free (l);
-
+
g_object_notify (G_OBJECT (config), "watch-directory-roots");
}
@@ -2147,7 +2147,7 @@
}
l = priv->no_watch_directory_roots;
- priv->no_watch_directory_roots =
+ priv->no_watch_directory_roots =
tracker_path_list_filter_duplicates (priv->no_watch_directory_roots);
g_slist_foreach (l, (GFunc) g_free, NULL);
@@ -2177,11 +2177,11 @@
(GCompareFunc) strcmp)) {
continue;
}
-
+
new_modules = g_slist_append (new_modules, g_strdup (*p));
}
- priv->disabled_modules = g_slist_concat (priv->disabled_modules,
+ priv->disabled_modules = g_slist_concat (priv->disabled_modules,
new_modules);
g_object_notify (G_OBJECT (config), "disabled-modules");
Modified: branches/indexer-split/src/libtracker-common/tracker-config.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-config.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-config.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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) 2007, Michal Pryc (Michal Pryc Sun Com)
* Copyright (C) 2008, Nokia (urho konttori nokia com)
Modified: branches/indexer-split/src/libtracker-common/tracker-dbus.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-dbus.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-dbus.c Sat Sep 20 14:45:00 2008
@@ -35,7 +35,7 @@
request_handler_call_for_new (guint request_id)
{
GSList *l;
-
+
for (l = hooks; l; l = l->next) {
TrackerDBusRequestHandler *handler;
@@ -51,7 +51,7 @@
request_handler_call_for_done (guint request_id)
{
GSList *l;
-
+
for (l = hooks; l; l = l->next) {
TrackerDBusRequestHandler *handler;
@@ -88,7 +88,7 @@
}
TrackerDBusData *
-tracker_dbus_data_new (const gpointer arg1,
+tracker_dbus_data_new (const gpointer arg1,
const gpointer arg2)
{
TrackerDBusData *data;
@@ -111,10 +111,10 @@
gint i = 0;
strv = g_new0 (gchar*, g_slist_length (list) + 1);
-
+
for (l = list; l != NULL; l = l->next) {
if (!g_utf8_validate (l->data, -1, NULL)) {
- g_message ("Could not add string:'%s' to GStrv, invalid UTF-8",
+ g_message ("Could not add string:'%s' to GStrv, invalid UTF-8",
(gchar*) l->data);
continue;
}
@@ -128,7 +128,7 @@
}
gchar **
-tracker_dbus_queue_str_to_strv (GQueue *queue,
+tracker_dbus_queue_str_to_strv (GQueue *queue,
gint max)
{
gchar **strv;
@@ -137,13 +137,13 @@
gint length;
length = g_queue_get_length (queue);
-
+
if (max > 0) {
length = MIN (max, length);
}
strv = g_new0 (gchar*, length + 1);
-
+
for (i = 0, j = 0; i < length; i++) {
str = g_queue_pop_head (queue);
@@ -166,7 +166,7 @@
}
gchar **
-tracker_dbus_queue_gfile_to_strv (GQueue *queue,
+tracker_dbus_queue_gfile_to_strv (GQueue *queue,
gint max)
{
gchar **strv;
@@ -176,13 +176,13 @@
gint length;
length = g_queue_get_length (queue);
-
+
if (max > 0) {
length = MIN (max, length);
}
strv = g_new0 (gchar*, length + 1);
-
+
for (i = 0, j = 0; i < length; i++) {
file = g_queue_pop_head (queue);
@@ -223,14 +223,14 @@
tracker_dbus_get_next_request_id (void)
{
static guint request_id = 1;
-
+
return request_id++;
}
TrackerDBusRequestHandler *
tracker_dbus_request_add_hook (TrackerDBusRequestFunc new,
TrackerDBusRequestFunc done,
- gpointer user_data)
+ gpointer user_data)
{
TrackerDBusRequestHandler *handler;
@@ -255,7 +255,7 @@
void
tracker_dbus_request_new (gint request_id,
- const gchar *format,
+ const gchar *format,
...)
{
gchar *str;
@@ -264,7 +264,7 @@
va_start (args, format);
str = g_strdup_vprintf (format, args);
va_end (args);
-
+
g_message ("<--- [%d] %s",
request_id,
str);
@@ -279,14 +279,14 @@
{
request_handler_call_for_done (request_id);
- g_message ("---> [%d] Success, no error given",
+ g_message ("---> [%d] Success, no error given",
request_id);
}
void
tracker_dbus_request_failed (gint request_id,
GError **error,
- const gchar *format,
+ const gchar *format,
...)
{
gchar *str;
@@ -298,7 +298,7 @@
va_start (args, format);
str = g_strdup_vprintf (format, args);
va_end (args);
-
+
g_set_error (error, TRACKER_DBUS_ERROR, 0, str);
} else if (*error != NULL) {
str = g_strdup ((*error)->message);
@@ -325,8 +325,8 @@
str = g_strdup_vprintf (format, args);
va_end (args);
- g_message ("---- [%d] %s",
- request_id,
+ g_message ("---- [%d] %s",
+ request_id,
str);
g_free (str);
}
Modified: branches/indexer-split/src/libtracker-common/tracker-dbus.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-dbus.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-dbus.h Sat Sep 20 14:45:00 2008
@@ -24,7 +24,7 @@
#ifndef DBUS_API_SUBJECT_TO_CHANGE
#define DBUS_API_SUBJECT_TO_CHANGE
-#endif
+#endif
#include <glib/gi18n.h>
Modified: branches/indexer-split/src/libtracker-common/tracker-field-data.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-field-data.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-field-data.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
@@ -171,7 +171,7 @@
{
}
-static void
+static void
field_data_finalize (GObject *object)
{
TrackerFieldDataPriv *priv;
@@ -311,7 +311,7 @@
tracker_field_data_get_alias (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
priv = GET_PRIV (field_data);
@@ -323,7 +323,7 @@
tracker_field_data_get_table_name (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
priv = GET_PRIV (field_data);
@@ -335,7 +335,7 @@
tracker_field_data_get_field_name (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
priv = GET_PRIV (field_data);
@@ -347,7 +347,7 @@
tracker_field_data_get_select_field (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
priv = GET_PRIV (field_data);
@@ -359,7 +359,7 @@
tracker_field_data_get_where_field (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
priv = GET_PRIV (field_data);
@@ -371,7 +371,7 @@
tracker_field_data_get_id_field (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), NULL);
priv = GET_PRIV (field_data);
@@ -383,7 +383,7 @@
tracker_field_data_get_data_type (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), TRACKER_FIELD_TYPE_INDEX);
priv = GET_PRIV (field_data);
@@ -395,7 +395,7 @@
tracker_field_data_get_multiple_values (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
priv = GET_PRIV (field_data);
@@ -408,7 +408,7 @@
tracker_field_data_get_is_select (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
priv = GET_PRIV (field_data);
@@ -420,7 +420,7 @@
tracker_field_data_get_is_condition (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
priv = GET_PRIV (field_data);
@@ -432,7 +432,7 @@
tracker_field_data_get_needs_join (TrackerFieldData *field_data)
{
TrackerFieldDataPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD_DATA (field_data), FALSE);
priv = GET_PRIV (field_data);
Modified: branches/indexer-split/src/libtracker-common/tracker-field-data.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-field-data.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-field-data.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
Modified: branches/indexer-split/src/libtracker-common/tracker-field.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-field.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-field.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
@@ -129,7 +129,7 @@
type = tracker_field_type_get_type ();
enum_class = G_ENUM_CLASS (g_type_class_peek (type));
enum_value = g_enum_get_value (enum_class, fieldtype);
-
+
if (!enum_value) {
return NULL;
}
@@ -235,7 +235,7 @@
{
}
-static void
+static void
field_finalize (GObject *object)
{
TrackerFieldPriv *priv;
@@ -400,7 +400,7 @@
tracker_field_get_id (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), NULL);
priv = GET_PRIV (field);
@@ -412,7 +412,7 @@
tracker_field_get_name (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), NULL);
priv = GET_PRIV (field);
@@ -424,7 +424,7 @@
tracker_field_get_data_type (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), TRACKER_FIELD_TYPE_STRING); //FIXME
priv = GET_PRIV (field);
@@ -436,7 +436,7 @@
tracker_field_get_field_name (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), NULL);
priv = GET_PRIV (field);
@@ -448,7 +448,7 @@
tracker_field_get_weight (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), -1);
priv = GET_PRIV (field);
@@ -461,7 +461,7 @@
tracker_field_get_embedded (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), FALSE);
priv = GET_PRIV (field);
@@ -474,7 +474,7 @@
tracker_field_get_multiple_values (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), FALSE);
priv = GET_PRIV (field);
@@ -486,7 +486,7 @@
tracker_field_get_delimited (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), FALSE);
priv = GET_PRIV (field);
@@ -498,7 +498,7 @@
tracker_field_get_filtered (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), FALSE);
priv = GET_PRIV (field);
@@ -510,7 +510,7 @@
tracker_field_get_store_metadata (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), FALSE);
priv = GET_PRIV (field);
@@ -523,7 +523,7 @@
tracker_field_get_child_ids (TrackerField *field)
{
TrackerFieldPriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_FIELD (field), NULL);
priv = GET_PRIV (field);
@@ -718,7 +718,7 @@
for (l = value; l; l = l->next) {
new_list = g_slist_prepend (new_list, g_strdup (l->data));
}
-
+
new_list = g_slist_reverse (new_list);
priv->child_ids = new_list;
} else {
@@ -730,7 +730,7 @@
void
tracker_field_append_child_id (TrackerField *field,
- const gchar *value)
+ const gchar *value)
{
TrackerFieldPriv *priv;
Modified: branches/indexer-split/src/libtracker-common/tracker-field.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-field.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-field.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
Modified: branches/indexer-split/src/libtracker-common/tracker-file-utils.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-file-utils.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-file-utils.c Sat Sep 20 14:45:00 2008
@@ -39,7 +39,7 @@
#define TEXT_SNIFF_SIZE 4096
gint
-tracker_file_open (const gchar *uri,
+tracker_file_open (const gchar *uri,
gboolean readahead)
{
gint fd;
@@ -48,16 +48,16 @@
fd = open (uri, O_RDONLY | O_NOATIME);
if (fd == -1) {
- fd = open (uri, O_RDONLY);
+ fd = open (uri, O_RDONLY);
}
#else
- fd = open (uri, O_RDONLY);
+ fd = open (uri, O_RDONLY);
#endif
- if (fd == -1) {
+ if (fd == -1) {
return -1;
}
-
+
#ifdef HAVE_POSIX_FADVISE
if (readahead) {
posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
@@ -70,7 +70,7 @@
}
void
-tracker_file_close (gint fd,
+tracker_file_close (gint fd,
gboolean no_longer_needed)
{
@@ -100,7 +100,7 @@
tracker_file_get_size (const gchar *uri)
{
struct stat finfo;
-
+
if (g_lstat (uri, &finfo) == -1) {
return 0;
} else {
@@ -115,8 +115,8 @@
gchar *end;
/* Code in this function modified from gnome-vfs */
- if (g_utf8_validate ((gchar*) buffer,
- buffer_length,
+ if (g_utf8_validate ((gchar*) buffer,
+ buffer_length,
(const gchar**) &end)) {
return TRUE;
} else {
@@ -162,9 +162,9 @@
* system call and so needs locale filenames.
*/
is_valid &= uri != NULL;
- is_valid &= g_file_test (str,
- G_FILE_TEST_IS_REGULAR |
- G_FILE_TEST_IS_DIR |
+ is_valid &= g_file_test (str,
+ G_FILE_TEST_IS_REGULAR |
+ G_FILE_TEST_IS_DIR |
G_FILE_TEST_IS_SYMLINK);
g_free (str);
@@ -216,10 +216,10 @@
is_indexable &= !S_ISDIR (finfo.st_mode);
is_indexable &= S_ISREG (finfo.st_mode);
- g_debug ("URI:'%s' %s indexable",
+ g_debug ("URI:'%s' %s indexable",
uri,
is_indexable ? "is" : "is not");
-
+
return is_indexable;
}
@@ -259,11 +259,11 @@
info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
G_FILE_QUERY_INFO_NONE,
- NULL,
+ NULL,
&error);
if (G_UNLIKELY (error)) {
- g_warning ("Could not guess mimetype, %s\n",
+ g_warning ("Could not guess mimetype, %s\n",
error->message);
g_error_free (error);
content_type = NULL;
@@ -287,23 +287,23 @@
}
p = (gchar*) uri + strlen (uri) - 1;
-
+
/* Skip trailing slash */
if (p != uri && *p == G_DIR_SEPARATOR) {
p--;
}
-
+
/* Search backwards to the next slash. */
while (p != uri && *p != G_DIR_SEPARATOR) {
p--;
}
-
+
if (p[0] != '\0') {
gchar *new_uri_text;
gint length;
-
+
length = p - uri;
-
+
if (length == 0) {
new_uri_text = g_strdup (G_DIR_SEPARATOR_S);
} else {
@@ -311,7 +311,7 @@
memcpy (new_uri_text, uri, length);
new_uri_text[length] = '\0';
}
-
+
return new_uri_text;
} else {
return g_strdup (G_DIR_SEPARATOR_S);
@@ -339,16 +339,16 @@
while (p != tmp && *p != G_DIR_SEPARATOR) {
p--;
}
-
+
res = p + 1;
-
+
if (res && res[0] != '\0') {
result = g_strdup (res);
g_free (tmp);
-
+
return result;
}
-
+
g_free (tmp);
return g_strdup (" ");
@@ -368,7 +368,7 @@
return normalized;
}
-void
+void
tracker_file_get_path_and_name (const gchar *uri,
gchar **path,
gchar **name)
@@ -390,7 +390,7 @@
*name = tracker_file_get_vfs_name (uri);
*path = tracker_file_get_vfs_path (uri);
}
-
+
}
@@ -452,7 +452,7 @@
g_return_val_if_fail (path != NULL, FALSE);
g_return_val_if_fail (in_path != NULL, FALSE);
-
+
if (!g_str_has_suffix (path, G_DIR_SEPARATOR_S)) {
new_path = g_strconcat (path, G_DIR_SEPARATOR_S, NULL);
} else {
@@ -464,10 +464,10 @@
} else {
new_in_path = g_strdup (in_path);
}
-
+
if (g_str_has_prefix (new_path, new_in_path)) {
is_in_path = TRUE;
- }
+ }
g_free (new_in_path);
g_free (new_path);
@@ -486,7 +486,7 @@
g_hash_table_iter_init (&iter1, roots);
while (g_hash_table_iter_next (&iter1, &key, NULL)) {
const gchar *path;
-
+
path = (const gchar*) key;
g_hash_table_iter_init (&iter2, roots);
@@ -500,14 +500,14 @@
}
if (tracker_path_is_in_path (path, in_path)) {
- g_debug ("Removing path:'%s', it is in path:'%s'",
+ g_debug ("Removing path:'%s', it is in path:'%s'",
path, in_path);
g_hash_table_iter_remove (&iter1);
g_hash_table_iter_init (&iter1, roots);
break;
} else if (tracker_path_is_in_path (in_path, path)) {
- g_debug ("Removing path:'%s', it is in path:'%s'",
+ g_debug ("Removing path:'%s', it is in path:'%s'",
in_path, path);
g_hash_table_iter_remove (&iter2);
@@ -524,11 +524,11 @@
GList *keys, *l;
keys = g_hash_table_get_keys (roots);
-
+
for (l = keys; l; l = l->next) {
g_debug (" %s", (gchar*) l->data);
}
-
+
g_list_free (keys);
}
#endif /* TESTING */
@@ -542,7 +542,7 @@
/* This function CREATES a new list and the data in the list
* is new too! g_free() must be called on the list data and
- * g_slist_free() on the list too when done with.
+ * g_slist_free() on the list too when done with.
*/
/* ONLY HERE do we add separators on each location we check.
@@ -567,11 +567,11 @@
/* If the new path exists as a lower level
* path or is the same as an existing checked
* root we disgard it, it will be checked
- * anyway.
+ * anyway.
*/
if (g_str_has_prefix (path, l2->data)) {
should_add = FALSE;
- }
+ }
/* If the new path exists as a higher level
* path to one already in the checked roots,
@@ -587,7 +587,7 @@
l2 = l2->next;
}
-
+
if (should_add) {
gint len;
@@ -602,8 +602,8 @@
checked_roots = g_slist_prepend (checked_roots, path);
continue;
- }
-
+ }
+
g_free (path);
}
@@ -650,7 +650,7 @@
}
/* Second try to find any environment variables and expand
- * them, like $HOME or ${FOO}
+ * them, like $HOME or ${FOO}
*/
tokens = g_strsplit (uri, G_DIR_SEPARATOR_S, -1);
@@ -660,13 +660,13 @@
}
start = *token + 1;
-
+
if (*start == '{') {
start++;
end = start + (strlen (start)) - 1;
*end='\0';
}
-
+
env = g_getenv (start);
g_free (*token);
@@ -678,7 +678,7 @@
/* Third get the real path removing any "../" and other
* symbolic links to other places, returning only the REAL
- * location.
+ * location.
*/
if (tokens) {
expanded = g_strjoinv (G_DIR_SEPARATOR_S, tokens);
@@ -692,7 +692,7 @@
*/
if (strchr (expanded, G_DIR_SEPARATOR)) {
GFile *file;
-
+
file = g_file_new_for_commandline_arg (expanded);
final_path = g_file_get_path (file);
g_object_unref (file);
@@ -720,10 +720,10 @@
info = g_file_query_info (file,
G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
0,
- NULL,
+ NULL,
&error);
g_object_unref (file);
-
+
if (G_UNLIKELY (error)) {
if (error->code == G_IO_ERROR_NOT_FOUND) {
if (exists) {
@@ -737,7 +737,7 @@
}
g_error_free (error);
-
+
writable = FALSE;
} else {
if (exists) {
@@ -763,8 +763,8 @@
if (writable) {
g_message (" Path is OK");
return TRUE;
- }
-
+ }
+
g_message (" Path can not be written to");
} else {
g_message (" Path does not exist, attempting to create...");
@@ -776,7 +776,7 @@
g_message (" Path could not be created");
}
-
+
return FALSE;
}
Modified: branches/indexer-split/src/libtracker-common/tracker-hal.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-hal.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-hal.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
@@ -141,7 +141,7 @@
"There is a battery on this machine",
FALSE,
G_PARAM_READABLE));
-
+
g_type_class_add_private (object_class, sizeof (TrackerHalPriv));
}
@@ -181,8 +181,8 @@
return;
}
- dbus_connection_setup_with_g_main (connection, NULL);
-
+ dbus_connection_setup_with_g_main (connection, NULL);
+
priv->context = libhal_ctx_new ();
if (!priv->context) {
@@ -207,7 +207,7 @@
return;
}
-
+
/* Volume and property notification callbacks */
g_message ("HAL monitors set for devices added/removed/mounted/umounted...");
libhal_ctx_set_device_added (priv->context, hal_device_added_cb);
@@ -289,9 +289,9 @@
dbus_error_init (&error);
- devices = libhal_find_device_by_capability (priv->context,
- DEVICE_VOLUME,
- &num,
+ devices = libhal_find_device_by_capability (priv->context,
+ DEVICE_VOLUME,
+ &num,
&error);
if (dbus_error_is_set (&error)) {
@@ -302,18 +302,18 @@
}
if (!devices || !devices[0]) {
- g_message ("HAL devices not found with 'volume' capability");
+ g_message ("HAL devices not found with 'volume' capability");
return TRUE;
}
for (p = devices; *p; p++) {
LibHalVolume *volume;
-
+
volume = libhal_volume_from_udi (priv->context, *p);
if (!volume) {
continue;
}
-
+
g_message ("HAL device found:\n"
" - udi : %s\n"
" - mount point: %s\n"
@@ -321,7 +321,7 @@
" - uuid : %s\n"
" - mounted : %s\n"
" - file system: %s\n"
- " - label : %s",
+ " - label : %s",
libhal_volume_get_udi (volume),
libhal_volume_get_mount_point (volume),
libhal_volume_get_device_file (volume),
@@ -333,9 +333,9 @@
hal_device_add (hal, volume);
libhal_volume_free (volume);
}
-
+
libhal_free_string_array (devices);
-
+
return TRUE;
}
@@ -351,9 +351,9 @@
dbus_error_init (&error);
- devices = libhal_find_device_by_capability (priv->context,
- DEVICE_AC_ADAPTER,
- &num,
+ devices = libhal_find_device_by_capability (priv->context,
+ DEVICE_AC_ADAPTER,
+ &num,
&error);
if (dbus_error_is_set (&error)) {
@@ -387,33 +387,33 @@
} else {
g_message (" - Device '%s'", *p);
}
- }
+ }
libhal_free_string_array (devices);
-
+
/* Make sure we watch changes to the battery use */
- libhal_device_add_property_watch (priv->context,
- priv->battery_udi,
+ libhal_device_add_property_watch (priv->context,
+ priv->battery_udi,
&error);
-
+
if (dbus_error_is_set (&error)) {
g_critical ("Could not add device:'%s' to property watch, %s",
priv->battery_udi, error.message);
dbus_error_free (&error);
return FALSE;
}
-
+
/* Get current state, are we using the battery now? */
- priv->battery_in_use = !libhal_device_get_property_bool (priv->context,
- priv->battery_udi,
- PROP_AC_ADAPTER_ON,
+ priv->battery_in_use = !libhal_device_get_property_bool (priv->context,
+ priv->battery_udi,
+ PROP_AC_ADAPTER_ON,
NULL);
-
+
g_message ("HAL reports system is currently powered by %s",
priv->battery_in_use ? "battery" : "AC adapter");
g_object_notify (G_OBJECT (hal), "battery-in-use");
-
+
return TRUE;
}
@@ -431,13 +431,13 @@
mount_point,
removable_device ? "yes" : "no");
- g_hash_table_insert (priv->mounted_devices,
- g_strdup (udi),
+ g_hash_table_insert (priv->mounted_devices,
+ g_strdup (udi),
g_strdup (mount_point));
if (removable_device) {
- g_hash_table_insert (priv->removable_devices,
- g_strdup (udi),
+ g_hash_table_insert (priv->removable_devices,
+ g_strdup (udi),
g_strdup (mount_point));
}
@@ -457,15 +457,15 @@
if (!mount_point) {
return;
}
-
+
g_message ("HAL device with mount point:'%s', removable:%s NO LONGER being tracked",
mount_point,
g_hash_table_remove (priv->removable_devices, udi) ? "yes" : "no");
g_signal_emit (hal, signals[SIG_MOUNT_POINT_REMOVED], 0, mount_point, NULL);
- g_hash_table_remove (priv->mounted_devices, udi);
- g_hash_table_remove (priv->removable_devices, udi);
+ g_hash_table_remove (priv->mounted_devices, udi);
+ g_hash_table_remove (priv->removable_devices, udi);
}
static const gchar *
@@ -507,7 +507,7 @@
return "";
}
-static gboolean
+static gboolean
hal_device_is_removable (TrackerHal *hal,
const gchar *device_file)
{
@@ -525,10 +525,10 @@
if (!drive) {
return FALSE;
}
-
+
removable = libhal_drive_uses_removable_media (drive);
libhal_drive_free (drive);
-
+
return removable;
}
@@ -553,7 +553,7 @@
}
/* From the list, the first one below seems to be the ONLY one
- * to ignore:
+ * to ignore:
*
* LIBHAL_DRIVE_TYPE_REMOVABLE_DISK = 0x00,
* LIBHAL_DRIVE_TYPE_DISK = 0x01,
@@ -570,7 +570,7 @@
* LIBHAL_DRIVE_TYPE_JAZ = 0x0c,
* LIBHAL_DRIVE_TYPE_FLASHKEY = 0x0d,
* LIBHAL_DRIVE_TYPE_MO = 0x0e
- *
+ *
*/
drive_type = libhal_drive_get_type (drive);
@@ -579,7 +579,7 @@
* the machine, we simply track devices which are added or
* removed in real time which we are interested in and which
* are viable for tracking. CDROMs are too slow.
- */
+ */
eligible = TRUE;
eligible &= drive_type != LIBHAL_DRIVE_TYPE_DISK;
eligible &= drive_type != LIBHAL_DRIVE_TYPE_CDROM;
@@ -593,7 +593,7 @@
g_message ("HAL device is eligible, type is '%s'",
hal_drive_type_to_string (drive_type));
}
-
+
return eligible;
}
@@ -627,25 +627,25 @@
/* Make sure we watch changes to the mount/umount state */
libhal_device_add_property_watch (priv->context, udi, &error);
-
+
if (dbus_error_is_set (&error)) {
g_critical ("Could not add device property watch for udi:'%s', %s",
udi, error.message);
dbus_error_free (&error);
return FALSE;
}
-
- g_hash_table_insert (priv->all_devices,
- g_strdup (udi),
+
+ g_hash_table_insert (priv->all_devices,
+ g_strdup (udi),
g_strdup (device_file));
if (mount_point) {
- hal_mount_point_add (hal,
- udi,
- mount_point,
+ hal_mount_point_add (hal,
+ udi,
+ mount_point,
hal_device_is_removable (hal, device_file));
}
-
+
return TRUE;
}
@@ -672,7 +672,7 @@
" - uuid : %s\n"
" - mounted : %s\n"
" - file system: %s\n"
- " - label : %s",
+ " - label : %s",
udi,
libhal_volume_get_mount_point (volume),
libhal_volume_get_device_file (volume),
@@ -706,25 +706,25 @@
}
mount_point = g_hash_table_lookup (priv->mounted_devices, udi);
-
+
g_message ("HAL device removed:\n"
" - udi : %s\n"
" - mount point: %s\n"
" - device_file: %s",
- udi,
+ udi,
mount_point,
device_file);
- g_hash_table_remove (priv->all_devices, udi);
-
+ g_hash_table_remove (priv->all_devices, udi);
+
hal_mount_point_remove (hal, udi);
}
static void
hal_device_property_modified_cb (LibHalContext *context,
- const char *udi,
+ const char *udi,
const char *key,
- dbus_bool_t is_removed,
+ dbus_bool_t is_removed,
dbus_bool_t is_added)
{
TrackerHal *hal;
@@ -751,9 +751,9 @@
* device being mounted/umounted.
*/
if (device_is_battery) {
- priv->battery_in_use = !libhal_device_get_property_bool (priv->context,
- priv->battery_udi,
- PROP_AC_ADAPTER_ON,
+ priv->battery_in_use = !libhal_device_get_property_bool (priv->context,
+ priv->battery_udi,
+ PROP_AC_ADAPTER_ON,
&error);
g_message ("HAL reports system is now powered by %s",
priv->battery_in_use ? "battery" : "AC adapter");
@@ -768,16 +768,16 @@
}
} else {
gboolean is_mounted;
-
- g_message ("HAL device property change for udi:'%s' and key:'%s'",
+
+ g_message ("HAL device property change for udi:'%s' and key:'%s'",
udi, key);
-
+
if (strcmp (key, PROP_IS_MOUNTED) != 0) {
return;
}
- is_mounted = libhal_device_get_property_bool (context,
- udi,
+ is_mounted = libhal_device_get_property_bool (context,
+ udi,
key,
&error);
@@ -791,7 +791,7 @@
hal_mount_point_remove (hal, udi);
return;
}
-
+
if (is_mounted) {
LibHalVolume *volume;
const gchar *mount_point;
@@ -804,9 +804,9 @@
g_message ("HAL device with udi:'%s' is now mounted",
udi);
- hal_mount_point_add (hal,
- udi,
- mount_point,
+ hal_mount_point_add (hal,
+ udi,
+ mount_point,
hal_device_is_removable (hal, device_file));
libhal_volume_free (volume);
@@ -831,9 +831,9 @@
TrackerHalPriv *priv;
g_return_val_if_fail (TRACKER_IS_HAL (hal), TRUE);
-
+
priv = GET_PRIV (hal);
-
+
return priv->battery_in_use;
}
@@ -843,7 +843,7 @@
TrackerHalPriv *priv;
g_return_val_if_fail (TRACKER_IS_HAL (hal), TRUE);
-
+
priv = GET_PRIV (hal);
return priv->battery_udi != NULL;
@@ -870,7 +870,7 @@
udi);
return;
}
-
+
mount_point = libhal_volume_get_mount_point (volume);
is_mounted = libhal_volume_is_mounted (volume);
@@ -894,7 +894,7 @@
gr.context = priv->context;
gr.roots = NULL;
- g_hash_table_foreach (priv->mounted_devices,
+ g_hash_table_foreach (priv->mounted_devices,
hal_get_mount_point_by_udi_foreach,
&gr);
@@ -914,7 +914,7 @@
gr.context = priv->context;
gr.roots = NULL;
- g_hash_table_foreach (priv->removable_devices,
+ g_hash_table_foreach (priv->removable_devices,
hal_get_mount_point_by_udi_foreach,
&gr);
Modified: branches/indexer-split/src/libtracker-common/tracker-hal.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-hal.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-hal.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
@@ -26,7 +26,7 @@
G_BEGIN_DECLS
-#ifdef HAVE_HAL
+#ifdef HAVE_HAL
#define TRACKER_TYPE_HAL (tracker_hal_get_type ())
#define TRACKER_HAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_HAL, TrackerHal))
Modified: branches/indexer-split/src/libtracker-common/tracker-ioprio.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-ioprio.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-ioprio.c Sat Sep 20 14:45:00 2008
@@ -24,7 +24,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
-
+
#include "config.h"
#ifdef HAVE_IOPRIO
@@ -104,7 +104,7 @@
return syscall (__NR_ioprio_set, which, who, ioprio_val);
}
-static int
+static int
set_io_priority_idle (void)
{
int ioprio, ioclass;
@@ -115,7 +115,7 @@
return ioprio_set (IOPRIO_WHO_PROCESS, 0, ioprio | ioclass);
}
-static int
+static int
set_io_priority_best_effort (int ioprio_val)
{
int ioclass;
Modified: branches/indexer-split/src/libtracker-common/tracker-ioprio.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-ioprio.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-ioprio.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2006, Anders Aagaard
*
* This library is free software; you can redistribute it and/or
Modified: branches/indexer-split/src/libtracker-common/tracker-language.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-language.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-language.c Sat Sep 20 14:45:00 2008
@@ -27,7 +27,7 @@
#include <libstemmer/libstemmer.h>
-#include "tracker-log.h"
+#include "tracker-log.h"
#include "tracker-language.h"
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_LANGUAGE, TrackerLanguagePriv))
@@ -347,10 +347,10 @@
language = g_object_new (TRACKER_TYPE_LANGUAGE,
"config", config,
NULL);
-
+
language_set_stopword_list (language,
tracker_config_get_language (config));
-
+
return language;
}
@@ -429,7 +429,7 @@
}
g_mutex_lock (priv->stemmer_mutex);
-
+
stem_word = (const gchar*) sb_stemmer_stem (priv->stemmer,
(guchar*) word,
word_length);
Modified: branches/indexer-split/src/libtracker-common/tracker-language.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-language.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-language.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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
*
Modified: branches/indexer-split/src/libtracker-common/tracker-log.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-log.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-log.c Sat Sep 20 14:45:00 2008
@@ -28,10 +28,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
+#include <unistd.h>
#include <errno.h>
-#include <glib/gstdio.h>
+#include <glib/gstdio.h>
#include "tracker-log.h"
@@ -91,9 +91,9 @@
break;
}
- output = g_strdup_printf ("%s%s %s%s: %s",
+ output = g_strdup_printf ("%s%s %s%s: %s",
log_level_str ? "\n" : "",
- time_str,
+ time_str,
domain,
log_level_str ? log_level_str : "",
message);
@@ -146,7 +146,7 @@
error_string = g_strerror (errno);
g_fprintf (stderr,
- "Could not open log:'%s', %s\n",
+ "Could not open log:'%s', %s\n",
filename,
error_string);
g_fprintf (stderr,
@@ -157,9 +157,9 @@
mutex = g_mutex_new ();
/* Add log handler function */
- log_handler_id = g_log_set_handler (NULL,
+ log_handler_id = g_log_set_handler (NULL,
G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL,
- tracker_log_handler,
+ tracker_log_handler,
NULL);
g_log_set_default_handler (tracker_log_handler, NULL);
@@ -170,7 +170,7 @@
}
void
-tracker_log_shutdown (void)
+tracker_log_shutdown (void)
{
if (!initialized) {
return;
Modified: branches/indexer-split/src/libtracker-common/tracker-module-config.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-module-config.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-module-config.c Sat Sep 20 14:45:00 2008
@@ -118,12 +118,12 @@
g_hash_table_iter_init (&iter1, mc->monitor_directories);
while (g_hash_table_iter_next (&iter1, &key, NULL)) {
const gchar *path;
-
+
path = (const gchar*) key;
if (g_hash_table_lookup (mc->monitor_recurse_directories, path)) {
g_debug ("Removing path:'%s' from monitor directories, "
- "ALREADY in monitor recurse directories",
+ "ALREADY in monitor recurse directories",
path);
g_hash_table_iter_remove (&iter1);
@@ -143,7 +143,7 @@
if (tracker_path_is_in_path (path, in_path)) {
g_debug ("Removing path:'%s' from monitor directories, "
- "ALREADY in monitor recurse directories HIERARCHY",
+ "ALREADY in monitor recurse directories HIERARCHY",
path);
g_hash_table_iter_remove (&iter1);
@@ -176,7 +176,7 @@
ignored_files = g_hash_table_get_keys (mc->ignored_files);
for (l = ignored_files; l; l = l->next) {
- g_message (" Adding file ignore pattern:'%s'",
+ g_message (" Adding file ignore pattern:'%s'",
(gchar *) l->data);
spec = g_pattern_spec_new (l->data);
patterns = g_list_prepend (patterns, spec);
@@ -203,7 +203,7 @@
ignored_directories = g_hash_table_get_keys (mc->ignored_directories);
for (l = ignored_directories; l; l = l->next) {
- g_message (" Adding directory ignore pattern:'%s'",
+ g_message (" Adding directory ignore pattern:'%s'",
(gchar *) l->data);
spec = g_pattern_spec_new (l->data);
patterns = g_list_prepend (patterns, spec);
@@ -230,7 +230,7 @@
index_files = g_hash_table_get_keys (mc->index_files);
for (l = index_files; l; l = l->next) {
- g_message (" Adding file index pattern:'%s'",
+ g_message (" Adding file index pattern:'%s'",
(gchar *) l->data);
spec = g_pattern_spec_new (l->data);
patterns = g_list_prepend (patterns, spec);
@@ -338,14 +338,14 @@
for (p = str; *p; p++) {
gchar *real_path;
-
+
if (!expand_strings_as_paths) {
if (g_hash_table_lookup (table, *p)) {
continue;
}
- g_hash_table_insert (table,
- g_strdup (*p),
+ g_hash_table_insert (table,
+ g_strdup (*p),
GINT_TO_POINTER (1));
} else {
if (g_hash_table_lookup (table, *p)) {
@@ -358,7 +358,7 @@
continue;
}
- g_hash_table_insert (table,
+ g_hash_table_insert (table,
real_path,
GINT_TO_POINTER (1));
g_debug ("Got real path:'%s' for '%s'", real_path, *p);
@@ -366,7 +366,7 @@
}
g_strfreev (str);
-
+
/* Go through again to make sure we don't have situations
* where /foo and / exist, because of course /foo is
* redundant here where 'remove_hierarchy_dups' is TRUE.
@@ -374,7 +374,7 @@
if (remove_hierarchy_dups) {
tracker_path_hash_table_filter_duplicates (table);
}
-
+
return table;
}
Modified: branches/indexer-split/src/libtracker-common/tracker-module-config.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-module-config.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-module-config.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
Modified: branches/indexer-split/src/libtracker-common/tracker-nfs-lock.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-nfs-lock.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-nfs-lock.c Sat Sep 20 14:45:00 2008
@@ -59,7 +59,7 @@
}
static gboolean
-is_initialized (void)
+is_initialized (void)
{
return lock_filename != NULL || tmp_dir != NULL;
}
@@ -82,9 +82,9 @@
g_critical ("Could not initialize NFS lock");
return FALSE;
}
-
- filename = g_strdup_printf ("%s_%s.lock",
- tmp_dir,
+
+ filename = g_strdup_printf ("%s_%s.lock",
+ tmp_dir,
g_get_user_name ());
for (attempt = 0; attempt < 10000; ++attempt) {
@@ -133,23 +133,23 @@
if (!use_nfs_safe_locking) {
return;
}
-
+
if (!is_initialized ()) {
g_critical ("Could not initialize NFS lock");
return;
}
-
- filename = g_strdup_printf ("%s_%s.lock",
- tmp_dir,
+
+ filename = g_strdup_printf ("%s_%s.lock",
+ tmp_dir,
g_get_user_name ());
-
+
g_unlink (filename);
g_unlink (lock_filename);
g_free (filename);
}
-void
+void
tracker_nfs_lock_init (gboolean nfs)
{
if (is_initialized ()) {
@@ -159,20 +159,20 @@
use_nfs_safe_locking = nfs;
if (lock_filename == NULL) {
- lock_filename = g_build_filename (g_get_user_data_dir (),
- "tracker",
- "tracker.lock",
+ lock_filename = g_build_filename (g_get_user_data_dir (),
+ "tracker",
+ "tracker.lock",
NULL);
}
if (tmp_dir == NULL) {
- tmp_dir = g_build_filename (g_get_user_data_dir (),
+ tmp_dir = g_build_filename (g_get_user_data_dir (),
"tracker",
- g_get_host_name (),
+ g_get_host_name (),
NULL);
}
- g_message ("NFS lock initialized %s",
+ g_message ("NFS lock initialized %s",
use_nfs_safe_locking ? "" : "(safe locking not in use)");
}
Modified: branches/indexer-split/src/libtracker-common/tracker-nfs-lock.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-nfs-lock.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-nfs-lock.h Sat Sep 20 14:45:00 2008
@@ -31,6 +31,6 @@
gboolean tracker_nfs_lock_obtain (void);
void tracker_nfs_lock_release (void);
-G_END_DECLS
+G_END_DECLS
#endif /* __LIBTRACKER_COMMON_NFS_LOCK_H__ */
Modified: branches/indexer-split/src/libtracker-common/tracker-ontology.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-ontology.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-ontology.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
@@ -33,17 +33,17 @@
static gboolean initialized;
-/* Hash (gint service_type_id, TrackerService *service) */
-static GHashTable *service_ids;
+/* Hash (gint service_type_id, TrackerService *service) */
+static GHashTable *service_ids;
/* Hash (gchar *service_name, TrackerService *service) */
-static GHashTable *service_names;
+static GHashTable *service_names;
/* Hash (gchar *mime, gint service_type_id) */
-static GHashTable *mimes_to_service_ids;
+static GHashTable *mimes_to_service_ids;
/* List of ServiceMimePrefixes */
-static GSList *service_mime_prefixes;
+static GSList *service_mime_prefixes;
/* Field descriptions */
static GHashTable *field_names;
@@ -52,8 +52,8 @@
static gpointer field_type_enum_class;
static void
-ontology_mime_prefix_foreach (gpointer data,
- gpointer user_data)
+ontology_mime_prefix_foreach (gpointer data,
+ gpointer user_data)
{
ServiceMimePrefixes *mime_prefix;
@@ -71,11 +71,11 @@
* names and field names are quite specific and defined in code so
* they shouldn't ever need to be collated or case insensitively
* compared.
- *
+ *
* If this breaks things, we can reinstate it.
*/
static gpointer
-ontology_hash_lookup_by_collated_str (GHashTable *hash_table,
+ontology_hash_lookup_by_collated_str (GHashTable *hash_table,
const gchar *str)
{
gpointer data;
@@ -95,7 +95,7 @@
#endif
static gpointer
-ontology_hash_lookup_by_id (GHashTable *hash_table,
+ontology_hash_lookup_by_id (GHashTable *hash_table,
gint id)
{
gpointer data;
@@ -119,17 +119,17 @@
return;
}
- service_ids = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
+ service_ids = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
g_object_unref);
-
- service_names = g_hash_table_new_full (g_str_hash,
+
+ service_names = g_hash_table_new_full (g_str_hash,
g_str_equal,
- g_free,
+ g_free,
g_object_unref);
-
- mimes_to_service_ids = g_hash_table_new_full (g_str_hash,
+
+ mimes_to_service_ids = g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
NULL);
@@ -168,9 +168,9 @@
field_names = NULL;
if (service_mime_prefixes) {
- g_slist_foreach (service_mime_prefixes,
- ontology_mime_prefix_foreach,
- NULL);
+ g_slist_foreach (service_mime_prefixes,
+ ontology_mime_prefix_foreach,
+ NULL);
g_slist_free (service_mime_prefixes);
service_mime_prefixes = NULL;
}
@@ -181,7 +181,7 @@
initialized = FALSE;
}
-void
+void
tracker_ontology_service_add (TrackerService *service,
GSList *mimes,
GSList *mime_prefixes)
@@ -197,17 +197,17 @@
id = tracker_service_get_id (service);
name = tracker_service_get_name (service);
- g_hash_table_insert (service_names,
+ g_hash_table_insert (service_names,
/* g_utf8_collate_key (name, -1), */
g_strdup (name),
g_object_ref (service));
- g_hash_table_insert (service_ids,
- g_strdup_printf ("%d", id),
+ g_hash_table_insert (service_ids,
+ g_strdup_printf ("%d", id),
g_object_ref (service));
for (l = mimes; l && l->data; l = l->next) {
- g_hash_table_insert (mimes_to_service_ids,
- l->data,
+ g_hash_table_insert (mimes_to_service_ids,
+ l->data,
GINT_TO_POINTER (id));
}
@@ -216,7 +216,7 @@
service_mime_prefix->prefix = l->data;
service_mime_prefix->service = id;
- service_mime_prefixes = g_slist_prepend (service_mime_prefixes,
+ service_mime_prefixes = g_slist_prepend (service_mime_prefixes,
service_mime_prefix);
}
}
@@ -244,7 +244,7 @@
}
gchar *
-tracker_ontology_get_service_by_mime (const gchar *mime)
+tracker_ontology_get_service_by_mime (const gchar *mime)
{
gpointer id;
ServiceMimePrefixes *item;
@@ -259,15 +259,15 @@
}
/* Try in prefixes */
- for (prefix_service = service_mime_prefixes;
- prefix_service != NULL;
+ for (prefix_service = service_mime_prefixes;
+ prefix_service != NULL;
prefix_service = prefix_service->next) {
item = prefix_service->data;
if (g_str_has_prefix (mime, item->prefix)) {
return tracker_ontology_get_service_by_id (item->service);
}
}
-
+
/* Default option */
return g_strdup ("Other");
}
@@ -297,7 +297,7 @@
g_return_val_if_fail (service_str != NULL, NULL);
service = g_hash_table_lookup (service_names, service_str);
-
+
if (service) {
parent = tracker_service_get_parent (service);
}
@@ -334,7 +334,7 @@
if (!parent) {
return -1;
}
-
+
service = g_hash_table_lookup (service_names, parent);
if (!service) {
@@ -354,7 +354,7 @@
str = g_utf8_strdown (service_str, -1);
- if (g_str_has_suffix (str, "emails") ||
+ if (g_str_has_suffix (str, "emails") ||
g_str_has_suffix (str, "attachments")) {
type = TRACKER_DB_TYPE_EMAIL;
} else if (g_str_has_prefix (str, "files")) {
@@ -402,7 +402,7 @@
TrackerService *service;
TrackerService *parent;
const gchar *parent_name;
-
+
service = tracker_ontology_get_service_by_name (service_str);
if (!service) {
return NULL;
@@ -410,20 +410,20 @@
/* Prefix for properties of the category */
prefix = tracker_service_get_property_prefix (service);
-
+
if (!prefix || g_strcmp0 (prefix, " ") == 0) {
prefix = service_str;
}
-
+
/* Prefix for properties of the parent */
parent_name = tracker_ontology_get_service_parent (service_str);
if (parent_name && g_strcmp0 (parent_name, " ") != 0) {
parent = tracker_ontology_get_service_by_name (parent_name);
-
+
if (parent) {
parent_prefix = tracker_service_get_property_prefix (parent);
-
+
if (!parent_prefix || g_strcmp0 (parent_prefix, " ") == 0) {
parent_prefix = parent_name;
}
@@ -437,11 +437,11 @@
for (l = fields; l; l = l->next) {
TrackerField *field;
const gchar *name;
-
+
field = l->data;
name = tracker_field_get_name (field);
- if (service_str == NULL ||
+ if (service_str == NULL ||
(prefix && g_str_has_prefix (name, prefix)) ||
(parent_prefix && g_str_has_prefix (name, parent_prefix))) {
names = g_slist_prepend (names, g_strdup (name));
@@ -481,7 +481,7 @@
}
gboolean
-tracker_ontology_service_has_metadata (const gchar *service_str)
+tracker_ontology_service_has_metadata (const gchar *service_str)
{
TrackerService *service;
@@ -512,8 +512,8 @@
return tracker_service_get_has_thumbs (service);
}
-gboolean
-tracker_ontology_service_has_text (const char *service_str)
+gboolean
+tracker_ontology_service_has_text (const char *service_str)
{
TrackerService *service;
@@ -529,7 +529,7 @@
}
gint
-tracker_ontology_service_get_key_metadata (const gchar *service_str,
+tracker_ontology_service_get_key_metadata (const gchar *service_str,
const gchar *meta_name)
{
TrackerService *service;
@@ -561,7 +561,7 @@
}
gboolean
-tracker_ontology_service_get_show_directories (const gchar *service_str)
+tracker_ontology_service_get_show_directories (const gchar *service_str)
{
TrackerService *service;
@@ -575,7 +575,7 @@
}
gboolean
-tracker_ontology_service_get_show_files (const gchar *service_str)
+tracker_ontology_service_get_show_files (const gchar *service_str)
{
TrackerService *service;
@@ -595,25 +595,25 @@
const gchar *name;
g_return_if_fail (TRACKER_IS_FIELD (field));
-
+
name = tracker_field_get_name (field);
g_return_if_fail (name != NULL);
- g_hash_table_insert (field_names,
+ g_hash_table_insert (field_names,
/* g_utf8_collate_key (tracker_field_get_name (field), -1), */
g_strdup (name),
g_object_ref (field));
}
TrackerField *
-tracker_ontology_get_field_by_name (const gchar *name)
+tracker_ontology_get_field_by_name (const gchar *name)
{
g_return_val_if_fail (name != NULL, NULL);
return g_hash_table_lookup (field_names, name);
}
-TrackerField *
+TrackerField *
tracker_ontology_get_field_by_id (gint id)
{
TrackerField *field = NULL;
@@ -623,7 +623,7 @@
/* TODO Create a hashtable with id -> field def. More efficient */
values = g_hash_table_get_values (field_names);
-
+
for (l = values; l && !field; l = l->next) {
if (atoi (tracker_field_get_id (l->data)) == id) {
field = l->data;
@@ -636,7 +636,7 @@
}
gchar *
-tracker_ontology_get_field_name_by_service_name (TrackerField *field,
+tracker_ontology_get_field_name_by_service_name (TrackerField *field,
const gchar *service_str)
{
const gchar *field_name;
@@ -647,13 +647,13 @@
g_return_val_if_fail (service_str != NULL, NULL);
meta_name = tracker_field_get_name (field);
- key_field = tracker_ontology_service_get_key_metadata (service_str,
+ key_field = tracker_ontology_service_get_key_metadata (service_str,
meta_name);
if (key_field > 0) {
return g_strdup_printf ("KeyMetadata%d", key_field);
- }
+ }
/* TODO do it using field_name in TrackerField! */
field_name = tracker_field_get_field_name (field);
@@ -665,7 +665,7 @@
}
/*
- * Field data
+ * Field data
*/
gchar *
tracker_ontology_field_get_display_name (TrackerField *field)
@@ -677,7 +677,7 @@
type = tracker_field_get_data_type (field);
if (type == TRACKER_FIELD_TYPE_INDEX ||
- type == TRACKER_FIELD_TYPE_STRING ||
+ type == TRACKER_FIELD_TYPE_STRING ||
type == TRACKER_FIELD_TYPE_DOUBLE) {
return g_strdup ("MetaDataDisplay");
}
@@ -697,13 +697,13 @@
if (field) {
return tracker_field_get_id (field);
}
-
+
return NULL;
}
gboolean
-tracker_ontology_field_is_child_of (const gchar *field_str_child,
- const gchar *field_str_parent)
+tracker_ontology_field_is_child_of (const gchar *field_str_child,
+ const gchar *field_str_parent)
{
TrackerField *field_child;
TrackerField *field_parent;
Modified: branches/indexer-split/src/libtracker-common/tracker-ontology.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-ontology.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-ontology.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
Modified: branches/indexer-split/src/libtracker-common/tracker-os-dependant-unix.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-os-dependant-unix.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-os-dependant-unix.c Sat Sep 20 14:45:00 2008
@@ -36,9 +36,9 @@
#define MAX_MEM_AMD64 512
gboolean
-tracker_spawn (gchar **argv,
- gint timeout,
- gchar **tmp_stdout,
+tracker_spawn (gchar **argv,
+ gint timeout,
+ gchar **tmp_stdout,
gint *exit_status)
{
GError *error = NULL;
@@ -49,7 +49,7 @@
g_return_val_if_fail (argv[0] != NULL, FALSE);
g_return_val_if_fail (timeout > 0, FALSE);
- flags = G_SPAWN_SEARCH_PATH |
+ flags = G_SPAWN_SEARCH_PATH |
G_SPAWN_STDERR_TO_DEV_NULL;
if (!tmp_stdout) {
@@ -151,8 +151,8 @@
/* nice() uses attribute "warn_unused_result" and so complains
* if we do not check its returned value. But it seems that
* since glibc 2.2.4, nice() can return -1 on a successful call
- * so we have to check value of errno too. Stupid...
- */
+ * so we have to check value of errno too. Stupid...
+ */
if (nice (19) == -1 && errno) {
g_warning ("Failed to set nice value");
}
Modified: branches/indexer-split/src/libtracker-common/tracker-os-dependant-win.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-os-dependant-win.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-os-dependant-win.c Sat Sep 20 14:45:00 2008
@@ -30,9 +30,9 @@
#include "tracker-os-dependant.h"
gboolean
-tracker_spawn (gchar **argv,
- gint timeout,
- gchar **tmp_stdout,
+tracker_spawn (gchar **argv,
+ gint timeout,
+ gchar **tmp_stdout,
gint *exit_status)
{
GSpawnFlags flags;
@@ -57,7 +57,7 @@
new_argv[i + 2] = argv[i];
}
- flags = G_SPAWN_SEARCH_PATH |
+ flags = G_SPAWN_SEARCH_PATH |
G_SPAWN_STDERR_TO_DEV_NULL;
if (!tmp_stdout) {
@@ -108,8 +108,8 @@
(gchar **) argv,
NULL,
G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
- tracker_spawn_child_func,
- GINT_TO_POINTER (timeout),
+ tracker_spawn_child_func,
+ GINT_TO_POINTER (timeout),
pid,
stdin_channel ? &stdin : NULL,
stdout_channel ? &stdout : NULL,
@@ -173,7 +173,7 @@
return str;
}
-gboolean
+gboolean
tracker_memory_setrlimits (void)
{
return TRUE;
Modified: branches/indexer-split/src/libtracker-common/tracker-parser.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-parser.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-parser.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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
*
@@ -233,7 +233,7 @@
c = g_utf8_get_char (p);
type = get_word_type (c);
- if (type == TRACKER_PARSER_WORD_IGNORE ||
+ if (type == TRACKER_PARSER_WORD_IGNORE ||
type == TRACKER_PARSER_WORD_NEWLINE ||
(delimit_hyphen &&
(type == TRACKER_PARSER_WORD_HYPHEN ||
@@ -400,7 +400,7 @@
gchar *start_word, *end_word;
old_word_start = word_start;
-
+
start_word = g_utf8_offset_to_pointer (parser->txt, word_start);
end_word = g_utf8_offset_to_pointer (parser->txt, i);
@@ -432,7 +432,7 @@
*byte_offset_end = *byte_offset_start + (end_word - start_word);
parser->attr_pos = i;
-
+
return TRUE;
}
@@ -448,7 +448,7 @@
static gboolean
-parser_next (TrackerParser *parser,
+parser_next (TrackerParser *parser,
gint *byte_offset_start,
gint *byte_offset_end,
gboolean *is_new_paragraph)
@@ -502,7 +502,7 @@
continue;
} else {
/* word break */
-
+
/* check if word is reserved */
if (is_valid && parser->parse_reserved_words) {
if (length == 2 && word[0] == 'o' && word[1] == 'r') {
@@ -510,11 +510,11 @@
}
}
- if (!is_valid ||
- length < parser->min_word_length ||
+ if (!is_valid ||
+ length < parser->min_word_length ||
word_type == TRACKER_PARSER_WORD_NUM) {
*is_new_paragraph = FALSE;
-
+
word_type = TRACKER_PARSER_WORD_IGNORE;
is_valid = TRUE;
length = 0;
@@ -540,7 +540,7 @@
/* Valid words must start with an alpha or
* underscore if we are filtering.
*/
-
+
if (type == TRACKER_PARSER_WORD_NUM) {
is_valid = FALSE;
start = NULL;
@@ -614,7 +614,7 @@
if (!is_valid) {
return FALSE;
}
-
+
if (word_type == TRACKER_PARSER_WORD_ALPHA_NUM || word_type == TRACKER_PARSER_WORD_ALPHA) {
gchar *utf8;
gchar *processed_word;
@@ -626,7 +626,7 @@
if (!utf8) {
return FALSE;
}
-
+
*byte_offset_start = start-parser->txt;
*byte_offset_end = *byte_offset_start + bytes;
@@ -635,7 +635,7 @@
processed_word = tracker_parser_process_word (parser, utf8, bytes, do_strip);
g_free (utf8);
-
+
parser->word_length = strlen (processed_word);
parser->word = processed_word;
@@ -708,7 +708,7 @@
}
g_free (parser->attrs);
-
+
g_free (parser->word);
g_free (parser);
@@ -736,7 +736,7 @@
parser->txt_size = txt_size;
parser->txt = txt;
parser->parse_reserved_words = parse_reserved_words;
-
+
g_free (parser->word);
parser->word = NULL;
@@ -746,7 +746,7 @@
if (parser->encoding == TRACKER_PARSER_ENCODING_CJK) {
PangoLogAttr *attrs;
-
+
if (parser->txt_size == -1) {
parser->txt_size = strlen (parser->txt);
}
@@ -853,9 +853,9 @@
const gchar *str;
gint byte_start = 0, byte_end = 0;
gboolean new_para;
-
+
str = NULL;
-
+
g_free (parser->word);
parser->word = NULL;
@@ -1062,7 +1062,7 @@
}
g_free (array);
-
+
return word_table;
}
Modified: branches/indexer-split/src/libtracker-common/tracker-parser.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-parser.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-parser.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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
*
@@ -48,17 +48,17 @@
guint min_word_length;
gboolean delimit_words;
gboolean parse_reserved_words;
-
+
/* Private members */
gchar *word;
gint word_length;
guint word_position;
TrackerParserEncoding encoding;
const gchar *cursor;
-
+
/* Pango members for CJK text parsing */
PangoLogAttr *attrs;
- guint attr_length;
+ guint attr_length;
guint attr_pos;
} TrackerParser;
@@ -90,19 +90,19 @@
void tracker_parser_free (TrackerParser *parser);
-/*
+/*
* Functions to parse supplied text and break into individual words and
* maintain a count of no of occurences of the word multiplied by a
- * "weight" factor.
- *
+ * "weight" factor.
+ *
* The word_table - can be NULL. It contains the accumulated parsed words
* with weighted word counts for the text (useful for indexing stuff
- * line by line)
+ * line by line)
*
- * text - the text to be parsed
+ * text - the text to be parsed
* weight - used to multiply the count of a word's occurance to create
- * a weighted rank score
- *
+ * a weighted rank score
+ *
* Returns the word_table.
*/
GHashTable * tracker_parser_text (GHashTable *word_table,
Modified: branches/indexer-split/src/libtracker-common/tracker-service.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-service.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-service.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
@@ -88,35 +88,35 @@
if (etype == 0) {
static const GEnumValue values[] = {
- { TRACKER_DB_TYPE_UNKNOWN,
- "TRACKER_DB_TYPE_UNKNOWN",
+ { TRACKER_DB_TYPE_UNKNOWN,
+ "TRACKER_DB_TYPE_UNKNOWN",
"unknown" },
- { TRACKER_DB_TYPE_DATA,
- "TRACKER_DB_TYPE_DATA",
+ { TRACKER_DB_TYPE_DATA,
+ "TRACKER_DB_TYPE_DATA",
"data" },
- { TRACKER_DB_TYPE_INDEX,
- "TRACKER_DB_TYPE_INDEX",
+ { TRACKER_DB_TYPE_INDEX,
+ "TRACKER_DB_TYPE_INDEX",
"index" },
- { TRACKER_DB_TYPE_COMMON,
- "TRACKER_DB_TYPE_COMMON",
+ { TRACKER_DB_TYPE_COMMON,
+ "TRACKER_DB_TYPE_COMMON",
"common" },
- { TRACKER_DB_TYPE_CONTENT,
- "TRACKER_DB_TYPE_CONTENT",
+ { TRACKER_DB_TYPE_CONTENT,
+ "TRACKER_DB_TYPE_CONTENT",
"content" },
- { TRACKER_DB_TYPE_EMAIL,
- "TRACKER_DB_TYPE_EMAIL",
+ { TRACKER_DB_TYPE_EMAIL,
+ "TRACKER_DB_TYPE_EMAIL",
"email" },
- { TRACKER_DB_TYPE_FILES,
- "TRACKER_DB_TYPE_FILES",
+ { TRACKER_DB_TYPE_FILES,
+ "TRACKER_DB_TYPE_FILES",
"files" },
- { TRACKER_DB_TYPE_XESAM,
- "TRACKER_DB_TYPE_XESAM",
+ { TRACKER_DB_TYPE_XESAM,
+ "TRACKER_DB_TYPE_XESAM",
"xesam" },
- { TRACKER_DB_TYPE_CACHE,
- "TRACKER_DB_TYPE_CACHE",
+ { TRACKER_DB_TYPE_CACHE,
+ "TRACKER_DB_TYPE_CACHE",
"cache" },
- { TRACKER_DB_TYPE_USER,
- "TRACKER_DB_TYPE_USER",
+ { TRACKER_DB_TYPE_USER,
+ "TRACKER_DB_TYPE_USER",
"user" },
{ 0, NULL, NULL }
};
@@ -247,7 +247,7 @@
{
}
-static void
+static void
service_finalize (GObject *object)
{
TrackerServicePriv *priv;
@@ -434,7 +434,7 @@
tracker_service_get_id (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), -1);
priv = GET_PRIV (service);
@@ -446,7 +446,7 @@
tracker_service_get_name (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), NULL);
priv = GET_PRIV (service);
@@ -458,7 +458,7 @@
tracker_service_get_parent (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), NULL);
priv = GET_PRIV (service);
@@ -470,7 +470,7 @@
tracker_service_get_property_prefix (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), NULL);
priv = GET_PRIV (service);
@@ -482,7 +482,7 @@
tracker_service_get_content_metadata (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), NULL);
priv = GET_PRIV (service);
@@ -494,7 +494,7 @@
tracker_service_get_key_metadata (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), NULL);
priv = GET_PRIV (service);
@@ -506,7 +506,7 @@
tracker_service_get_db_type (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), TRACKER_DB_TYPE_DATA);
priv = GET_PRIV (service);
@@ -518,7 +518,7 @@
tracker_service_get_enabled (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), FALSE);
priv = GET_PRIV (service);
@@ -530,7 +530,7 @@
tracker_service_get_embedded (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), FALSE);
priv = GET_PRIV (service);
@@ -542,7 +542,7 @@
tracker_service_get_has_metadata (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), FALSE);
priv = GET_PRIV (service);
@@ -554,7 +554,7 @@
tracker_service_get_has_full_text (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), FALSE);
priv = GET_PRIV (service);
@@ -566,7 +566,7 @@
tracker_service_get_has_thumbs (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), FALSE);
priv = GET_PRIV (service);
@@ -578,7 +578,7 @@
tracker_service_get_show_service_files (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), FALSE);
priv = GET_PRIV (service);
@@ -590,7 +590,7 @@
tracker_service_get_show_service_directories (TrackerService *service)
{
TrackerServicePriv *priv;
-
+
g_return_val_if_fail (TRACKER_IS_SERVICE (service), FALSE);
priv = GET_PRIV (service);
@@ -722,7 +722,7 @@
for (l = value; l; l = l->next) {
new_list = g_slist_prepend (new_list, g_strdup (l->data));
}
-
+
new_list = g_slist_reverse (new_list);
priv->key_metadata = new_list;
} else {
Modified: branches/indexer-split/src/libtracker-common/tracker-service.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-service.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-service.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
@@ -29,14 +29,14 @@
#define TRACKER_TYPE_DB_TYPE (tracker_db_type_get_type ())
typedef enum {
- TRACKER_DB_TYPE_UNKNOWN,
- TRACKER_DB_TYPE_DATA,
+ TRACKER_DB_TYPE_UNKNOWN,
+ TRACKER_DB_TYPE_DATA,
TRACKER_DB_TYPE_INDEX,
- TRACKER_DB_TYPE_COMMON,
+ TRACKER_DB_TYPE_COMMON,
TRACKER_DB_TYPE_CONTENT,
- TRACKER_DB_TYPE_EMAIL,
- TRACKER_DB_TYPE_FILES,
- TRACKER_DB_TYPE_XESAM,
+ TRACKER_DB_TYPE_EMAIL,
+ TRACKER_DB_TYPE_FILES,
+ TRACKER_DB_TYPE_XESAM,
TRACKER_DB_TYPE_CACHE,
TRACKER_DB_TYPE_USER
} TrackerDBType;
Modified: branches/indexer-split/src/libtracker-common/tracker-type-utils.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-type-utils.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-type-utils.c Sat Sep 20 14:45:00 2008
@@ -148,7 +148,7 @@
return g_strdup (buf);
} else if (len == 14) {
/* Check for pdf format EG 20050315113224-08'00' or
- * 20050216111533Z
+ * 20050216111533Z
*/
buf[0] = timestamp[0];
buf[1] = timestamp[1];
@@ -303,7 +303,7 @@
tracker_date_to_time_string (const gchar *time_string)
{
gchar *dvalue;
-
+
dvalue = tracker_date_format (time_string);
if (dvalue) {
@@ -314,10 +314,10 @@
if (time != -1) {
return tracker_gint_to_string (time);
- }
+ }
}
- return NULL;
+ return NULL;
}
static gboolean
@@ -390,13 +390,13 @@
} else {
if (len > 20) {
/* Format must be YYYY-MM-DDThh:mm:ss+xx or
- * YYYY-MM-DDThh:mm:ss+xx:yy
- */
+ * YYYY-MM-DDThh:mm:ss+xx:yy
+ */
if (len < 22 || len > 25) {
return FALSE;
}
- if (timestamp[19] != '+' &&
+ if (timestamp[19] != '+' &&
timestamp[19] != '-') {
return FALSE;
}
@@ -421,8 +421,8 @@
g_return_val_if_fail (timestamp, -1);
/* We should have a valid iso 8601 date in format
- * YYYY-MM-DDThh:mm:ss with optional TZ
- */
+ * YYYY-MM-DDThh:mm:ss with optional TZ
+ */
if (!is_valid_8601_datetime (timestamp)) {
return -1;
}
@@ -444,8 +444,8 @@
}
if (*timestamp++ != 'T') {
- g_critical ("Date validation failed for '%s' st '%c'",
- timestamp,
+ g_critical ("Date validation failed for '%s' st '%c'",
+ timestamp,
*timestamp);
return -1;
}
@@ -471,7 +471,7 @@
t = mktime (&tm);
t -= timezone;
- if (*timestamp == '+' ||
+ if (*timestamp == '+' ||
*timestamp == '-') {
gint sign;
@@ -479,9 +479,9 @@
/* We have format hh:mm or hhmm */
/* Now, we are reading hours */
- if (timestamp[0] &&
+ if (timestamp[0] &&
timestamp[1]) {
- if (g_ascii_isdigit (timestamp[0]) &&
+ if (g_ascii_isdigit (timestamp[0]) &&
g_ascii_isdigit (timestamp[1])) {
gchar buff[3];
@@ -500,9 +500,9 @@
}
/* Now, we are reading minutes */
- if (timestamp[0] &&
+ if (timestamp[0] &&
timestamp[1]) {
- if (g_ascii_isdigit (timestamp[0]) &&
+ if (g_ascii_isdigit (timestamp[0]) &&
g_ascii_isdigit (timestamp[1])) {
gchar buff[3];
@@ -569,7 +569,7 @@
}
gboolean
-tracker_string_to_uint (const gchar *s,
+tracker_string_to_uint (const gchar *s,
guint *value)
{
unsigned long int n;
@@ -596,7 +596,7 @@
}
gint
-tracker_string_in_string_list (const gchar *str,
+tracker_string_in_string_list (const gchar *str,
gchar **strv)
{
gchar **p;
@@ -618,7 +618,7 @@
}
GSList *
-tracker_string_list_to_gslist (gchar **strv,
+tracker_string_list_to_gslist (gchar **strv,
gsize size)
{
GSList *list;
@@ -647,8 +647,8 @@
}
gchar *
-tracker_string_list_to_string (gchar **strv,
- gsize size,
+tracker_string_list_to_string (gchar **strv,
+ gsize size,
gchar sep)
{
GString *string;
@@ -680,7 +680,7 @@
return g_string_free (string, FALSE);
}
-gchar **
+gchar **
tracker_string_to_string_list (const gchar *str)
{
gchar **result;
@@ -715,7 +715,7 @@
return strv;
}
-GSList *
+GSList *
tracker_gslist_copy_with_string_data (GSList *list)
{
GSList *l;
@@ -739,7 +739,7 @@
return new_list;
}
-gchar *
+gchar *
tracker_string_boolean_to_string_gint (const gchar *value)
{
g_return_val_if_fail (value != NULL, NULL);
Modified: branches/indexer-split/src/libtracker-common/tracker-utils.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-utils.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-utils.c Sat Sep 20 14:45:00 2008
@@ -128,11 +128,11 @@
gdouble total;
g_return_val_if_fail (seconds_elapsed >= 0.0, g_strdup (_("unknown time")));
-
+
/* We don't want division by 0 or if total is 0 because items
* remaining is 0 then, equally pointless.
*/
- if (items_done < 1 ||
+ if (items_done < 1 ||
items_remaining < 1) {
return g_strdup (_("unknown time"));
}
@@ -169,40 +169,40 @@
if (days) {
g_string_append_printf (s, " %dd", days);
}
-
+
if (hours) {
g_string_append_printf (s, " %2.2dh", hours);
}
-
+
if (minutes) {
g_string_append_printf (s, " %2.2dm", minutes);
}
-
+
if (seconds) {
g_string_append_printf (s, " %2.2ds", seconds);
}
} else {
if (days) {
- g_string_append_printf (s, " %d day%s",
- days,
+ g_string_append_printf (s, " %d day%s",
+ days,
days == 1 ? "" : "s");
}
-
+
if (hours) {
- g_string_append_printf (s, " %2.2d hour%s",
- hours,
+ g_string_append_printf (s, " %2.2d hour%s",
+ hours,
hours == 1 ? "" : "s");
}
-
+
if (minutes) {
- g_string_append_printf (s, " %2.2d minute%s",
- minutes,
- minutes == 1 ? "" : "s");
+ g_string_append_printf (s, " %2.2d minute%s",
+ minutes,
+ minutes == 1 ? "" : "s");
}
-
+
if (seconds) {
- g_string_append_printf (s, " %2.2d second%s",
- seconds,
+ g_string_append_printf (s, " %2.2d second%s",
+ seconds,
seconds == 1 ? "" : "s");
}
}
Modified: branches/indexer-split/src/libtracker-db/tracker-db-action.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-action.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-action.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia
*
@@ -108,12 +108,12 @@
* it here to make sure it exists when we call
* g_type_class_peek(). This wouldn't be necessary if
* it was a param in a GObject for example.
- *
+ *
* This does mean that we are leaking by 1 reference
* here and should clean it up, but it doesn't grow so
- * this is acceptable.
+ * this is acceptable.
*/
-
+
g_type_class_ref (etype);
}
@@ -130,7 +130,7 @@
type = tracker_db_action_get_type ();
enum_class = G_ENUM_CLASS (g_type_class_peek (type));
enum_value = g_enum_get_value (enum_class, action);
-
+
if (!enum_value) {
enum_value = g_enum_get_value (enum_class, TRACKER_DB_ACTION_IGNORE);
}
@@ -138,10 +138,10 @@
return enum_value->value_nick;
}
-gboolean
+gboolean
tracker_db_action_is_delete (TrackerDBAction action)
{
- return
+ return
action == TRACKER_DB_ACTION_DELETE ||
action == TRACKER_DB_ACTION_DELETE_SELF ||
action == TRACKER_DB_ACTION_FILE_DELETED ||
Modified: branches/indexer-split/src/libtracker-db/tracker-db-action.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-action.h (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-action.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia
*
Modified: branches/indexer-split/src/libtracker-db/tracker-db-dbus.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-dbus.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-dbus.c Sat Sep 20 14:45:00 2008
@@ -24,7 +24,7 @@
#include "tracker-db-dbus.h"
static gchar **
-dbus_query_result_to_strv (TrackerDBResultSet *result_set,
+dbus_query_result_to_strv (TrackerDBResultSet *result_set,
gint column,
gint *count,
gboolean numeric)
@@ -44,7 +44,7 @@
rows = tracker_db_result_set_get_n_rows (result_set);
strv = g_new (gchar*, rows + 1);
-
+
while (valid) {
if (numeric) {
tracker_db_result_set_get (result_set, column, &value, -1);
@@ -52,12 +52,12 @@
} else {
tracker_db_result_set_get (result_set, column, &str, -1);
}
-
+
if (!str) {
valid = tracker_db_result_set_iter_next (result_set);
continue;
}
-
+
if (!g_utf8_validate (str, -1, NULL)) {
g_warning ("Could not add string:'%s' to GStrv, invalid UTF-8", str);
g_free (str);
@@ -79,7 +79,7 @@
}
gchar **
-tracker_dbus_query_result_to_strv (TrackerDBResultSet *result_set,
+tracker_dbus_query_result_to_strv (TrackerDBResultSet *result_set,
gint column,
gint *count)
{
@@ -87,7 +87,7 @@
}
gchar **
-tracker_dbus_query_result_numeric_to_strv (TrackerDBResultSet *result_set,
+tracker_dbus_query_result_numeric_to_strv (TrackerDBResultSet *result_set,
gint column,
gint *count)
{
@@ -95,7 +95,7 @@
}
gchar **
-tracker_dbus_query_result_columns_to_strv (TrackerDBResultSet *result_set,
+tracker_dbus_query_result_columns_to_strv (TrackerDBResultSet *result_set,
gint offset_column,
gint until_column,
gboolean rewind)
@@ -246,7 +246,7 @@
g_value_init (&transform, G_TYPE_STRING);
_tracker_db_result_set_get_value (result_set, i, &value);
-
+
if (g_value_transform (&value, &transform)) {
str = g_value_dup_string (&transform);
Modified: branches/indexer-split/src/libtracker-db/tracker-db-dbus.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-dbus.h (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-dbus.h Sat Sep 20 14:45:00 2008
@@ -31,10 +31,10 @@
gchar ** tracker_dbus_query_result_to_strv (TrackerDBResultSet *result_set,
gint column,
gint *count);
-gchar ** tracker_dbus_query_result_numeric_to_strv (TrackerDBResultSet *result_set,
+gchar ** tracker_dbus_query_result_numeric_to_strv (TrackerDBResultSet *result_set,
gint column,
gint *count);
-gchar ** tracker_dbus_query_result_columns_to_strv (TrackerDBResultSet *result_set,
+gchar ** tracker_dbus_query_result_columns_to_strv (TrackerDBResultSet *result_set,
gint offset_column,
gint until_column,
gboolean rewind);
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 Sat Sep 20 14:45:00 2008
@@ -37,7 +37,7 @@
static gint deallocated;
/*
- * TrackerDBWatch
+ * TrackerDBWatch
*/
GType
tracker_db_watch_get_type (void)
@@ -73,12 +73,12 @@
* it here to make sure it exists when we call
* g_type_class_peek(). This wouldn't be necessary if
* it was a param in a GObject for example.
- *
+ *
* This does mean that we are leaking by 1 reference
* here and should clean it up, but it doesn't grow so
- * this is acceptable.
+ * this is acceptable.
*/
-
+
g_type_class_ref (etype);
}
@@ -95,7 +95,7 @@
type = tracker_db_action_get_type ();
enum_class = G_ENUM_CLASS (g_type_class_peek (type));
enum_value = g_enum_get_value (enum_class, watch);
-
+
if (!enum_value) {
enum_value = g_enum_get_value (enum_class, TRACKER_DB_WATCH_OTHER);
}
@@ -104,12 +104,12 @@
}
/*
- * TrackerDBFileInfo
+ * TrackerDBFileInfo
*/
TrackerDBFileInfo *
-tracker_db_file_info_new (const char *uri,
- TrackerDBAction action,
- gint counter,
+tracker_db_file_info_new (const char *uri,
+ TrackerDBAction action,
+ gint counter,
TrackerDBWatch watch)
{
TrackerDBFileInfo *info;
@@ -217,11 +217,11 @@
#if 0
static TrackerDBFileInfo *
-db_file_info_get_pending (guint32 file_id,
- const gchar *uri,
- const gchar *mime,
- gint counter,
- TrackerDBAction action,
+db_file_info_get_pending (guint32 file_id,
+ const gchar *uri,
+ const gchar *mime,
+ gint counter,
+ TrackerDBAction action,
gboolean is_directory)
{
TrackerDBFileInfo *info;
@@ -285,7 +285,7 @@
}
} else {
- g_warning ("URI:'%s' could not be converted to locale format",
+ g_warning ("URI:'%s' could not be converted to locale format",
info->uri);
return NULL;
}
@@ -340,7 +340,7 @@
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 Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia
*
@@ -27,7 +27,7 @@
#include "tracker-db-action.h"
/*
- * Watch types
+ * Watch types
*/
#define TRACKER_TYPE_DB_WATCH (tracker_db_watch_get_type ())
@@ -44,7 +44,7 @@
const gchar * tracker_db_watch_to_string (TrackerDBWatch watch);
/*
- * File Information
+ * File Information
*/
typedef struct _TrackerDBFileInfo TrackerDBFileInfo;
@@ -90,7 +90,7 @@
/* We ref count FileInfo as it has a complex lifespan and is
* tossed between various threads, lists, queues and hash
* tables.
- */
+ */
gint ref_count;
};
Modified: branches/indexer-split/src/libtracker-db/tracker-db-index-item.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-index-item.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index-item.c Sat Sep 20 14:45:00 2008
@@ -20,8 +20,8 @@
#include "tracker-db-index-item.h"
-guint32
-tracker_db_index_item_calc_amalgamated (gint service_type,
+guint32
+tracker_db_index_item_calc_amalgamated (gint service_type,
gint score)
{
unsigned char a[4];
@@ -47,7 +47,7 @@
return (a[0] << 24) | (a[1] << 16) | (a[2] << 8) | a[3];
}
-guint8
+guint8
tracker_db_index_item_get_service_type (TrackerDBIndexItem *item)
{
g_return_val_if_fail (item != NULL, 0);
@@ -55,7 +55,7 @@
return (item->amalgamated >> 24) & 0xFF;
}
-gint16
+gint16
tracker_db_index_item_get_score (TrackerDBIndexItem *item)
{
unsigned char a[2];
@@ -65,12 +65,12 @@
a[0] = (item->amalgamated >> 16) & 0xFF;
a[1] = (item->amalgamated >> 8) & 0xFF;
- return (gint16) (a[0] << 8) | (a[1]);
+ return (gint16) (a[0] << 8) | (a[1]);
}
-guint32
+guint32
tracker_db_index_item_get_id (TrackerDBIndexItem *item)
-{
+{
g_return_val_if_fail (item != NULL, 0);
return item->id;
Modified: branches/indexer-split/src/libtracker-db/tracker-db-index-item.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-index-item.h (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index-item.h Sat Sep 20 14:45:00 2008
@@ -25,14 +25,14 @@
G_BEGIN_DECLS
-typedef struct {
+typedef struct {
/* Service ID number of the document */
- guint32 id;
+ guint32 id;
/* Amalgamation of service_type and score of the word in the
* document's metadata.
*/
- gint amalgamated;
+ gint amalgamated;
} TrackerDBIndexItem;
typedef struct {
Modified: branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c Sat Sep 20 14:45:00 2008
@@ -46,22 +46,22 @@
static gchar *data_dir;
static TrackerDBIndexDefinition indexes[] = {
- { TRACKER_DB_INDEX_UNKNOWN,
+ { TRACKER_DB_INDEX_UNKNOWN,
NULL,
NULL,
NULL,
NULL },
- { TRACKER_DB_INDEX_FILE,
+ { TRACKER_DB_INDEX_FILE,
NULL,
"file-index.db",
"file-index",
NULL },
- { TRACKER_DB_INDEX_FILE_UPDATE,
+ { TRACKER_DB_INDEX_FILE_UPDATE,
NULL,
"file-index-update.db",
"file-index-update",
NULL },
- { TRACKER_DB_INDEX_EMAIL,
+ { TRACKER_DB_INDEX_EMAIL,
NULL,
"email-index.db",
"email-index",
@@ -92,7 +92,7 @@
G_FILE_ATTRIBUTE_STANDARD_NAME ","
G_FILE_ATTRIBUTE_STANDARD_TYPE,
G_PRIORITY_DEFAULT,
- NULL,
+ NULL,
&error);
if (error) {
@@ -108,7 +108,7 @@
return FALSE;
}
-
+
found = FALSE;
for (info = g_file_enumerator_next_file (enumerator, NULL, &error);
@@ -128,7 +128,7 @@
error->message);
g_error_free (error);
}
-
+
g_object_unref (enumerator);
g_object_unref (file);
g_free (dirname);
@@ -139,7 +139,7 @@
gboolean
tracker_db_index_manager_init (TrackerDBIndexManagerFlags flags,
- gint min_bucket,
+ gint min_bucket,
gint max_bucket)
{
gchar *final_index_filename;
@@ -158,8 +158,8 @@
g_message ("Setting index database locations");
- data_dir = g_build_filename (g_get_user_cache_dir (),
- "tracker",
+ data_dir = g_build_filename (g_get_user_cache_dir (),
+ "tracker",
NULL);
g_message ("Checking index directories exist");
@@ -175,48 +175,48 @@
continue;
}
- if (!g_file_test (indexes[i].abs_filename, G_FILE_TEST_EXISTS)) {
+ if (!g_file_test (indexes[i].abs_filename, G_FILE_TEST_EXISTS)) {
g_message ("Could not find index file:'%s'", indexes[i].abs_filename);
}
}
-
+
g_message ("Merging old temporary indexes");
-
+
i = TRACKER_DB_INDEX_FILE;
name = g_strconcat (indexes[i].name, "-final", NULL);
final_index_filename = g_build_filename (data_dir, name, NULL);
g_free (name);
-
- if (g_file_test (final_index_filename, G_FILE_TEST_EXISTS) &&
+
+ if (g_file_test (final_index_filename, G_FILE_TEST_EXISTS) &&
!has_tmp_merge_files (i)) {
- g_message (" Overwriting '%s' with '%s'",
- indexes[i].abs_filename,
- final_index_filename);
-
+ g_message (" Overwriting '%s' with '%s'",
+ indexes[i].abs_filename,
+ final_index_filename);
+
g_rename (final_index_filename, indexes[i].abs_filename);
}
-
+
g_free (final_index_filename);
i = TRACKER_DB_INDEX_EMAIL;
name = g_strconcat (indexes[i].name, "-final", NULL);
final_index_filename = g_build_filename (data_dir, name, NULL);
g_free (name);
-
- if (g_file_test (final_index_filename, G_FILE_TEST_EXISTS) &&
+
+ if (g_file_test (final_index_filename, G_FILE_TEST_EXISTS) &&
!has_tmp_merge_files (i)) {
- g_message (" Overwriting '%s' with '%s'",
- indexes[i].abs_filename,
- final_index_filename);
-
+ g_message (" Overwriting '%s' with '%s'",
+ indexes[i].abs_filename,
+ final_index_filename);
+
g_rename (final_index_filename, indexes[i].abs_filename);
}
-
+
g_free (final_index_filename);
-
+
/* Now we have cleaned up merge files, see if we are supposed
* to be reindexing.
- */
+ */
force_reindex = (flags & TRACKER_DB_INDEX_MANAGER_FORCE_REINDEX) != 0;
@@ -229,13 +229,13 @@
}
g_message ("Creating index files, this may take a few moments...");
-
+
readonly = (flags & TRACKER_DB_INDEX_MANAGER_READONLY) != 0;
for (i = 1; i < G_N_ELEMENTS (indexes); i++) {
indexes[i].index = tracker_db_index_new (indexes[i].abs_filename,
- min_bucket,
- max_bucket,
+ min_bucket,
+ max_bucket,
readonly);
}
@@ -252,7 +252,7 @@
if (!initialized) {
return;
}
-
+
for (i = 1; i < G_N_ELEMENTS (indexes); i++) {
g_object_unref (indexes[i].index);
indexes[i].index = NULL;
@@ -266,7 +266,7 @@
initialized = FALSE;
}
-TrackerDBIndex *
+TrackerDBIndex *
tracker_db_index_manager_get_index (TrackerDBIndexType type)
{
return indexes[type].index;
@@ -353,10 +353,10 @@
for (i = 1, too_big = FALSE; i < G_N_ELEMENTS (indexes) && !too_big; i++) {
too_big = tracker_file_get_size (indexes[i].abs_filename) > MAX_INDEX_FILE_SIZE;
}
-
+
if (too_big) {
g_critical ("One or more index files are too big, indexing disabled");
- return TRUE;
+ return TRUE;
}
return FALSE;
Modified: branches/indexer-split/src/libtracker-db/tracker-db-index.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-index.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index.c Sat Sep 20 14:45:00 2008
@@ -273,7 +273,7 @@
void
tracker_db_index_set_filename (TrackerDBIndex *index,
- const gchar *filename)
+ const gchar *filename)
{
TrackerDBIndexPrivate *priv;
@@ -331,7 +331,7 @@
priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
priv->reload = reload;
-
+
g_object_notify (G_OBJECT (index), "reload");
}
@@ -346,7 +346,7 @@
priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
priv->readonly = readonly;
-
+
g_object_notify (G_OBJECT (index), "readonly");
}
@@ -540,10 +540,10 @@
* new.
*/
static gboolean
-indexer_update_word (DEPOT *index,
- const gchar *word,
+indexer_update_word (DEPOT *index,
+ const gchar *word,
GArray *new_hits)
-{
+{
TrackerDBIndexItem *new_hit;
TrackerDBIndexItem *previous_hits;
GArray *pending_hits;
@@ -564,19 +564,19 @@
old_hit_count = 0;
pending_hits = NULL;
- previous_hits = (TrackerDBIndexItem *) dpget (index,
- word,
- -1,
- 0,
- MAX_HIT_BUFFER,
+ previous_hits = (TrackerDBIndexItem *) dpget (index,
+ word,
+ -1,
+ 0,
+ MAX_HIT_BUFFER,
&tsiz);
-
+
/* New word in the index */
if (previous_hits == NULL) {
- result = dpput (index,
- word, -1,
- (char *) new_hits->data,
- new_hits->len * sizeof (TrackerDBIndexItem),
+ result = dpput (index,
+ word, -1,
+ (char *) new_hits->data,
+ new_hits->len * sizeof (TrackerDBIndexItem),
DP_DOVER);
if (!result) {
@@ -593,7 +593,7 @@
for (j = 0; j < new_hits->len; j++) {
guint left, right, center;
- new_hit = &g_array_index (new_hits, TrackerDBIndexItem, j);
+ new_hit = &g_array_index (new_hits, TrackerDBIndexItem, j);
edited = FALSE;
left = 0;
@@ -613,13 +613,13 @@
right = center;
} else if (new_hit->id == previous_hits[center].id) {
write_back = TRUE;
-
+
/* NB the paramter score can be negative */
score = tracker_db_index_item_get_score (&previous_hits[center]);
score += tracker_db_index_item_get_score (new_hit);
-
- /* Check for deletion */
+
+ /* Check for deletion */
if (score < 1) {
/* Shift all subsequent records in array down one place */
g_memmove (&previous_hits[center], &previous_hits[center + 1],
@@ -628,13 +628,13 @@
} else {
guint32 service_type;
- service_type =
+ service_type =
tracker_db_index_item_get_service_type (&previous_hits[center]);
- previous_hits[center].amalgamated =
- tracker_db_index_item_calc_amalgamated (service_type,
+ previous_hits[center].amalgamated =
+ tracker_db_index_item_calc_amalgamated (service_type,
score);
}
-
+
edited = TRUE;
break;
}
@@ -647,15 +647,15 @@
*/
if (!edited) {
if (!pending_hits) {
- pending_hits = g_array_new (FALSE,
- TRUE,
+ pending_hits = g_array_new (FALSE,
+ TRUE,
sizeof (TrackerDBIndexItem));
}
g_array_append_val (pending_hits, *new_hit);
}
}
-
+
/* Write back if we have modded anything */
if (write_back) {
/* If the word has no hits, remove it! Otherwise
@@ -675,7 +675,7 @@
g_warning ("Could not modify word '%s': %s", word, dperrmsg (dpecode));
}
}
-
+
/* Append new occurences */
if (pending_hits) {
result = dpput (index,
@@ -691,7 +691,7 @@
}
g_free (previous_hits);
-
+
return TRUE;
}
@@ -709,7 +709,7 @@
index = (DEPOT *) user_data;
/* Mark element for removal if succesfull insertion */
-
+
/**
* FIXME:
*
@@ -717,7 +717,7 @@
* That's because the only thing we'll achieve is letting this queue
* grow until it starts succeeding again. Which might end up being
* never. Making tracker-indexer both becoming increasingly slow and
- * start consuming increasing amounts of memory.
+ * start consuming increasing amounts of memory.
**/
return indexer_update_word (index, word, array);
@@ -738,7 +738,7 @@
g_return_val_if_fail (priv->filename != NULL, FALSE);
g_return_val_if_fail (priv->index == NULL, FALSE);
- g_debug ("Opening index:'%s' (%s)",
+ g_debug ("Opening index:'%s' (%s)",
priv->filename,
priv->readonly ? "readonly" : "read/write");
@@ -788,7 +788,7 @@
} else {
priv->reload = TRUE;
}
-
+
return !priv->reload;
}
@@ -808,7 +808,7 @@
g_debug ("Closing index:'%s'", priv->filename);
if (!dpclose (priv->index)) {
- g_message ("Could not close index, %s",
+ g_message ("Could not close index, %s",
dperrmsg (dpecode));
retval = FALSE;
}
@@ -965,8 +965,8 @@
g_get_current_time (¤t);
/* 2 second time out */
- if (current.tv_sec - start.tv_sec >= 2) {
- g_message ("Timed out in %s, not collecting more suggestions.",
+ if (current.tv_sec - start.tv_sec >= 2) {
+ g_message ("Timed out in %s, not collecting more suggestions.",
__FUNCTION__);
break;
}
@@ -1051,7 +1051,7 @@
g_array_append_val (array, elem);
return;
- }
+ }
/* It is not the first time we find the word */
for (i = 0; i < array->len; i++) {
@@ -1059,7 +1059,7 @@
if (current->id == service_id) {
/* The word was already found in the same
- * service_id (file), increase score
+ * service_id (file), increase score
*/
new_score = tracker_db_index_item_get_score (current) + weight;
if (new_score < 1) {
@@ -1069,11 +1069,11 @@
}
} else {
guint32 service_type;
-
- service_type =
+
+ service_type =
tracker_db_index_item_get_service_type (current);
- current->amalgamated =
- tracker_db_index_item_calc_amalgamated (service_type,
+ current->amalgamated =
+ tracker_db_index_item_calc_amalgamated (service_type,
new_score);
}
@@ -1148,7 +1148,7 @@
if (details[i].id == rank->service_id) {
gint k;
-
+
/* Shift all subsequent
* records in array down one
* place.
@@ -1156,13 +1156,13 @@
for (k = i + 1; k < pnum; k++) {
details[k - 1] = details[k];
}
-
+
/* Make size of array one size
* smaller.
*/
tsiz -= sizeof (TrackerDBIndexItem);
pnum--;
-
+
break;
}
}
Modified: branches/indexer-split/src/libtracker-db/tracker-db-index.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-index.h (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index.h Sat Sep 20 14:45:00 2008
@@ -66,7 +66,7 @@
gboolean tracker_db_index_get_reload (TrackerDBIndex *index);
gboolean tracker_db_index_get_readonly (TrackerDBIndex *index);
-void tracker_db_index_set_paused (TrackerDBIndex *index,
+void tracker_db_index_set_paused (TrackerDBIndex *index,
gboolean paused);
/* Open/Close/Flush */
Modified: branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.c Sat Sep 20 14:45:00 2008
@@ -272,7 +272,7 @@
break;
}
default:
- g_critical ("Unknown sqlite3 database value type:%d",
+ g_critical ("Unknown sqlite3 database value type:%d",
sqlite3_value_type (argv[i]));
}
}
@@ -390,9 +390,9 @@
}
if (result != SQLITE_DONE) {
-
+
g_hash_table_foreach (priv->statements, foreach_print_error, stmt);
-
+
if (result == SQLITE_CORRUPT) {
g_critical ("Sqlite3 database:'%s' is corrupt, can not live without it",
priv->filename);
@@ -436,7 +436,7 @@
procedure = g_hash_table_lookup (priv->procedures, procedure_name);
if (!procedure) {
- g_critical ("Sqlite3 prepared query:'%s' was not found",
+ g_critical ("Sqlite3 prepared query:'%s' was not found",
procedure_name);
return NULL;
}
Modified: branches/indexer-split/src/libtracker-db/tracker-db-interface.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-interface.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-interface.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- 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
@@ -203,7 +203,7 @@
"Columns",
"Resultset columns",
0, G_MAXUINT, 0,
- G_PARAM_READWRITE |
+ G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
@@ -247,14 +247,14 @@
if (!TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_query) {
g_critical ("Database abstraction %s doesn't implement "
- "the method execute_vquery()",
+ "the method execute_vquery()",
G_OBJECT_TYPE_NAME (interface));
return NULL;
}
str = g_strdup_vprintf (query, args);
- result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_query (interface,
- error,
+ result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_query (interface,
+ error,
str);
g_free (str);
@@ -273,9 +273,9 @@
va_list args;
va_start (args, query);
- result_set = tracker_db_interface_execute_vquery (interface,
- error,
- query,
+ result_set = tracker_db_interface_execute_vquery (interface,
+ error,
+ query,
args);
va_end (args);
@@ -296,7 +296,7 @@
return;
}
- TRACKER_DB_INTERFACE_GET_IFACE (interface)->set_procedure_table (interface,
+ TRACKER_DB_INTERFACE_GET_IFACE (interface)->set_procedure_table (interface,
procedure_table);
}
@@ -313,14 +313,14 @@
if (!TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure) {
g_critical ("Database abstraction %s doesn't implement "
- "the method execute_procedure()",
+ "the method execute_procedure()",
G_OBJECT_TYPE_NAME (interface));
return NULL;
}
- result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure (interface,
- error,
- procedure,
+ result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure (interface,
+ error,
+ procedure,
args);
return ensure_result_set_state (result_set);
@@ -341,14 +341,14 @@
if (!TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure_len) {
g_critical ("Database abstraction %s doesn't implement "
- "the method execute_procedure_len()",
+ "the method execute_procedure_len()",
G_OBJECT_TYPE_NAME (interface));
return NULL;
}
result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure_len (interface,
- error,
- procedure,
+ error,
+ procedure,
args);
return ensure_result_set_state (result_set);
@@ -364,9 +364,9 @@
va_list args;
va_start (args, procedure);
- result_set = tracker_db_interface_execute_vprocedure (interface,
- error,
- procedure,
+ result_set = tracker_db_interface_execute_vprocedure (interface,
+ error,
+ procedure,
args);
va_end (args);
@@ -383,9 +383,9 @@
va_list args;
va_start (args, procedure);
- result_set = tracker_db_interface_execute_vprocedure_len (interface,
- error,
- procedure,
+ result_set = tracker_db_interface_execute_vprocedure_len (interface,
+ error,
+ procedure,
args);
va_end (args);
@@ -397,8 +397,8 @@
{
GError *error = NULL;
- tracker_db_interface_execute_query (interface,
- &error,
+ tracker_db_interface_execute_query (interface,
+ &error,
"BEGIN TRANSACTION");
if (error) {
Modified: branches/indexer-split/src/libtracker-db/tracker-db-interface.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-interface.h (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-interface.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- 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
Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -71,27 +71,27 @@
NULL,
NULL,
32,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
FALSE,
FALSE },
- { TRACKER_DB_COMMON,
- TRACKER_DB_LOCATION_USER_DATA_DIR,
+ { TRACKER_DB_COMMON,
+ TRACKER_DB_LOCATION_USER_DATA_DIR,
NULL,
"common.db",
"common",
NULL,
- 32,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
+ 32,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
FALSE,
FALSE },
- { TRACKER_DB_CACHE,
+ { TRACKER_DB_CACHE,
TRACKER_DB_LOCATION_SYS_TMP_DIR,
NULL,
"cache.db",
"cache",
- NULL,
- 128,
- TRACKER_DB_PAGE_SIZE_DONT_SET,
+ NULL,
+ 128,
+ TRACKER_DB_PAGE_SIZE_DONT_SET,
FALSE,
FALSE },
{ TRACKER_DB_FILE_METADATA,
@@ -100,8 +100,8 @@
"file-meta.db",
"file-meta",
NULL,
- 512,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
+ 512,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
TRUE,
FALSE },
{ TRACKER_DB_FILE_CONTENTS,
@@ -120,7 +120,7 @@
"email-meta.db",
"email-meta",
NULL,
- 512,
+ 512,
TRACKER_DB_PAGE_SIZE_DEFAULT,
TRUE,
FALSE},
@@ -163,7 +163,7 @@
static TrackerDBInterface *email_iface = NULL;
static TrackerDBInterface *xesam_iface = NULL;
-static const gchar *
+static const gchar *
location_to_directory (TrackerDBLocation location)
{
switch (location) {
@@ -255,10 +255,10 @@
def = tracker_ontology_get_field_by_name (groups[i]);
if (!def) {
- tracker_db_interface_execute_procedure (iface,
- NULL,
- "InsertMetadataType",
- groups[i],
+ tracker_db_interface_execute_procedure (iface,
+ NULL,
+ "InsertMetadataType",
+ groups[i],
NULL);
id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (iface));
} else {
@@ -282,11 +282,11 @@
g_free (value);
if (strcasecmp (keys[j], "Parent") == 0) {
- tracker_db_interface_execute_procedure (iface,
- NULL,
+ tracker_db_interface_execute_procedure (iface,
+ NULL,
"InsertMetaDataChildren",
- str_id,
- new_value,
+ str_id,
+ new_value,
NULL);
} else if (strcasecmp (keys[j], "DataType") == 0) {
GEnumValue *enum_value;
@@ -302,7 +302,7 @@
gchar *esc_value;
esc_value = tracker_escape_string (new_value);
-
+
tracker_db_interface_execute_query (iface, NULL,
"update MetaDataTypes set %s = '%s' where ID = %d",
keys[j], esc_value, id);
@@ -323,7 +323,7 @@
}
static void
-load_service_file (TrackerDBInterface *iface,
+load_service_file (TrackerDBInterface *iface,
const gchar *filename)
{
TrackerService *service;
@@ -350,9 +350,9 @@
if (!service) {
tracker_db_interface_execute_procedure (iface,
- NULL,
- "InsertServiceType",
- groups[i],
+ NULL,
+ "InsertServiceType",
+ groups[i],
NULL);
id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (iface));
} else {
@@ -368,18 +368,18 @@
gchar **tab_array;
gint k;
- tab_array = g_key_file_get_string_list (key_file,
- groups[i],
- keys[j],
- NULL,
+ tab_array = g_key_file_get_string_list (key_file,
+ groups[i],
+ keys[j],
+ NULL,
NULL);
for (k = 0; tab_array[k]; k++) {
tracker_db_interface_execute_procedure (iface,
NULL,
"InsertServiceTabularMetadata",
- str_id,
- tab_array[k],
+ str_id,
+ tab_array[k],
NULL);
}
@@ -388,18 +388,18 @@
gchar **tab_array;
gint k;
- tab_array = g_key_file_get_string_list (key_file,
- groups[i],
- keys[j],
- NULL,
+ tab_array = g_key_file_get_string_list (key_file,
+ groups[i],
+ keys[j],
+ NULL,
NULL);
for (k = 0; tab_array[k]; k++) {
- tracker_db_interface_execute_procedure (iface,
+ tracker_db_interface_execute_procedure (iface,
NULL,
"InsertServiceTileMetadata",
- str_id,
- tab_array[k],
+ str_id,
+ tab_array[k],
NULL);
}
@@ -408,21 +408,21 @@
gchar **tab_array;
gint k;
- tab_array = g_key_file_get_string_list (key_file,
- groups[i],
- keys[j],
- NULL,
+ tab_array = g_key_file_get_string_list (key_file,
+ groups[i],
+ keys[j],
+ NULL,
NULL);
for (k = 0; tab_array[k]; k++) {
tracker_db_interface_execute_procedure (iface, NULL,
"InsertMimes",
- tab_array[k],
+ tab_array[k],
NULL);
- tracker_db_interface_execute_query (iface,
+ tracker_db_interface_execute_query (iface,
NULL,
"update FileMimes set ServiceTypeID = %s where Mime = '%s'",
- str_id,
+ str_id,
tab_array[k]);
}
@@ -431,22 +431,22 @@
gchar **tab_array;
gint k;
- tab_array = g_key_file_get_string_list (key_file,
- groups[i],
- keys[j],
- NULL,
+ tab_array = g_key_file_get_string_list (key_file,
+ groups[i],
+ keys[j],
+ NULL,
NULL);
for (k = 0; tab_array[k]; k++) {
- tracker_db_interface_execute_procedure (iface,
+ tracker_db_interface_execute_procedure (iface,
NULL,
"InsertMimePrefixes",
tab_array[k],
NULL);
- tracker_db_interface_execute_query (iface,
+ tracker_db_interface_execute_query (iface,
NULL,
"update FileMimePrefixes set ServiceTypeID = %s where MimePrefix = '%s'",
- str_id,
+ str_id,
tab_array[k]);
}
@@ -458,11 +458,11 @@
new_value = tracker_string_boolean_to_string_gint (value);
esc_value = tracker_escape_string (new_value);
- tracker_db_interface_execute_query (iface,
+ tracker_db_interface_execute_query (iface,
NULL,
"update ServiceTypes set %s = '%s' where TypeID = %s",
- keys[j],
- esc_value,
+ keys[j],
+ esc_value,
str_id);
g_free (esc_value);
@@ -481,17 +481,17 @@
}
static TrackerDBResultSet *
-db_exec_proc (TrackerDBInterface *iface,
- const gchar *procedure,
+db_exec_proc (TrackerDBInterface *iface,
+ const gchar *procedure,
...)
{
TrackerDBResultSet *result_set;
va_list args;
va_start (args, procedure);
- result_set = tracker_db_interface_execute_vprocedure (iface,
- NULL,
- procedure,
+ result_set = tracker_db_interface_execute_vprocedure (iface,
+ NULL,
+ procedure,
args);
va_end (args);
@@ -499,8 +499,8 @@
}
static gboolean
-db_exec_no_reply (TrackerDBInterface *iface,
- const gchar *query,
+db_exec_no_reply (TrackerDBInterface *iface,
+ const gchar *query,
...)
{
TrackerDBResultSet *result_set;
@@ -529,21 +529,21 @@
{
gchar **mappings;
gchar **mapping;
-
+
mappings = g_strsplit_set (data_to_split, ";", -1);
-
+
if (!mappings) {
return;
}
for (mapping = mappings; *mapping; mapping++) {
gchar *esc_value;
-
+
esc_value = tracker_escape_string (*mapping);
db_exec_proc (iface,
db_proc,
data_to_insert,
- esc_value,
+ esc_value,
NULL);
g_free (esc_value);
}
@@ -559,9 +559,9 @@
{
gchar **parents;
gchar **parent;
-
+
parents = g_strsplit_set (data_to_split, ";", -1);
-
+
if (!parents) {
return;
}
@@ -586,11 +586,11 @@
{
gchar *str;
gchar *sql;
-
+
str = tracker_escape_string (data_key);
- sql = g_strdup_printf (sql_format,
- data_to_update,
- str,
+ sql = g_strdup_printf (sql_format,
+ data_to_update,
+ str,
data_value);
db_exec_no_reply (iface, sql);
g_free (sql);
@@ -598,7 +598,7 @@
}
static gboolean
-load_service_file_xesam (TrackerDBInterface *iface,
+load_service_file_xesam (TrackerDBInterface *iface,
const gchar *filename)
{
GKeyFile *key_file;
@@ -611,17 +611,17 @@
gboolean is_service;
gboolean is_metadata_mapping;
gboolean is_service_mapping;
- gint i, j;
+ gint i, j;
const gchar *data_types[] = {
- "string",
- "float",
- "integer",
- "boolean",
- "dateTime",
- "List of strings",
- "List of Uris",
- "List of Urls",
+ "string",
+ "float",
+ "integer",
+ "boolean",
+ "dateTime",
+ "List of strings",
+ "List of Uris",
+ "List of Urls",
NULL
};
@@ -645,7 +645,7 @@
is_service = FALSE;
is_metadata_mapping = FALSE;
is_service_mapping = FALSE;
-
+
if (g_str_has_suffix (filename, ".metadata")) {
is_metadata = TRUE;
} else if (g_str_has_suffix (filename, ".service")) {
@@ -660,48 +660,48 @@
filename);
g_key_file_free (key_file);
return FALSE;
- }
+ }
language_names = g_get_language_names ();
-
+
groups = g_key_file_get_groups (key_file, NULL);
-
+
for (i = 0; groups[i]; i++) {
gchar *str_id;
gchar **keys;
gint id = -1;
if (is_metadata) {
- db_exec_proc (iface,
- "InsertXesamMetadataType",
- groups[i],
+ db_exec_proc (iface,
+ "InsertXesamMetadataType",
+ groups[i],
NULL);
id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (iface));
} else if (is_service) {
- db_exec_proc (iface,
- "InsertXesamServiceType",
- groups[i],
+ db_exec_proc (iface,
+ "InsertXesamServiceType",
+ groups[i],
NULL);
id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (iface));
}
-
+
/* Get inserted ID */
str_id = tracker_guint_to_string (id);
keys = g_key_file_get_keys (key_file, groups[i], NULL, NULL);
-
+
for (j = 0; keys[j]; j++) {
gchar *value;
-
- value = g_key_file_get_locale_string (key_file,
- groups[i],
- keys[j],
+
+ value = g_key_file_get_locale_string (key_file,
+ groups[i],
+ keys[j],
language_names[0],
NULL);
-
+
if (!value) {
continue;
}
-
+
if (strcasecmp (value, "true") == 0) {
g_free (value);
value = g_strdup ("1");
@@ -709,7 +709,7 @@
g_free (value);
value = g_strdup ("0");
}
-
+
if (is_metadata) {
if (strcasecmp (keys[j], "Parents") == 0) {
load_service_file_xesam_insert (iface,
@@ -718,9 +718,9 @@
groups[i]);
} else if (strcasecmp (keys[j], "ValueType") == 0) {
gint data_id;
-
+
data_id = tracker_string_in_string_list (value, (gchar **) data_types);
-
+
if (data_id != -1) {
gint mapped_data_id;
gboolean list = FALSE;
@@ -733,7 +733,7 @@
* config file
* instead.
*/
-
+
switch (data_id) {
case 0:
mapped_data_id = TRACKER_FIELD_TYPE_STRING;
@@ -757,19 +757,19 @@
mapped_data_id = TRACKER_FIELD_TYPE_STRING;
break;
default:
- g_warning ("Couldn't map data id %d to TrackerFieldType",
+ g_warning ("Couldn't map data id %d to TrackerFieldType",
data_id);
mapped_data_id = -1;
}
- sql = g_strdup_printf ("update XesamMetadataTypes set DataTypeID = %d where ID = %s",
- mapped_data_id,
+ sql = g_strdup_printf ("update XesamMetadataTypes set DataTypeID = %d where ID = %s",
+ mapped_data_id,
str_id);
db_exec_no_reply (iface, sql);
g_free (sql);
-
+
if (list) {
- sql = g_strdup_printf ("update XesamMetadataTypes set MultipleValues = 1 where ID = %s",
+ sql = g_strdup_printf ("update XesamMetadataTypes set MultipleValues = 1 where ID = %s",
str_id);
db_exec_no_reply (iface, sql);
g_free (sql);
@@ -778,8 +778,8 @@
} else {
load_service_file_xesam_update (iface,
"update XesamMetadataTypes set %s = '%s' where ID = %s",
- keys[j],
- value,
+ keys[j],
+ value,
str_id);
}
} else if (is_service) {
@@ -791,76 +791,76 @@
} else if (strcasecmp (keys[j], "Mimes") == 0) {
gchar **tab_array;
gint k;
-
- tab_array = g_key_file_get_string_list (key_file,
- groups[i],
- keys[j],
- NULL,
+
+ tab_array = g_key_file_get_string_list (key_file,
+ groups[i],
+ keys[j],
+ NULL,
NULL);
-
+
for (k = 0; tab_array[k]; k++) {
tracker_db_interface_execute_procedure (iface, NULL,
"InsertXesamMimes",
- tab_array[k],
+ tab_array[k],
NULL);
- tracker_db_interface_execute_query (iface,
+ tracker_db_interface_execute_query (iface,
NULL,
"update XesamFileMimes set ServiceTypeID = %s where Mime = '%s'",
- str_id,
+ str_id,
tab_array[k]);
}
-
+
g_strfreev (tab_array);
} else if (strcasecmp (keys[j], "MimePrefixes") == 0) {
gchar **tab_array;
gint k;
-
- tab_array = g_key_file_get_string_list (key_file,
- groups[i],
- keys[j],
- NULL,
+
+ tab_array = g_key_file_get_string_list (key_file,
+ groups[i],
+ keys[j],
+ NULL,
NULL);
-
+
for (k = 0; tab_array[k]; k++) {
- tracker_db_interface_execute_procedure (iface,
+ tracker_db_interface_execute_procedure (iface,
NULL,
"InsertXesamMimePrefixes",
tab_array[k],
NULL);
- tracker_db_interface_execute_query (iface,
+ tracker_db_interface_execute_query (iface,
NULL,
"update XesamFileMimePrefixes set ServiceTypeID = %s where MimePrefix = '%s'",
- str_id,
+ str_id,
tab_array[k]);
}
-
+
g_strfreev (tab_array);
} else {
load_service_file_xesam_update (iface,
"update XesamServiceTypes set %s = '%s' where typeID = %s",
- keys[j],
- value,
+ keys[j],
+ value,
str_id);
}
} else if (is_metadata_mapping) {
load_service_file_xesam_map (iface,
- "InsertXesamMetaDataMapping",
- value,
+ "InsertXesamMetaDataMapping",
+ value,
groups[i]);
} else {
load_service_file_xesam_map (iface,
- "InsertXesamServiceMapping",
- value,
+ "InsertXesamServiceMapping",
+ value,
groups[i]);
}
-
+
g_free (value);
}
-
+
g_strfreev (keys);
g_free (str_id);
}
-
+
g_strfreev (groups);
g_key_file_free (key_file);
@@ -951,7 +951,7 @@
}
static TrackerField *
-db_row_to_field_def (TrackerDBResultSet *result_set)
+db_row_to_field_def (TrackerDBResultSet *result_set)
{
TrackerField *field_def;
TrackerFieldType field_type;
@@ -1045,7 +1045,7 @@
}
}
- /* FIXME: is this necessary?
+ /* FIXME: is this necessary?
* This values are set as key metadata in default.service already
*/
#if 0
@@ -1087,10 +1087,10 @@
service_id_str = g_strdup_printf ("%d", service_id);
- result_set = tracker_db_interface_execute_procedure (iface,
- NULL,
- stored_proc,
- service_id_str,
+ result_set = tracker_db_interface_execute_procedure (iface,
+ NULL,
+ stored_proc,
+ service_id_str,
NULL);
g_free (service_id_str);
@@ -1256,8 +1256,8 @@
}
static gchar *
-function_uncompress_string (const gchar *ptr,
- gint size,
+function_uncompress_string (const gchar *ptr,
+ gint size,
gint *uncompressed_size)
{
z_stream zs;
@@ -1446,8 +1446,8 @@
return result;
}
- output = function_uncompress_string ((const gchar *) array->data,
- array->len,
+ output = function_uncompress_string ((const gchar *) array->data,
+ array->len,
&len);
if (!output) {
@@ -1527,36 +1527,36 @@
g_message (" Adding functions (FormatDate, etc)");
if (!tracker_db_interface_sqlite_set_collation_function (TRACKER_DB_INTERFACE_SQLITE (iface),
- "UTF8",
+ "UTF8",
utf8_collation_func)) {
g_critical ("Collation sequence failed");
}
/* Create user defined functions that can be used in sql */
- tracker_db_interface_sqlite_create_function (iface,
- "FormatDate",
- function_date_to_str,
+ tracker_db_interface_sqlite_create_function (iface,
+ "FormatDate",
+ function_date_to_str,
1);
- tracker_db_interface_sqlite_create_function (iface,
- "GetServiceName",
- function_get_service_name,
+ tracker_db_interface_sqlite_create_function (iface,
+ "GetServiceName",
+ function_get_service_name,
1);
- tracker_db_interface_sqlite_create_function (iface,
- "GetServiceTypeID",
- function_get_service_type,
+ tracker_db_interface_sqlite_create_function (iface,
+ "GetServiceTypeID",
+ function_get_service_type,
1);
- tracker_db_interface_sqlite_create_function (iface,
- "GetMaxServiceTypeID",
- function_get_max_service_type,
+ tracker_db_interface_sqlite_create_function (iface,
+ "GetMaxServiceTypeID",
+ function_get_max_service_type,
1);
- tracker_db_interface_sqlite_create_function (iface,
+ tracker_db_interface_sqlite_create_function (iface,
"REGEXP",
function_regexp,
2);
- tracker_db_interface_sqlite_create_function (iface,
- "uncompress",
- function_uncompress,
+ tracker_db_interface_sqlite_create_function (iface,
+ "uncompress",
+ function_uncompress,
1);
tracker_db_interface_sqlite_create_function (iface,
"compress",
@@ -1576,9 +1576,9 @@
TrackerDBResultSet *result_set;
/* Get static metadata info */
- result_set = tracker_db_interface_execute_procedure (iface,
- NULL,
- "GetMetadataTypes",
+ result_set = tracker_db_interface_execute_procedure (iface,
+ NULL,
+ "GetMetadataTypes",
NULL);
if (result_set) {
@@ -1592,10 +1592,10 @@
def = db_row_to_field_def (result_set);
- result_set2 = tracker_db_interface_execute_procedure (iface,
+ result_set2 = tracker_db_interface_execute_procedure (iface,
NULL,
"GetMetadataAliases",
- tracker_field_get_id (def),
+ tracker_field_get_id (def),
NULL);
if (result_set2) {
@@ -1631,8 +1631,8 @@
/* Get static service info */
result_set = tracker_db_interface_execute_procedure (iface,
- NULL,
- "GetAllServices",
+ NULL,
+ "GetAllServices",
NULL);
if (result_set) {
@@ -1682,9 +1682,9 @@
TrackerDBResultSet *result_set;
/* Get static xesam metadata info */
- result_set = tracker_db_interface_execute_procedure (iface,
- NULL,
- "GetXesamMetaDataTypes",
+ result_set = tracker_db_interface_execute_procedure (iface,
+ NULL,
+ "GetXesamMetaDataTypes",
NULL);
if (result_set) {
@@ -1695,7 +1695,7 @@
def = db_row_to_field_def (result_set);
/*
- * The ids in xesam db overwritte the IDs in common db! It means that all the
+ * The ids in xesam db overwritte the IDs in common db! It means that all the
* files are assigned to a wrong category
*
* g_message ("Loading xesam metadata def:'%s' with type:%d",
@@ -1713,8 +1713,8 @@
/* Get static xesam service info */
result_set = tracker_db_interface_execute_procedure (iface,
- NULL,
- "GetXesamServiceTypes",
+ NULL,
+ "GetXesamServiceTypes",
NULL);
if (result_set) {
@@ -1737,8 +1737,8 @@
mimes = db_get_xesam_mimes_for_service_id (iface, id);
mime_prefixes = db_get_xesam_mime_prefixes_for_service_id (iface, id);
-
- /*
+
+ /*
* Same as above
*
* g_message ("Adding xesam service:'%s' with id:%d and mimes:%d",
@@ -1771,7 +1771,7 @@
type = tracker_db_get_type ();
enum_class = G_ENUM_CLASS (g_type_class_peek (type));
enum_value = g_enum_get_value (enum_class, db);
-
+
if (!enum_value) {
return "unknown";
}
@@ -1794,14 +1794,14 @@
*create = FALSE;
}
- g_message ("%s database... '%s' (%s)",
+ g_message ("%s database... '%s' (%s)",
*create ? "Creating" : "Loading",
path,
db_type_to_string (type));
iface = tracker_db_interface_sqlite_new (path);
- tracker_db_interface_set_procedure_table (iface,
+ tracker_db_interface_set_procedure_table (iface,
prepared_queries);
db_set_params (iface,
@@ -1897,9 +1897,9 @@
tracker_db_interface_end_transaction (iface);
}
- tracker_db_interface_sqlite_create_function (iface,
- "uncompress",
- function_uncompress,
+ tracker_db_interface_sqlite_create_function (iface,
+ "uncompress",
+ function_uncompress,
1);
tracker_db_interface_sqlite_create_function (iface,
"compress",
@@ -1942,9 +1942,9 @@
tracker_db_interface_end_transaction (iface);
}
- tracker_db_interface_sqlite_create_function (iface,
- "uncompress",
- function_uncompress,
+ tracker_db_interface_sqlite_create_function (iface,
+ "uncompress",
+ function_uncompress,
1);
tracker_db_interface_sqlite_create_function (iface,
"compress",
@@ -1955,8 +1955,8 @@
}
static gboolean
-db_xesam_get_service_mapping (TrackerDBInterface *iface,
- const gchar *type,
+db_xesam_get_service_mapping (TrackerDBInterface *iface,
+ const gchar *type,
GList **list)
{
TrackerDBResultSet *result_set;
@@ -1964,43 +1964,43 @@
result_set = db_exec_proc (iface,
"GetXesamServiceMappings",
- type,
+ type,
NULL);
if (result_set) {
while (valid) {
gchar *st;
-
+
tracker_db_result_set_get (result_set, 0, &st, -1);
- if (strcmp (st, " ") != 0) {
+ if (strcmp (st, " ") != 0) {
*list = g_list_prepend (*list, g_strdup (st));
}
-
+
valid = tracker_db_result_set_iter_next (result_set);
g_free (st);
}
-
+
*list = g_list_reverse (*list);
g_object_unref (result_set);
}
- result_set = db_exec_proc (iface,
- "GetXesamServiceChildren",
- type,
+ result_set = db_exec_proc (iface,
+ "GetXesamServiceChildren",
+ type,
NULL);
valid = TRUE;
if (result_set) {
while (valid) {
gchar *st;
-
+
tracker_db_result_set_get (result_set, 0, &st, -1);
db_xesam_get_service_mapping (iface, st, list);
-
+
valid = tracker_db_result_set_iter_next (result_set);
g_free (st);
}
-
+
g_object_unref (result_set);
}
@@ -2008,28 +2008,28 @@
}
static gboolean
-db_xesam_get_metadata_mapping (TrackerDBInterface *iface,
- const gchar *type,
+db_xesam_get_metadata_mapping (TrackerDBInterface *iface,
+ const gchar *type,
GList **list)
{
TrackerDBResultSet *result_set;
gboolean valid = TRUE;
- result_set = db_exec_proc (iface,
- "GetXesamMetaDataMappings",
- type,
+ result_set = db_exec_proc (iface,
+ "GetXesamMetaDataMappings",
+ type,
NULL);
if (result_set) {
while (valid) {
gchar *st;
-
+
tracker_db_result_set_get (result_set, 0, &st, -1);
- if (strcmp(st, " ") != 0) {
+ if (strcmp(st, " ") != 0) {
*list = g_list_prepend (*list, g_strdup (st));
}
-
+
valid = tracker_db_result_set_iter_next (result_set);
g_free (st);
}
@@ -2038,23 +2038,23 @@
g_object_unref (result_set);
}
- result_set = db_exec_proc (iface,
- "GetXesamMetaDataChildren",
- type,
+ result_set = db_exec_proc (iface,
+ "GetXesamMetaDataChildren",
+ type,
NULL);
valid = TRUE;
if (result_set) {
while (valid) {
gchar *st;
-
+
tracker_db_result_set_get (result_set, 0, &st, -1);
db_xesam_get_service_mapping (iface, st ,list);
-
+
valid = tracker_db_result_set_iter_next (result_set);
g_free (st);
}
-
+
g_object_unref (result_set);
}
@@ -2066,75 +2066,75 @@
{
TrackerDBResultSet *result_set;
gboolean valid;
-
+
valid = TRUE;
- result_set = db_exec_proc (iface,
- "GetXesamServiceParents",
+ result_set = db_exec_proc (iface,
+ "GetXesamServiceParents",
NULL);
-
+
if (result_set) {
while (valid) {
GList *list = NULL;
GList *iter = NULL;
gchar *st;
-
+
tracker_db_result_set_get (result_set, 0, &st, -1);
db_xesam_get_service_mapping (iface, st, &list);
-
+
iter = g_list_first (list);
while (iter) {
db_exec_proc (iface,
- "InsertXesamServiceLookup",
- st,
- iter->data,
+ "InsertXesamServiceLookup",
+ st,
+ iter->data,
NULL);
g_free (iter->data);
iter = g_list_next (iter);
- }
-
+ }
+
g_list_free (list);
-
- valid = tracker_db_result_set_iter_next (result_set);
+
+ valid = tracker_db_result_set_iter_next (result_set);
g_free (st);
}
}
-
- g_object_unref (result_set);
-
+
+ g_object_unref (result_set);
+
valid = TRUE;
- result_set = db_exec_proc (iface,
- "GetXesamMetaDataParents",
+ result_set = db_exec_proc (iface,
+ "GetXesamMetaDataParents",
NULL);
-
+
if (result_set) {
while (valid) {
GList *list = NULL;
- GList *iter = NULL;
+ GList *iter = NULL;
gchar *st;
-
+
tracker_db_result_set_get (result_set, 0, &st, -1);
db_xesam_get_metadata_mapping (iface, st, &list);
-
+
iter = g_list_first (list);
while (iter) {
- db_exec_proc (iface,
- "InsertXesamMetaDataLookup",
- st,
- iter->data,
+ db_exec_proc (iface,
+ "InsertXesamMetaDataLookup",
+ st,
+ iter->data,
NULL);
g_free (iter->data);
iter = g_list_next (iter);
- }
-
+ }
+
g_list_free (list);
-
+
valid = tracker_db_result_set_iter_next (result_set);
g_free (st);
}
}
-
+
g_object_unref (result_set);
return TRUE;
@@ -2177,7 +2177,7 @@
case TRACKER_DB_COMMON:
return db_interface_get_common ();
-
+
case TRACKER_DB_CACHE:
return db_interface_get_cache ();
@@ -2212,7 +2212,7 @@
g_message ("Removing all database files");
for (i = 1; i < G_N_ELEMENTS (dbs); i++) {
- g_message ("Removing database:'%s'",
+ g_message ("Removing database:'%s'",
dbs[i].abs_filename);
g_unlink (dbs[i].abs_filename);
}
@@ -2225,26 +2225,26 @@
if (etype == 0) {
static const GEnumValue values[] = {
- { TRACKER_DB_COMMON,
- "TRACKER_DB_COMMON",
+ { TRACKER_DB_COMMON,
+ "TRACKER_DB_COMMON",
"common" },
- { TRACKER_DB_CACHE,
- "TRACKER_DB_CACHE",
+ { TRACKER_DB_CACHE,
+ "TRACKER_DB_CACHE",
"cache" },
- { TRACKER_DB_FILE_METADATA,
- "TRACKER_DB_FILE_METADATA",
+ { TRACKER_DB_FILE_METADATA,
+ "TRACKER_DB_FILE_METADATA",
"file metadata" },
- { TRACKER_DB_FILE_CONTENTS,
- "TRACKER_DB_FILE_CONTENTS",
+ { TRACKER_DB_FILE_CONTENTS,
+ "TRACKER_DB_FILE_CONTENTS",
"file contents" },
- { TRACKER_DB_EMAIL_METADATA,
- "TRACKER_DB_EMAIL_METADATA",
+ { TRACKER_DB_EMAIL_METADATA,
+ "TRACKER_DB_EMAIL_METADATA",
"email metadata" },
- { TRACKER_DB_EMAIL_CONTENTS,
- "TRACKER_DB_EMAIL_CONTENTS",
+ { TRACKER_DB_EMAIL_CONTENTS,
+ "TRACKER_DB_EMAIL_CONTENTS",
"email contents" },
- { TRACKER_DB_XESAM,
- "TRACKER_DB_XESAM",
+ { TRACKER_DB_XESAM,
+ "TRACKER_DB_XESAM",
"xesam" },
{ 0, NULL, NULL }
};
@@ -2277,10 +2277,10 @@
* it here to make sure it exists when we call
* g_type_class_peek(). This wouldn't be necessary if
* it was a param in a GObject for example.
- *
+ *
* This does mean that we are leaking by 1 reference
* here and should clean it up, but it doesn't grow so
- * this is acceptable.
+ * this is acceptable.
*/
etype = tracker_db_get_type ();
db_type_enum_class_pointer = g_type_class_ref (etype);
@@ -2288,21 +2288,21 @@
/* Set up locations */
g_message ("Setting database locations");
- services_dir = g_build_filename (SHAREDIR,
- "tracker",
- "services",
+ services_dir = g_build_filename (SHAREDIR,
+ "tracker",
+ "services",
NULL);
- sql_dir = g_build_filename (SHAREDIR,
- "tracker",
+ sql_dir = g_build_filename (SHAREDIR,
+ "tracker",
NULL);
-
- user_data_dir = g_build_filename (g_get_user_data_dir (),
- "tracker",
- "data",
+
+ user_data_dir = g_build_filename (g_get_user_data_dir (),
+ "tracker",
+ "data",
NULL);
- data_dir = g_build_filename (g_get_user_cache_dir (),
- "tracker",
+ data_dir = g_build_filename (g_get_user_cache_dir (),
+ "tracker",
NULL);
filename = g_strdup_printf ("tracker-%s", g_get_user_name ());
@@ -2334,15 +2334,15 @@
if (i == TRACKER_DB_CACHE) {
continue;
}
-
+
/* No need to check for other files not existing (for
- * reindex) if one is already missing.
+ * reindex) if one is already missing.
*/
if (need_reindex) {
continue;
}
- if (!g_file_test (dbs[i].abs_filename, G_FILE_TEST_EXISTS)) {
+ if (!g_file_test (dbs[i].abs_filename, G_FILE_TEST_EXISTS)) {
g_message ("Could not find database file:'%s'", dbs[i].abs_filename);
g_message ("One or more database files are missing, a reindex will be forced");
need_reindex = TRUE;
@@ -2381,7 +2381,7 @@
/* Make sure we initialize all other modules we depend on */
tracker_ontology_init ();
-
+
/* Now create the databases and close them */
g_message ("Creating database files, this may take a few moments...");
@@ -2404,7 +2404,7 @@
* thing.
*/
if (flags & TRACKER_DB_MANAGER_REMOVE_CACHE) {
- g_message ("Removing cache database:'%s'",
+ g_message ("Removing cache database:'%s'",
dbs[TRACKER_DB_CACHE].abs_filename);
g_unlink (dbs[TRACKER_DB_CACHE].abs_filename);
}
@@ -2424,7 +2424,7 @@
}
void
-tracker_db_manager_shutdown (void)
+tracker_db_manager_shutdown (void)
{
guint i;
@@ -2465,10 +2465,10 @@
* it here to make sure it exists when we call
* g_type_class_peek(). This wouldn't be necessary if
* it was a param in a GObject for example.
- *
+ *
* This does mean that we are leaking by 1 reference
* here and should clean it up, but it doesn't grow so
- * this is acceptable.
+ * this is acceptable.
*/
g_type_class_unref (db_type_enum_class_pointer);
db_type_enum_class_pointer = NULL;
@@ -2488,7 +2488,7 @@
}
const gchar *
-tracker_db_manager_get_file (TrackerDB db)
+tracker_db_manager_get_file (TrackerDB db)
{
g_return_val_if_fail (initialized != FALSE, NULL);
@@ -2522,7 +2522,7 @@
if (!connection) {
connection = tracker_db_interface_sqlite_new (dbs[db].abs_filename);
- tracker_db_interface_set_procedure_table (connection,
+ tracker_db_interface_set_procedure_table (connection,
prepared_queries);
db_set_params (connection,
@@ -2531,7 +2531,7 @@
TRUE);
} else {
- db_exec_no_reply (connection,
+ db_exec_no_reply (connection,
"ATTACH '%s' as '%s'",
dbs[db].abs_filename,
dbs[db].name);
@@ -2601,7 +2601,7 @@
case TRACKER_DB_TYPE_XESAM:
if (!xesam_iface) {
- xesam_iface = tracker_db_manager_get_db_interfaces (7,
+ xesam_iface = tracker_db_manager_get_db_interfaces (7,
TRACKER_DB_CACHE,
TRACKER_DB_COMMON,
TRACKER_DB_FILE_CONTENTS,
@@ -2668,25 +2668,25 @@
return tracker_db_manager_get_db_interface (db);
}
-gboolean
+gboolean
tracker_db_manager_are_db_too_big (void)
{
const gchar *filename_const;
gboolean too_big;
filename_const = tracker_db_manager_get_file (TRACKER_DB_FILE_METADATA);
too_big = tracker_file_get_size (filename_const) > MAX_DB_FILE_SIZE;
-
+
if (too_big) {
g_critical ("File metadata database is too big, discontinuing indexing");
- return TRUE;
+ return TRUE;
}
filename_const = tracker_db_manager_get_file (TRACKER_DB_EMAIL_METADATA);
too_big = tracker_file_get_size (filename_const) > MAX_DB_FILE_SIZE;
-
+
if (too_big) {
g_critical ("Email metadata database is too big, discontinuing indexing");
- return TRUE;
+ return TRUE;
}
return FALSE;
Modified: branches/indexer-split/src/libtracker-gtk/tracker-keyword-store.c
==============================================================================
--- branches/indexer-split/src/libtracker-gtk/tracker-keyword-store.c (original)
+++ branches/indexer-split/src/libtracker-gtk/tracker-keyword-store.c Sat Sep 20 14:45:00 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
*
- * tracker-gtk/keyword-store.c - A derived GtkListStore that maintians a
- * DBus connection to tracker such that when a new keyword is created it
+ * tracker-gtk/keyword-store.c - A derived GtkListStore that maintians a
+ * DBus connection to tracker such that when a new keyword is created it
* is automatically inserted here.
*
* Copyright (C) 2007 John Stowers
@@ -41,7 +41,7 @@
G_DEFINE_TYPE_WITH_CODE (TrackerKeywordStore, tracker_keyword_store, GTK_TYPE_LIST_STORE,
G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
tracker_keyword_store_tree_drag_source_init))
-
+
#define parent_class tracker_keyword_store_parent_class
static void
@@ -67,9 +67,9 @@
store->tracker_client = tracker_connect (TRUE);
//populate the liststore asyncronously
- tracker_keywords_get_list_async (store->tracker_client,
- SERVICE_FILES,
- tracker_keyword_store_populate_cb,
+ tracker_keywords_get_list_async (store->tracker_client,
+ SERVICE_FILES,
+ tracker_keyword_store_populate_cb,
store);
}
@@ -119,7 +119,7 @@
iface->drag_data_delete = tracker_keyword_store_drag_data_delete;
}
-static void
+static void
tracker_keyword_store_populate_cb (GPtrArray *result, GError *error, gpointer user_data) {
GtkTreeIter iter;
GtkListStore *list_store = GTK_LIST_STORE (user_data);
@@ -161,7 +161,7 @@
/**
* tracker_keyword_store_new:
*
- * Creates a #GtkListStore with several columns. This store is especially
+ * Creates a #GtkListStore with several columns. This store is especially
* useful because it also contais a hashtable which retains a gtk_tree_iter
* indexed by keyword, for O(1) fast lookups of liststore contents.
*
@@ -180,8 +180,8 @@
**/
gboolean
tracker_keyword_store_insert ( GtkListStore *store,
- const char *keyword,
- const char *stock_id
+ const char *keyword,
+ const char *stock_id
)
{
GtkTreeIter *iter;
@@ -192,7 +192,7 @@
self = TRACKER_KEYWORD_STORE (store);
- if (g_hash_table_lookup (self->keywords, keyword) == NULL)
+ if (g_hash_table_lookup (self->keywords, keyword) == NULL)
{
iter = (GtkTreeIter *)g_new0 (GtkTreeIter, 1);
gtk_list_store_insert_with_values (store,
@@ -208,7 +208,7 @@
}
/**
- * O(1) lookup of items by keyword from the store
+ * O(1) lookup of items by keyword from the store
* Returns the GtkTreeIter corresponding to the item with keyword or
* NULL of it cant be found
**/
@@ -228,7 +228,7 @@
/**
* O(1) removal of items by keyword
**/
-gboolean
+gboolean
tracker_keyword_store_remove ( GtkListStore *store,
const char *keyword)
{
Modified: branches/indexer-split/src/libtracker-gtk/tracker-keyword-store.h
==============================================================================
--- branches/indexer-split/src/libtracker-gtk/tracker-keyword-store.h (original)
+++ branches/indexer-split/src/libtracker-gtk/tracker-keyword-store.h Sat Sep 20 14:45:00 2008
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
*
- * tracker-gtk/keyword-store.h - A derived GtkListStore that maintians a
- * DBus connection to tracker such that when a new keyword is created it
+ * tracker-gtk/keyword-store.h - A derived GtkListStore that maintians a
+ * DBus connection to tracker such that when a new keyword is created it
* is automatically inserted here.
*
* Copyright (C) 2007 John Stowers
@@ -70,14 +70,14 @@
gboolean
tracker_keyword_store_insert (GtkListStore *store,
- const char *keyword,
+ const char *keyword,
const char *stock_id );
GtkTreeIter *
tracker_keyword_store_lookup (GtkListStore *store,
const char *keyword);
-gboolean
+gboolean
tracker_keyword_store_remove (GtkListStore *store,
const char *keyword);
Modified: branches/indexer-split/src/libtracker-gtk/tracker-metadata-tile.c
==============================================================================
--- branches/indexer-split/src/libtracker-gtk/tracker-metadata-tile.c (original)
+++ branches/indexer-split/src/libtracker-gtk/tracker-metadata-tile.c Sat Sep 20 14:45:00 2008
@@ -37,34 +37,34 @@
struct TrackerMetadataTilePrivate {
TrackerClient *client;
-
+
gboolean visible;
gboolean lock;
-
+
gboolean expanded;
gchar *type;
GdkPixbuf *preview;
-
+
GtkWidget *align;
-
+
GtkWidget *image;
GtkWidget *size;
-
+
GtkWidget *expander;
GtkWidget *arrow;
GtkWidget *title;
-
+
GtkWidget *table;
-
+
GtkWidget *info1;
GtkWidget *info2;
-
+
GtkWidget *info3;
GtkWidget *info4;
-
+
GtkWidget *info5;
GtkWidget *info6;
-
+
GtkWidget *tag_bar;
};
@@ -89,7 +89,7 @@
static void _int_to_label (GtkWidget *label, const char *prop, const char *string);
static inline gboolean is_empty_string (const char *s);
-
+
/* structs & enums */
static char *default_keys[] =
@@ -169,14 +169,14 @@
NULL
};
-enum {
+enum {
WEBHISTORY_URL,
WEBHISTORY_TITLE,
WEBHISTORY_SIZE,
WEBHISTORY_MIME,
WEBHISTORY_KEYWORDS,
WEBHISTORY_N_KEYS
-};
+};
static char *app_keys[] =
@@ -289,7 +289,7 @@
_show_labels (TrackerMetadataTile *tile, gboolean label_visible)
{
TrackerMetadataTilePrivate *priv;
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
if (!label_visible) {
@@ -310,7 +310,7 @@
}
/* populates the metadata tile for a default file */
-static void
+static void
_tile_tracker_populate_default (char **array, GError *error, TrackerMetadataTile *tile )
{
if (error) {
@@ -323,11 +323,11 @@
/* create title */
TrackerMetadataTilePrivate *priv;
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile); /* create title */
-
+
_property_to_label ( priv->title, array[DEFAULT_NAME] , "<span size='large'><b>%s</b></span>");
-
+
/* then set the remaining properties */
_property_to_label ( priv->info1, array[DEFAULT_PATH] , _("Path : <b>%s</b>"));
_date_to_label ( priv->info2, array[DEFAULT_MODIFIED] , _("Modified : <b>%s</b>"));
@@ -335,7 +335,7 @@
_date_to_label ( priv->info4, array[DEFAULT_ACCESSED] , _("Accessed : <b>%s</b>"));
_property_to_label ( priv->info5, array[DEFAULT_MIME] , _("Mime : <b>%s</b>"));
_property_to_label ( priv->info6, " " , "%s");
-
+
tracker_metadata_tile_show (tile);
@@ -343,12 +343,12 @@
}
-static void
+static void
_tile_tracker_populate_blank (TrackerMetadataTile *tile)
{
TrackerMetadataTilePrivate *priv;
-
- priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
+
+ priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
_show_labels (tile, FALSE);
@@ -365,7 +365,7 @@
}
-static void
+static void
_tile_tracker_populate_email (char **array, GError *error, TrackerMetadataTile *tile)
{
/* format properties */
@@ -378,8 +378,8 @@
}
TrackerMetadataTilePrivate *priv;
-
- priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
+
+ priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
/* create title */
@@ -404,7 +404,7 @@
}
-static void
+static void
_tile_tracker_populate_applications (char **array, GError *error, TrackerMetadataTile *tile)
{
/* format properties */
@@ -417,10 +417,10 @@
}
TrackerMetadataTilePrivate *priv;
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
-
+
/* create title */
_property_to_label ( priv->title, array[APP_DISPLAYNAME] , "<span size='large'><b>%s</b></span>");
@@ -432,7 +432,7 @@
_property_to_label ( priv->info5, " " , "%s");
_property_to_label ( priv->info6, " " , "%s");
-
+
/* free properties */
g_strfreev (array);
@@ -445,7 +445,7 @@
-static void
+static void
_tile_tracker_populate_audio (char **array, GError *error, TrackerMetadataTile *tile)
{
/* format properties */
@@ -458,7 +458,7 @@
}
TrackerMetadataTilePrivate *priv;
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile); /* create title */
char *prop = NULL;
@@ -466,14 +466,14 @@
GString *str;
gboolean artist = FALSE;
gboolean album = FALSE;
-
+
str = g_string_new ("<span size='large'><b>%s</b></span>");
-
+
if (!is_empty_string (array[AUDIO_ARTIST])) {
artist = TRUE;
str = g_string_append (str, " by <span size='large'><i>%s</i></span>");
}
-
+
if (!is_empty_string (array[AUDIO_ALBUM])) {
album = TRUE;
str = g_string_append (str, " from <span size='large'><i>%s</i></span>");
@@ -494,11 +494,11 @@
temp2 = g_markup_escape_text (array[AUDIO_ARTIST], -1);
prop = g_strdup_printf (str->str, temp1, temp2);
g_free (temp1);
- g_free (temp2);
+ g_free (temp2);
} else if (album) {
char *temp1, *temp2;
temp1 = g_markup_escape_text (array[AUDIO_TITLE], -1);
- temp2 = g_markup_escape_text (array[AUDIO_ALBUM], -1);
+ temp2 = g_markup_escape_text (array[AUDIO_ALBUM], -1);
prop = g_strdup_printf (str->str, temp1, temp2);
g_free (temp1);
g_free (temp2);
@@ -508,29 +508,29 @@
prop = g_strdup_printf (str->str, temp1);
g_free (temp1);
}
-
+
gtk_label_set_markup (GTK_LABEL (priv->title), prop);
g_free (prop);
g_string_free (str, TRUE);
-
+
_seconds_to_label ( priv->info1, array[AUDIO_DURATION] , _("Duration : <b>%s</b>"));
_property_to_label ( priv->info2, array[AUDIO_GENRE] , _("Genre : <b>%s</b>"));
_bitrate_to_label ( priv->info3, array[AUDIO_BITRATE] , _("Bitrate : <b>%s Kbs</b>"));
_year_to_label ( priv->info4, array[AUDIO_RELEASEDATE] , _("Year : <b>%s</b>"));
_size_to_label ( priv->info5, array[AUDIO_SIZE] , _("Size : <b>%s</b>"));
_property_to_label ( priv->info6, array[AUDIO_CODEC] , _("Codec : <b>%s</b>"));
-
-
+
+
/* free properties */
g_strfreev (array);
-
+
tracker_metadata_tile_show (tile);
}
/* populates the metadata tile for a image file */
-static void
+static void
_tile_tracker_populate_image (char **array, GError *error, TrackerMetadataTile *tile )
{
if (error) {
@@ -539,42 +539,42 @@
gtk_widget_hide (GTK_WIDGET(tile));
return;
}
-
+
/* TODO : check for a normal image file, not all images are photos */
TrackerMetadataTilePrivate *priv;
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile); /* create title */
/* create title */
_property_to_label ( priv->title, array[IMAGE_TITLE] , "<span size='large'><b>%s</b></span>");
- char *prop = NULL;
+ char *prop = NULL;
/* make nice looking description */
GString *str;
gboolean camera = TRUE;
gboolean model = TRUE;
str = g_string_new ("<span size='large'><b>%s</b></span>");
-
+
if (!is_empty_string (array[IMAGE_CAMERA])) {
camera = TRUE;
str = g_string_append (str, _(" taken with a <span size='large'><i>%s</i></span>"));
}
-
+
if (!is_empty_string (array[IMAGE_MODEL])) {
model = TRUE;
str = g_string_append (str, _(" <span size='large'><i>%s</i></span>"));
}
if (camera && model) {
prop = g_strdup_printf (str->str, g_markup_escape_text (array[IMAGE_TITLE], -1),
- g_markup_escape_text (array[IMAGE_CAMERA], -1),
+ g_markup_escape_text (array[IMAGE_CAMERA], -1),
g_markup_escape_text (array[IMAGE_MODEL], -1));
} else if (camera) {
prop = g_strdup_printf (str->str, g_markup_escape_text (array[IMAGE_TITLE], -1),
g_markup_escape_text (array[IMAGE_CAMERA], -1));
} else if (model) {
- prop = g_strdup_printf (str->str, g_markup_escape_text (array[IMAGE_TITLE], -1),
+ prop = g_strdup_printf (str->str, g_markup_escape_text (array[IMAGE_TITLE], -1),
g_markup_escape_text (array[IMAGE_MODEL], -1));
} else {
prop = g_strdup_printf (str->str, g_markup_escape_text (array[IMAGE_TITLE], -1));
@@ -582,7 +582,7 @@
gtk_label_set_markup (GTK_LABEL (priv->title), prop);
g_free (prop);
g_string_free (str, TRUE);
-
+
/* then set the remaining properties */
_dimensions_to_label ( priv->info1, array[IMAGE_WIDTH], array[IMAGE_HEIGHT] , _("Dimensions : <b>%d x %d</b>"));
_date_to_label ( priv->info2, array[IMAGE_DATE] , _("Date Taken : <b>%s</b>"));
@@ -590,16 +590,16 @@
_property_to_label ( priv->info4, array[IMAGE_FLASH] , _("Flash : <b>%s</b>"));
_property_to_label ( priv->info5, array[IMAGE_FOCAL] , _("Focal Length : <b>%s</b>"));
_property_to_label ( priv->info6, array[IMAGE_EXPO] , _("Exposure Time : <b>%s</b>"));
-
-
+
+
tracker_metadata_tile_show (tile);
g_strfreev (array);
}
/* populates the metadata tile for a video file */
-static void
+static void
_tile_tracker_populate_video (char **array, GError *error, TrackerMetadataTile *tile )
{
if (error) {
@@ -610,11 +610,11 @@
}
TrackerMetadataTilePrivate *priv;
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile); /* create title */
_property_to_label ( priv->title, array[VIDEO_TITLE] , "<span size='large'><b>%s</b></span>");
-
+
/* then set the remaining properties */
_dimensions_to_label ( priv->info1, array[VIDEO_WIDTH], array[VIDEO_HEIGHT] , _("Dimensions : <b>%d x %d</b>"));
_property_to_label ( priv->info2, array[VIDEO_AUTHOR] , _("Author : <b>%s</b>"));
@@ -624,14 +624,14 @@
_property_to_label ( priv->info6, array[VIDEO_FRAMERATE] , _("Framerate : <b>%s</b>"));
-
+
tracker_metadata_tile_show (tile);
- g_strfreev (array);
-
+ g_strfreev (array);
+
}
/* populates the metadata tile for a document */
-static void
+static void
_tile_tracker_populate_documents (char **array, GError *error, TrackerMetadataTile *tile )
{
if (error) {
@@ -640,14 +640,14 @@
gtk_widget_hide (GTK_WIDGET(tile));
return;
}
-
+
TrackerMetadataTilePrivate *priv;
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
-
+
/* create title */
_property_to_label ( priv->title, array[DOC_NAME] , "<span size='large'><b>%s</b></span>");
-
+
/* then set the remaining properties */
_property_to_label ( priv->info1, array[DOC_SUBJECT] , _("Subject : <b>%s</b>"));
_property_to_label ( priv->info2, array[DOC_AUTHOR] , _("Author : <b>%s</b>"));
@@ -655,8 +655,8 @@
_int_to_label ( priv->info4, array[DOC_WORDCOUNT] , _("Word Count : <b>%s</b>"));
_date_to_label ( priv->info5, array[DOC_CREATED] , _("Created : <b>%s</b>"));
_property_to_label ( priv->info6, array[DOC_COMMENTS] , _("Comments : <b>%s</b>"));
-
-
+
+
tracker_metadata_tile_show (tile);
g_strfreev (array);
}
@@ -698,38 +698,38 @@
/* UTILILTY FUNCTIONS FOR CONVERSIONS */
/* Converts bitrate to kbs */
-static void
+static void
_bitrate_to_label (GtkWidget *label, const char *prop, const char *string)
{
- int size;
+ int size;
char *format;
char *temp;
-
+
size = atoi (prop);
size = size/1000;
-
+
format = g_strdup_printf ("%d", size);
temp = g_strdup_printf (string, format);
gtk_label_set_markup (GTK_LABEL (label), temp);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
g_free (temp);
- g_free (format);
+ g_free (format);
}
/* Converts seconds to time */
-static void
+static void
_seconds_to_label (GtkWidget *label, const char *prop, const char *string)
{
- gulong size;
- char *format;
+ gulong size;
+ char *format;
char *temp;
-
+
size = atol (prop);
int hours = (int) (size / 3600);
int minutes = (int)(size/60) - (hours * 60);
int seconds = (int) (size % 60);
-
+
if ( hours > 0 ) {
format = g_strdup_printf ("%02d:%02d:%02d", hours, minutes, seconds);
} else {
@@ -741,20 +741,20 @@
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
g_free (temp);
- g_free (format);
+ g_free (format);
}
/* Converts width and height into WxH */
-static void
+static void
_dimensions_to_label (GtkWidget *label, const char *width, const char *height, const char *string)
{
- gulong w;
- gulong h;
+ gulong w;
+ gulong h;
char *temp;
-
+
w = atol (width);
h = atol (height);
-
+
temp = g_strdup_printf (string, w, h);
gtk_label_set_markup (GTK_LABEL (label), temp);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
@@ -789,16 +789,16 @@
}
/* Converts text size to something human readable */
-static void
+static void
_size_to_label (GtkWidget *label, const char *prop, const char *string)
{
- gulong size;
- char *format;
+ gulong size;
+ char *format;
char *temp;
-
+
size = atol (prop);
format = format_file_size_for_display (size);
-
+
temp = g_strdup_printf (string, format);
gtk_label_set_markup (GTK_LABEL (label), temp);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
@@ -808,16 +808,16 @@
}
/* Converts text size to something human readable */
-static void
+static void
_int_to_label (GtkWidget *label, const char *prop, const char *string)
{
- gulong size;
+ gulong size;
char *temp;
char *format;
-
+
size = atol (prop);
format = g_strdup_printf ("%ld", size);
-
+
if (size) {
temp = g_strdup_printf (string, format);
} else {
@@ -825,9 +825,9 @@
}
gtk_label_set_markup (GTK_LABEL (label), temp);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
-
+
g_free (temp);
- g_free (format);
+ g_free (format);
}
/* Converts ISO date to something human readable */
@@ -838,7 +838,7 @@
time_t my_time = atoi (iso);
- if (my_time != 0) {
+ if (my_time != 0) {
g_date_set_time_t (val, my_time);
return TRUE;
} else {
@@ -846,7 +846,7 @@
}
}
-static void
+static void
_date_to_label (GtkWidget *label, const char *iso, const char *string)
{
GDate val;
@@ -893,7 +893,7 @@
}
/* Checks that a property is valid, parses it to play nicely wth pango */
-static void
+static void
_property_to_label (GtkWidget *label, const char *prop, const char *string)
{
if (!is_empty_string(prop)) {
@@ -922,22 +922,22 @@
* @type: the tracker type or mime type of the file
* @icon: a GdkPixbuf representing the file, or #NULL
*
- * Replaces the current metadata in the tile with metadata for the
+ * Replaces the current metadata in the tile with metadata for the
* uri specified. Can optionally also update the #GtkImage in the tile with
* the icon specified.
*
**/
-void
+void
tracker_metadata_tile_set_uri (TrackerMetadataTile *tile, const gchar *uri,
ServiceType service_type,
const gchar *type,
GdkPixbuf *icon)
{
TrackerMetadataTilePrivate *priv;
-
+
g_return_if_fail (TRACKER_IS_METADATA_TILE (tile));
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
gtk_image_clear (GTK_IMAGE (priv->image));
@@ -945,7 +945,7 @@
if (icon) {
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), icon);
} else {
- gtk_widget_hide (priv->image);
+ gtk_widget_hide (priv->image);
}
/* call correct function according to service type */
@@ -953,32 +953,32 @@
case SERVICE_MUSIC:
- tracker_metadata_get_async (priv->client, SERVICE_MUSIC,
- uri, audio_keys,
- (TrackerArrayReply)_tile_tracker_populate_audio,
+ tracker_metadata_get_async (priv->client, SERVICE_MUSIC,
+ uri, audio_keys,
+ (TrackerArrayReply)_tile_tracker_populate_audio,
(gpointer)tile);
break;
case SERVICE_EMAILS:
- tracker_metadata_get_async (priv->client, SERVICE_EMAILS,
- uri, email_keys,
- (TrackerArrayReply)_tile_tracker_populate_email,
+ tracker_metadata_get_async (priv->client, SERVICE_EMAILS,
+ uri, email_keys,
+ (TrackerArrayReply)_tile_tracker_populate_email,
(gpointer)tile);
break;
case SERVICE_DOCUMENTS:
- tracker_metadata_get_async (priv->client, SERVICE_DOCUMENTS,
- uri, doc_keys,
- (TrackerArrayReply)_tile_tracker_populate_documents,
+ tracker_metadata_get_async (priv->client, SERVICE_DOCUMENTS,
+ uri, doc_keys,
+ (TrackerArrayReply)_tile_tracker_populate_documents,
(gpointer)tile);
break;
case SERVICE_WEBHISTORY:
-
+
tracker_metadata_get_async (priv->client, SERVICE_WEBHISTORY,
uri, webhistory_keys,
(TrackerArrayReply)_tile_tracker_populate_webhistory,
@@ -988,26 +988,26 @@
case SERVICE_IMAGES:
- tracker_metadata_get_async (priv->client, SERVICE_IMAGES,
- uri, image_keys,
- (TrackerArrayReply)_tile_tracker_populate_image,
+ tracker_metadata_get_async (priv->client, SERVICE_IMAGES,
+ uri, image_keys,
+ (TrackerArrayReply)_tile_tracker_populate_image,
(gpointer)tile);
break;
case SERVICE_VIDEOS:
- tracker_metadata_get_async (priv->client, SERVICE_VIDEOS,
- uri, video_keys,
- (TrackerArrayReply)_tile_tracker_populate_video,
+ tracker_metadata_get_async (priv->client, SERVICE_VIDEOS,
+ uri, video_keys,
+ (TrackerArrayReply)_tile_tracker_populate_video,
(gpointer)tile);
break;
case SERVICE_APPLICATIONS:
- tracker_metadata_get_async (priv->client, SERVICE_APPLICATIONS,
- uri, app_keys,
- (TrackerArrayReply)_tile_tracker_populate_applications,
+ tracker_metadata_get_async (priv->client, SERVICE_APPLICATIONS,
+ uri, app_keys,
+ (TrackerArrayReply)_tile_tracker_populate_applications,
(gpointer)tile);
break;
@@ -1019,9 +1019,9 @@
_tile_tracker_populate_blank (tile);
} else {
- tracker_metadata_get_async (priv->client, SERVICE_FILES,
- uri, default_keys,
- (TrackerArrayReply)_tile_tracker_populate_default,
+ tracker_metadata_get_async (priv->client, SERVICE_FILES,
+ uri, default_keys,
+ (TrackerArrayReply)_tile_tracker_populate_default,
(gpointer)tile);
}
@@ -1044,9 +1044,9 @@
tracker_metadata_tile_show (TrackerMetadataTile *tile)
{
g_return_if_fail (TRACKER_IS_METADATA_TILE (tile));
-
+
TrackerMetadataTilePrivate *priv;
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
if (priv->expanded) {
@@ -1055,26 +1055,26 @@
gtk_widget_show_all (GTK_WIDGET (tile));
gtk_widget_hide (priv->table);
gtk_widget_hide (priv->image);
- }
+ }
}
static gboolean
tracker_metadata_tile_toggle_view (GtkWidget *button, TrackerMetadataTile *tile)
{
TrackerMetadataTilePrivate *priv;
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
if (priv->expanded) {
gtk_widget_hide (priv->image);
gtk_widget_hide (priv->table);
- gtk_arrow_set (GTK_ARROW (priv->arrow),
+ gtk_arrow_set (GTK_ARROW (priv->arrow),
GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
gtk_alignment_set_padding (GTK_ALIGNMENT (priv->align), 1, 1, 4, 4);
} else {
gtk_widget_show (priv->image);
gtk_widget_show (priv->table);
- gtk_arrow_set (GTK_ARROW (priv->arrow),
+ gtk_arrow_set (GTK_ARROW (priv->arrow),
GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_alignment_set_padding (GTK_ALIGNMENT (priv->align), 6, 6, 4, 4);
}
@@ -1082,7 +1082,7 @@
return FALSE;
}
-static void
+static void
draw (GtkWidget *widget, cairo_t *cr)
{
TrackerMetadataTile *tile;
@@ -1091,25 +1091,25 @@
GtkStyle *style;
GdkColor step1;
GdkColor step2;
-
+
tile = TRACKER_METADATA_TILE (widget);
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
-
+
width = widget->allocation.width;
height = widget->allocation.height;
-
+
style = gtk_widget_get_style (widget);
step1 = style->base[GTK_STATE_NORMAL];
step2 = style->bg[GTK_STATE_SELECTED];
-
+
/* clear window to base[NORMAL] */
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
gdk_cairo_set_source_color (cr, &step1);
cairo_paint (cr);
-
+
cairo_move_to(cr, 0, 0);
cairo_set_line_width(cr, 1.0);
-
+
cairo_pattern_t *pat;
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
@@ -1123,12 +1123,12 @@
step2.green/65535.0,
step2.blue/65535.0,
0.5);
-
+
cairo_rectangle (cr, 0, 0, width, height);
cairo_set_source(cr, pat);
cairo_fill(cr);
cairo_pattern_destroy(pat);
-
+
/* border line */
cairo_set_source_rgba (cr, step2.red/65535.0,
step2.green/65535.0,
@@ -1137,13 +1137,13 @@
cairo_move_to (cr, 0, 0);
cairo_line_to (cr, width, 0);
cairo_stroke (cr);
-
+
/* highlight line */
cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.5);
cairo_move_to (cr, 0, 1);
cairo_line_to (cr, width, 1);
cairo_stroke (cr);
-
+
if (!priv->expanded)
return;
/* mime icon */
@@ -1157,25 +1157,25 @@
/* watermark */
if (priv->type == NULL)
return;
-
+
cairo_text_extents_t extents;
double x,y;
int font_slant = CAIRO_FONT_SLANT_NORMAL;
int font_weight = CAIRO_FONT_WEIGHT_NORMAL;
-
+
cairo_select_font_face (cr, "Sans",font_slant, font_weight);
cairo_set_font_size (cr, 40);
cairo_text_extents (cr, priv->type, &extents);
x = (width)-(extents.width + extents.x_bearing)-90;
y = (height)-(extents.height + extents.y_bearing)-5;
-
-
+
+
/* shadow */
cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.05);
cairo_move_to (cr, x-1, y-1);
cairo_show_text (cr, priv->type);
-
+
/*main text */
cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.1);
cairo_move_to (cr, x, y);
@@ -1189,7 +1189,7 @@
cr = gdk_cairo_create (widget->window);
draw (widget, cr);
cairo_destroy (cr);
-
+
return GTK_WIDGET_CLASS(parent_class)->expose_event(widget, event);
}
@@ -1198,15 +1198,15 @@
{
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
-
+
parent_class = g_type_class_peek_parent (klass);
widget_class = GTK_WIDGET_CLASS(klass);
-
+
gobject_class = G_OBJECT_CLASS (klass);
//gobject_class->finalize = finalize;
-
+
widget_class->expose_event = tracker_metadata_tile_expose_event;
-
+
g_type_class_add_private (gobject_class, sizeof (TrackerMetadataTilePrivate));
}
@@ -1217,39 +1217,39 @@
GtkWidget *label, *table, *arrow;
GtkWidget *tag_bar;
GtkWidget *hbox, *vbox, *box;
-
+
TrackerMetadataTilePrivate *priv;
-
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
-
+
gtk_widget_set_app_paintable (GTK_WIDGET(tile), TRUE);
-
+
priv->expanded = TRUE;
priv->type = NULL;
priv->preview = NULL;
-
+
align = gtk_alignment_new (0.5, 0.5, 1, 1);
priv->align = align;
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 6, 4, 4);
gtk_container_add (GTK_CONTAINER (tile), align);
gtk_widget_show (align);
-
+
/* main hbox */
box = gtk_hbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (align), box);
gtk_widget_show (box);
-
+
/* Image widget */
image = gtk_image_new ();
priv->image = image;
gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
gtk_widget_show (image);
-
+
/* center vbox */
vbox = gtk_vbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (box), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
-
+
/* arrow & title */
button = gtk_button_new ();
priv->expander = button;
@@ -1259,71 +1259,71 @@
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (tracker_metadata_tile_toggle_view), (gpointer)tile);
-
+
hbox = gtk_hbox_new (FALSE, 4);
gtk_container_add (GTK_CONTAINER(button), hbox);
gtk_widget_show (hbox);
-
+
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
priv->arrow = arrow;
gtk_box_pack_start (GTK_BOX(hbox), arrow, FALSE, FALSE, 0);
gtk_widget_show (arrow);
-
+
label = gtk_label_new (" ");
priv->title = label;
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
-
+
/* info table */
table = gtk_table_new (3, 3, FALSE);
priv->table = table;
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
gtk_widget_show (table);
-
+
label = gtk_label_new (" ");
priv->info1 = label;
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach_defaults (GTK_TABLE(table), label, 0, 1, 0, 1);
-
+
label = gtk_label_new (" ");
priv->info2 = label;
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach_defaults (GTK_TABLE(table), label, 0, 1, 1, 2);
-
+
label = gtk_label_new (" ");
priv->info3 = label;
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE(table), label, 1, 2, 0, 1);
-
+ gtk_table_attach_defaults (GTK_TABLE(table), label, 1, 2, 0, 1);
+
label = gtk_label_new (" ");
priv->info4 = label;
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach_defaults (GTK_TABLE(table), label, 1, 2, 1, 2);
-
+
label = gtk_label_new (" ");
priv->info5 = label;
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE(table), label, 2, 3, 0, 1);
-
+ gtk_table_attach_defaults (GTK_TABLE(table), label, 2, 3, 0, 1);
+
label = gtk_label_new (" ");
priv->info6 = label;
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_table_attach_defaults (GTK_TABLE(table), label, 2, 3, 1, 2);
-
+
/* tag bar */
tag_bar = tracker_tag_bar_new ();
priv->tag_bar = tag_bar;
gtk_widget_show_all (tag_bar);
-
+
gtk_table_attach_defaults (GTK_TABLE (table), tag_bar, 0, 3, 2, 3);
gtk_widget_show_all (table);
}
@@ -1334,7 +1334,7 @@
TrackerClient *client;
GtkWidget *tile;
TrackerMetadataTilePrivate *priv;
-
+
tile = g_object_new (TRACKER_TYPE_METADATA_TILE, NULL);
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
Modified: branches/indexer-split/src/libtracker-gtk/tracker-metadata-tile.h
==============================================================================
--- branches/indexer-split/src/libtracker-gtk/tracker-metadata-tile.h (original)
+++ branches/indexer-split/src/libtracker-gtk/tracker-metadata-tile.h Sat Sep 20 14:45:00 2008
@@ -43,14 +43,14 @@
typedef struct {
GtkEventBoxClass parent_class;
-
+
} TrackerMetadataTileClass;
GType tracker_metadata_tile_get_type (void);
GtkWidget* tracker_metadata_tile_new (void);
-void tracker_metadata_tile_set_uri (TrackerMetadataTile *tile,
+void tracker_metadata_tile_set_uri (TrackerMetadataTile *tile,
const gchar *uri,
ServiceType service_type,
const gchar *type,
Modified: branches/indexer-split/src/libtracker-gtk/tracker-tag-bar.c
==============================================================================
--- branches/indexer-split/src/libtracker-gtk/tracker-tag-bar.c (original)
+++ branches/indexer-split/src/libtracker-gtk/tracker-tag-bar.c Sat Sep 20 14:45:00 2008
@@ -45,12 +45,12 @@
struct _TrackerTagBarPrivate
{
TrackerClient *client;
-
+
gchar *uri;
const gchar *active_tag;
ServiceType type;
-
+
GtkWidget *tag_box;
GtkWidget *add_button;
GtkWidget *menu;
@@ -60,7 +60,7 @@
};
/* CALLBACKS */
-static void
+static void
_keywords_reply (char **array, GError *error, TrackerTagBar *bar)
{
TrackerTagBarPrivate *priv;
@@ -68,7 +68,7 @@
gchar * tag = NULL;
gint i = 0;
GtkWidget *hbox;
-
+
if (error) {
g_print ("%s\n", error->message);
g_clear_error(&error);
@@ -77,7 +77,7 @@
if (array == NULL) {
return;
}
-
+
priv = TRACKER_TAG_BAR_GET_PRIVATE (bar);
hbox = gtk_hbox_new (FALSE, 5);
@@ -94,26 +94,26 @@
}
priv->tag_box = hbox;
gtk_box_pack_start (GTK_BOX(bar), hbox, FALSE, FALSE, 0);
-
+
gtk_widget_show_all (hbox);
-
+
g_strfreev (array);
}
static gboolean
-_on_tag_button_press_event (GtkWidget *button,
- GdkEventButton *event,
+_on_tag_button_press_event (GtkWidget *button,
+ GdkEventButton *event,
TrackerTagBar *bar)
{
TrackerTagBarPrivate *priv;
GtkWidget *label;
const gchar *tag;
-
+
priv = TRACKER_TAG_BAR_GET_PRIVATE (bar);
-
+
label = gtk_bin_get_child (GTK_BIN (button));
tag = gtk_label_get_text (GTK_LABEL (label));
-
+
switch (event->button) {
case 1:
_tag_launch_search (tag);
@@ -122,25 +122,25 @@
priv->active_tag = tag;
gtk_menu_popup (GTK_MENU (priv->menu),
NULL, NULL, NULL, bar, 3, event->time);
-
+
break;
default:
break;
-
- }
+
+ }
return FALSE;
}
-static void
+static void
_tag_launch_search (const gchar *tag)
{
GdkScreen *screen;
gchar *command;
GError *error = NULL;
-
+
screen = gdk_screen_get_default ();
command = g_strdup_printf ("tracker-search-tool %s", tag);
-
+
if (! gdk_spawn_command_line_on_screen (screen, command, &error)) {
if (error) {
g_print ("Error : %s", error->message);
@@ -154,9 +154,9 @@
search_tag_activate_cb(GtkMenuItem *menu_item, TrackerTagBar *bar)
{
TrackerTagBarPrivate *priv;
-
+
priv = TRACKER_TAG_BAR_GET_PRIVATE (bar);
-
+
_tag_launch_search (priv->active_tag);
}
@@ -166,12 +166,12 @@
TrackerTagBarPrivate *priv;
GError *error = NULL;
char *args[1];
-
+
priv = TRACKER_TAG_BAR_GET_PRIVATE (bar);
-
+
args[0] = g_strdup (priv->active_tag);
-
- tracker_keywords_remove(priv->client, priv->type, priv->uri,
+
+ tracker_keywords_remove(priv->client, priv->type, priv->uri,
args, &error);
if (error) {
g_print ("Tag Removal Error : %s", error->message);
@@ -187,10 +187,10 @@
{
TrackerTagBarPrivate *priv;
priv = TRACKER_TAG_BAR_GET_PRIVATE (bar);
-
+
gtk_widget_destroy (priv->entry_box);
priv->entry_box = priv->entry = NULL;
-
+
gtk_widget_show (priv->tag_box);
gtk_widget_show (priv->add_button);
}
@@ -202,21 +202,21 @@
const gchar *text;
gchar **tags;
GError *error = NULL;
-
+
priv = TRACKER_TAG_BAR_GET_PRIVATE (bar);
-
+
text = gtk_entry_get_text (GTK_ENTRY (priv->entry));
if (strcmp (text, "Type tags you want to add here, separated by commas") != 0) {
-
+
tags = g_strsplit (text, ",", 0);
-
- tracker_keywords_add(priv->client, priv->type, priv->uri,
+
+ tracker_keywords_add(priv->client, priv->type, priv->uri,
tags, &error);
if (error) {
g_print ("Tag Addition Error : %s", error->message);
return;
- }
+ }
}
_on_close_add_tag (but, bar);
@@ -239,63 +239,63 @@
GtkWidget *entry;
GtkWidget *image;
GtkWidget *button;
-
+
priv = TRACKER_TAG_BAR_GET_PRIVATE (bar);
hbox = gtk_hbox_new (FALSE, 4);
priv->entry_box = hbox;
-
+
entry = gtk_entry_new ();
priv->entry = entry;
gtk_entry_set_text (GTK_ENTRY (entry), _("Type tags you want to add here, separated by commas"));
gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
gtk_box_pack_start (GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-
+
g_signal_connect (G_OBJECT (entry), "activate",
G_CALLBACK (_on_entry_activate), bar);
-
+
image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
-
+
button = gtk_button_new ();
gtk_box_pack_start (GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_button_set_image (GTK_BUTTON (button), image);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-
+
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (_on_close_add_tag), bar);
-
+
image = gtk_image_new_from_stock (GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU);
-
+
button = gtk_button_new ();
gtk_box_pack_start (GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_button_set_image (GTK_BUTTON (button), image);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-
-
+
+
g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (_on_apply_add_tag), bar);
-
+ G_CALLBACK (_on_apply_add_tag), bar);
+
gtk_box_pack_start (GTK_BOX (bar), hbox, TRUE, TRUE, 0);
gtk_widget_show_all (hbox);
gtk_widget_hide (priv->tag_box);
- gtk_widget_hide (priv->add_button);
+ gtk_widget_hide (priv->add_button);
gtk_widget_grab_focus (entry);
}
/* UTILS */
-static void
+static void
_tag_bar_add_tag (TrackerTagBar *bar, GtkWidget *box, const char *tag)
{
GtkWidget *button;
GtkWidget *label;
gchar *temp;
-
+
temp = g_strdup_printf ("<b><u>%s</u></b>", tag);
-
+
label = gtk_label_new (" ");
gtk_label_set_markup (GTK_LABEL (label), temp);
-
+
button = gtk_button_new ();
gtk_container_add (GTK_CONTAINER (button), label);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
@@ -310,24 +310,24 @@
g_signal_connect (G_OBJECT (button), "button-press-event",
G_CALLBACK (_on_tag_button_press_event), bar);
- g_free (temp);
+ g_free (temp);
}
/* HEADER FUNCTIONS */
-void
+void
tracker_tag_bar_set_uri (TrackerTagBar *bar, ServiceType type, const gchar *uri)
{
TrackerTagBarPrivate *priv;
-
+
priv = TRACKER_TAG_BAR_GET_PRIVATE (bar);
-
+
if (priv->uri)
g_free (priv->uri);
priv->uri = g_strdup (uri);
priv->type = type;
-
- tracker_keywords_get_async (priv->client, priv->type, uri,
- (TrackerArrayReply)_keywords_reply,
+
+ tracker_keywords_get_async (priv->client, priv->type, uri,
+ (TrackerArrayReply)_keywords_reply,
bar);
}
@@ -354,23 +354,23 @@
GtkWidget *image;
GtkWidget *menu;
GtkWidget *item;
-
+
priv = TRACKER_TAG_BAR_GET_PRIVATE (tag_bar);
-
+
priv->uri = NULL;
priv->active_tag = NULL;
-
+
gtk_container_set_border_width (GTK_CONTAINER(tag_bar), 0);
-
+
label = gtk_label_new (_("Tags :"));
gtk_box_pack_start (GTK_BOX(tag_bar), label, FALSE, TRUE, 0);
-
+
hbox = gtk_hbox_new (FALSE, 4);
priv->tag_box = hbox;
gtk_box_pack_start (GTK_BOX(tag_bar), hbox, FALSE, TRUE, 0);
-
+
image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
-
+
button = gtk_button_new ();
priv->add_button = button;
gtk_box_pack_start (GTK_BOX(tag_bar), button, FALSE, FALSE, 0);
@@ -384,10 +384,10 @@
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (_on_add_tag_clicked), tag_bar);
-
+
menu = gtk_menu_new();
priv->menu = menu;
-
+
/* Search For Tag */
item = gtk_image_menu_item_new_with_mnemonic(_("_Search For Tag"));
gtk_widget_show(item);
@@ -410,7 +410,7 @@
image = gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
- gtk_widget_show(image);
+ gtk_widget_show(image);
}
GtkWidget *
@@ -419,13 +419,13 @@
TrackerClient *client;
GtkWidget *tag_bar;
TrackerTagBarPrivate *priv;
-
- tag_bar = g_object_new (TRACKER_TYPE_TAG_BAR,
+
+ tag_bar = g_object_new (TRACKER_TYPE_TAG_BAR,
"homogeneous", FALSE,
"spacing", 0 ,
NULL);
priv = TRACKER_TAG_BAR_GET_PRIVATE (tag_bar);
-
+
client = tracker_connect (TRUE);
priv->client = client;
return tag_bar;
Modified: branches/indexer-split/src/libtracker-gtk/tracker-tag-bar.h
==============================================================================
--- branches/indexer-split/src/libtracker-gtk/tracker-tag-bar.h (original)
+++ branches/indexer-split/src/libtracker-gtk/tracker-tag-bar.h Sat Sep 20 14:45:00 2008
@@ -50,11 +50,11 @@
GtkWidget *tracker_tag_bar_new (void);
-/*
-uri has to be a local uri i.e.
-'/home/john/doe.mp3' not 'file:///home/john/doe.mp3'
-*/
-void tracker_tag_bar_set_uri (TrackerTagBar *bar,
+/*
+uri has to be a local uri i.e.
+'/home/john/doe.mp3' not 'file:///home/john/doe.mp3'
+*/
+void tracker_tag_bar_set_uri (TrackerTagBar *bar,
ServiceType type,
const gchar *uri
);
Modified: branches/indexer-split/src/libtracker-gtk/tracker-ui.h
==============================================================================
--- branches/indexer-split/src/libtracker-gtk/tracker-ui.h (original)
+++ branches/indexer-split/src/libtracker-gtk/tracker-ui.h Sat Sep 20 14:45:00 2008
@@ -20,7 +20,7 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-
+
#ifndef TRACKER_UI_H
#define TRACKER_UI_H
@@ -28,7 +28,7 @@
#include <gtk/gtk.h>
/**
- * The GtkTargetEntry to use as the drag type when
+ * The GtkTargetEntry to use as the drag type when
* dragging and dropping keywords
**/
const GtkTargetEntry KEYWORD_DRAG_TYPES[] = {
Modified: branches/indexer-split/src/libtracker-gtk/tracker-utils.c
==============================================================================
--- branches/indexer-split/src/libtracker-gtk/tracker-utils.c (original)
+++ branches/indexer-split/src/libtracker-gtk/tracker-utils.c Sat Sep 20 14:45:00 2008
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
*
- * libtracker-gtk/tracker-utils.c - Grab bag of functions for manuipulating
+ * libtracker-gtk/tracker-utils.c - Grab bag of functions for manuipulating
* tracker results into more Gtk friedly types.
*
* Copyright (C) 2007 John Stowers
@@ -72,7 +72,7 @@
return list;
}
-/* Creates a tree model containing the keywords in List
+/* Creates a tree model containing the keywords in List
this simple treemodel has a single column containing the keyword name*/
GtkTreeModel *
tracker_create_simple_keyword_liststore (const GList *list)
Modified: branches/indexer-split/src/libtracker-gtk/tracker-utils.h
==============================================================================
--- branches/indexer-split/src/libtracker-gtk/tracker-utils.h (original)
+++ branches/indexer-split/src/libtracker-gtk/tracker-utils.h Sat Sep 20 14:45:00 2008
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
*
- * libtracker-gtk/tracker-utils.c - Grab bag of functions for manuipulating
+ * libtracker-gtk/tracker-utils.c - Grab bag of functions for manuipulating
* tracker results into more Gtk friedly types.
*
* Copyright (C) 2007 John Stowers
@@ -20,7 +20,7 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-
+
#ifndef TRACKER_UTILS_H
#define TRACKER_UTILS_H
Modified: branches/indexer-split/src/libtracker/tracker.c
==============================================================================
--- branches/indexer-split/src/libtracker/tracker.c (original)
+++ branches/indexer-split/src/libtracker/tracker.c Sat Sep 20 14:45:00 2008
@@ -119,7 +119,7 @@
};
-ServiceType
+ServiceType
tracker_service_name_to_type (const char *service)
{
@@ -260,7 +260,7 @@
g_type_init ();
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-
+
if (connection == NULL) {
if (enable_warnings) {
g_warning("Unable to connect to dbus: %s\n", error->message);
@@ -281,7 +281,7 @@
return NULL;
}
-
+
client = g_new (TrackerClient, 1);
client->proxy = proxy;
@@ -357,7 +357,7 @@
org_freedesktop_Tracker_get_version (client->proxy, &version, &*error);
return version;
-}
+}
char *
tracker_get_status (TrackerClient *client, GError **error)
@@ -365,10 +365,10 @@
char *status ;
org_freedesktop_Tracker_get_status (client->proxy, &status, &*error);
return status;
-}
+}
-GHashTable *
+GHashTable *
tracker_get_services (TrackerClient *client, gboolean main_services_only, GError **error)
{
GHashTable *table;
@@ -379,12 +379,12 @@
return table;
-
+
}
-GPtrArray *
+GPtrArray *
tracker_get_stats (TrackerClient *client, GError **error)
{
GPtrArray *table;
@@ -395,7 +395,7 @@
return table;
-
+
}
@@ -427,8 +427,8 @@
-char **
-tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, char **keys, GError **error)
+char **
+tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, char **keys, GError **error)
{
char **array = NULL;
char *service_str = tracker_service_types[service];
@@ -442,7 +442,7 @@
void
-tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, GError **error)
+tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, GError **error)
{
char *service_str = tracker_service_types[service];
@@ -459,7 +459,7 @@
g_warning ("%s no longer does anything", __FUNCTION__);
}
-MetaDataTypeDetails *
+MetaDataTypeDetails *
tracker_metadata_get_type_details (TrackerClient *client, const char *name, GError **error)
{
@@ -475,7 +475,7 @@
}
-char **
+char **
tracker_metadata_get_registered_types (TrackerClient *client, const char *class, GError **error)
{
char **array = NULL;
@@ -488,18 +488,18 @@
}
-char **
+char **
tracker_metadata_get_writeable_types (TrackerClient *client, const char *class, GError **error)
{
/* This does nothing now, this API has been removed */
g_warning ("%s no longer does anything", __FUNCTION__);
-
+
return NULL;
}
-char **
+char **
tracker_metadata_get_registered_classes (TrackerClient *client, GError **error)
{
char **array = NULL;
@@ -512,16 +512,16 @@
}
-GPtrArray *
+GPtrArray *
tracker_metadata_get_unique_values (TrackerClient *client, ServiceType service, char **meta_types, char *query, gboolean descending, int offset, int max_hits, GError **error)
{
GPtrArray *table;
char *service_str = tracker_service_types[service];
-
+
if (!org_freedesktop_Tracker_Metadata_get_unique_values (client->proxy_metadata, service_str, (const char **)meta_types, query, descending, offset, max_hits, &table, &*error)) {
return NULL;
}
-
+
return table;
}
@@ -531,11 +531,11 @@
int sum;
char *service_str = tracker_service_types[service];
-
+
if (!org_freedesktop_Tracker_Metadata_get_sum (client->proxy_metadata, service_str, field, query, &sum, &*error)) {
return -1;
}
-
+
return sum;
}
@@ -545,30 +545,30 @@
int count;
char *service_str = tracker_service_types[service];
-
+
if (!org_freedesktop_Tracker_Metadata_get_count (client->proxy_metadata, service_str, field, query, &count, &*error)) {
return -1;
}
-
+
return count;
}
-GPtrArray *
+GPtrArray *
tracker_metadata_get_unique_values_with_count (TrackerClient *client, ServiceType service, char **meta_types, char *query, char *count, gboolean descending, int offset, int max_hits, GError **error)
{
GPtrArray *table;
char *service_str = tracker_service_types[service];
-
+
if (!org_freedesktop_Tracker_Metadata_get_unique_values_with_count (client->proxy_metadata, service_str, (const char **)meta_types, query, count, descending, offset, max_hits, &table, &*error)) {
return NULL;
}
-
+
return table;
}
-GPtrArray *
+GPtrArray *
tracker_keywords_get_list (TrackerClient *client, ServiceType service, GError **error)
{
GPtrArray *table;
@@ -580,11 +580,11 @@
return table;
-
+
}
-char **
+char **
tracker_keywords_get (TrackerClient *client, ServiceType service, const char *id, GError **error)
{
char **array = NULL;
@@ -608,7 +608,7 @@
-void
+void
tracker_keywords_remove (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error)
{
char *service_str = tracker_service_types[service];
@@ -618,7 +618,7 @@
-void
+void
tracker_keywords_remove_all (TrackerClient *client, ServiceType service, const char *id, GError **error)
{
char *service_str = tracker_service_types[service];
@@ -627,7 +627,7 @@
}
-char **
+char **
tracker_keywords_search (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, GError **error)
{
char **array = NULL;
@@ -672,7 +672,7 @@
}
-char **
+char **
tracker_search_text (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error)
{
char **array = NULL;
@@ -685,7 +685,7 @@
return array;
}
-GPtrArray *
+GPtrArray *
tracker_search_text_detailed (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error)
{
GPtrArray *array;
@@ -698,7 +698,7 @@
return array;
}
-char *
+char *
tracker_search_get_snippet (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, GError **error)
{
char *result;
@@ -709,13 +709,13 @@
}
return result;
-
+
}
-char **
+char **
tracker_search_metadata (TrackerClient *client, ServiceType service, const char *field, const char* search_text, int offset, int max_hits, GError **error)
{
char **array = NULL;
@@ -730,7 +730,7 @@
-GPtrArray *
+GPtrArray *
tracker_search_query (TrackerClient *client, int live_query_id, ServiceType service, char **fields, const char *search_text, const char *keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, char **sort_fields, gboolean sort_descending, GError **error)
{
GPtrArray *table;
@@ -755,21 +755,21 @@
-void
+void
tracker_files_create (TrackerClient *client, const char *uri, gboolean is_directory, const char *mime, int size, int mtime, GError **error)
{
org_freedesktop_Tracker_Files_create (client->proxy_files, uri, is_directory, mime, size, mtime, &*error);
}
-void
+void
tracker_files_delete (TrackerClient *client, const char *uri, GError **error)
{
org_freedesktop_Tracker_Files_delete (client->proxy_files, uri, &*error);
}
-char *
+char *
tracker_files_get_text_contents (TrackerClient *client, const char *uri, int offset, int max_length, GError **error)
{
char *result;
@@ -784,7 +784,7 @@
-char *
+char *
tracker_files_search_text_contents (TrackerClient *client, const char *uri, const char *search_text, int length, GError **error)
{
char *result;
@@ -798,7 +798,7 @@
-char **
+char **
tracker_files_get_by_service_type (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, GError **error)
{
char **array = NULL;
@@ -813,7 +813,7 @@
-char **
+char **
tracker_files_get_by_mime_type (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, GError **error)
{
char **array = NULL;
@@ -827,7 +827,7 @@
-char **
+char **
tracker_files_get_by_mime_type_vfs (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, GError **error)
{
char **array = NULL;
@@ -841,7 +841,7 @@
-int
+int
tracker_files_get_mtime (TrackerClient *client, const char *uri, GError **error)
{
int result;
@@ -854,7 +854,7 @@
}
-GPtrArray *
+GPtrArray *
tracker_files_get_metadata_for_files_in_folder (TrackerClient *client, int live_query_id, const char *uri, char **fields, GError **error)
{
GPtrArray *table;
@@ -879,56 +879,56 @@
}
return array;
-
+
}
/* asynchronous calls */
-char **
-tracker_search_metadata_by_text_and_mime (TrackerClient *client, const char *query, const char **mimes, GError **error)
-{
- char **strs;
-
- if (!org_freedesktop_Tracker_Files_search_by_text_and_mime (client->proxy_files, query,(const char **) mimes, &strs, &*error)) {
- return NULL;
- }
- return strs;
-
-}
-
-
-char **
-tracker_search_metadata_by_text_and_mime_and_location (TrackerClient *client, const char *query, const char **mimes, const char *location, GError **error)
-{
- char **strs;
-
- if (!org_freedesktop_Tracker_Files_search_by_text_and_mime_and_location (client->proxy_files, query, (const char **)mimes, location, &strs, &*error)) {
- return NULL;
- }
- return strs;
-
-}
+char **
+tracker_search_metadata_by_text_and_mime (TrackerClient *client, const char *query, const char **mimes, GError **error)
+{
+ char **strs;
+
+ if (!org_freedesktop_Tracker_Files_search_by_text_and_mime (client->proxy_files, query,(const char **) mimes, &strs, &*error)) {
+ return NULL;
+ }
+ return strs;
+}
-char **
-tracker_search_metadata_by_text_and_location (TrackerClient *client, const char *query, const char *location, GError **error)
-{
- char **strs;
-
- if (!org_freedesktop_Tracker_Files_search_by_text_and_location (client->proxy_files, query, location, &strs, &*error)) {
- return NULL;
- }
- return strs;
-
+char **
+tracker_search_metadata_by_text_and_mime_and_location (TrackerClient *client, const char *query, const char **mimes, const char *location, GError **error)
+{
+ char **strs;
+
+ if (!org_freedesktop_Tracker_Files_search_by_text_and_mime_and_location (client->proxy_files, query, (const char **)mimes, location, &strs, &*error)) {
+ return NULL;
+ }
+ return strs;
+
+}
+
+
+
+char **
+tracker_search_metadata_by_text_and_location (TrackerClient *client, const char *query, const char *location, GError **error)
+{
+ char **strs;
+
+ if (!org_freedesktop_Tracker_Files_search_by_text_and_location (client->proxy_files, query, location, &strs, &*error)) {
+ return NULL;
+ }
+ return strs;
+
}
void
-tracker_get_version_async (TrackerClient *client, TrackerIntReply callback, gpointer user_data)
+tracker_get_version_async (TrackerClient *client, TrackerIntReply callback, gpointer user_data)
{
IntCallBackStruct *callback_struct;
@@ -939,18 +939,18 @@
client->last_pending_call = org_freedesktop_Tracker_get_version_async (client->proxy, tracker_int_reply, callback_struct);
-}
+}
void
-tracker_get_status_async (TrackerClient *client, TrackerStringReply callback, gpointer user_data)
+tracker_get_status_async (TrackerClient *client, TrackerStringReply callback, gpointer user_data)
{
-
+
StringCallBackStruct *callback_struct;
-
+
callback_struct = g_new (StringCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
client->last_pending_call = org_freedesktop_Tracker_get_status_async (client->proxy, tracker_string_reply, callback_struct);
}
@@ -959,7 +959,7 @@
void
-tracker_get_services_async (TrackerClient *client, gboolean main_services_only, TrackerHashTableReply callback, gpointer user_data)
+tracker_get_services_async (TrackerClient *client, gboolean main_services_only, TrackerHashTableReply callback, gpointer user_data)
{
HashTableCallBackStruct *callback_struct;
@@ -1042,7 +1042,7 @@
-void
+void
tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, char **keys, TrackerArrayReply callback, gpointer user_data)
{
ArrayCallBackStruct *callback_struct;
@@ -1054,7 +1054,7 @@
char *service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Metadata_get_async (client->proxy_metadata, service_str, id, (const char**)keys, tracker_array_reply, callback_struct);
-
+
}
@@ -1096,10 +1096,10 @@
-void
+void
tracker_metadata_get_registered_types_async (TrackerClient *client, const char *class, TrackerArrayReply callback, gpointer user_data)
{
-
+
ArrayCallBackStruct *callback_struct;
callback_struct = g_new (ArrayCallBackStruct, 1);
@@ -1114,7 +1114,7 @@
void
tracker_metadata_get_writeable_types_async (TrackerClient *client, const char *class, TrackerArrayReply callback, gpointer user_data)
{
-
+
ArrayCallBackStruct *callback_struct;
callback_struct = g_new (ArrayCallBackStruct, 1);
@@ -1130,7 +1130,7 @@
-void
+void
tracker_metadata_get_registered_classes_async (TrackerClient *client, TrackerArrayReply callback, gpointer user_data)
{
ArrayCallBackStruct *callback_struct;
@@ -1141,23 +1141,23 @@
client->last_pending_call = org_freedesktop_Tracker_Metadata_get_registered_classes_async (client->proxy_metadata, tracker_array_reply, callback_struct);
-
+
}
void
tracker_metadata_get_unique_values_async (TrackerClient *client, ServiceType service, char **meta_types, const char *query, gboolean descending, int offset, int max_hits, TrackerGPtrArrayReply callback, gpointer user_data)
{
-
+
GPtrArrayCallBackStruct *callback_struct;
char *service_str = tracker_service_types[service];
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
client->last_pending_call = org_freedesktop_Tracker_Metadata_get_unique_values_async (client->proxy_metadata, service_str, (const char **) meta_types, query, descending, offset, max_hits, tracker_GPtrArray_reply, callback_struct);
-
+
}
void
@@ -1190,23 +1190,23 @@
void
tracker_metadata_get_unique_values_with_count_async (TrackerClient *client, ServiceType service, char **meta_types, const char *query, char *count, gboolean descending, int offset, int max_hits, TrackerGPtrArrayReply callback, gpointer user_data)
{
-
+
GPtrArrayCallBackStruct *callback_struct;
char *service_str = tracker_service_types[service];
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
client->last_pending_call = org_freedesktop_Tracker_Metadata_get_unique_values_with_count_async (client->proxy_metadata, service_str, (const char **) meta_types, query, count, descending, offset, max_hits, tracker_GPtrArray_reply, callback_struct);
-
+
}
void
tracker_keywords_get_list_async (TrackerClient *client, ServiceType service, TrackerGPtrArrayReply callback, gpointer user_data)
{
-
+
GPtrArrayCallBackStruct *callback_struct;
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
@@ -1218,14 +1218,14 @@
client->last_pending_call = org_freedesktop_Tracker_Keywords_get_list_async (client->proxy_keywords, service_str, tracker_GPtrArray_reply, callback_struct);
-
+
}
-void
+void
tracker_keywords_get_async (TrackerClient *client, ServiceType service, const char *id, TrackerArrayReply callback, gpointer user_data)
{
-
+
ArrayCallBackStruct *callback_struct;
callback_struct = g_new (ArrayCallBackStruct, 1);
@@ -1235,7 +1235,7 @@
char *service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Keywords_get_async (client->proxy_keywords, service_str, id, tracker_array_reply, callback_struct);
-
+
}
@@ -1256,7 +1256,7 @@
-void
+void
tracker_keywords_remove_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data)
{
@@ -1273,7 +1273,7 @@
-void
+void
tracker_keywords_remove_all_async (TrackerClient *client, ServiceType service, const char *id, TrackerVoidReply callback, gpointer user_data)
{
@@ -1289,7 +1289,7 @@
}
-void
+void
tracker_keywords_search_async (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
{
@@ -1306,7 +1306,7 @@
}
-void
+void
tracker_search_text_get_hit_count_async (TrackerClient *client, ServiceType service, const char *search_text, TrackerIntReply callback, gpointer user_data)
{
char *service_str = tracker_service_types[service];
@@ -1332,13 +1332,13 @@
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
client->last_pending_call = org_freedesktop_Tracker_Search_get_hit_count_all_async (client->proxy_search, search_text, tracker_GPtrArray_reply, callback_struct);
-
+
}
-void
+void
tracker_search_text_async (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
{
@@ -1347,15 +1347,15 @@
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
char *service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Search_text_async (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, tracker_array_reply, callback_struct);
-
+
}
-void
+void
tracker_search_text_detailed_async (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, TrackerGPtrArrayReply callback, gpointer user_data)
{
@@ -1364,11 +1364,11 @@
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
char *service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Search_text_detailed_async (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, tracker_GPtrArray_reply, callback_struct);
-
+
}
@@ -1380,18 +1380,18 @@
callback_struct = g_new (StringCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
char *service_str = tracker_service_types[service];
- client->last_pending_call = org_freedesktop_Tracker_Search_get_snippet_async (client->proxy_search, service_str, uri, search_text, tracker_string_reply, callback_struct);
+ client->last_pending_call = org_freedesktop_Tracker_Search_get_snippet_async (client->proxy_search, service_str, uri, search_text, tracker_string_reply, callback_struct);
}
-void
+void
tracker_search_metadata_async (TrackerClient *client, ServiceType service, const char *field, const char* search_text, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
{
-
+
ArrayCallBackStruct *callback_struct;
callback_struct = g_new (ArrayCallBackStruct, 1);
@@ -1401,7 +1401,7 @@
char *service_str = tracker_service_types[service];
org_freedesktop_Tracker_Search_metadata_async (client->proxy_search, service_str, field, search_text, offset, max_hits, tracker_array_reply, callback_struct);
-
+
}
void
@@ -1412,11 +1412,11 @@
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
char *service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Search_query_async (client->proxy_search, live_query_id, service_str, (const char **)fields, search_text, keywords, query, sort_by_service, (const char **)sort_fields, sort_descending, offset, max_hits, tracker_GPtrArray_reply, callback_struct);
-
+
}
@@ -1429,13 +1429,13 @@
callback_struct = g_new (StringCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
client->last_pending_call = org_freedesktop_Tracker_Search_suggest_async (client->proxy_search, search_text, maxdist, tracker_string_reply, callback_struct);
-
+
}
-void
+void
tracker_files_create_async (TrackerClient *client, const char *uri, gboolean is_directory, const char *mime, int size, int mtime, TrackerVoidReply callback, gpointer user_data)
{
VoidCallBackStruct *callback_struct;
@@ -1448,7 +1448,7 @@
}
-void
+void
tracker_files_delete_async (TrackerClient *client, const char *uri, TrackerVoidReply callback, gpointer user_data)
{
@@ -1462,7 +1462,7 @@
}
-void
+void
tracker_files_get_text_contents_async (TrackerClient *client, const char *uri, int offset, int max_length, TrackerStringReply callback, gpointer user_data)
{
StringCallBackStruct *callback_struct;
@@ -1470,17 +1470,17 @@
callback_struct = g_new (StringCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
client->last_pending_call = org_freedesktop_Tracker_Files_get_text_contents_async (client->proxy_files, uri, offset, max_length, tracker_string_reply, callback_struct);
-
+
}
-void
+void
tracker_files_search_text_contents_async (TrackerClient *client, const char *uri, const char *search_text, int length, TrackerStringReply callback, gpointer user_data)
{
-
+
StringCallBackStruct *callback_struct;
callback_struct = g_new (StringCallBackStruct, 1);
@@ -1488,13 +1488,13 @@
callback_struct->data = user_data;
client->last_pending_call = org_freedesktop_Tracker_Files_search_text_contents_async (client->proxy_files, uri, search_text, length, tracker_string_reply, callback_struct);
-
-
+
+
}
-void
+void
tracker_files_get_by_service_type_async (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
{
ArrayCallBackStruct *callback_struct;
@@ -1502,7 +1502,7 @@
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
char *service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Files_get_by_service_type_async (client->proxy_files, live_query_id, service_str, offset, max_hits, tracker_array_reply, callback_struct);
@@ -1510,7 +1510,7 @@
-void
+void
tracker_files_get_by_mime_type_async (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
{
ArrayCallBackStruct *callback_struct;
@@ -1520,27 +1520,27 @@
callback_struct->data = user_data;
client->last_pending_call = org_freedesktop_Tracker_Files_get_by_mime_type_async (client->proxy_files, live_query_id, (const char **)mimes, offset, max_hits, tracker_array_reply, callback_struct);
-
+
}
-void
+void
tracker_files_get_by_mime_type_vfs_async (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
{
ArrayCallBackStruct *callback_struct;
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
- callback_struct->data = user_data;
+ callback_struct->data = user_data;
client->last_pending_call = org_freedesktop_Tracker_Files_get_by_mime_type_vfs_async (client->proxy_files, live_query_id,(const char **) mimes, offset, max_hits, tracker_array_reply, callback_struct);
-
+
}
-void
+void
tracker_files_get_mtime_async (TrackerClient *client, const char *uri, TrackerIntReply callback, gpointer user_data)
{
@@ -1551,7 +1551,7 @@
callback_struct->data = user_data;
client->last_pending_call = org_freedesktop_Tracker_Files_get_mtime_async (client->proxy_files, uri, tracker_int_reply, callback_struct);
-
+
}
@@ -1562,11 +1562,11 @@
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
- callback_struct->data = user_data;
+ callback_struct->data = user_data;
client->last_pending_call = org_freedesktop_Tracker_Files_get_metadata_for_files_in_folder_async (client->proxy_files, live_query_id, uri, (const char **)fields, tracker_GPtrArray_reply, callback_struct);
-
-
+
+
}
@@ -1574,14 +1574,14 @@
tracker_search_metadata_by_text_async (TrackerClient *client, const char *query, TrackerArrayReply callback, gpointer user_data)
{
ArrayCallBackStruct *callback_struct;
-
+
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
-
+
char *metadata;
char *keywords[2];
-
+
if (strchr (query, ':') != NULL) {
metadata = strtok ((char *)query, ":");
if(strcoll(metadata,"tag") == 0){
@@ -1601,10 +1601,10 @@
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
- callback_struct->data = user_data;
+ callback_struct->data = user_data;
client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_mime_async (client->proxy_files, query,(const char **) mimes, tracker_array_reply, callback_struct);
-
+
}
@@ -1615,10 +1615,10 @@
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
- callback_struct->data = user_data;
+ callback_struct->data = user_data;
client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_mime_and_location_async (client->proxy_files, query, (const char **)mimes, location, tracker_array_reply, callback_struct);
-
+
}
@@ -1630,9 +1630,9 @@
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
- callback_struct->data = user_data;
+ callback_struct->data = user_data;
client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_location_async (client->proxy_files, query, location, tracker_array_reply, callback_struct);
-
+
}
Modified: branches/indexer-split/src/libtracker/tracker.h
==============================================================================
--- branches/indexer-split/src/libtracker/tracker.h (original)
+++ branches/indexer-split/src/libtracker/tracker.h Sat Sep 20 14:45:00 2008
@@ -22,9 +22,9 @@
G_BEGIN_DECLS
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus/dbus-glib.h>
typedef void (*TrackerArrayReply) (char **result, GError *error, gpointer user_data);
typedef void (*TrackerHashTableReply) (GHashTable *result, GError *error, gpointer user_data);
@@ -37,10 +37,10 @@
typedef enum {
- METADATA_STRING_INDEXABLE,
- METADATA_STRING,
- METADATA_NUMERIC,
- METADATA_DATE
+ METADATA_STRING_INDEXABLE,
+ METADATA_STRING,
+ METADATA_NUMERIC,
+ METADATA_DATE
} MetadataTypes;
typedef enum {
@@ -92,7 +92,7 @@
DBusGProxy *proxy_keywords;
DBusGProxy *proxy_search;
DBusGProxy *proxy_files;
- DBusGProxyCall *last_pending_call;
+ DBusGProxyCall *last_pending_call;
} TrackerClient;
Modified: branches/indexer-split/src/tracker-applet/tracker-applet.c
==============================================================================
--- branches/indexer-split/src/tracker-applet/tracker-applet.c (original)
+++ branches/indexer-split/src/tracker-applet/tracker-applet.c Sat Sep 20 14:45:00 2008
@@ -155,7 +155,7 @@
GtkWidget *btn_close;
} TrayIconPrivate;
-static void set_auto_pause (TrayIcon *icon,
+static void set_auto_pause (TrayIcon *icon,
gboolean pause);
static TrayIcon *main_icon;
@@ -189,7 +189,7 @@
static gboolean disable_daemon_start;
static GOptionEntry entries[] = {
- { "disable-daemon-start", 'd', 0, G_OPTION_ARG_NONE, &disable_daemon_start,
+ { "disable-daemon-start", 'd', 0, G_OPTION_ARG_NONE, &disable_daemon_start,
NULL,
NULL
},
@@ -226,7 +226,7 @@
GString *hint;
priv = TRAY_ICON_GET_PRIVATE (icon);
-
+
hint = g_string_new ("Tracker");
switch (priv->index_state) {
@@ -282,9 +282,9 @@
gchar *str1;
gchar *str2;
- str1 = tracker_seconds_estimate_to_string (priv->seconds_elapsed,
+ str1 = tracker_seconds_estimate_to_string (priv->seconds_elapsed,
FALSE,
- priv->items_done,
+ priv->items_done,
priv->items_remaining);
str2 = tracker_seconds_to_string (priv->seconds_elapsed, FALSE);
@@ -301,7 +301,7 @@
"\n"
"%s : %d of %d\n"
"%s : %s\n"
- "%s : %s",
+ "%s : %s",
_("Done"),
priv->items_done,
priv->items_total,
@@ -332,9 +332,9 @@
priv = TRAY_ICON_GET_PRIVATE (icon);
- if (priv->user_pause ||
+ if (priv->user_pause ||
priv->pause_state == PAUSE_BATTERY ||
- priv->disabled ||
+ priv->disabled ||
priv->indexer_stopped) {
return FALSE;
}
@@ -358,10 +358,10 @@
gchar *path;
name = index_icons[priv->index_icon];
- path = g_build_filename (SHAREDIR,
- "tracker",
- "icons",
- name,
+ path = g_build_filename (SHAREDIR,
+ "tracker",
+ "icons",
+ name,
NULL);
if (g_file_test (path, G_FILE_TEST_EXISTS)) {
@@ -391,8 +391,8 @@
}
}
- if (priv->user_pause ||
- priv->auto_pause ||
+ if (priv->user_pause ||
+ priv->auto_pause ||
priv->pause_state != PAUSE_NONE) {
if (priv->index_icon != ICON_PAUSED) {
priv->index_icon = ICON_PAUSED;
@@ -444,18 +444,18 @@
return FALSE;
}
- dbus_g_proxy_begin_call (priv->tracker->proxy,
+ dbus_g_proxy_begin_call (priv->tracker->proxy,
"PromptIndexSignals",
- NULL,
- NULL,
- NULL,
+ NULL,
+ NULL,
+ NULL,
G_TYPE_INVALID);
return TRUE;
}
static void
-set_auto_pause (TrayIcon *icon,
+set_auto_pause (TrayIcon *icon,
gboolean pause)
{
TrayIconPrivate *priv;
@@ -512,7 +512,7 @@
}
static void
-set_user_pause (TrayIcon *icon,
+set_user_pause (TrayIcon *icon,
gboolean pause)
{
TrayIconPrivate *priv;
@@ -524,7 +524,7 @@
}
static void
-notice_events_inner (Window window,
+notice_events_inner (Window window,
gboolean enable,
gboolean top)
{
@@ -544,10 +544,10 @@
}
kids = NULL;
- status = XQueryTree (GDK_DISPLAY (),
- window,
- &root,
- &parent,
+ status = XQueryTree (GDK_DISPLAY (),
+ window,
+ &root,
+ &parent,
&kids,
&nkids);
@@ -601,17 +601,17 @@
/* Select for SubstructureNotify on all windows.
* Select for KeyPress on all windows that already have it selected.
- *
+ *
* Note that we can't select for ButtonPress, because of X braindamage:
* only one client at a time may select for ButtonPress on a given
* window, though any number can select for KeyPress. Someone explain
* *that* to me.
- *
+ *
* So, if the user spends a while clicking the mouse without ever moving
* the mouse or touching the keyboard, we won't know that they've been
* active, and the screensaver will come on. That sucks, but I don't
* know how to get around it.
- *
+ *
* Since X presents mouse wheels as clicks, this applies to those, too:
* scrolling through a document using only the mouse wheel doesn't
* count as activity... Fortunately, /proc/interrupts helps, on
@@ -635,7 +635,7 @@
}
static void
-notice_events (Window window,
+notice_events (Window window,
gboolean enable)
{
gdk_error_trap_push ();
@@ -653,7 +653,7 @@
}
static GdkFilterReturn
-filter_x_events (GdkXEvent *xevent,
+filter_x_events (GdkXEvent *xevent,
GdkEvent *event,
gpointer data)
{
@@ -679,7 +679,7 @@
case CreateNotify: {
Window window;
-
+
window = ev->xcreatewindow.window;
start_notice_events (window);
@@ -759,7 +759,7 @@
if (!g_spawn_command_line_async (command, &error)) {
g_warning ("Unable to execute command:'%s', %s",
- command,
+ command,
error->message);
g_error_free (error);
}
@@ -785,7 +785,7 @@
}
static inline void
-set_auto_pause_setting (TrayIcon *icon,
+set_auto_pause_setting (TrayIcon *icon,
AutoPauseEnum auto_pause)
{
TrayIconPrivate *priv;
@@ -805,10 +805,10 @@
priv = TRAY_ICON_GET_PRIVATE (icon);
- g_key_file_set_boolean (priv->keyfile,
+ g_key_file_set_boolean (priv->keyfile,
"Applet", "AnimateWhenIndexing",
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->chk_animate)));
- g_key_file_set_boolean (priv->keyfile,
+ g_key_file_set_boolean (priv->keyfile,
"Applet", "AutoHideIcon",
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->chk_show_icon)));
g_key_file_set_integer (priv->keyfile, "Applet", "SmartPause",
@@ -827,7 +827,7 @@
}
static void
-prefs_closed (GtkWidget *widget,
+prefs_closed (GtkWidget *widget,
gpointer data)
{
TrayIconPrivate *priv;
@@ -888,7 +888,7 @@
}
static void
-chk_animate_toggled_cb (GtkToggleButton *check_button,
+chk_animate_toggled_cb (GtkToggleButton *check_button,
gpointer user_data)
{
TrayIcon *icon;
@@ -901,7 +901,7 @@
}
static void
-chk_show_icon_toggled_cb (GtkToggleButton *check_button,
+chk_show_icon_toggled_cb (GtkToggleButton *check_button,
gpointer user_data)
{
TrayIcon *icon;
@@ -929,8 +929,8 @@
gchar *filename;
priv = TRAY_ICON_GET_PRIVATE (icon);
- filename = g_build_filename (SHAREDIR,
- "tracker",
+ filename = g_build_filename (SHAREDIR,
+ "tracker",
"tracker-applet-prefs.glade",
NULL);
glade = glade_xml_new (filename, NULL, NULL);
@@ -1000,8 +1000,8 @@
}
static void
-restart_tracker (GtkDialog *dialog,
- gint response,
+restart_tracker (GtkDialog *dialog,
+ gint response,
TrayIcon *icon)
{
gtk_widget_destroy (GTK_WIDGET (dialog));
@@ -1025,7 +1025,7 @@
}
static void
-reindex (GtkMenuItem *item,
+reindex (GtkMenuItem *item,
TrayIcon *icon)
{
GtkWidget *dialog;
@@ -1059,7 +1059,7 @@
}
static void
-applet_preferences_menu_activated (GtkMenuItem *item,
+applet_preferences_menu_activated (GtkMenuItem *item,
gpointer data)
{
TrayIconPrivate *priv;
@@ -1072,7 +1072,7 @@
}
static void
-preferences_menu_activated (GtkMenuItem *item,
+preferences_menu_activated (GtkMenuItem *item,
gpointer data)
{
GError *error = NULL;
@@ -1082,15 +1082,15 @@
if (!g_spawn_command_line_async (command, &error)) {
g_warning ("Unable to execute command:'%s', %s",
- command,
+ command,
error->message);
g_error_free (error);
}
}
static void
-stat_window_free (GtkWidget *widget,
- gint arg,
+stat_window_free (GtkWidget *widget,
+ gint arg,
gpointer data)
{
TrayIcon *icon;
@@ -1105,7 +1105,7 @@
}
static gchar *
-get_stat_value (gchar ***stat_array,
+get_stat_value (gchar ***stat_array,
const gchar *stat)
{
gchar **array;
@@ -1125,8 +1125,8 @@
}
static void
-update_stats (GPtrArray *array,
- GError *error,
+update_stats (GPtrArray *array,
+ GError *error,
gpointer data)
{
TrayIcon *icon;
@@ -1172,7 +1172,7 @@
refresh_stats (TrayIcon *icon)
{
TrayIconPrivate *priv;
-
+
priv = TRAY_ICON_GET_PRIVATE (icon);
if (!priv->stat_window_active || priv->stat_request_pending) {
@@ -1182,12 +1182,12 @@
priv->stat_request_pending = TRUE;
tracker_get_stats_async (priv->tracker,
- (TrackerGPtrArrayReply) update_stats,
+ (TrackerGPtrArrayReply) update_stats,
icon);
}
static void
-statistics_menu_activated (GtkMenuItem *item,
+statistics_menu_activated (GtkMenuItem *item,
gpointer data)
{
TrayIcon *icon;
@@ -1264,7 +1264,7 @@
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
dialog_hbox);
- g_signal_connect (G_OBJECT (dialog), "response",
+ g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (stat_window_free),
icon);
@@ -1272,7 +1272,7 @@
}
static void
-open_uri (GtkWindow *parent,
+open_uri (GtkWindow *parent,
const char *uri)
{
GtkWidget *dialog;
@@ -1299,16 +1299,16 @@
}
static void
-about_url_hook (GtkAboutDialog *dialog,
- const gchar *url,
+about_url_hook (GtkAboutDialog *dialog,
+ const gchar *url,
gpointer data)
{
open_uri (GTK_WINDOW (dialog), url);
}
static void
-about_email_hook (GtkAboutDialog *dialog,
- const gchar *email,
+about_email_hook (GtkAboutDialog *dialog,
+ const gchar *email,
gpointer data)
{
gchar *uri;
@@ -1391,7 +1391,7 @@
}
static void
-quit_menu_activated (GtkMenuItem *item,
+quit_menu_activated (GtkMenuItem *item,
gpointer data)
{
gtk_main_quit ();
@@ -1481,19 +1481,19 @@
}
static void
-index_finished (DBusGProxy *proxy,
- gdouble seconds_elapsed,
+index_finished (DBusGProxy *proxy,
+ gdouble seconds_elapsed,
TrayIcon *icon)
{
gchar *str;
str = tracker_seconds_to_string (seconds_elapsed, FALSE);
- tray_icon_show_message (icon,
+ tray_icon_show_message (icon,
"%s in %s.\n"
"\n"
- "%s",
+ "%s",
_("Tracker has finished indexing your system"),
- str,
+ str,
_("You can now perform searches by clicking here"));
g_free (str);
@@ -1501,13 +1501,13 @@
}
static void
-index_state_changed (DBusGProxy *proxy,
+index_state_changed (DBusGProxy *proxy,
const gchar *state,
- gboolean initial_index,
+ gboolean initial_index,
gboolean in_merge,
- gboolean is_manual_paused,
+ gboolean is_manual_paused,
gboolean is_battery_paused,
- gboolean is_io_paused,
+ gboolean is_io_paused,
gboolean is_indexing_enabled,
TrayIcon *icon)
{
@@ -1537,7 +1537,7 @@
if (!priv->initial_index_msg_shown && initial_index) {
priv->initial_index_msg_shown = TRUE;
g_usleep (G_USEC_PER_SEC / 10);
- tray_icon_show_message (icon,
+ tray_icon_show_message (icon,
"%s\n"
"\n"
"%s\n",
@@ -1596,11 +1596,11 @@
}
static void
-index_progress_changed (DBusGProxy *proxy,
+index_progress_changed (DBusGProxy *proxy,
const gchar *service,
const gchar *uri,
gint items_done,
- gint items_remaining,
+ gint items_remaining,
gint items_total,
gdouble seconds_elapsed,
TrayIcon *icon)
@@ -1616,8 +1616,8 @@
priv->email_indexing = strcmp (service, "Emails") == 0;
- g_print ("Indexed %d/%d, seconds elapsed:%f\n",
- items_done,
+ g_print ("Indexed %d/%d, seconds elapsed:%f\n",
+ items_done,
items_total,
seconds_elapsed);
@@ -1657,9 +1657,9 @@
}
static void
-name_owner_changed (DBusGProxy *proxy,
+name_owner_changed (DBusGProxy *proxy,
const gchar *name,
- const gchar *prev_owner,
+ const gchar *prev_owner,
const gchar *new_owner,
gpointer data)
{
@@ -1675,14 +1675,14 @@
/* Tracker has exited so reset status and make
* invisible until trackerd relaunched.
*/
- index_state_changed (proxy,
- "Idle",
- FALSE,
- FALSE,
+ index_state_changed (proxy,
+ "Idle",
+ FALSE,
+ FALSE,
FALSE,
FALSE,
- FALSE,
- FALSE,
+ FALSE,
+ FALSE,
data);
init_settings (data);
@@ -1705,7 +1705,7 @@
if (!g_spawn_command_line_async (command, &error)) {
g_warning ("Unable to execute command:'%s', %s",
- command,
+ command,
error->message);
g_error_free (error);
}
@@ -1719,7 +1719,7 @@
TrayIconPrivate *priv;
DBusGConnection *connection;
DBusGProxy *dbus_proxy;
-
+
priv = TRAY_ICON_GET_PRIVATE (icon);
priv->tracker = tracker_connect (FALSE);
@@ -1731,21 +1731,21 @@
/* Set signal handlers */
dbus_g_object_register_marshaller (tracker_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN,
- G_TYPE_NONE,
- G_TYPE_STRING,
- G_TYPE_BOOLEAN,
+ G_TYPE_NONE,
+ G_TYPE_STRING,
+ G_TYPE_BOOLEAN,
+ G_TYPE_BOOLEAN,
+ G_TYPE_BOOLEAN,
+ G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN,
G_TYPE_INVALID);
- dbus_g_object_register_marshaller (tracker_VOID__STRING_STRING_INT_INT_INT_DOUBLE,
+ dbus_g_object_register_marshaller (tracker_VOID__STRING_STRING_INT_INT_INT_DOUBLE,
G_TYPE_NONE,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_INT,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_INT,
G_TYPE_INT,
G_TYPE_INT,
G_TYPE_DOUBLE,
@@ -1759,7 +1759,7 @@
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN,
+ G_TYPE_BOOLEAN,
G_TYPE_INVALID);
dbus_g_proxy_add_signal (priv->tracker->proxy,
@@ -1767,8 +1767,8 @@
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_INT,
- G_TYPE_INT,
- G_TYPE_INT,
+ G_TYPE_INT,
+ G_TYPE_INT,
G_TYPE_DOUBLE,
G_TYPE_INVALID);
@@ -1786,13 +1786,13 @@
dbus_g_proxy_connect_signal (priv->tracker->proxy,
"IndexProgress",
G_CALLBACK (index_progress_changed),
- icon,
+ icon,
NULL);
dbus_g_proxy_connect_signal (priv->tracker->proxy,
"IndexFinished",
- G_CALLBACK (index_finished),
- icon,
+ G_CALLBACK (index_finished),
+ icon,
NULL);
connection = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
@@ -1813,19 +1813,19 @@
icon, NULL);
/* Prompt for updated signals */
- dbus_g_proxy_begin_call (priv->tracker->proxy,
+ dbus_g_proxy_begin_call (priv->tracker->proxy,
"PromptIndexSignals",
- NULL,
- NULL,
- NULL,
+ NULL,
+ NULL,
+ NULL,
G_TYPE_INVALID);
return FALSE;
}
static void
-tray_icon_clicked (GtkStatusIcon *status_icon,
- guint button,
+tray_icon_clicked (GtkStatusIcon *status_icon,
+ guint button,
guint timestamp,
gpointer data)
{
@@ -1835,10 +1835,10 @@
icon = TRAY_ICON (data);
priv = TRAY_ICON_GET_PRIVATE (icon);
- gtk_menu_popup (GTK_MENU (priv->menu),
+ gtk_menu_popup (GTK_MENU (priv->menu),
NULL, NULL,
gtk_status_icon_position_menu,
- status_icon,
+ status_icon,
button,
timestamp);
}
@@ -1860,10 +1860,10 @@
priv->reindex = FALSE;
g_signal_connect (G_OBJECT (priv->icon), "activate",
- G_CALLBACK (activate_icon),
+ G_CALLBACK (activate_icon),
instance);
g_signal_connect (G_OBJECT (priv->icon), "popup-menu",
- G_CALLBACK (tray_icon_clicked),
+ G_CALLBACK (tray_icon_clicked),
instance);
/* Build context menu */
@@ -1875,8 +1875,8 @@
}
void
-tray_icon_set_tooltip (TrayIcon *icon,
- const gchar *format,
+tray_icon_set_tooltip (TrayIcon *icon,
+ const gchar *format,
...)
{
TrayIconPrivate *priv;
@@ -1896,14 +1896,14 @@
void
tray_icon_show_message (TrayIcon *icon,
- const gchar *message,
+ const gchar *message,
...)
{
TrayIconPrivate *priv;
NotifyNotification *notification;
gchar *msg = NULL;
va_list args;
-
+
priv = TRAY_ICON_GET_PRIVATE (icon);
va_start (args, message);
@@ -1919,9 +1919,9 @@
}
notification =
- notify_notification_new_with_status_icon ("Tracker",
+ notify_notification_new_with_status_icon ("Tracker",
msg,
- NULL,
+ NULL,
priv->icon);
notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
@@ -1940,17 +1940,17 @@
if (type == 0) {
static const GTypeInfo info = {
sizeof (TrayIconClass),
- NULL,
- NULL,
+ NULL,
+ NULL,
(GClassInitFunc) tray_icon_class_init,
- NULL,
- NULL,
+ NULL,
+ NULL,
sizeof (TrayIcon),
- 0,
- tray_icon_init
+ 0,
+ tray_icon_init
};
- type = g_type_register_static (G_TYPE_OBJECT,
+ type = g_type_register_static (G_TYPE_OBJECT,
"TrayIconType",
&info,
0);
@@ -1975,11 +1975,11 @@
gchar *tracker_dir;
gchar *contents;
- tracker_dir = g_build_path (g_get_user_config_dir (),
- "tracker",
+ tracker_dir = g_build_path (g_get_user_config_dir (),
+ "tracker",
NULL);
- if (!g_file_test (tracker_dir, G_FILE_TEST_EXISTS)) {
+ if (!g_file_test (tracker_dir, G_FILE_TEST_EXISTS)) {
g_mkdir_with_parents (tracker_dir, 0700);
}
@@ -1990,19 +1990,19 @@
"\n",
"AutoHideIcon=false\n"
"\n",
- "SmartPause=2\n",
+ "SmartPause=2\n",
NULL);
g_file_set_contents (priv->filename,
contents,
- strlen (contents),
+ strlen (contents),
NULL);
g_free (contents);
}
- if (!g_key_file_load_from_file (priv->keyfile,
- priv->filename,
- G_KEY_FILE_KEEP_COMMENTS,
+ if (!g_key_file_load_from_file (priv->keyfile,
+ priv->filename,
+ G_KEY_FILE_KEEP_COMMENTS,
&error) || error) {
if (error) {
g_warning ("Call to g_key_file_load_from_file() failed for filename:'%s', %s\n",
@@ -2017,37 +2017,37 @@
return FALSE;
}
- if (g_key_file_has_key (priv->keyfile,
- "Applet",
- "AnimateWhenIndexing",
+ if (g_key_file_has_key (priv->keyfile,
+ "Applet",
+ "AnimateWhenIndexing",
NULL)) {
- priv->show_animation = g_key_file_get_boolean (priv->keyfile,
+ priv->show_animation = g_key_file_get_boolean (priv->keyfile,
"Applet",
- "AnimateWhenIndexing",
+ "AnimateWhenIndexing",
NULL);
} else {
priv->show_animation = TRUE;
}
- if (g_key_file_has_key (priv->keyfile,
- "Applet",
- "AutoHideIcon",
+ if (g_key_file_has_key (priv->keyfile,
+ "Applet",
+ "AutoHideIcon",
NULL)) {
- priv->auto_hide = g_key_file_get_boolean (priv->keyfile,
+ priv->auto_hide = g_key_file_get_boolean (priv->keyfile,
"Applet",
- "AutoHideIcon",
+ "AutoHideIcon",
NULL);
} else {
priv->auto_hide = FALSE;
}
- if (g_key_file_has_key (priv->keyfile,
- "Applet",
- "SmartPause",
+ if (g_key_file_has_key (priv->keyfile,
+ "Applet",
+ "SmartPause",
NULL)) {
- priv->auto_pause_setting = g_key_file_get_integer (priv->keyfile,
+ priv->auto_pause_setting = g_key_file_get_integer (priv->keyfile,
"Applet",
- "SmartPause",
+ "SmartPause",
NULL);
} else {
priv->auto_pause_setting = AUTO_PAUSE_MERGING;
@@ -2101,7 +2101,7 @@
g_print ("Initializing libnotify\n");
- if (!notify_is_initted () &&
+ if (!notify_is_initted () &&
!notify_init (PROGRAM_NAME)) {
g_warning ("Call to notify_init() failed\n");
return EXIT_FAILURE;
@@ -2112,13 +2112,13 @@
gtk_window_set_default_icon_name ("tracker");
g_set_application_name (_("Tracker"));
- initial_index_1 =
+ initial_index_1 =
_("Your computer is about to be indexed so "
"you can perform fast searches of your files and emails");
- initial_index_2 =
+ initial_index_2 =
_("You can pause indexing at any time and "
"configure index settings by right clicking here");
-
+
stat_info[0].label = _("Files:");
stat_info[1].label = _(" Folders:");
stat_info[2].label = _(" Documents:");
@@ -2143,7 +2143,7 @@
priv->keyfile = NULL;
priv->filename = g_build_filename (g_get_user_config_dir (),
"tracker"
- "tracker-applet.cfg",
+ "tracker-applet.cfg",
NULL);
if (!load_options (main_icon)) {
Modified: branches/indexer-split/src/tracker-applet/tracker-applet.h
==============================================================================
--- branches/indexer-split/src/tracker-applet/tracker-applet.h (original)
+++ branches/indexer-split/src/tracker-applet/tracker-applet.h Sat Sep 20 14:45:00 2008
@@ -54,7 +54,7 @@
void
tray_icon_set_tooltip (TrayIcon *icon, const gchar *format, ...);
-void
+void
tray_icon_show_message (TrayIcon *icon, const gchar *message, ...);
#endif
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-abw.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-abw.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-abw.c Sat Sep 20 14:45:00 2008
@@ -36,7 +36,7 @@
#include "tracker-extract.h"
-static void extract_abw (const gchar *filename,
+static void extract_abw (const gchar *filename,
GHashTable *metadata);
static TrackerExtractorData data[] = {
@@ -45,7 +45,7 @@
};
static void
-extract_abw (const gchar *filename,
+extract_abw (const gchar *filename,
GHashTable *metadata)
{
gint fd;
@@ -78,22 +78,22 @@
}
else if (g_str_has_prefix (line, "<m key=\"dc.subject\">")) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Subject"),
+ g_strdup ("Doc:Subject"),
g_strdup (line + 20));
}
else if (g_str_has_prefix (line, "<m key=\"dc.creator\">")) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Author"),
+ g_strdup ("Doc:Author"),
g_strdup (line + 20));
}
else if (g_str_has_prefix (line, "<m key=\"abiword.keywords\">")) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Keywords"),
+ g_strdup ("Doc:Keywords"),
g_strdup (line + 26));
}
else if (g_str_has_prefix (line, "<m key=\"dc.description\">")) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Comments"),
+ g_strdup ("Doc:Comments"),
g_strdup (line + 24));
}
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-exif.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-exif.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-exif.c Sat Sep 20 14:45:00 2008
@@ -77,12 +77,12 @@
if (sep) {
gdouble fraction = g_ascii_strtod (sep+1, NULL);
-
- if (fraction > 0) {
+
+ if (fraction > 0) {
gdouble val = 1.0f / fraction;
char str_value[30];
-
- g_ascii_dtostr (str_value, 30, val);
+
+ g_ascii_dtostr (str_value, 30, val);
return g_strdup (str_value);
}
}
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-gstreamer.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-gstreamer.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-gstreamer.c Sat Sep 20 14:45:00 2008
@@ -103,8 +103,8 @@
};
static void
-caps_set (GObject *object,
- MetadataExtractor *extractor,
+caps_set (GObject *object,
+ MetadataExtractor *extractor,
const gchar *type)
{
GstPad *pad;
@@ -121,16 +121,16 @@
if (s) {
if (!strcmp (type, "audio")) {
- if ((extractor->audio_channels != -1 &&
+ if ((extractor->audio_channels != -1 &&
extractor->audio_samplerate != -1) ||
!(gst_structure_get_int (s, "channels", &extractor->audio_channels) &&
gst_structure_get_int (s, "rate", &extractor->audio_samplerate))) {
return;
}
} else if (!strcmp (type, "video")) {
- if ((extractor->video_fps_n != -1 &&
- extractor->video_fps_d != -1 &&
- extractor->video_width != -1 &&
+ if ((extractor->video_fps_n != -1 &&
+ extractor->video_fps_d != -1 &&
+ extractor->video_width != -1 &&
extractor->video_height != -1) ||
!(gst_structure_get_fraction (s, "framerate", &extractor->video_fps_n, &extractor->video_fps_d) &&
gst_structure_get_int (s, "width", &extractor->video_width) &&
@@ -146,7 +146,7 @@
}
static void
-caps_set_audio (GObject *object,
+caps_set_audio (GObject *object,
MetadataExtractor *extractor)
{
g_return_if_fail (object);
@@ -156,7 +156,7 @@
}
static void
-caps_set_video (GObject *object,
+caps_set_video (GObject *object,
MetadataExtractor *extractor)
{
g_return_if_fail (object);
@@ -234,8 +234,8 @@
}
static void
-gst_bus_cb (GstBus *bus,
- GstMessage *message,
+gst_bus_cb (GstBus *bus,
+ GstMessage *message,
MetadataExtractor *extractor)
{
GstMessageType msg_type;
@@ -281,8 +281,8 @@
old_state = new_state = GST_STATE_NULL;
gst_message_parse_state_changed (message,
- &old_state,
- &new_state,
+ &old_state,
+ &new_state,
NULL);
if (old_state == new_state) {
@@ -335,8 +335,8 @@
GST_DEBUG ("Tags: %" GST_PTR_FORMAT, tag_list);
/* All tags */
- result = gst_tag_list_merge (extractor->tagcache,
- tag_list,
+ result = gst_tag_list_merge (extractor->tagcache,
+ tag_list,
GST_TAG_MERGE_KEEP);
if (extractor->tagcache) {
@@ -346,7 +346,7 @@
extractor->tagcache = result;
/* media-type-specific tags */
- if (GST_IS_ELEMENT (message->src) &&
+ if (GST_IS_ELEMENT (message->src) &&
(f = gst_element_get_factory (GST_ELEMENT (message->src)))) {
GstTagList **cache;
const gchar *klass;
@@ -361,8 +361,8 @@
}
if (cache) {
- result = gst_tag_list_merge (*cache,
- tag_list,
+ result = gst_tag_list_merge (*cache,
+ tag_list,
GST_TAG_MERGE_KEEP);
if (*cache) {
gst_tag_list_free (*cache);
@@ -383,8 +383,8 @@
}
static void
-add_int64_info (GHashTable *metadata,
- gchar *key,
+add_int64_info (GHashTable *metadata,
+ gchar *key,
gint64 info)
{
gchar *str_info;
@@ -394,8 +394,8 @@
}
static void
-add_uint_info (GHashTable *metadata,
- gchar *key,
+add_uint_info (GHashTable *metadata,
+ gchar *key,
guint info)
{
gchar *str_info;
@@ -405,9 +405,9 @@
}
static void
-add_string_gst_tag (GHashTable *metadata,
- const gchar *key,
- GstTagList *tag_list,
+add_string_gst_tag (GHashTable *metadata,
+ const gchar *key,
+ GstTagList *tag_list,
const gchar *tag)
{
gchar *s;
@@ -418,8 +418,8 @@
if (s) {
if (ret && s[0] != '\0') {
- g_hash_table_insert (metadata,
- g_strdup (key),
+ g_hash_table_insert (metadata,
+ g_strdup (key),
s);
} else {
g_free (s);
@@ -429,8 +429,8 @@
static void
add_uint_gst_tag (GHashTable *metadata,
- const gchar *key,
- GstTagList *tag_list,
+ const gchar *key,
+ GstTagList *tag_list,
const gchar *tag)
{
gboolean ret;
@@ -440,15 +440,15 @@
if (ret) {
g_hash_table_insert (metadata,
- g_strdup (key),
+ g_strdup (key),
g_strdup_printf ("%d", n));
}
}
static void
-add_double_gst_tag (GHashTable *metadata,
- const gchar *key,
- GstTagList *tag_list,
+add_double_gst_tag (GHashTable *metadata,
+ const gchar *key,
+ GstTagList *tag_list,
const gchar *tag)
{
gboolean ret;
@@ -457,16 +457,16 @@
ret = gst_tag_list_get_double (tag_list, tag, &n);
if (ret) {
- g_hash_table_insert (metadata,
- g_strdup (key),
+ g_hash_table_insert (metadata,
+ g_strdup (key),
g_strdup_printf ("%f", n));
}
}
static void
add_year_of_gdate_gst_tag (GHashTable *metadata,
- const gchar *key,
- GstTagList *tag_list,
+ const gchar *key,
+ GstTagList *tag_list,
const gchar *tag)
{
GDate *date;
@@ -479,8 +479,8 @@
gchar buf[10];
if (g_date_strftime (buf, 10, "%Y", date)) {
- g_hash_table_insert (metadata,
- g_strdup (key),
+ g_hash_table_insert (metadata,
+ g_strdup (key),
g_strdup (buf));
}
}
@@ -503,9 +503,9 @@
duration = -1;
- if (gst_element_query_duration (extractor->playbin,
- &fmt,
- &duration) &&
+ if (gst_element_query_duration (extractor->playbin,
+ &fmt,
+ &duration) &&
duration >= 0) {
return duration / GST_SECOND;
} else {
@@ -514,44 +514,44 @@
}
static void
-extract_metadata (MetadataExtractor *extractor,
+extract_metadata (MetadataExtractor *extractor,
GHashTable *metadata)
{
g_return_if_fail (extractor);
g_return_if_fail (metadata);
if (extractor->audio_channels >= 0) {
- add_uint_info (metadata,
- g_strdup ("Audio:Channels"),
+ add_uint_info (metadata,
+ g_strdup ("Audio:Channels"),
extractor->audio_channels);
}
if (extractor->audio_samplerate >= 0) {
- add_uint_info (metadata,
- g_strdup ("Audio:Samplerate"),
+ add_uint_info (metadata,
+ g_strdup ("Audio:Samplerate"),
extractor->audio_samplerate);
}
if (extractor->video_height >= 0) {
if (extractor->mime == EXTRACT_MIME_IMAGE) {
- add_uint_info (metadata,
- g_strdup ("Image:Height"),
+ add_uint_info (metadata,
+ g_strdup ("Image:Height"),
extractor->video_height);
} else {
- add_uint_info (metadata,
- g_strdup ("Video:Height"),
+ add_uint_info (metadata,
+ g_strdup ("Video:Height"),
extractor->video_height);
}
}
if (extractor->video_width >= 0) {
if (extractor->mime == EXTRACT_MIME_IMAGE) {
- add_uint_info (metadata,
- g_strdup ("Image:Width"),
+ add_uint_info (metadata,
+ g_strdup ("Image:Width"),
extractor->video_height);
} else {
- add_uint_info (metadata,
- g_strdup ("Video:Width"),
+ add_uint_info (metadata,
+ g_strdup ("Video:Width"),
extractor->video_height);
}
}
@@ -589,7 +589,7 @@
duration = get_media_duration (extractor);
- if (extractor->mime == EXTRACT_MIME_IMAGE &&
+ if (extractor->mime == EXTRACT_MIME_IMAGE &&
extractor->has_video) {
add_string_gst_tag (metadata, "Image:Title", extractor->tagcache, GST_TAG_TITLE);
add_string_gst_tag (metadata, "Image:Comments", extractor->tagcache, GST_TAG_COMMENT);
@@ -628,7 +628,7 @@
}
static gboolean
-poll_for_state_change (MetadataExtractor *extractor,
+poll_for_state_change (MetadataExtractor *extractor,
GstState state)
{
GstBus *bus;
@@ -639,9 +639,9 @@
bus = gst_element_get_bus (extractor->playbin);
- events =
- GST_MESSAGE_STATE_CHANGED |
- GST_MESSAGE_ERROR |
+ events =
+ GST_MESSAGE_STATE_CHANGED |
+ GST_MESSAGE_ERROR |
GST_MESSAGE_EOS;
saved_events = extractor->ignore_messages_mask;
@@ -719,21 +719,21 @@
success:
/* State change succeeded */
- GST_DEBUG ("state change to %s succeeded",
+ GST_DEBUG ("state change to %s succeeded",
gst_element_state_get_name (state));
extractor->ignore_messages_mask = saved_events;
return TRUE;
timed_out:
/* It's taking a long time to open */
- GST_DEBUG ("state change to %s timed out, returning success",
+ GST_DEBUG ("state change to %s timed out, returning success",
gst_element_state_get_name (state));
extractor->ignore_messages_mask = saved_events;
return TRUE;
error:
/* Already set *error */
- GST_DEBUG ("error while waiting for state change to %s",
+ GST_DEBUG ("error while waiting for state change to %s",
gst_element_state_get_name (state));
extractor->ignore_messages_mask = saved_events;
return FALSE;
@@ -741,7 +741,7 @@
static void
tracker_extract_gstreamer (const gchar *uri,
- GHashTable *metadata,
+ GHashTable *metadata,
ExtractMime type)
{
MetadataExtractor *extractor;
@@ -803,19 +803,19 @@
/* Check that we have the minimum data. FIXME We should not need to do this */
if (!g_hash_table_lookup (metadata, "Audio:Title")) {
- g_hash_table_insert (metadata, g_strdup ("Audio:Title"), g_strdup ("tracker:unknown"));
+ g_hash_table_insert (metadata, g_strdup ("Audio:Title"), g_strdup ("tracker:unknown"));
}
if (!g_hash_table_lookup (metadata, "Audio:Album")) {
- g_hash_table_insert (metadata, g_strdup ("Audio:Album"), g_strdup ("tracker:unknown"));
+ g_hash_table_insert (metadata, g_strdup ("Audio:Album"), g_strdup ("tracker:unknown"));
}
if (!g_hash_table_lookup (metadata, "Audio:Artist")) {
- g_hash_table_insert (metadata, g_strdup ("Audio:Artist"), g_strdup ("tracker:unknown"));
+ g_hash_table_insert (metadata, g_strdup ("Audio:Artist"), g_strdup ("tracker:unknown"));
}
if (!g_hash_table_lookup (metadata, "Audio:Genre")) {
- g_hash_table_insert (metadata, g_strdup ("Audio:Genre"), g_strdup ("tracker:unknown"));
+ g_hash_table_insert (metadata, g_strdup ("Audio:Genre"), g_strdup ("tracker:unknown"));
}
/* Also clean up */
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-html.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-html.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-html.c Sat Sep 20 14:45:00 2008
@@ -37,7 +37,7 @@
tag_type current;
} HTMLParseInfo;
-static void extract_html (const gchar *filename,
+static void extract_html (const gchar *filename,
GHashTable *metadata);
static TrackerExtractorData data[] = {
@@ -47,8 +47,8 @@
};
static gboolean
-has_attribute (const xmlChar **atts,
- const gchar *attr,
+has_attribute (const xmlChar **atts,
+ const gchar *attr,
const gchar *val)
{
gint i;
@@ -69,7 +69,7 @@
}
static const xmlChar *
-lookup_attribute (const xmlChar **atts,
+lookup_attribute (const xmlChar **atts,
const gchar *attr)
{
gint i;
@@ -88,8 +88,8 @@
}
void
-startElement (void *info,
- const xmlChar *name,
+startElement (void *info,
+ const xmlChar *name,
const xmlChar **atts)
{
if (!(info && name)) {
@@ -101,14 +101,14 @@
/* This tag is a license. Ignore, however, if it is
* referring to another document.
*/
- if (has_attribute (atts, "rel", "license") &&
+ if (has_attribute (atts, "rel", "license") &&
has_attribute (atts, "about", NULL) == FALSE) {
const xmlChar *href;
href = lookup_attribute (atts, "href");
if (href) {
- g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
+ g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
g_strdup ("File:License"),
g_strdup ((gchar*) href));
}
@@ -118,11 +118,11 @@
} else if (strcasecmp ((gchar*)name, "meta") == 0) {
if (has_attribute (atts, "name", "Author")) {
const xmlChar *author;
-
+
author = lookup_attribute (atts, "content");
if (author) {
- g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
+ g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
g_strdup ("Doc:Author"),
g_strdup ((gchar*) author));
}
@@ -134,35 +134,35 @@
desc = lookup_attribute (atts,"content");
if (desc) {
- g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
+ g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
g_strdup ("Doc:Comments"),
g_strdup ((gchar*) desc));
}
}
-
- if (has_attribute (atts, "name", "KEYWORDS") ||
+
+ if (has_attribute (atts, "name", "KEYWORDS") ||
has_attribute (atts, "name", "keywords")) {
const xmlChar *keywords;
-
+
keywords = lookup_attribute (atts, "content");
-
+
if (keywords) {
- g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
+ g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
g_strdup ("Doc:Keywords"),
- g_strdup ((gchar*) keywords));
- }
+ g_strdup ((gchar*) keywords));
+ }
}
}
}
void
-characters (void *info,
- const xmlChar *ch,
+characters (void *info,
+ const xmlChar *ch,
int len)
{
switch (((HTMLParseInfo*) info)->current) {
case READ_TITLE:
- g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
+ g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
g_strdup ("Doc:Title"),
g_strdup ((gchar*) ch));
break;
@@ -174,7 +174,7 @@
}
static void
-extract_html (const gchar *filename,
+extract_html (const gchar *filename,
GHashTable *metadata)
{
xmlSAXHandler SAXHandlerStruct = {
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-jpeg.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-jpeg.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-jpeg.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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
*
@@ -132,7 +132,7 @@
}
new_fn = g_strdup (fn);
-
+
if (new_fn[0] == 'F') {
new_fn[0] = ' ';
} else if (fn[0] == 'f' && new_fn[1] == '/') {
@@ -153,13 +153,13 @@
gdouble fraction;
fraction = g_ascii_strtod (sep + 1, NULL);
-
- if (fraction > 0.0) {
+
+ if (fraction > 0.0) {
gdouble val;
gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
val = 1.0f / fraction;
- g_ascii_dtostr (buf, sizeof(buf), val);
+ g_ascii_dtostr (buf, sizeof(buf), val);
return g_strdup (buf);
}
@@ -171,8 +171,8 @@
#endif /* HAVE_LIBEXIF */
static void
-read_exif (const unsigned char *buffer,
- size_t len,
+read_exif (const unsigned char *buffer,
+ size_t len,
GHashTable *metadata)
{
#ifdef HAVE_LIBEXIF
@@ -192,11 +192,11 @@
exif_entry_get_value (entry, buffer, 1024);
if (p->post) {
- g_hash_table_insert (metadata,
+ g_hash_table_insert (metadata,
g_strdup (p->name),
(*p->post) (buffer));
} else {
- g_hash_table_insert (metadata,
+ g_hash_table_insert (metadata,
g_strdup (p->name),
g_strdup (buffer));
}
@@ -214,86 +214,86 @@
struct jpeg_marker_struct *marker;
FILE *jpeg;
gint fd_jpeg;
-
+
if ((fd_jpeg = g_open (filename, O_RDONLY)) == -1) {
return;
}
-
+
if ((jpeg = fdopen (fd_jpeg, "rb"))) {
gchar *str;
gsize len;
cinfo.err = jpeg_std_error (&jerr);
jpeg_create_decompress (&cinfo);
-
+
jpeg_save_markers (&cinfo, JPEG_COM, 0xFFFF);
jpeg_save_markers (&cinfo, JPEG_APP0 + 1, 0xFFFF);
-
+
jpeg_stdio_src (&cinfo, jpeg);
-
+
jpeg_read_header (&cinfo, TRUE);
-
+
/* FIXME? It is possible that there are markers after SOS,
* but there shouldn't be. Should we decompress the whole file?
*
* jpeg_start_decompress(&cinfo);
* jpeg_finish_decompress(&cinfo);
*
- * jpeg_calc_output_dimensions(&cinfo);
+ * jpeg_calc_output_dimensions(&cinfo);
*/
-
+
marker = (struct jpeg_marker_struct *) &cinfo.marker_list;
-
+
while (marker) {
switch (marker->marker) {
case JPEG_COM:
str = (gchar*) marker->data;
len = marker->data_length;
- g_hash_table_insert (metadata,
+ g_hash_table_insert (metadata,
g_strdup ("Image:Comments"),
g_strndup (str, len));
break;
-
+
case JPEG_APP0+1:
#if defined(HAVE_LIBEXIF)
if (strncmp ("Exif", (gchar*) (marker->data), 5) == 0) {
- read_exif ((unsigned char*) marker->data,
- marker->data_length,
+ read_exif ((unsigned char*) marker->data,
+ marker->data_length,
metadata);
}
#endif /* HAVE_LIBEXIF */
-
+
#if defined(HAVE_EXEMPI)
str = (gchar*) marker->data;
len = marker->data_length;
if (strncmp (XMP_NAMESPACE, str, XMP_NAMESPACE_LENGTH) == 0) {
- tracker_read_xmp (str + XMP_NAMESPACE_LENGTH,
+ tracker_read_xmp (str + XMP_NAMESPACE_LENGTH,
len - XMP_NAMESPACE_LENGTH,
metadata);
}
#endif /* HAVE_EXEMPI */
break;
-
+
default:
marker = marker->next;
continue;
}
-
+
marker = marker->next;
}
-
+
/* We want native size to have priority over EXIF, XMP etc */
- g_hash_table_insert (metadata,
+ g_hash_table_insert (metadata,
g_strdup ("Image:Width"),
g_strdup_printf ("%u", cinfo.image_width));
- g_hash_table_insert (metadata,
+ g_hash_table_insert (metadata,
g_strdup ("Image:Height"),
g_strdup_printf ("%u", cinfo.image_height));
jpeg_destroy_decompress (&cinfo);
-
+
fclose (jpeg);
} else {
close (fd_jpeg);
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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
*
@@ -65,14 +65,14 @@
MPEG_V25
};
-enum {
+enum {
LAYER_ERR,
LAYER_1,
LAYER_2,
LAYER_3
};
-static void extract_mp3 (const gchar *filename,
+static void extract_mp3 (const gchar *filename,
GHashTable *metadata);
static const char *const genre_names[] = {
@@ -268,10 +268,10 @@
};
static gchar *
-get_utf8 (const gchar *txt,
- gint size,
- gpointer p1,
- gpointer p2,
+get_utf8 (const gchar *txt,
+ gint size,
+ gpointer p1,
+ gpointer p2,
gpointer p3)
{
if (!g_utf8_validate (txt, size, NULL)) {
@@ -281,10 +281,10 @@
}
}
-static gboolean
+static gboolean
get_id3 (const gchar *data,
size_t size,
- id3tag *id3)
+ id3tag *id3)
{
const gchar *pos;
@@ -300,9 +300,9 @@
pos += 3;
- id3->title = get_utf8 (pos, 30, NULL, NULL, NULL);
+ id3->title = get_utf8 (pos, 30, NULL, NULL, NULL);
pos += 30;
- id3->artist = get_utf8 (pos, 30, NULL, NULL, NULL);
+ id3->artist = get_utf8 (pos, 30, NULL, NULL, NULL);
pos += 30;
id3->album = get_utf8 (pos, 30, NULL, NULL, NULL);
pos += 30;
@@ -321,15 +321,15 @@
}
static void
-mp3_parse (const gchar *data,
- size_t size,
- GHashTable *metadata)
+mp3_parse (const gchar *data,
+ size_t size,
+ GHashTable *metadata)
{
guint header;
gint counter = 0;
gchar mpeg_ver = 0;
gchar layer_ver = 0;
- gint idx_num = 0;
+ gint idx_num = 0;
guint bitrate = 0;
guint avg_bps = 0;
gint vbr_flag = 0;
@@ -340,7 +340,7 @@
guint frames = 0;
size_t pos = 0;
- do {
+ do {
/* Seek for frame start */
if (pos + sizeof(header) > size) {
return;
@@ -369,29 +369,29 @@
mpeg_ver = MPEG_ERR;
break;
case 0x800:
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Codec"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Codec"),
g_strdup ("MPEG"));
- g_hash_table_insert (metadata,
- g_strdup ("Audio:CodecVersion"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:CodecVersion"),
g_strdup ("2"));
mpeg_ver = MPEG_V2;
break;
case 0x1800:
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Codec"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Codec"),
g_strdup ("MPEG"));
- g_hash_table_insert (metadata,
- g_strdup ("Audio:CodecVersion"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:CodecVersion"),
g_strdup ("1"));
mpeg_ver = MPEG_V1;
break;
- case 0:
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Codec"),
+ case 0:
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Codec"),
g_strdup ("MPEG"));
- g_hash_table_insert (metadata,
- g_strdup ("Audio:CodecVersion"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:CodecVersion"),
g_strdup ("2.5"));
mpeg_ver = MPEG_V25;
break;
@@ -413,7 +413,7 @@
if (!layer_ver || !mpeg_ver) {
/* Unknown mpeg type */
- return;
+ return;
}
if (mpeg_ver<3) {
@@ -423,28 +423,28 @@
}
bitrate = 1000 * bitrate_table[(header & bitrate_mask) >> 20][idx_num];
-
+
if (bitrate < 0) {
frames--;
break;
- }
+ }
sample_rate = freq_table[(header & freq_mask) >> 18][mpeg_ver - 1];
if (sample_rate < 0) {
/* Error in header */
frames--;
break;
- }
+ }
if ((header & ch_mask) == ch_mask) {
ch = 1;
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Channels"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Channels"),
g_strdup ("1"));
} else {
ch=2; /*stereo non stereo select*/
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Channels"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Channels"),
g_strdup ("2"));
}
@@ -455,7 +455,7 @@
if (frames > max_frames_scan) {
/* Optimization */
- break;
+ break;
}
if (avg_bps / frames != bitrate / 1000) {
@@ -464,7 +464,7 @@
if (pos + sizeof (header) > size) {
/* EOF */
- break;
+ break;
}
memcpy(&header, &data[pos], sizeof (header));
@@ -477,28 +477,28 @@
avg_bps /= frames;
- if (max_frames_scan) {
+ if (max_frames_scan) {
/* If not all frames scaned */
length = size / (avg_bps ? avg_bps : bitrate ? bitrate : 0xFFFFFFFF) / 125;
} else{
length = 1152 * frames / (sample_rate ? sample_rate : 0xFFFFFFFF);
}
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Duration"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Duration"),
g_strdup_printf ("%d", length));
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Samplerate"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Samplerate"),
g_strdup_printf ("%d", sample_rate));
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Bitrate"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Bitrate"),
g_strdup_printf ("%d", avg_bps));
}
static void
-get_id3v24_tags (const gchar *data,
- size_t size,
- GHashTable *metadata)
+get_id3v24_tags (const gchar *data,
+ size_t size,
+ GHashTable *metadata)
{
gint unsync;
gint extendedHdr;
@@ -582,7 +582,7 @@
(csize == 0)) {
break;
}
-
+
flags = (data[pos + 8] << 8) + data[pos + 9];
if (((flags & 0x80) > 0) ||
((flags & 0x40) > 0)) {
@@ -603,7 +603,7 @@
/* This byte describes the encoding
* try to convert strings to UTF-8
- * if it fails, then forget it
+ * if it fails, then forget it
*/
switch (data[pos + 10]) {
case 0x00:
@@ -622,7 +622,7 @@
NULL, NULL, NULL);
break;
case 0x03 :
- word = malloc (csize + 1);
+ word = malloc (csize + 1);
memcpy (word,
&data[pos + 11],
csize);
@@ -632,7 +632,7 @@
default:
/* Bad encoding byte,
* try to convert from
- * iso-8859-1
+ * iso-8859-1
*/
word = get_utf8 ((const char*) &data[pos + 11],
csize,
@@ -652,8 +652,8 @@
word = s;
}
- g_hash_table_insert (metadata,
- g_strdup (tmap[i].type),
+ g_hash_table_insert (metadata,
+ g_strdup (tmap[i].type),
g_strdup (word));
} else {
g_free (word);
@@ -670,9 +670,9 @@
}
static void
-get_id3v23_tags (const gchar *data,
- size_t size,
- GHashTable *metadata)
+get_id3v23_tags (const gchar *data,
+ size_t size,
+ GHashTable *metadata)
{
gint unsync;
gint extendedHdr;
@@ -756,9 +756,9 @@
return;
}
- csize = (data[pos + 4] << 24) +
- (data[pos + 5] << 16) +
- (data[pos + 6] << 8) +
+ csize = (data[pos + 4] << 24) +
+ (data[pos + 5] << 16) +
+ (data[pos + 6] << 8) +
data[pos + 7];
if ((pos + 10 + csize > tsize) ||
@@ -791,7 +791,7 @@
* try to convert strings to UTF-8 if
* it fails, then forget it./
*/
-
+
switch (data[pos + 10]) {
case 0x00:
word = get_utf8 ((const gchar*) &data[pos + 11],
@@ -805,7 +805,7 @@
break;
default:
/* Bad encoding byte, try to
- * convert from iso-8859-1
+ * convert from iso-8859-1
*/
word = get_utf8 ((const gchar*) &data[pos + 11],
csize,
@@ -818,14 +818,14 @@
if (word != NULL && strlen(word) > 0) {
if (strcmp (tmap[i].text, "COMM") == 0) {
gchar *s;
-
+
s = g_strdup (word + strlen (word) + 1);
g_free (word);
word = s;
}
- g_hash_table_insert (metadata,
- g_strdup (tmap[i].type),
+ g_hash_table_insert (metadata,
+ g_strdup (tmap[i].type),
g_strdup (word));
} else {
g_free (word);
@@ -842,9 +842,9 @@
}
static void
-get_id3v2_tags (const gchar *data,
- size_t size,
- GHashTable *metadata)
+get_id3v2_tags (const gchar *data,
+ size_t size,
+ GHashTable *metadata)
{
gint unsync;
guint tsize;
@@ -877,7 +877,7 @@
{"COM", "Audio:Comment"},
{ NULL, 0},
};
-
+
if ((size < 16) ||
(data[0] != 0x49) ||
(data[1] != 0x44) ||
@@ -919,7 +919,7 @@
while (tmap[i].text != NULL) {
if (strncmp(tmap[i].text, (const char*) &data[pos], 3) == 0) {
gchar * word;
-
+
/* This byte describes the encoding
* try to convert strings to UTF-8 if
* it fails, then forget it.
@@ -931,7 +931,7 @@
csize,
NULL, NULL, NULL);
break;
-
+
default:
/* Bad encoding byte, try to
* convert from iso-8859-1.
@@ -954,8 +954,8 @@
word = s;
}
- g_hash_table_insert (metadata,
- g_strdup (tmap[i].type),
+ g_hash_table_insert (metadata,
+ g_strdup (tmap[i].type),
g_strdup (word));
} else {
g_free (word);
@@ -972,7 +972,7 @@
}
static void
-extract_mp3 (const gchar *filename,
+extract_mp3 (const gchar *filename,
GHashTable *metadata)
{
gint file;
@@ -995,13 +995,13 @@
#endif
if (file == -1 || stat (filename, &fstatbuf) == -1) {
- close (file);
+ close (file);
return;
}
size = fstatbuf.st_size;
if (size == 0) {
- close (file);
+ close (file);
return;
}
@@ -1023,38 +1023,38 @@
}
if (info.title && strlen (info.title) > 0) {
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Title"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Title"),
g_strdup (info.title));
}
if (info.artist && strlen (info.artist) > 0) {
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Artist"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Artist"),
g_strdup (info.artist));
}
if (info.album && strlen (info.album) > 0) {
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Album"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Album"),
g_strdup (info.album));
}
if (info.year && strlen (info.year) > 0) {
- g_hash_table_insert (metadata,
- g_strdup ("Audio:ReleaseDate"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:ReleaseDate"),
g_strdup (info.year));
}
if (info.genre && strlen (info.genre) > 0) {
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Genre"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Genre"),
g_strdup (info.genre));
}
if (info.comment && strlen (info.comment) > 0) {
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Comment"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Comment"),
g_strdup (info.comment));
}
@@ -1074,29 +1074,29 @@
/* Check that we have the minimum data. FIXME We should not need to do this */
if (!g_hash_table_lookup (metadata, "Audio:Title")) {
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Title"),
- g_strdup ("tracker:unknown"));
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Title"),
+ g_strdup ("tracker:unknown"));
}
if (!g_hash_table_lookup (metadata, "Audio:Album")) {
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Album"),
- g_strdup ("tracker:unknown"));
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Album"),
+ g_strdup ("tracker:unknown"));
}
if (!g_hash_table_lookup (metadata, "Audio:Artist")) {
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Artist"),
- g_strdup ("tracker:unknown"));
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Artist"),
+ g_strdup ("tracker:unknown"));
}
if (!g_hash_table_lookup (metadata, "Audio:Genre")) {
- g_hash_table_insert (metadata,
- g_strdup ("Audio:Genre"),
- g_strdup ("tracker:unknown"));
+ g_hash_table_insert (metadata,
+ g_strdup ("Audio:Genre"),
+ g_strdup ("tracker:unknown"));
}
-
+
#ifndef OS_WIN32
munmap (buffer, size);
#endif
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-mplayer.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-mplayer.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-mplayer.c Sat Sep 20 14:45:00 2008
@@ -30,7 +30,7 @@
#include "tracker-extract.h"
-static void extract_mplayer (const gchar *filename,
+static void extract_mplayer (const gchar *filename,
GHashTable *metadata);
static TrackerExtractorData data[] = {
@@ -75,17 +75,17 @@
};
static void
-copy_hash_table_entry (gpointer key,
+copy_hash_table_entry (gpointer key,
gpointer value,
gpointer user_data)
{
- g_hash_table_insert (user_data,
- g_strdup (key),
+ g_hash_table_insert (user_data,
+ g_strdup (key),
g_strdup (value));
}
static void
-extract_mplayer (const gchar *filename,
+extract_mplayer (const gchar *filename,
GHashTable *metadata)
{
gchar *argv[10];
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-msoffice.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-msoffice.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-msoffice.c Sat Sep 20 14:45:00 2008
@@ -38,7 +38,7 @@
#include "tracker-extract.h"
-static void extract_msoffice (const gchar *filename,
+static void extract_msoffice (const gchar *filename,
GHashTable *metadata);
static TrackerExtractorData data[] = {
@@ -49,7 +49,7 @@
static void
add_gvalue_in_hash_table (GHashTable *table,
- const gchar *key,
+ const gchar *key,
GValue const *val)
{
g_return_if_fail (table != NULL);
@@ -81,8 +81,8 @@
* something different...
* We copy the string
* from the
- * beginning.
- */
+ * beginning.
+ */
str_val = g_strdup (s);
}
} else {
@@ -101,8 +101,8 @@
}
static void
-metadata_cb (gpointer key,
- gpointer value,
+metadata_cb (gpointer key,
+ gpointer value,
gpointer user_data)
{
gchar *name;
@@ -138,7 +138,7 @@
static void
doc_metadata_cb (gpointer key,
- gpointer value,
+ gpointer value,
gpointer user_data)
{
gchar *name;
@@ -157,7 +157,7 @@
}
static void
-extract_msoffice (const gchar *filename,
+extract_msoffice (const gchar *filename,
GHashTable *metadata)
{
GsfInput *input;
@@ -186,14 +186,14 @@
GsfDocMetaData *md;
md = gsf_doc_meta_data_new ();
-
+
if (gsf_msole_metadata_read (stream, md)) {
gsf_shutdown ();
return;
}
-
+
gsf_doc_meta_data_foreach (md, metadata_cb, metadata);
-
+
g_object_unref (G_OBJECT (md));
g_object_unref (G_OBJECT (stream));
}
@@ -203,14 +203,14 @@
GsfDocMetaData *md;
md = gsf_doc_meta_data_new ();
-
+
if (gsf_msole_metadata_read (stream, md)) {
gsf_shutdown ();
return;
}
-
+
gsf_doc_meta_data_foreach (md, doc_metadata_cb, metadata);
-
+
g_object_unref (G_OBJECT (md));
g_object_unref (G_OBJECT (stream));
}
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-oasis.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-oasis.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-oasis.c Sat Sep 20 14:45:00 2008
@@ -68,14 +68,14 @@
};
static void
-extract_oasis (const gchar *filename,
+extract_oasis (const gchar *filename,
GHashTable *metadata)
{
gchar *argv[5];
gchar *xml;
- ODTParseInfo info = {
- metadata,
- -1
+ ODTParseInfo info = {
+ metadata,
+ -1
};
argv[0] = g_strdup ("unzip");
@@ -141,12 +141,12 @@
for (a = attribute_names, v = attribute_values; *a; ++a, ++v) {
if (strcmp (*a, "meta:word-count") == 0) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:WordCount"),
+ g_strdup ("Doc:WordCount"),
g_strdup (*v));
}
else if (strcmp (*a, "meta:page-count") == 0) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:PageCount"),
+ g_strdup ("Doc:PageCount"),
g_strdup (*v));
}
}
@@ -164,7 +164,7 @@
}
}
-void
+void
end_element_handler (GMarkupParseContext *context,
const gchar *element_name,
gpointer user_data,
@@ -173,7 +173,7 @@
((ODTParseInfo*) user_data)->current = -1;
}
-void
+void
text_handler (GMarkupParseContext *context,
const gchar *text,
gsize text_len,
@@ -188,50 +188,50 @@
switch (data->current) {
case READ_TITLE:
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Title"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Title"),
g_strdup (text));
break;
case READ_SUBJECT:
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Subject"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Subject"),
g_strdup (text));
break;
case READ_AUTHOR:
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Author"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Author"),
g_strdup (text));
break;
case READ_KEYWORDS: {
gchar *keywords;
if ((keywords = g_hash_table_lookup (metadata, "Doc:Keywords"))) {
- g_hash_table_replace (metadata,
+ g_hash_table_replace (metadata,
g_strdup ("Doc:Keywords"),
g_strconcat (keywords, ",", text, NULL));
} else {
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Keywords"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Keywords"),
g_strdup (text));
}
}
break;
case READ_COMMENTS:
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Comments"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Comments"),
g_strdup (text));
break;
case READ_CREATED:
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Created"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Created"),
g_strdup (text));
break;
case READ_FILE_OTHER:
- g_hash_table_insert (metadata,
- g_strdup ("File:Other"),
+ g_hash_table_insert (metadata,
+ g_strdup ("File:Other"),
g_strdup (text));
break;
-
+
default:
break;
}
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-pdf.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-pdf.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-pdf.c Sat Sep 20 14:45:00 2008
@@ -31,7 +31,7 @@
#include <libtracker-common/tracker-utils.h>
-static void extract_pdf (const gchar *filename,
+static void extract_pdf (const gchar *filename,
GHashTable *metadata);
static TrackerExtractorData data[] = {
@@ -40,7 +40,7 @@
};
static void
-extract_pdf (const gchar *filename,
+extract_pdf (const gchar *filename,
GHashTable *metadata)
{
PopplerDocument *document;
@@ -77,27 +77,27 @@
}
if (!tracker_is_empty_string (title)) {
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Title"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Title"),
g_strdup (title));
}
if (!tracker_is_empty_string (author)) {
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Author"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Author"),
g_strdup (author));
}
if (!tracker_is_empty_string (subject)) {
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Subject"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Subject"),
g_strdup (subject));
}
if (!tracker_is_empty_string (keywords)) {
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Keywords"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Keywords"),
g_strdup (keywords));
}
- g_hash_table_insert (metadata,
+ g_hash_table_insert (metadata,
g_strdup ("Doc:PageCount"),
g_strdup_printf ("%d", poppler_document_get_n_pages (document)));
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-png.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-png.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-png.c Sat Sep 20 14:45:00 2008
@@ -81,7 +81,7 @@
}
static void
-extract_png (const gchar *filename,
+extract_png (const gchar *filename,
GHashTable *metadata)
{
gint fd_png;
@@ -104,7 +104,7 @@
if ((png = fdopen (fd_png, "r"))) {
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
- NULL,
+ NULL,
NULL,
NULL);
if (!png_ptr) {
@@ -139,7 +139,7 @@
continue;
}
#endif
-
+
for (j = 0; tag_processors[j].type; j++) {
if (strcasecmp (tag_processors[j].name, text_ptr[i].key) != 0) {
continue;
@@ -170,19 +170,19 @@
/* Read size from header. We want native have higher
* priority than EXIF etc.
*/
- if (png_get_IHDR (png_ptr,
- info_ptr,
- &width,
- &height,
+ if (png_get_IHDR (png_ptr,
+ info_ptr,
+ &width,
+ &height,
&bit_depth,
&color_type,
&interlace_type,
&compression_type,
&filter_type)) {
- g_hash_table_insert (metadata,
+ g_hash_table_insert (metadata,
g_strdup ("Image:Width"),
g_strdup_printf ("%ld", width));
- g_hash_table_insert (metadata,
+ g_hash_table_insert (metadata,
g_strdup ("Image:Height"),
g_strdup_printf ("%ld", height));
}
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-ps.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-ps.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-ps.c Sat Sep 20 14:45:00 2008
@@ -62,15 +62,15 @@
#define GROWBY 80
static ssize_t
-igetdelim (gchar **linebuf,
- size_t *linebufsz,
- gint delimiter,
+igetdelim (gchar **linebuf,
+ size_t *linebufsz,
+ gint delimiter,
FILE *file)
{
gint ch;
gint idx;
- if ((file == NULL || linebuf == NULL || *linebuf == NULL || *linebufsz == 0) &&
+ if ((file == NULL || linebuf == NULL || *linebuf == NULL || *linebufsz == 0) &&
!(*linebuf == NULL && *linebufsz == 0)) {
errno = EINVAL;
return -1;
@@ -116,8 +116,8 @@
}
static gint
-getline (gchar **s,
- guint *lim,
+getline (gchar **s,
+ guint *lim,
FILE *stream)
{
return igetdelim (s, lim, '\n', stream);
@@ -183,14 +183,14 @@
/* we have probably a date like
"6:07 PM May 22, 2007" */
return hour_month_day_date (date);
- }
+ }
}
return NULL;
}
static void
-extract_ps (const gchar *filename,
+extract_ps (const gchar *filename,
GHashTable *metadata)
{
gint fd;
@@ -220,12 +220,12 @@
if (!header_finished && strncmp (line, "%%Copyright:", 12) == 0) {
g_hash_table_insert (metadata,
- g_strdup ("File:Other"),
+ g_strdup ("File:Other"),
g_strdup (line + 13));
} else if (!header_finished && strncmp (line, "%%Title:", 8) == 0) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Title"),
+ g_strdup ("Doc:Title"),
g_strdup (line + 9));
} else if (!header_finished && strncmp (line, "%%Creator:", 10) == 0) {
@@ -239,8 +239,8 @@
date = date_to_iso8601 (line + 16);
if (date) {
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Created"),
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Created"),
date);
}
@@ -249,7 +249,7 @@
pageno_atend = TRUE;
} else {
g_hash_table_insert (metadata,
- g_strdup ("Doc:PageCount"),
+ g_strdup ("Doc:PageCount"),
g_strdup (line + 9));
}
} else if (strncmp (line, "%%EndComments", 14) == 0) {
@@ -276,7 +276,7 @@
}
static void
-extract_ps_gz (const gchar *filename,
+extract_ps_gz (const gchar *filename,
GHashTable *metadata)
{
FILE *fz;
@@ -287,8 +287,8 @@
gboolean stat;
const gchar *argv[4];
- fd = g_file_open_tmp ("tracker-extract-ps-gunzipped.XXXXXX",
- &gunzipped,
+ fd = g_file_open_tmp ("tracker-extract-ps-gunzipped.XXXXXX",
+ &gunzipped,
&error);
if (error) {
@@ -306,8 +306,8 @@
NULL,
G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
tracker_spawn_child_func,
- GINT_TO_POINTER (10),
- NULL,
+ GINT_TO_POINTER (10),
+ NULL,
NULL,
&fdz,
NULL,
@@ -329,7 +329,7 @@
/* 20 MiB should be enough! */
accum = 0;
- max = 20u << 20;
+ max = 20u << 20;
while ((b = fread (buf, 1, 8192, fz)) && accum <= max) {
accum += b;
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-tiff.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-tiff.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-tiff.c Sat Sep 20 14:45:00 2008
@@ -134,9 +134,9 @@
if (TIFFGetField(image, TIFFTAG_EXIFIFD, &exifOffset)) {
if (TIFFReadEXIFDirectory(image, exifOffset)) {
-
+
for (tag = exiftags; tag->name; ++tag) {
-
+
switch (tag->type) {
case TIFF_TAGTYPE_STRING:
if (!TIFFGetField(image, tag->tag, &buffer)) {
@@ -147,14 +147,14 @@
if (!TIFFGetField(image, tag->tag, &varui32)) {
continue;
}
-
+
sprintf(buffer,"%i",varui16);
break;
case TIFF_TAGTYPE_UINT32:
if (!TIFFGetField(image, tag->tag, &varui32)) {
continue;
}
-
+
sprintf(buffer,"%i",varui32);
break;
case TIFF_TAGTYPE_DOUBLE:
@@ -168,7 +168,7 @@
continue;
break;
}
-
+
if (tag->post) {
g_hash_table_insert (metadata, g_strdup (tag->name),
g_strdup ((*tag->post) (buffer)));
@@ -177,7 +177,7 @@
g_strdup (buffer));
}
}
-
+
}
}
@@ -207,7 +207,7 @@
if (!TIFFGetField(image, tag->tag, &vardouble)) {
continue;
}
-
+
sprintf(buffer,"%f",vardouble);
break;
default:
@@ -225,7 +225,7 @@
}
TIFFClose(image);
-
+
}
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-totem.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-totem.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-totem.c Sat Sep 20 14:45:00 2008
@@ -42,7 +42,7 @@
{ NULL, NULL }
};
-static void extract_totem (const gchar *filename,
+static void extract_totem (const gchar *filename,
GHashTable *metadata);
static TrackerExtractorData data[] = {
@@ -52,7 +52,7 @@
};
static void
-extract_totem (const gchar *filename,
+extract_totem (const gchar *filename,
GHashTable *metadata)
{
gchar *argv[3];
Modified: branches/indexer-split/src/tracker-extract/tracker-extract-vorbis.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-vorbis.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-vorbis.c Sat Sep 20 14:45:00 2008
@@ -68,7 +68,7 @@
};
-static char*
+static char*
get_comment (vorbis_comment *vc, char *label)
{
char *tag;
@@ -76,7 +76,7 @@
if (vc && (tag = vorbis_comment_query (vc, label, 0)) != NULL) {
- utf_tag = g_locale_to_utf8 (tag, -1, NULL, NULL, NULL);
+ utf_tag = g_locale_to_utf8 (tag, -1, NULL, NULL, NULL);
/*g_free (tag);*/
@@ -96,11 +96,11 @@
i = 0;
while (tags[i].name != NULL) {
-
+
if (strcmp (tags[i].meta_name, meta) == 0) {
return tags[i].writable;
}
-
+
i++;
}
@@ -110,14 +110,14 @@
gboolean
-tracker_metadata_ogg_write (const char *meta_name, const char *value)
+tracker_metadata_ogg_write (const char *meta_name, const char *value)
{
/* to do */
return FALSE;
}
-void
+void
tracker_extract_vorbis (const char *filename, GHashTable *metadata)
{
gint fd;
@@ -134,7 +134,7 @@
}
oggFile = fdopen (fd, "r");
-
+
if (!oggFile) {
close (fd);
return;
@@ -144,20 +144,20 @@
fclose (oggFile);
return;
}
-
+
char *tmpComment;
vorbis_comment *comment;
if ((comment = ov_comment (&vf, -1)) == NULL) {
- ov_clear (&vf);
+ ov_clear (&vf);
return;
}
i = 0;
while (tags[i].name != NULL) {
tmpComment = get_comment (comment, tags[i].name);
-
+
if (tmpComment) {
g_hash_table_insert (metadata, g_strdup (tags[i].meta_name), tmpComment);
}
@@ -182,8 +182,8 @@
g_hash_table_insert (metadata, g_strdup ("Audio.Samplerate"), g_strdup_printf ("%ld", vi->rate));
}
-
-
+
+
/* Duration */
int time;
@@ -195,8 +195,8 @@
g_hash_table_insert (metadata, g_strdup ("Audio.Codec"), g_strdup ("vorbis"));
- ov_clear(&vf);
-
+ ov_clear(&vf);
+
}
#else
Modified: branches/indexer-split/src/tracker-extract/tracker-extract.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract.c Sat Sep 20 14:45:00 2008
@@ -78,12 +78,12 @@
static guint shutdown_timeout_id = 0;
gchar *
-tracker_generic_date_to_iso8601 (const gchar *date,
+tracker_generic_date_to_iso8601 (const gchar *date,
const gchar *format)
{
gchar *result;
struct tm date_tm;
-
+
memset (&date_tm, 0, sizeof (struct tm));
if (strptime (date, format, &date_tm) == NULL) {
@@ -97,17 +97,17 @@
return result;
}
-#ifndef DISABLE_DEBUG
+#ifndef DISABLE_DEBUG
static void
debug_impl (const gchar *msg, ...)
{
va_list args;
-
+
va_start (args, msg);
g_vfprintf (stderr, msg, args);
va_end (args);
-
+
g_fprintf (stderr, "\n");
}
@@ -131,8 +131,8 @@
}
error = NULL;
-
- extractors = g_array_sized_new (FALSE,
+
+ extractors = g_array_sized_new (FALSE,
TRUE,
sizeof (TrackerExtractorData),
10);
@@ -140,7 +140,7 @@
/* This array is going to be used to store
* temporarily extractors with mimetypes such as "audio / *"
*/
- generic_extractors = g_array_sized_new (FALSE,
+ generic_extractors = g_array_sized_new (FALSE,
TRUE,
sizeof (TrackerExtractorData),
10);
@@ -198,14 +198,14 @@
/* Append the generic extractors at the end of
* the list, so the specific ones are used first
*/
- g_array_append_vals (extractors,
- generic_extractors->data,
+ g_array_append_vals (extractors,
+ generic_extractors->data,
generic_extractors->len);
g_array_free (generic_extractors, TRUE);
}
static GHashTable *
-tracker_get_file_metadata (const gchar *uri,
+tracker_get_file_metadata (const gchar *uri,
const gchar *mime)
{
GHashTable *meta_table;
@@ -232,9 +232,9 @@
return NULL;
}
- meta_table = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
+ meta_table = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
g_free);
if (mime) {
@@ -276,7 +276,7 @@
gpointer user_data)
{
gchar *value_utf8;
-
+
g_return_if_fail (key != NULL);
g_return_if_fail (value != NULL);
@@ -289,8 +289,8 @@
value_utf8 = g_strdelimit (value_utf8, "=", '-');
value_utf8 = g_strstrip (value_utf8);
- debug ("Extractor - Found '%s' = '%s'",
- (gchar*) key,
+ debug ("Extractor - Found '%s' = '%s'",
+ (gchar*) key,
value_utf8);
g_print ("%s=%s;\n", (gchar*) key, value_utf8);
Modified: branches/indexer-split/src/tracker-fts/tracker-fts-hash.c
==============================================================================
--- branches/indexer-split/src/tracker-fts/tracker-fts-hash.c (original)
+++ branches/indexer-split/src/tracker-fts/tracker-fts-hash.c Sat Sep 20 14:45:00 2008
@@ -49,8 +49,8 @@
** fields of the Hash structure.
**
** "pNew" is a pointer to the hash table that is to be initialized.
-** keyClass is one of the constants
-** FTS3_HASH_BINARY or FTS3_HASH_STRING. The value of keyClass
+** keyClass is one of the constants
+** FTS3_HASH_BINARY or FTS3_HASH_STRING. The value of keyClass
** determines what kind of key the hash table will use. "copyKey" is
** true if the hash table should make its own private copy of keys and
** false if it should just use the supplied pointer.
@@ -127,7 +127,7 @@
/*
** Return a pointer to the appropriate hash function given the key class.
**
-** The C syntax in this function definition may be unfamilar to some
+** The C syntax in this function definition may be unfamilar to some
** programmers, so we provide the following additional explanation:
**
** The name of the function is "ftsHashFunction". The function takes a
@@ -187,7 +187,7 @@
/* Resize the hash table so that it cantains "new_size" buckets.
-** "new_size" must be a power of 2. The hash table might fail
+** "new_size" must be a power of 2. The hash table might fail
** to resize if sqliteMalloc() fails.
*/
static void fts3Rehash(fts3Hash *pH, int new_size){
@@ -229,7 +229,7 @@
count = pEntry->count;
xCompare = ftsCompareFunction(pH->keyClass);
while( count-- && elem ){
- if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
+ if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
return elem;
}
elem = elem->next;
@@ -248,7 +248,7 @@
){
struct _fts3ht *pEntry;
if( elem->prev ){
- elem->prev->next = elem->next;
+ elem->prev->next = elem->next;
}else{
pH->first = elem->next;
}
Modified: branches/indexer-split/src/tracker-fts/tracker-fts-hash.h
==============================================================================
--- branches/indexer-split/src/tracker-fts/tracker-fts-hash.h (original)
+++ branches/indexer-split/src/tracker-fts/tracker-fts-hash.h Sat Sep 20 14:45:00 2008
@@ -41,7 +41,7 @@
} *ht;
};
-/* Each element in the hash table is an instance of the following
+/* Each element in the hash table is an instance of the following
** structure. All elements are stored on a single doubly-linked list.
**
** Again, this structure is intended to be opaque, but it can't really
@@ -60,10 +60,10 @@
** (including the null-terminator, if any). Case
** is respected in comparisons.
**
-** FTS3_HASH_BINARY pKey points to binary data nKey bytes long.
+** FTS3_HASH_BINARY pKey points to binary data nKey bytes long.
** memcmp() is used to compare keys.
**
-** A copy of the key is made if the copyKey parameter to fts3HashInit is 1.
+** A copy of the key is made if the copyKey parameter to fts3HashInit is 1.
*/
#define FTS3_HASH_STRING 1
#define FTS3_HASH_BINARY 2
Modified: branches/indexer-split/src/tracker-fts/tracker-fts.c
==============================================================================
--- branches/indexer-split/src/tracker-fts/tracker-fts.c (original)
+++ branches/indexer-split/src/tracker-fts/tracker-fts.c Sat Sep 20 14:45:00 2008
@@ -341,7 +341,7 @@
}
int sqlite3_extension_init(
- sqlite3 *db,
+ sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pApi
);
@@ -1388,14 +1388,14 @@
dlwDestroy(&writer);
}
-/*
+/*
** This function is used as part of the implementation of phrase and
** NEAR matching.
**
** pLeft and pRight are DLReaders positioned to the same docid in
** lists of type DL_POSITION. This function writes an entry to the
** DLWriter pOut for each position in pRight that is less than
-** (nNear+1) greater (but not equal to or smaller) than a position
+** (nNear+1) greater (but not equal to or smaller) than a position
** in pLeft. For example, if nNear is 0, and the positions contained
** by pLeft and pRight are:
**
@@ -1410,7 +1410,7 @@
** and "20" would be added instead of "6" and "21".
*/
static void posListPhraseMerge(
- DLReader *pLeft,
+ DLReader *pLeft,
DLReader *pRight,
int nNear,
int isSaveLeft,
@@ -1461,7 +1461,7 @@
}
/*
-** Compare the values pointed to by the PLReaders passed as arguments.
+** Compare the values pointed to by the PLReaders passed as arguments.
** Return -1 if the value pointed to by pLeft is considered less than
** the value pointed to by pRight, +1 if it is considered greater
** than it, or 0 if it is equal. i.e.
@@ -1496,7 +1496,7 @@
** A phrase intersection means that two documents only match
** if pLeft.iPos+1==pRight.iPos.
**
-** A NEAR intersection means that two documents only match if
+** A NEAR intersection means that two documents only match if
** (abs(pLeft.iPos-pRight.iPos)<nNear).
**
** If a NEAR intersection is requested, then the nPhrase argument should
@@ -1548,7 +1548,7 @@
DataBuffer two = {0, 0, 0};
DLWriter dlwriter2;
- DLReader dr1 = {0, 0, 0, 0, 0};
+ DLReader dr1 = {0, 0, 0, 0, 0};
DLReader dr2 = {0, 0, 0, 0, 0};
dlwInit(&dlwriter2, iType, &one);
@@ -1809,12 +1809,12 @@
** is the first in a contiguous string of terms that are either part
** of the same phrase, or connected by the NEAR operator.
**
-** If the QueryTerm.nNear variable is non-zero, then the token is followed
-** by a NEAR operator with span set to (nNear-1). For example, the
+** If the QueryTerm.nNear variable is non-zero, then the token is followed
+** by a NEAR operator with span set to (nNear-1). For example, the
** following query:
**
** The QueryTerm.iPhrase variable stores the index of the token within
-** its phrase, indexed starting at 1, or 1 if the token is not part
+** its phrase, indexed starting at 1, or 1 if the token is not part
** of any phrase.
**
** For example, the data structure used to represent the following query:
@@ -1858,7 +1858,7 @@
*
* OR binds more tightly than the implied AND, which is what the
* major search engines seem to do. So, for example:
- *
+ *
* [one two OR three] ==> one AND (two OR three)
* [one OR two three] ==> (one OR two) AND three
*
@@ -1994,7 +1994,7 @@
char **azContentColumn; /* column names in content table; malloced */
TrackerParser *parser; /* tokenizer for inserts and queries */
int max_words;
-
+
/* Precompiled statements which we keep as long as the table is
** open.
*/
@@ -2571,11 +2571,11 @@
** ftsIdChar(X) will be true. Otherwise it is false.
**
** For ASCII, any character with the high-order bit set is
-** allowed in an identifier. For 7-bit characters,
+** allowed in an identifier. For 7-bit characters,
** isFtsIdChar[X] must be 1.
**
** Ticket #1066. the SQL standard does not allow '$' in the
-** middle of identfiers. But many SQL implementations do.
+** middle of identfiers. But many SQL implementations do.
** SQLite will allow '$' in identifiers for compatibility.
** But the feature is undocumented.
*/
@@ -2592,7 +2592,7 @@
/*
-** Return the length of the token that begins at z[0].
+** Return the length of the token that begins at z[0].
** Store the token type in *tokenType before returning.
*/
static int ftsGetToken(const char *z, int *tokenType){
@@ -2798,7 +2798,7 @@
** * s begins with the string t, ignoring case
** * s is longer than t
** * The first character of s beyond t is not a alphanumeric
-**
+**
** Ignore leading space in *s.
**
** To put it another way, return true if the first token of
@@ -2841,7 +2841,7 @@
* USING fts3(subject, body, tokenize mytokenizer(myarg))
*
* We return parsed information in a TableSpec structure.
- *
+ *
*/
static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
char**pzErr){
@@ -2992,12 +2992,12 @@
v->azColumn = spec->azColumn;
spec->azColumn = 0;
-/* comment out tokenizer stuff
+/* comment out tokenizer stuff
if( spec->azTokenizer==0 ){
return SQLITE_NOMEM;
}
- zTok = spec->azTokenizer[0];
+ zTok = spec->azTokenizer[0];
if( !zTok ){
zTok = "simple";
}
@@ -3019,22 +3019,22 @@
}
if( rc!=SQLITE_OK ) goto err;
*/
-
-
+
+
/* set up our parser */
-
+
TrackerConfig *config = tracker_config_new ();
-
+
TrackerLanguage *language = tracker_language_new (config);
-
+
int min_len = tracker_config_get_min_word_length (config);
int max_len = tracker_config_get_max_word_length (config);
v->max_words = tracker_config_get_max_words_to_index (config);
-
+
v->parser = tracker_parser_new (language, max_len, min_len);
-
+
g_object_unref (language);
-
+
/* TODO: verify the existence of backing tables foo_content, foo_term */
@@ -3155,7 +3155,7 @@
/* An arbitrary value for now.
* TODO: Perhaps docid matches should be considered cheaper than
* full-text searches. */
- pInfo->estimatedCost = 1.0;
+ pInfo->estimatedCost = 1.0;
return SQLITE_OK;
}
@@ -3272,7 +3272,7 @@
fulltext_vtab *pVtab; /* The full text index */
int nColumn; /* Number of columns in the index */
const QueryTerm *aTerm; /* Query string terms */
- int nTerm; /* Number of query string terms */
+ int nTerm; /* Number of query string terms */
int i, j; /* Loop counters */
unsigned int match, prevMatch; /* Phrase search bitmasks */
const char *zToken; /* Next token from the tokenizer */
@@ -3288,7 +3288,7 @@
pVtab = pQuery->pFts;
nColumn = pVtab->nColumn;
-
+
tracker_parser_reset (pVtab->parser, zDoc, nDoc, FALSE, TRUE, TRUE, FALSE);
aTerm = pQuery->pTerms;
@@ -3302,17 +3302,17 @@
while(1){
// rc = pTModule->xNext(pTCursor, &zToken, &nToken, &iBegin, &iEnd, &iPos);
-
- zToken = tracker_parser_next (pVtab->parser,
+
+ zToken = tracker_parser_next (pVtab->parser,
&iPos,
&iBegin,
&iEnd,
&new_paragraph,
&stop_word,
&nToken);
-
- if (!zToken) break;
-
+
+ if (!zToken) break;
+
if (stop_word) {
continue;
}
@@ -3341,12 +3341,12 @@
prevMatch = match<<1;
iRotor++;
}
-// pTModule->xClose(pTCursor);
+// pTModule->xClose(pTCursor);
}
/*
** Remove entries from the pSnippet structure to account for the NEAR
-** operator. When this is called, pSnippet contains the list of token
+** operator. When this is called, pSnippet contains the list of token
** offsets produced by treating all NEAR operators as AND operators.
** This function removes any entries that should not be present after
** accounting for the NEAR restriction. For example, if the queried
@@ -3355,7 +3355,7 @@
** "A B C D E A"
**
** and the query is:
-**
+**
** A NEAR/0 E
**
** then when this function is called the Snippet contains token offsets
@@ -3374,17 +3374,17 @@
struct snippetMatch *pMatch = &pSnippet->aMatch[ii];
QueryTerm *pQueryTerm = &pQuery->pTerms[pMatch->iTerm];
- if( (pMatch->iTerm+iDir)<0
+ if( (pMatch->iTerm+iDir)<0
|| (pMatch->iTerm+iDir)>=pQuery->nTerms
){
continue;
}
-
+
nNear = pQueryTerm->nNear;
if( iDir<0 ){
nNear = pQueryTerm[-1].nNear;
}
-
+
if( pMatch->iTerm>=0 && nNear ){
int isOk = 0;
int iNextTerm = pMatch->iTerm+iDir;
@@ -3396,8 +3396,8 @@
if( iDir<0 ){
int nPhrase = 1;
iStartToken = pMatch->iToken;
- while( (pMatch->iTerm+nPhrase)<pQuery->nTerms
- && pQuery->pTerms[pMatch->iTerm+nPhrase].iPhrase>1
+ while( (pMatch->iTerm+nPhrase)<pQuery->nTerms
+ && pQuery->pTerms[pMatch->iTerm+nPhrase].iPhrase>1
){
nPhrase++;
}
@@ -3410,21 +3410,21 @@
while( pQuery->pTerms[iNextTerm].iPhrase>1 ){
iNextTerm--;
}
- while( (iPrevTerm+1)<pQuery->nTerms &&
- pQuery->pTerms[iPrevTerm+1].iPhrase>1
+ while( (iPrevTerm+1)<pQuery->nTerms &&
+ pQuery->pTerms[iPrevTerm+1].iPhrase>1
){
iPrevTerm++;
}
-
+
for(jj=0; isOk==0 && jj<pSnippet->nMatch; jj++){
struct snippetMatch *p = &pSnippet->aMatch[jj];
if( p->iCol==pMatch->iCol && ((
- p->iTerm==iNextTerm &&
- p->iToken>iEndToken &&
+ p->iTerm==iNextTerm &&
+ p->iToken>iEndToken &&
p->iToken<=iEndToken+nNear
) || (
- p->iTerm==iPrevTerm &&
- p->iToken<iStartToken &&
+ p->iTerm==iPrevTerm &&
+ p->iToken<iStartToken &&
p->iToken>=iStartToken-nNear
))){
isOk = 1;
@@ -3444,7 +3444,7 @@
}
/*
-** Compute all offsets for the current row of the query.
+** Compute all offsets for the current row of the query.
** If the offsets have already been computed, this routine is a no-op.
*/
static void snippetAllOffsets(fulltext_cursor *p){
@@ -3490,9 +3490,9 @@
for(i=0; i<p->nMatch; i++){
struct snippetMatch *pMatch = &p->aMatch[i];
if( pMatch->iTerm>=0 ){
- /* If snippetMatch.iTerm is less than 0, then the match was
- ** discarded as part of processing the NEAR operator (see the
- ** trimSnippetOffsetsForNear() function for details). Ignore
+ /* If snippetMatch.iTerm is less than 0, then the match was
+ ** discarded as part of processing the NEAR operator (see the
+ ** trimSnippetOffsetsForNear() function for details). Ignore
** it in this case
*/
zBuf[0] = ' ';
@@ -3581,7 +3581,7 @@
int iStart, iEnd;
int tailEllipsis = 0;
int iMatch;
-
+
sqlite3_free(pCursor->snippet.zSnippet);
pCursor->snippet.zSnippet = 0;
@@ -3772,8 +3772,8 @@
** to the number of tokens in the phrase. Otherwise leave it at 1.
*/
int nPhraseRight = 1;
- while( (i+nPhraseRight)<=pQTerm->nPhrase
- && pQTerm[i+nPhraseRight].nNear==0
+ while( (i+nPhraseRight)<=pQTerm->nPhrase
+ && pQTerm[i+nPhraseRight].nNear==0
){
nPhraseRight++;
}
@@ -3862,7 +3862,7 @@
int nTerm = 1;
tracker_parser_reset (parser, pSegment, nSegment, FALSE, TRUE, TRUE, TRUE);
-
+
while( 1 ){
const char *pToken;
int nToken, iBegin, iEnd, iPos, stop_word, new_paragraph;
@@ -3876,38 +3876,38 @@
&nToken);
if (!pToken) {
break;
- }
-
+ }
+
// printf("token being indexed is %s, pos is %d, begin is %d, end is %d and length is %d\n", pToken, iPos, iBegin, iEnd, nToken);
-
+
if( !inPhrase &&
pSegment[iEnd]==':') {
-
+
int len = iEnd - iBegin;
- char *field = g_strndup (pSegment + iBegin, len);
-
+ char *field = g_strndup (pSegment + iBegin, len);
+
// printf ("field is %s\n", field);
-
+
if ((iCol = checkColumnSpecifier(pQuery->pFts, field, len))>=0 ){
pQuery->nextColumn = iCol;
g_free (field);
continue;
}
}
- if( !inPhrase && pQuery->nTerms>0 && nToken==2
- && pToken[0] == 'o' && pToken[1] == 'r'
+ if( !inPhrase && pQuery->nTerms>0 && nToken==2
+ && pToken[0] == 'o' && pToken[1] == 'r'
){
pQuery->nextIsOr = 1;
continue;
}
- if( !inPhrase && pQuery->nTerms>0 && !pQuery->nextIsOr && nToken==4
- && pToken[0]=='n'
- && pToken[1]=='e'
- && pToken[2]=='a'
- && pToken[3]=='r'
+ if( !inPhrase && pQuery->nTerms>0 && !pQuery->nextIsOr && nToken==4
+ && pToken[0]=='n'
+ && pToken[1]=='e'
+ && pToken[2]=='a'
+ && pToken[3]=='r'
){
QueryTerm *pTerm = &pQuery->pTerms[pQuery->nTerms-1];
- if( (iBegin+6)<nSegment
+ if( (iBegin+6)<nSegment
&& pSegment[iBegin+4] == '/'
&& pSegment[iBegin+5]>='0' && pSegment[iBegin+5]<='9'
){
@@ -3925,25 +3925,25 @@
&nToken);
if (!pToken) {
break;
- }
-
-
+ }
+
+
} else {
pTerm->nNear = SQLITE_FTS3_DEFAULT_NEAR_PARAM;
}
pTerm->nNear++;
continue;
}
-
+
if (stop_word != 0) {
continue;
}
queryAdd(pQuery, pToken, nToken);
if( !inPhrase && iBegin>0) {
-
+
// printf("first char is %c, prev char is %c\n", pSegment[iBegin], pSegment[iBegin-1]);
-
+
if (pSegment[iBegin-1]=='-' ){
pQuery->pTerms[pQuery->nTerms-1].isNot = 1;
}
@@ -4282,7 +4282,7 @@
if (!zText) return SQLITE_OK;
tracker_parser_reset (parser, zText, strlen (zText), FALSE, TRUE, TRUE, FALSE);
-
+
while( 1 ){
pToken = tracker_parser_next (parser, &iPosition,
@@ -4293,15 +4293,15 @@
&nTokenBytes);
if (!pToken) {
break;
- }
-
- // printf("token being indexed is %s, begin is %d, end is %d and length is %d\n", pToken, iStartOffset, iEndOffset, nTokenBytes);
-
+ }
+
+ // printf("token being indexed is %s, begin is %d, end is %d and length is %d\n", pToken, iStartOffset, iEndOffset, nTokenBytes);
+
if (stop_word) {
continue;
- }
-
-
+ }
+
+
DLCollector *p;
@@ -7142,8 +7142,8 @@
"ALTER TABLE %Q.'%q_content' RENAME TO '%q_content';"
"ALTER TABLE %Q.'%q_segments' RENAME TO '%q_segments';"
"ALTER TABLE %Q.'%q_segdir' RENAME TO '%q_segdir';"
- , p->zDb, p->zName, zName
- , p->zDb, p->zName, zName
+ , p->zDb, p->zName, zName
+ , p->zDb, p->zName, zName
, p->zDb, p->zName, zName
);
if( zSql ){
@@ -7194,11 +7194,11 @@
int sqlite3Fts3Init(sqlite3 *db){
int rc = SQLITE_OK;
- /* Create the virtual table wrapper around the hash-table and overload
+ /* Create the virtual table wrapper around the hash-table and overload
** the two scalar functions. If this is successful, register the
** module with sqlite.
*/
- if( SQLITE_OK==rc
+ if( SQLITE_OK==rc
&& SQLITE_OK==(rc = sqlite3_overload_function(db, "snippet", -1))
&& SQLITE_OK==(rc = sqlite3_overload_function(db, "offsets", -1))
&& SQLITE_OK==(rc = sqlite3_overload_function(db, "optimize", -1))
@@ -7220,7 +7220,7 @@
int sqlite3_extension_init(
- sqlite3 *db,
+ sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pApi
){
Modified: branches/indexer-split/src/tracker-indexer/modules/dummy.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/dummy.c (original)
+++ branches/indexer-split/src/tracker-indexer/modules/dummy.c Sat Sep 20 14:45:00 2008
@@ -65,7 +65,7 @@
{
/* Implementing this function is optional.
*
- * Return the service type for the incoming path.
+ * Return the service type for the incoming path.
*
* If this function is not implemented, the indexer will use
* the name of the module (tracker_module_get_name) as service.
Modified: branches/indexer-split/src/tracker-indexer/modules/evolution.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/evolution.c (original)
+++ branches/indexer-split/src/tracker-indexer/modules/evolution.c Sat Sep 20 14:45:00 2008
@@ -280,7 +280,7 @@
{
const gchar *start, *at, *semic;
gchar *user_name, *at_host_name, *account_name;
-
+
/* Assume url schema is:
* imap://foo imap free fr/;etc
* or
Modified: branches/indexer-split/src/tracker-indexer/tracker-dbus.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-dbus.c (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-dbus.c Sat Sep 20 14:45:00 2008
@@ -43,7 +43,7 @@
guint result;
g_message ("Registering DBus service...\n"
- " Name:'%s'",
+ " Name:'%s'",
name);
if (!org_freedesktop_DBus_request_name (proxy,
@@ -113,21 +113,21 @@
return thumb_proxy;
}
-static gboolean
+static gboolean
dbus_register_names (void)
{
GError *error = NULL;
if (connection) {
- g_critical ("The DBusGConnection is already set, have we already initialized?");
+ g_critical ("The DBusGConnection is already set, have we already initialized?");
return FALSE;
}
if (proxy) {
- g_critical ("The DBusGProxy is already set, have we already initialized?");
+ g_critical ("The DBusGProxy is already set, have we already initialized?");
return FALSE;
}
-
+
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (!connection) {
Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
@@ -86,17 +86,17 @@
service_type = tracker_service_get_name (service);
parent = tracker_service_get_parent (service);
- tracker_db_interface_execute_procedure (iface,
- NULL,
- "IncStat",
- service_type,
+ tracker_db_interface_execute_procedure (iface,
+ NULL,
+ "IncStat",
+ service_type,
NULL);
if (parent) {
- tracker_db_interface_execute_procedure (iface,
- NULL,
- "IncStat",
- parent,
+ tracker_db_interface_execute_procedure (iface,
+ NULL,
+ "IncStat",
+ parent,
NULL);
}
}
@@ -110,31 +110,31 @@
service_type = tracker_service_get_name (service);
parent = tracker_service_get_parent (service);
- tracker_db_interface_execute_procedure (iface,
+ tracker_db_interface_execute_procedure (iface,
NULL,
"DecStat",
- service_type,
+ service_type,
NULL);
if (parent) {
tracker_db_interface_execute_procedure (iface,
NULL,
- "DecStat",
- parent,
+ "DecStat",
+ parent,
NULL);
}
}
void
tracker_db_create_event (TrackerDBInterface *iface,
- guint32 service_id,
+ guint32 service_id,
const gchar *type)
{
gchar *service_id_str;
service_id_str = tracker_guint32_to_string (service_id);
- tracker_db_interface_execute_procedure (iface, NULL, "CreateEvent",
+ tracker_db_interface_execute_procedure (iface, NULL, "CreateEvent",
service_id_str,
type,
NULL);
@@ -278,7 +278,7 @@
static gchar *
db_get_metadata (TrackerService *service,
- guint service_id,
+ guint service_id,
gboolean keywords)
{
TrackerDBInterface *iface;
@@ -308,7 +308,6 @@
g_free (query);
if (result_set) {
-
gboolean valid = TRUE;
while (valid) {
@@ -318,6 +317,7 @@
valid = tracker_db_result_set_iter_next (result_set);
g_free (str);
}
+
g_object_unref (result_set);
}
@@ -338,18 +338,18 @@
while (valid) {
if (numeric) {
- tracker_db_result_set_get (result_set,
- 0, &metadata_id,
- 1, &numeric_value,
+ tracker_db_result_set_get (result_set,
+ 0, &metadata_id,
+ 1, &numeric_value,
-1);
value = g_strdup_printf ("%d", numeric_value);
} else {
- tracker_db_result_set_get (result_set,
- 0, &metadata_id,
- 1, &value,
+ tracker_db_result_set_get (result_set,
+ 0, &metadata_id,
+ 1, &value,
-1);
}
-
+
field = tracker_ontology_get_field_by_id (metadata_id);
if (!field) {
g_critical ("Field id %d in database but not in tracker-ontology",
@@ -357,11 +357,11 @@
g_free (value);
return;
}
-
+
if (tracker_field_get_embedded (field) || !only_embedded) {
if (tracker_field_get_multiple_values (field)) {
GList *new_values;
- const GList *old_values;
+ const GList *old_values;
new_values = NULL;
old_values = tracker_metadata_lookup_multiple_values (metadata,
@@ -369,14 +369,14 @@
if (old_values) {
new_values = g_list_copy ((GList *) old_values);
}
-
+
new_values = g_list_prepend (new_values, value);
- tracker_metadata_insert_multiple_values (metadata,
+ tracker_metadata_insert_multiple_values (metadata,
tracker_field_get_name (field),
new_values);
} else {
- tracker_metadata_insert (metadata,
- tracker_field_get_name (field),
+ tracker_metadata_insert (metadata,
+ tracker_field_get_name (field),
value);
}
} else {
@@ -444,10 +444,10 @@
service_id_str = tracker_guint32_to_string (service_id);
/* Delete from services table */
- tracker_db_interface_execute_procedure (iface,
+ tracker_db_interface_execute_procedure (iface,
NULL,
- "DeleteService1",
- service_id_str,
+ "DeleteService1",
+ service_id_str,
NULL);
g_free (service_id_str);
@@ -468,15 +468,15 @@
iface = tracker_db_manager_get_db_interface_by_type (tracker_service_get_name (service),
TRACKER_DB_CONTENT_TYPE_METADATA);
- tracker_file_get_path_and_name (from,
- &from_dirname,
+ tracker_file_get_path_and_name (from,
+ &from_dirname,
&from_basename);
- tracker_file_get_path_and_name (to,
- &to_dirname,
+ tracker_file_get_path_and_name (to,
+ &to_dirname,
&to_basename);
- tracker_db_interface_execute_procedure (iface,
- NULL,
+ tracker_db_interface_execute_procedure (iface,
+ NULL,
"MoveService",
to_dirname, to_basename,
from_dirname, from_basename,
@@ -484,11 +484,11 @@
/* FIXME: This procedure should use LIKE statement */
tracker_db_interface_execute_procedure (iface,
- &error,
- "MoveServiceChildren",
- from,
- to,
- from,
+ &error,
+ "MoveServiceChildren",
+ from,
+ to,
+ from,
NULL);
g_free (to_dirname);
@@ -512,20 +512,20 @@
/* Delete from ServiceMetadata, ServiceKeywordMetadata,
* ServiceNumberMetadata.
*/
- tracker_db_interface_execute_procedure (iface,
- NULL,
- "DeleteServiceMetadata",
- service_id_str,
- NULL);
- tracker_db_interface_execute_procedure (iface,
- NULL,
- "DeleteServiceKeywordMetadata",
- service_id_str,
- NULL);
- tracker_db_interface_execute_procedure (iface,
- NULL,
- "DeleteServiceNumericMetadata",
- service_id_str,
+ tracker_db_interface_execute_procedure (iface,
+ NULL,
+ "DeleteServiceMetadata",
+ service_id_str,
+ NULL);
+ tracker_db_interface_execute_procedure (iface,
+ NULL,
+ "DeleteServiceKeywordMetadata",
+ service_id_str,
+ NULL);
+ tracker_db_interface_execute_procedure (iface,
+ NULL,
+ "DeleteServiceNumericMetadata",
+ service_id_str,
NULL);
}
@@ -562,19 +562,19 @@
if (metadata_key > 0) {
gchar *query;
- query = g_strdup_printf ("SELECT KeyMetadata%d FROM Services WHERE id = '%d'",
- metadata_key,
+ query = g_strdup_printf ("SELECT KeyMetadata%d FROM Services WHERE id = '%d'",
+ metadata_key,
id);
- result_set = tracker_db_interface_execute_query (iface,
- NULL,
- query,
+ result_set = tracker_db_interface_execute_query (iface,
+ NULL,
+ query,
NULL);
g_free (query);
} else {
gchar *id_str;
id_str = tracker_guint32_to_string (id);
-
+
switch (tracker_field_get_data_type (field)) {
case TRACKER_FIELD_TYPE_KEYWORD:
result_set = tracker_db_interface_execute_procedure (iface, NULL,
@@ -618,15 +618,15 @@
if (tracker_db_result_set_get_n_rows (result_set) > 1) {
g_warning ("More than one result in tracker_db_get_property_value");
}
-
+
if (!is_numeric) {
final_result = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
} else {
- final_result = tracker_dbus_query_result_numeric_to_strv (result_set, 0, NULL);
+ final_result = tracker_dbus_query_result_numeric_to_strv (result_set, 0, NULL);
}
g_object_unref (result_set);
- }
+ }
return final_result;
}
@@ -710,8 +710,8 @@
if (metadata_key > 0) {
tracker_db_interface_execute_query (iface, NULL,
"update Services set KeyMetadata%d = '%s' where id = %d",
- metadata_key,
- value,
+ metadata_key,
+ value,
id);
}
@@ -818,7 +818,7 @@
gchar *
tracker_db_get_text (TrackerService *service,
- guint32 id)
+ guint32 id)
{
TrackerDBInterface *iface;
TrackerField *field;
@@ -831,9 +831,9 @@
TRACKER_DB_CONTENT_TYPE_CONTENTS);
/* Delete contents if it has! */
- result_set = tracker_db_interface_execute_procedure (iface, NULL,
- "GetContents",
- service_id_str,
+ result_set = tracker_db_interface_execute_procedure (iface, NULL,
+ "GetContents",
+ service_id_str,
tracker_field_get_id (field),
NULL);
@@ -849,7 +849,7 @@
void
tracker_db_delete_text (TrackerService *service,
- guint32 id)
+ guint32 id)
{
TrackerDBInterface *iface;
TrackerField *field;
@@ -861,9 +861,9 @@
TRACKER_DB_CONTENT_TYPE_CONTENTS);
/* Delete contents if it has! */
- tracker_db_interface_execute_procedure (iface, NULL,
- "DeleteContent",
- service_id_str,
+ tracker_db_interface_execute_procedure (iface, NULL,
+ "DeleteContent",
+ service_id_str,
tracker_field_get_id (field),
NULL);
Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-db.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-db.h (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-db.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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 (urho konttori nokia com)
*
Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.c (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.c Sat Sep 20 14:45:00 2008
@@ -211,7 +211,7 @@
info->module = module;
info->module_name = g_strdup (module_name);
info->file = tracker_indexer_module_file_new (module, path);
-
+
if (G_UNLIKELY (other_path)) {
info->other_file = tracker_indexer_module_file_new (module, other_path);
} else {
@@ -227,7 +227,7 @@
if (G_UNLIKELY (info->other_file)) {
tracker_indexer_module_file_free (info->module, info->other_file);
}
-
+
tracker_indexer_module_file_free (info->module, info->file);
g_free (info->module_name);
g_slice_free (PathInfo, info);
@@ -1034,18 +1034,18 @@
tracker_config_get_enable_stemmer (indexer->private->config),
FALSE);
} else {
- /* We dont know the exact property weight.
+ /* We dont know the exact property weight.
Big value works.
*/
parsed = tracker_parser_text_fast (NULL,
text,
- weight_factor);
+ weight_factor);
}
g_hash_table_iter_init (&iter, parsed);
index = tracker_db_index_manager_get_index_by_service_id (service_type);
-
+
while (g_hash_table_iter_next (&iter, &key, &value)) {
tracker_db_index_add_word (index,
key,
@@ -1053,73 +1053,73 @@
service_type,
GPOINTER_TO_INT (value));
}
-
+
g_hash_table_unref (parsed);
}
static void
-index_text_with_parsing (TrackerIndexer *indexer,
- gint service_id,
- gint service_type_id,
- const gchar *content,
+index_text_with_parsing (TrackerIndexer *indexer,
+ gint service_id,
+ gint service_type_id,
+ const gchar *content,
gint weight_factor)
{
- send_text_to_index (indexer,
- service_id,
- service_type_id,
- content,
- TRUE,
+ send_text_to_index (indexer,
+ service_id,
+ service_type_id,
+ content,
+ TRUE,
weight_factor);
}
static void
-unindex_text_with_parsing (TrackerIndexer *indexer,
- gint service_id,
- gint service_type_id,
- const gchar *content,
+unindex_text_with_parsing (TrackerIndexer *indexer,
+ gint service_id,
+ gint service_type_id,
+ const gchar *content,
gint weight_factor)
{
- send_text_to_index (indexer,
- service_id,
- service_type_id,
- content,
- TRUE,
+ send_text_to_index (indexer,
+ service_id,
+ service_type_id,
+ content,
+ TRUE,
weight_factor * -1);
}
static void
-index_text_no_parsing (TrackerIndexer *indexer,
- gint service_id,
- gint service_type_id,
- const gchar *content,
+index_text_no_parsing (TrackerIndexer *indexer,
+ gint service_id,
+ gint service_type_id,
+ const gchar *content,
gchar weight_factor)
{
- send_text_to_index (indexer,
- service_id,
- service_type_id,
- content,
- FALSE,
+ send_text_to_index (indexer,
+ service_id,
+ service_type_id,
+ content,
+ FALSE,
weight_factor);
}
static void
-unindex_text_no_parsing (TrackerIndexer *indexer,
- gint service_id,
- gint service_type_id,
- const gchar *content,
+unindex_text_no_parsing (TrackerIndexer *indexer,
+ gint service_id,
+ gint service_type_id,
+ const gchar *content,
gint weight_factor)
{
- send_text_to_index (indexer,
- service_id,
- service_type_id,
- content,
+ send_text_to_index (indexer,
+ service_id,
+ service_type_id,
+ content,
FALSE,
weight_factor * -1);
}
static void
update_word_foreach (gpointer key,
- gpointer value,
+ gpointer value,
gpointer user_data)
{
TrackerDBIndex *index;
@@ -1143,8 +1143,8 @@
static void
update_words_no_parsing (TrackerIndexer *indexer,
- gint service_id,
- gint service_type_id,
+ gint service_id,
+ gint service_type_id,
GHashTable *words)
{
UpdateWordsForeachData user_data;
@@ -1173,21 +1173,21 @@
if (g_hash_table_lookup_extended (new_table, word, &k, &v)) {
gint old_score;
gint calculated_score;
-
+
old_score = GPOINTER_TO_INT (v);
calculated_score = old_score - new_score;
if (calculated_score != 0) {
- g_hash_table_insert (new_table,
- g_strdup (word),
+ g_hash_table_insert (new_table,
+ g_strdup (word),
GINT_TO_POINTER (calculated_score));
} else {
/* The word is the same in old and new text */
g_hash_table_remove (new_table, word);
}
} else {
- g_hash_table_insert (new_table,
- g_strdup (word),
+ g_hash_table_insert (new_table,
+ g_strdup (word),
GINT_TO_POINTER (0 - new_score));
}
}
@@ -1198,55 +1198,55 @@
guint32 id,
const gchar *old_text,
const gchar *new_text)
-{
+{
GHashTable *old_words;
GHashTable *new_words;
-
+
if (!old_text && !new_text) {
return;
}
/* Service has/had full text */
- old_words = tracker_parser_text (NULL,
- old_text,
- 1,
+ old_words = tracker_parser_text (NULL,
+ old_text,
+ 1,
indexer->private->language,
tracker_config_get_max_words_to_index (indexer->private->config),
tracker_config_get_max_word_length (indexer->private->config),
tracker_config_get_min_word_length (indexer->private->config),
tracker_config_get_enable_stemmer (indexer->private->config),
FALSE);
-
+
new_words = tracker_parser_text (NULL,
new_text,
- 1,
+ 1,
indexer->private->language,
tracker_config_get_max_words_to_index (indexer->private->config),
tracker_config_get_max_word_length (indexer->private->config),
tracker_config_get_min_word_length (indexer->private->config),
tracker_config_get_enable_stemmer (indexer->private->config),
FALSE);
-
+
/* Merge the score of the words from one and
* other file new_table contains the words
- * with the updated scores
+ * with the updated scores
*/
g_hash_table_foreach (old_words, merge_word_table, new_words);
-
- update_words_no_parsing (indexer,
- id,
- tracker_service_get_id (service),
+
+ update_words_no_parsing (indexer,
+ id,
+ tracker_service_get_id (service),
new_words);
-
+
/* Remove old text and set new one in the db */
if (old_text) {
tracker_db_delete_text (service, id);
}
-
+
if (new_text) {
tracker_db_set_text (service, id, new_text);
}
-
+
g_hash_table_unref (old_words);
g_hash_table_unref (new_words);
}
@@ -1263,7 +1263,7 @@
gchar *text;
guint32 id;
- service_type = tracker_indexer_module_file_get_service_type (info->module,
+ service_type = tracker_indexer_module_file_get_service_type (info->module,
info->file);
if (!service_type) {
@@ -1285,9 +1285,9 @@
/* Update case */
g_debug ("Updating file '%s'", info->file->path);
- /*
+ /*
* Using DB directly: get old (embedded) metadata,
- * unindex, index the new metadata
+ * unindex, index the new metadata
*/
old_metadata = tracker_db_get_all_metadata (service, id, TRUE);
unindex_metadata (indexer, id, service, old_metadata);
@@ -1298,34 +1298,33 @@
*/
old_text = tracker_db_get_text (service, id);
new_text = tracker_indexer_module_file_get_text (info->module, info->file);
-
- item_update_content (indexer, service, id, old_text, new_text);
+ item_update_content (indexer, service, id, old_text, new_text);
g_free (old_text);
g_free (new_text);
- tracker_metadata_free (old_metadata);
+ tracker_metadata_free (old_metadata);
return;
}
g_debug ("Creating file '%s'", info->file->path);
-
+
/* Service wasn't previously indexed */
id = tracker_db_get_new_service_id (indexer->private->common);
-
+
tracker_db_create_service (service,
id,
dirname,
basename,
metadata);
-
+
tracker_db_create_event (indexer->private->cache, id, "Create");
tracker_db_increment_stats (indexer->private->common, service);
-
+
index_metadata (indexer, id, service, metadata);
-
+
text = tracker_indexer_module_file_get_text (info->module, info->file);
-
+
if (text) {
/* Save in the index */
index_text_with_parsing (indexer,
@@ -1333,7 +1332,7 @@
tracker_service_get_id (service),
text,
1);
-
+
/* Save in the DB */
tracker_db_set_text (service, id, text);
g_free (text);
@@ -1351,7 +1350,7 @@
gchar *service_type;
guint32 id;
- service_type = tracker_indexer_module_file_get_service_type (info->module,
+ service_type = tracker_indexer_module_file_get_service_type (info->module,
info->other_file);
if (!service_type) {
@@ -1365,28 +1364,28 @@
return;
}
- g_debug ("Moving file from '%s' to '%s'",
+ g_debug ("Moving file from '%s' to '%s'",
info->file->path,
info->other_file->path);
/* Get 'source' ID */
- if (!tracker_db_check_service (service,
- dirname,
- basename,
- &id,
+ if (!tracker_db_check_service (service,
+ dirname,
+ basename,
+ &id,
NULL)) {
g_message ("Source file '%s' not found in database to move",
info->file->path);
return;
}
- tracker_db_move_service (service,
- info->file->path,
+ tracker_db_move_service (service,
+ info->file->path,
info->other_file->path);
- /*
+ /*
* Using DB directly: get old (embedded) metadata, unindex,
- * index the new metadata
+ * index the new metadata
*/
metadata = tracker_db_get_all_metadata (service, id, TRUE);
unindex_metadata (indexer, id, service, metadata);
@@ -1441,34 +1440,34 @@
/* Get content, unindex the words and delete the contents */
content = tracker_db_get_text (service, service_id);
if (content) {
- unindex_text_with_parsing (indexer,
- service_id,
- service_type_id,
- content,
+ unindex_text_with_parsing (indexer,
+ service_id,
+ service_type_id,
+ content,
1);
g_free (content);
tracker_db_delete_text (service, service_id);
}
/* Get metadata from DB to remove it from the index */
- metadata = tracker_db_get_parsed_metadata (service,
+ metadata = tracker_db_get_parsed_metadata (service,
service_id);
- unindex_text_no_parsing (indexer,
- service_id,
- service_type_id,
- metadata,
+ unindex_text_no_parsing (indexer,
+ service_id,
+ service_type_id,
+ metadata,
1000);
g_free (metadata);
/* The weight depends on metadata, but a number high enough
* force deletion.
*/
- metadata = tracker_db_get_unparsed_metadata (service,
+ metadata = tracker_db_get_unparsed_metadata (service,
service_id);
- unindex_text_with_parsing (indexer,
- service_id,
- service_type_id,
- metadata,
+ unindex_text_with_parsing (indexer,
+ service_id,
+ service_type_id,
+ metadata,
1000);
g_free (metadata);
@@ -1497,18 +1496,18 @@
service = tracker_ontology_get_service_by_name (service_type);
if (!service) {
- g_set_error (error,
- g_quark_from_string (TRACKER_INDEXER_ERROR),
+ g_set_error (error,
+ g_quark_from_string (TRACKER_INDEXER_ERROR),
TRACKER_INDEXER_ERROR_CODE,
- "Unknown service type: '%s'",
+ "Unknown service type: '%s'",
service_type);
return FALSE;
}
field = tracker_ontology_get_field_by_name (property);
if (!field) {
- g_set_error (error,
- g_quark_from_string (TRACKER_INDEXER_ERROR),
+ g_set_error (error,
+ g_quark_from_string (TRACKER_INDEXER_ERROR),
TRACKER_INDEXER_ERROR_CODE,
"Unknown field type: '%s'",
property);
@@ -1516,8 +1515,8 @@
}
if (tracker_field_get_embedded (field)) {
- g_set_error (error,
- g_quark_from_string (TRACKER_INDEXER_ERROR),
+ g_set_error (error,
+ g_quark_from_string (TRACKER_INDEXER_ERROR),
TRACKER_INDEXER_ERROR_CODE,
"Field type: '%s' is embedded and not writable",
property);
@@ -1527,11 +1526,11 @@
len = g_strv_length (values);
if (!tracker_field_get_multiple_values (field) && len > 1) {
- g_set_error (error,
- g_quark_from_string (TRACKER_INDEXER_ERROR),
+ g_set_error (error,
+ g_quark_from_string (TRACKER_INDEXER_ERROR),
TRACKER_INDEXER_ERROR_CODE,
- "Field type: '%s' doesnt support multiple values (trying to set %d)",
- property,
+ "Field type: '%s' doesnt support multiple values (trying to set %d)",
+ property,
len);
return FALSE;
}
@@ -1547,8 +1546,8 @@
g_free (basename);
if (service_id < 1) {
- g_set_error (error,
- g_quark_from_string (TRACKER_INDEXER_ERROR),
+ g_set_error (error,
+ g_quark_from_string (TRACKER_INDEXER_ERROR),
TRACKER_INDEXER_ERROR_CODE,
"File '%s' doesnt exist in the DB", uri);
return FALSE;
@@ -1558,8 +1557,8 @@
/* Remove old value from DB and index */
gchar **old_contents;
- old_contents = tracker_db_get_property_values (service,
- service_id,
+ old_contents = tracker_db_get_property_values (service,
+ service_id,
field);
len = g_strv_length (old_contents);
@@ -1633,18 +1632,18 @@
service = tracker_ontology_get_service_by_name (service_type);
if (!service) {
- g_set_error (error,
- g_quark_from_string (TRACKER_INDEXER_ERROR),
+ g_set_error (error,
+ g_quark_from_string (TRACKER_INDEXER_ERROR),
TRACKER_INDEXER_ERROR_CODE,
- "Unknown service type: '%s'",
+ "Unknown service type: '%s'",
service_type);
return FALSE;
}
field = tracker_ontology_get_field_by_name (property);
if (!field) {
- g_set_error (error,
- g_quark_from_string (TRACKER_INDEXER_ERROR),
+ g_set_error (error,
+ g_quark_from_string (TRACKER_INDEXER_ERROR),
TRACKER_INDEXER_ERROR_CODE,
"Unknown field type: '%s'",
property);
@@ -1652,8 +1651,8 @@
}
if (tracker_field_get_embedded (field)) {
- g_set_error (error,
- g_quark_from_string (TRACKER_INDEXER_ERROR),
+ g_set_error (error,
+ g_quark_from_string (TRACKER_INDEXER_ERROR),
TRACKER_INDEXER_ERROR_CODE,
"Field type: '%s' is embedded and cannot be deleted",
property);
@@ -1668,8 +1667,8 @@
g_free (basename);
if (service_id < 1) {
- g_set_error (error,
- g_quark_from_string (TRACKER_INDEXER_ERROR),
+ g_set_error (error,
+ g_quark_from_string (TRACKER_INDEXER_ERROR),
TRACKER_INDEXER_ERROR_CODE,
"File '%s' doesnt exist in the DB", uri);
return FALSE;
@@ -1677,7 +1676,7 @@
/* If we receive concrete values, we delete those rows in the
* db. Otherwise, retrieve the old values of the property and
- * remove all their instances for the file
+ * remove all their instances for the file
*/
if (g_strv_length (values) > 0) {
for (i = 0; values[i] != NULL; i++) {
@@ -1689,16 +1688,16 @@
joined = g_strjoinv (" ", values);
} else {
gchar **old_contents;
-
- old_contents = tracker_db_get_property_values (service,
- service_id,
+
+ old_contents = tracker_db_get_property_values (service,
+ service_id,
field);
if (old_contents) {
tracker_db_delete_metadata (service,
service_id,
field,
NULL);
-
+
joined = g_strjoinv (" ", old_contents);
g_strfreev (old_contents);
}
@@ -1754,10 +1753,10 @@
/* Check the file/directory exists. If it doesn't we
* definitely want to index it.
*/
- if (!tracker_db_check_service (service,
- dirname,
- basename,
- NULL,
+ if (!tracker_db_check_service (service,
+ dirname,
+ basename,
+ NULL,
&mtime)) {
return TRUE;
}
@@ -1777,10 +1776,10 @@
* more likely to be less of those than actual directories.
* So we keep a list of them and if the dirname is in the
* hash table we then say it needs reindexing. If not, we
- * assume that it must be up to date.
+ * assume that it must be up to date.
*
* This entry in the hash table is removed after each index is
- * complete.
+ * complete.
*
* Note: info->file->path = '/tmp/foo/bar'
* dirname = '/tmp/foo'
@@ -1801,7 +1800,7 @@
* --> return FALSE
* 3) Add to hash table
* --> return TRUE
- */
+ */
is_dir = S_ISDIR (st.st_mode);
should_be_cached = TRUE;
@@ -1835,7 +1834,7 @@
return should_index;
}
-
+
/* Step 2. */
if (!is_dir) {
gchar *parent_dirname;
@@ -1849,16 +1848,16 @@
/* We don't have the mtime for the dirname yet, we do
* if this is a info->file->path of course.
*/
- exists = tracker_db_check_service (service,
- parent_dirname,
- parent_basename,
- NULL,
+ exists = tracker_db_check_service (service,
+ parent_dirname,
+ parent_basename,
+ NULL,
&mtime);
if (!exists) {
g_message ("Expected path '%s/%s' to exist, not in database?",
parent_dirname,
parent_basename);
-
+
g_free (parent_basename);
g_free (parent_dirname);
@@ -1892,10 +1891,10 @@
is_dir ? "Path" : "Parent path",
str);
- g_hash_table_replace (indexer->private->mtime_cache,
+ g_hash_table_replace (indexer->private->mtime_cache,
g_strdup (str),
GINT_TO_POINTER (1));
-
+
return TRUE;
}
static gboolean
@@ -1912,7 +1911,7 @@
/* Set the current module */
indexer->private->current_module = g_quark_from_string (info->module_name);
-
+
if (!tracker_indexer_module_file_get_uri (info->module,
info->file,
&dirname,
@@ -1920,12 +1919,12 @@
return TRUE;
}
- /*
+ /*
* FIRST:
* ======
* We don't check if we should index files for MOVE events.
*
- * SECOND:
+ * SECOND:
* =======
* Here we do a quick check to see if this is an email URI or
* not. For emails we don't check if we should index them, we
@@ -2378,7 +2377,7 @@
tracker_dbus_async_return_if_fail (files != NULL, context);
tracker_dbus_request_new (request_id,
- "DBus request to check %d files",
+ "DBus request to check %d files",
g_strv_length (files));
module = g_hash_table_lookup (indexer->private->indexer_modules, module_name);
@@ -2396,7 +2395,7 @@
/* Add files to the queue */
for (i = 0; files[i]; i++) {
PathInfo *info;
-
+
info = path_info_new (module, module_name, files[i], NULL);
add_file (indexer, info);
}
@@ -2449,7 +2448,7 @@
request_id = tracker_dbus_get_next_request_id ();
tracker_dbus_request_new (request_id,
- "DBus request to move '%s' to '%s'",
+ "DBus request to move '%s' to '%s'",
from, to);
module = g_hash_table_lookup (indexer->private->indexer_modules, module_name);
@@ -2479,7 +2478,7 @@
const gchar *property,
GStrv values,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
guint request_id;
GError *actual_error = NULL;
@@ -2500,10 +2499,10 @@
uri);
if (!handle_metadata_add (indexer,
- service_type,
- uri,
- property,
- values,
+ service_type,
+ uri,
+ property,
+ values,
&actual_error)) {
tracker_dbus_request_failed (request_id,
&actual_error,
@@ -2512,7 +2511,7 @@
g_error_free (actual_error);
return;
}
-
+
schedule_flush (indexer, TRUE);
dbus_g_method_return (context);
@@ -2545,11 +2544,11 @@
property,
uri);
- if (!handle_metadata_remove (indexer,
- service_type,
- uri,
- property,
- values,
+ if (!handle_metadata_remove (indexer,
+ service_type,
+ uri,
+ property,
+ values,
&actual_error)) {
tracker_dbus_request_failed (request_id,
&actual_error,
Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.h (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.h Sat Sep 20 14:45:00 2008
@@ -45,7 +45,7 @@
struct TrackerIndexer {
GObject parent_instance;
-
+
/* Private struct */
TrackerIndexerPrivate *private;
};
Modified: branches/indexer-split/src/tracker-indexer/tracker-main.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-main.c (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-main.c Sat Sep 20 14:45:00 2008
@@ -46,14 +46,14 @@
#define ABOUT \
"Tracker " VERSION "\n" \
- "Copyright (c) 2005-2008 Jamie McCracken (jamiemcc gnome org)\n"
+ "Copyright (c) 2005-2008 Jamie McCracken (jamiemcc gnome org)\n"
#define LICENSE \
"This program is free software and comes without any warranty.\n" \
"It is licensed under version 2 or later of the General Public " \
"License which can be viewed at:\n" \
"\n" \
- " http://www.gnu.org/licenses/gpl.txt\n";
+ " http://www.gnu.org/licenses/gpl.txt\n";
#define QUIT_TIMEOUT 300 /* 5 minutes worth of seconds */
@@ -65,18 +65,18 @@
static gboolean run_forever = FALSE;
static GOptionEntry entries[] = {
- { "verbosity", 'v', 0,
- G_OPTION_ARG_INT, &verbosity,
+ { "verbosity", 'v', 0,
+ G_OPTION_ARG_INT, &verbosity,
N_("Logging, 0 = errors only, "
- "1 = minimal, 2 = detailed and 3 = debug (default = 0)"),
+ "1 = minimal, 2 = detailed and 3 = debug (default = 0)"),
NULL },
{ "process-all", 'p', 0,
G_OPTION_ARG_NONE, &process_all,
N_("Whether to process data from all configured modules to be indexed"),
NULL },
- { "run-forever", 'f', 0,
- G_OPTION_ARG_NONE, &run_forever,
- N_("Run forever, only interesting for debugging purposes"),
+ { "run-forever", 'f', 0,
+ G_OPTION_ARG_NONE, &run_forever,
+ N_("Run forever, only interesting for debugging purposes"),
NULL },
{ NULL }
@@ -86,29 +86,29 @@
sanity_check_option_values (TrackerConfig *config)
{
g_message ("General options:");
- g_message (" Verbosity ............................ %d",
+ g_message (" Verbosity ............................ %d",
tracker_config_get_verbosity (config));
- g_message (" Low memory mode ...................... %s",
+ g_message (" Low memory mode ...................... %s",
tracker_config_get_low_memory_mode (config) ? "yes" : "no");
g_message ("Indexer options:");
g_message (" Throttle level ....................... %d",
tracker_config_get_throttle (config));
- g_message (" File content indexing enabled ........ %s",
+ g_message (" File content indexing enabled ........ %s",
tracker_config_get_enable_content_indexing (config) ? "yes" : "no");
- g_message (" Thumbnail indexing enabled ........... %s",
+ g_message (" Thumbnail indexing enabled ........... %s",
tracker_config_get_enable_thumbnails (config) ? "yes" : "no");
- g_message (" Indexer language code ................ %s",
+ g_message (" Indexer language code ................ %s",
tracker_config_get_language (config));
- g_message (" Stemmer enabled ...................... %s",
+ g_message (" Stemmer enabled ...................... %s",
tracker_config_get_enable_stemmer (config) ? "yes" : "no");
- g_message (" Fast merges enabled .................. %s",
+ g_message (" Fast merges enabled .................. %s",
tracker_config_get_fast_merges (config) ? "yes" : "no");
- g_message (" Disable indexing on battery .......... %s (initially = %s)",
+ g_message (" Disable indexing on battery .......... %s (initially = %s)",
tracker_config_get_disable_indexing_on_battery (config) ? "yes" : "no",
tracker_config_get_disable_indexing_on_battery_init (config) ? "yes" : "no");
- if (tracker_config_get_low_disk_space_limit (config) == -1) {
+ if (tracker_config_get_low_disk_space_limit (config) == -1) {
g_message (" Low disk space limit ................. Disabled");
} else {
g_message (" Low disk space limit ................. %d%%",
@@ -252,7 +252,7 @@
gchar *filename;
g_type_init ();
-
+
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
@@ -292,9 +292,9 @@
tracker_config_set_verbosity (config, verbosity);
}
- filename = g_build_filename (g_get_user_data_dir (),
- "tracker",
- "tracker-indexer.log",
+ filename = g_build_filename (g_get_user_data_dir (),
+ "tracker",
+ "tracker-indexer.log",
NULL);
tracker_log_init (filename, tracker_config_get_verbosity (config));
@@ -316,7 +316,7 @@
}
tracker_db_manager_init (flags, NULL);
- if (!tracker_db_index_manager_init (0,
+ if (!tracker_db_index_manager_init (0,
tracker_config_get_min_bucket_count (config),
tracker_config_get_max_bucket_count (config))) {
return EXIT_FAILURE;
@@ -330,13 +330,13 @@
/* nice() uses attribute "warn_unused_result" and so complains
* if we do not check its returned value. But it seems that
* since glibc 2.2.4, nice() can return -1 on a successful
- * call so we have to check value of errno too. Stupid...
+ * call so we have to check value of errno too. Stupid...
*/
if (nice (19) == -1 && errno) {
const gchar *str;
str = g_strerror (errno);
- g_message ("Couldn't set nice value to 19, %s",
+ g_message ("Couldn't set nice value to 19, %s",
str ? str : "no error given");
}
@@ -349,7 +349,7 @@
/* Create the indexer and run the main loop */
g_signal_connect (indexer, "finished",
- G_CALLBACK (indexer_finished_cb),
+ G_CALLBACK (indexer_finished_cb),
NULL);
if (process_all) {
Modified: branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c Sat Sep 20 14:45:00 2008
@@ -90,8 +90,8 @@
gint status,
gpointer user_data)
{
- g_debug ("Process '%d' exited with code: %d->'%s'",
- pid,
+ g_debug ("Process '%d' exited with code: %d->'%s'",
+ pid,
status,
g_strerror (status));
@@ -110,16 +110,16 @@
GIOFlags flags;
GPid pid;
- if (!tracker_spawn_async_with_channels (argv,
- 10,
- &pid,
- &stdin_channel,
- &stdout_channel,
+ if (!tracker_spawn_async_with_channels (argv,
+ 10,
+ &pid,
+ &stdin_channel,
+ &stdout_channel,
NULL)) {
return NULL;
}
- g_debug ("Process '%d' spawned for command:'%s'",
+ g_debug ("Process '%d' spawned for command:'%s'",
pid,
argv[0]);
@@ -132,7 +132,7 @@
G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP,
stdout_watch_func,
context);
-
+
flags = g_io_channel_get_flags (context->stdout_channel);
flags |= G_IO_FLAG_NONBLOCK;
@@ -166,10 +166,10 @@
if ((condition & G_IO_IN) || (condition & G_IO_PRI)) {
do {
- status = g_io_channel_read_line (metadata_context->stdout_channel,
- &line,
- NULL,
- NULL,
+ status = g_io_channel_read_line (metadata_context->stdout_channel,
+ &line,
+ NULL,
+ NULL,
NULL);
if (status == G_IO_STATUS_NORMAL && line && *line) {
@@ -193,9 +193,9 @@
static gboolean
metadata_setup (void)
{
- const gchar *argv[2] = {
- LIBEXEC_PATH G_DIR_SEPARATOR_S "tracker-extract",
- NULL
+ const gchar *argv[2] = {
+ LIBEXEC_PATH G_DIR_SEPARATOR_S "tracker-extract",
+ NULL
};
if (metadata_context) {
@@ -203,7 +203,7 @@
metadata_context = NULL;
}
- metadata_context = process_context_create (argv,
+ metadata_context = process_context_create (argv,
metadata_read_cb);
if (!metadata_context) {
@@ -388,12 +388,12 @@
return TRUE;
}
-static gboolean
+static gboolean
get_file_is_utf8 (GString *s,
gssize *bytes_valid)
{
const gchar *end;
-
+
/* Check for UTF-8 validity, since we may
* have cut off the end.
*/
@@ -403,7 +403,7 @@
}
*bytes_valid = end - s->str;
-
+
/* 4 is the maximum bytes for a UTF-8 character. */
if (*bytes_valid > 4) {
return FALSE;
@@ -412,7 +412,7 @@
if (g_utf8_get_char_validated (end, *bytes_valid) == (gunichar) -1) {
return FALSE;
}
-
+
return TRUE;
}
@@ -425,17 +425,17 @@
gchar *str;
gsize bytes_read;
gsize bytes_written;
-
- str = g_locale_to_utf8 (s->str,
- s->len,
- &bytes_read,
- &bytes_written,
+
+ str = g_locale_to_utf8 (s->str,
+ s->len,
+ &bytes_read,
+ &bytes_written,
&error);
if (error) {
g_debug (" Conversion to UTF-8 read %d bytes, wrote %d bytes",
- bytes_read,
+ bytes_read,
bytes_written);
- g_message ("Could not convert file from locale to UTF-8, %s",
+ g_message ("Could not convert file from locale to UTF-8, %s",
error->message);
g_error_free (error);
g_free (str);
@@ -485,7 +485,7 @@
buf_size = TEXT_CHECK_SIZE - 1;
g_debug (" Starting read...");
-
+
while (has_more_data && !has_reached_max && !error) {
gssize bytes_read;
gssize bytes_remaining;
@@ -507,7 +507,7 @@
bytes_read += bytes;
bytes_remaining -= bytes;
- g_debug (" Read %d bytes",
+ g_debug (" Read %d bytes",
bytes);
}
@@ -527,7 +527,7 @@
if (bytes_read_total == 0) {
if (bytes_read == buf_size &&
strchr (buf, '\n') == NULL) {
- g_debug (" No '\\n' in the first %d bytes, not indexing file",
+ g_debug (" No '\\n' in the first %d bytes, not indexing file",
buf_size);
break;
} else if (bytes_read <= 2) {
@@ -545,13 +545,13 @@
if (bytes_read != buf_size || bytes_read == 0) {
has_more_data = FALSE;
- }
+ }
if (bytes_read_total >= TEXT_MAX_SIZE) {
has_reached_max = TRUE;
}
- g_debug (" Read %d bytes total, %d bytes this time, more data:%s, reached max:%s",
+ g_debug (" Read %d bytes total, %d bytes this time, more data:%s, reached max:%s",
bytes_read_total,
bytes_read,
has_more_data ? "yes" : "no",
@@ -576,28 +576,28 @@
return NULL;
}
-
+
/* Check for UTF-8 Validity, if not try to convert it to the
* locale we are in.
*/
is_utf8 = get_file_is_utf8 (s, &bytes_valid);
-
+
/* Make sure the string is NULL terminated and in the case
* where the string is valid UTF-8 up to the last character
* which was cut off, NULL terminate to the last most valid
- * character.
+ * character.
*/
#ifdef TRY_LOCALE_TO_UTF8_CONVERSION
if (!is_utf8) {
s = get_file_in_locale (s);
} else {
- g_debug (" Truncating to last valid UTF-8 character (%d/%d bytes)",
+ g_debug (" Truncating to last valid UTF-8 character (%d/%d bytes)",
bytes_valid,
s->len);
s = g_string_truncate (s, bytes_valid);
}
#else /* TRY_LOCALE_TO_UTF8_CONVERSION */
- g_debug (" Truncating to last valid UTF-8 character (%d/%d bytes)",
+ g_debug (" Truncating to last valid UTF-8 character (%d/%d bytes)",
bytes_valid,
s->len);
s = g_string_truncate (s, bytes_valid);
@@ -610,7 +610,7 @@
g_string_free (s, TRUE);
s = NULL;
}
-
+
return s ? g_string_free (s, FALSE) : NULL;
}
@@ -618,7 +618,7 @@
#ifdef HAVE_HILDON_THUMBNAIL
static void
-get_file_thumbnail_queue_cb (DBusGProxy *proxy,
+get_file_thumbnail_queue_cb (DBusGProxy *proxy,
DBusGProxyCall *call,
gpointer user_data)
{
@@ -626,8 +626,8 @@
guint handle;
/* FIXME: What is the point of this? */
- dbus_g_proxy_end_call (proxy, call, &error,
- G_TYPE_UINT, &handle,
+ dbus_g_proxy_end_call (proxy, call, &error,
+ G_TYPE_UINT, &handle,
G_TYPE_INVALID);
}
@@ -658,11 +658,11 @@
g_debug ("Requesting thumbnails");
dbus_g_proxy_begin_call (tracker_dbus_get_thumbnailer (),
- "Queue",
- get_file_thumbnail_queue_cb,
- NULL, NULL,
- G_TYPE_STRV, batch,
- G_TYPE_UINT, 0,
+ "Queue",
+ get_file_thumbnail_queue_cb,
+ NULL, NULL,
+ G_TYPE_STRV, batch,
+ G_TYPE_UINT, 0,
G_TYPE_INVALID);
for (i = 0; i <= count; i++) {
@@ -683,7 +683,7 @@
argv[3] = g_strdup ("normal");
argv[4] = NULL;
- context = process_context_create ((const gchar **) argv,
+ context = process_context_create ((const gchar **) argv,
get_file_content_read_cb)
if (!context) {
@@ -749,7 +749,7 @@
g_message ("Extracting text for:'%s' using filter:'%s'", argv[1], argv[0]);
- context = process_context_create ((const gchar **) argv,
+ context = process_context_create ((const gchar **) argv,
get_file_content_read_cb);
g_free (text_filter_file);
@@ -818,17 +818,17 @@
mime_type = tracker_file_get_mime_type (path);
- tracker_metadata_insert (metadata, METADATA_FILE_NAME,
+ tracker_metadata_insert (metadata, METADATA_FILE_NAME,
g_filename_display_basename (path));
- tracker_metadata_insert (metadata, METADATA_FILE_PATH,
+ tracker_metadata_insert (metadata, METADATA_FILE_PATH,
g_path_get_dirname (path));
tracker_metadata_insert (metadata, METADATA_FILE_NAME_DELIMITED,
g_filename_to_utf8 (path, -1, NULL, NULL, NULL));
- tracker_metadata_insert (metadata, METADATA_FILE_MIMETYPE,
+ tracker_metadata_insert (metadata, METADATA_FILE_MIMETYPE,
mime_type);
if (mime_type) {
- /* FIXME:
+ /* FIXME:
* We should determine here for which items we do and for which
* items we don't want to pre-create the thumbnail. */
Modified: branches/indexer-split/src/tracker-preferences/tracker-preferences.c
==============================================================================
--- branches/indexer-split/src/tracker-preferences/tracker-preferences.c (original)
+++ branches/indexer-split/src/tracker-preferences/tracker-preferences.c Sat Sep 20 14:45:00 2008
@@ -258,7 +258,7 @@
NULL,
NULL,
NULL,
- G_TYPE_STRING, name,
+ G_TYPE_STRING, name,
G_TYPE_BOOLEAN, value,
G_TYPE_INVALID);
}
@@ -272,7 +272,7 @@
NULL,
NULL,
NULL,
- G_TYPE_STRING, name,
+ G_TYPE_STRING, name,
G_TYPE_INT, value,
G_TYPE_INVALID);
}
@@ -543,7 +543,7 @@
static void
-restart_tracker (GtkDialog *dialog, gint response, gpointer data)
+restart_tracker (GtkDialog *dialog, gint response, gpointer data)
{
gtk_widget_destroy (GTK_WIDGET (dialog));
@@ -843,7 +843,7 @@
"next time the Tracker daemon "
"is restarted."));
button = g_strdup (_("_Reindex"));
-
+
} else {
primary = g_strdup (_("Tracker daemon must be "
"restarted"));
@@ -854,7 +854,7 @@
"daemon now."));
button = g_strdup (_("_Restart"));
}
-
+
dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
@@ -864,8 +864,8 @@
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
secondary);
- gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
button, GTK_RESPONSE_YES, NULL);
g_free (primary);
Modified: branches/indexer-split/src/tracker-search-tool/tracker-search-tool-callbacks.c
==============================================================================
--- branches/indexer-split/src/tracker-search-tool/tracker-search-tool-callbacks.c (original)
+++ branches/indexer-split/src/tracker-search-tool/tracker-search-tool-callbacks.c Sat Sep 20 14:45:00 2008
@@ -257,7 +257,7 @@
gboolean
text_changed_cb (GtkWidget * widget,
- gpointer data)
+ gpointer data)
{
GSearchWindow * gsearch = data;
const gchar * s = gtk_entry_get_text (GTK_ENTRY (gsearch->search_entry));
@@ -308,7 +308,7 @@
void
category_changed_cb (GtkTreeSelection * treeselection,
- gpointer data)
+ gpointer data)
{
select_category (treeselection, data);
}
@@ -421,7 +421,7 @@
void
select_changed_cb (GtkTreeSelection *treeselection,
- gpointer user_data)
+ gpointer user_data)
{
GSearchWindow *gsearch = user_data;
@@ -436,7 +436,7 @@
if (gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection)) == 0) {
return;
}
-
+
gtk_tree_selection_get_selected (GTK_TREE_SELECTION (gsearch->search_results_selection),
&model,
&iter);
@@ -446,12 +446,12 @@
COLUMN_PATH, &path,
-1);
- //g_print ("selected uri is %s/%s\n", path, name);
+ //g_print ("selected uri is %s/%s\n", path, name);
g_free (path);
g_free (name);
-
+
#endif
}
@@ -465,7 +465,7 @@
if (is_local_file) {
gchar *uri = gnome_vfs_get_uri_from_local_path (local_uri);
-
+
thumb_name = gnome_thumbnail_path_for_uri (uri, GNOME_THUMBNAIL_SIZE_NORMAL);
g_free (uri);
@@ -478,14 +478,14 @@
local_uri,
NULL,
GNOME_ICON_LOOKUP_FLAGS_SHOW_SMALL_IMAGES_AS_THEMSELVES | GNOME_ICON_LOOKUP_FLAGS_ALLOW_SVG_AS_THEMSELVES,
- 0);
+ 0);
temp = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(),
icon_name,
METADATA_IMAGE_HEIGHT,
GTK_ICON_LOOKUP_FORCE_SVG,
NULL);
-
+
g_free (icon_name);
return temp;
@@ -507,7 +507,7 @@
ServiceType type;
if (gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection)) != 1) {
- tracker_metadata_tile_set_uri (TRACKER_METADATA_TILE (gsearch->metatile), NULL, 0, NULL, NULL);
+ tracker_metadata_tile_set_uri (TRACKER_METADATA_TILE (gsearch->metatile), NULL, 0, NULL, NULL);
//gtk_widget_hide (gsearch->metatile);
return;
}
@@ -545,7 +545,7 @@
} else {
tracker_metadata_tile_set_uri (TRACKER_METADATA_TILE (gsearch->metatile), uri, type, mime, pixbuf);
}
-
+
g_free (uri);
g_free (mime);
@@ -976,7 +976,7 @@
gtk_tree_selection_unselect_iter (GTK_TREE_SELECTION (gsearch->search_results_selection), &iter);
if (result == GNOME_VFS_OK) {
-
+
gtk_list_store_remove (GTK_LIST_STORE (gsearch->search_results_list_store), &iter);
}
else {
@@ -1010,7 +1010,7 @@
}
if (result == GNOME_VFS_OK) {
-
+
gtk_list_store_remove (GTK_LIST_STORE (gsearch->search_results_list_store), &iter);
}
else {
@@ -1297,17 +1297,17 @@
time_t seconds;
item = gnome_desktop_item_new ();
-
+
exec_string = g_strdup_printf ("evolution \"%s\"",utf8_uri);
-
+
gnome_desktop_item_set_string (item, GNOME_DESKTOP_ITEM_ENCODING, "UTF-8");
gnome_desktop_item_set_string (item, GNOME_DESKTOP_ITEM_NAME, utf8_name);
gnome_desktop_item_set_string (item, GNOME_DESKTOP_ITEM_COMMENT, _("Activate to view this email"));
gnome_desktop_item_set_string (item, GNOME_DESKTOP_ITEM_EXEC, exec_string);
- gnome_desktop_item_set_string (item, GNOME_DESKTOP_ITEM_ICON, "email");
+ gnome_desktop_item_set_string (item, GNOME_DESKTOP_ITEM_ICON, "email");
gnome_desktop_item_set_string (item, GNOME_DESKTOP_ITEM_TERMINAL, "false");
gnome_desktop_item_set_string (item, GNOME_DESKTOP_ITEM_TYPE, "Application");
-
+
seconds = time (NULL);
save_uri = g_strdup_printf ("/tmp/tracker-email-shortcut-file%d.desktop", (int)seconds);
gnome_desktop_item_save (item,
@@ -1384,7 +1384,7 @@
8,
(guchar *) desktop_uri,
strlen (desktop_uri));
- g_free (desktop_uri);
+ g_free (desktop_uri);
}
g_free (tmp_uri);
}
@@ -1838,7 +1838,7 @@
{
GSearchWindow * gsearch = data;
gchar * suggest = g_object_get_data (G_OBJECT (widget), "suggestion");
-
+
gtk_entry_set_text (GTK_ENTRY (gsearch->search_entry), suggest);
gtk_button_clicked (GTK_BUTTON (gsearch->find_button));
}
Modified: branches/indexer-split/src/tracker-search-tool/tracker-search-tool-support.c
==============================================================================
--- branches/indexer-split/src/tracker-search-tool/tracker-search-tool-support.c (original)
+++ branches/indexer-split/src/tracker-search-tool/tracker-search-tool-support.c Sat Sep 20 14:45:00 2008
@@ -1141,7 +1141,7 @@
if (file == NULL || mime == NULL) {
icon_name = g_strdup (ICON_THEME_REGULAR_ICON);
- }
+ }
else if ((g_file_test (file, G_FILE_TEST_IS_EXECUTABLE)) &&
(g_ascii_strcasecmp (mime, "application/x-executable-binary") == 0)) {
@@ -1162,7 +1162,7 @@
/* check for thumbnail first */
GdkPixbuf *thumbnail_pixbuf = tracker_search_get_thumbnail_image (file);
-
+
if (thumbnail_pixbuf != NULL) {
if ((gdk_pixbuf_get_width (thumbnail_pixbuf) > ICON_SIZE) ||
@@ -1197,7 +1197,7 @@
} else {
return thumbnail_pixbuf;
}
-
+
}
/* check if image can be generated from file */
@@ -1212,16 +1212,16 @@
icon_name = tracker_search_icon_lookup (gsearch, file, mime, file_info, TRUE);
}
-
+
}
pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), icon_name, ICON_SIZE, 0, NULL);
if (!pixbuf) {
- gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), ICON_THEME_REGULAR_ICON, ICON_SIZE, 0, NULL);
+ gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), ICON_THEME_REGULAR_ICON, ICON_SIZE, 0, NULL);
}
-
+
g_free (icon_name);
@@ -1526,7 +1526,7 @@
return DEFAULT_SEPARATOR_POSITION;
}
- return saved_pos;
+ return saved_pos;
}
void
Modified: branches/indexer-split/src/tracker-search-tool/tracker-search-tool.c
==============================================================================
--- branches/indexer-split/src/tracker-search-tool/tracker-search-tool.c (original)
+++ branches/indexer-split/src/tracker-search-tool/tracker-search-tool.c Sat Sep 20 14:45:00 2008
@@ -2,7 +2,7 @@
/*
* TRACKER Search Tool - modfied from Gnome search tool
*
- * File: tracker_search_tool.c
+ * File: tracker_search_tool.c
* (C) Me Jamie McCracken
*
* Original Copyright:
@@ -313,14 +313,14 @@
gtk_widget_set_sensitive (gsearch->search_results_save_results_as_item, TRUE);
}
gtk_widget_show (gsearch->find_button);
-
+
if (gtk_window_get_focus (GTK_WINDOW (gsearch->window)) == NULL) {
gtk_window_set_focus (GTK_WINDOW (gsearch->window), gsearch->focus);
}
}
-static gboolean
+static gboolean
process_snippets (GSearchWindow * gsearch)
{
if (!gsearch->snippet_queue || g_queue_is_empty (gsearch->snippet_queue)) {
@@ -330,7 +330,7 @@
SnippetRow *snippet = g_queue_pop_head (gsearch->snippet_queue);
tracker_search_get_snippet_async (tracker_client, snippet->type, snippet->uri, gsearch->search_term, set_snippet, snippet);
-
+
return FALSE;
}
@@ -357,7 +357,7 @@
locale = g_locale_from_utf8 (file_is_named_utf8, -1, NULL, NULL, &error);
if (locale == NULL) {
-
+
display_dialog_character_set_conversion_error (gsearch->window, file_is_named_utf8, error);
g_free (file_is_named_utf8);
g_error_free (error);
@@ -438,15 +438,15 @@
break;
}
}
- }
+ }
}
-
+
if (!g_queue_is_empty (snippet_row->gsearch->snippet_queue)) {
g_idle_add ((GSourceFunc) process_snippets, snippet_row->gsearch);
}
free_snippet (snippet_row);
-
+
g_free (snippet_markup);
}
@@ -464,7 +464,7 @@
gtk_list_store_append (GTK_LIST_STORE (store), iter);
gtk_list_store_set (GTK_LIST_STORE (store), iter,
COLUMN_ICON, gsearch->email_pixbuf,
- COLUMN_URI, uri,
+ COLUMN_URI, uri,
COLUMN_NAME, subject,
COLUMN_PATH, sender,
COLUMN_MIME, mime,
@@ -501,7 +501,7 @@
{
GdkPixbuf * pixbuf;
GnomeVFSFileInfo * vfs_file_info;
-
+
gchar * description;
gchar * base_name;
gchar * dir_name;
@@ -528,13 +528,13 @@
pixbuf = get_file_pixbuf (gsearch, uri, mime, vfs_file_info);
-
+
description = get_file_type_description (uri, mime, vfs_file_info);
if (!description) {
- description = g_strdup (mime);
+ description = g_strdup (mime);
}
-
+
base_name = g_path_get_basename (file);
dir_name = g_path_get_dirname (file);
@@ -549,7 +549,7 @@
gtk_list_store_append (GTK_LIST_STORE (store), iter);
gtk_list_store_set (GTK_LIST_STORE (store), iter,
COLUMN_ICON, pixbuf,
- COLUMN_URI, file,
+ COLUMN_URI, file,
COLUMN_NAME, base_name,
COLUMN_PATH, dir_name,
COLUMN_MIME, (description != NULL) ? description : mime,
@@ -619,7 +619,7 @@
gtk_list_store_set (GTK_LIST_STORE (store), iter,
COLUMN_ICON, pixbuf,
- COLUMN_URI, uri,
+ COLUMN_URI, uri,
COLUMN_NAME, display_name,
COLUMN_PATH, "Application",
COLUMN_MIME, "",
@@ -665,7 +665,7 @@
g_object_set_data (G_OBJECT (button), "suggestion", suggestion);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (suggest_search_cb), gsearch);
}
@@ -696,7 +696,7 @@
title_bar_string = g_strconcat ( _("Tracker Search Tool-"), gsearch->search_term ,NULL);
gtk_window_set_title (GTK_WINDOW (gsearch->window), title_bar_string);
- g_free (title_bar_string);
+ g_free (title_bar_string);
}
void
@@ -1038,7 +1038,7 @@
align_box = gtk_alignment_new (0.0, 1.0, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align_box), 18, 3, 0, 0);
-
+
gtk_box_pack_start (GTK_BOX (hbox), align_box, FALSE, TRUE, 0);
label_box = gtk_hbox_new (FALSE, 0);
@@ -1088,7 +1088,7 @@
gtk_widget_show_all (hbox);
-
+
gtk_widget_set_sensitive (gsearch->forward_button, FALSE);
gtk_widget_set_sensitive (gsearch->back_button, FALSE);
@@ -1172,7 +1172,7 @@
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (gsearch->search_results_tree_view));
gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (gsearch->search_results_tree_view));
-
+
/* metadata_tile */
gsearch->metatile = tracker_metadata_tile_new ();
@@ -1225,7 +1225,7 @@
gtk_tree_view_column_set_cell_data_func (column, renderer,
(GtkTreeCellDataFunc) snippet_cell_data_func,
- gsearch, NULL);
+ gsearch, NULL);
gtk_tree_view_column_set_reorderable (column, TRUE);
@@ -1234,7 +1234,7 @@
gtk_tree_view_column_set_max_width (column, 10000);
gtk_tree_view_append_column (GTK_TREE_VIEW (gsearch->search_results_tree_view), column);
-
+
// gtk_tree_view_set_grid_lines (GTK_TREE_VIEW (gsearch->search_results_tree_view), GTK_TREE_VIEW_GRID_LINES_VERTICAL);
gtk_tree_view_set_enable_search (GTK_TREE_VIEW (gsearch->search_results_tree_view), FALSE);
@@ -1278,7 +1278,7 @@
gtk_tree_selection_set_mode (GTK_TREE_SELECTION (gsearch->category_selection),
GTK_SELECTION_BROWSE);
-
+
g_signal_connect (G_OBJECT (gsearch->category_selection),
"changed",
G_CALLBACK (category_changed_cb),
@@ -1300,7 +1300,7 @@
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
+
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
gtk_tree_view_column_set_attributes (column, renderer,
@@ -1471,7 +1471,7 @@
if (meta[0] && meta[1] && meta[2]) {
gchar * subject = "Unknown email subject", * sender = "Unknown email sender";
-
+
if (meta[3]) {
subject = meta[3];
if (meta[4]) {
@@ -1496,8 +1496,8 @@
if (meta[5]) {
icon = meta[5];
- }
-
+ }
+
add_application_to_search_results (meta[0], name, exec, icon,
gsearch->search_results_list_store, &gsearch->search_results_iter, gsearch);
@@ -1529,7 +1529,7 @@
static void
populate_hit_counts (gpointer value,
gpointer data)
-
+
{
gchar **meta;
gint type;
@@ -1560,17 +1560,17 @@
count = gsearch->current_service->hit_count;
from = gsearch->current_service->offset+1;
-
+
if (MAX_SEARCH_RESULTS + from > count) {
to = count;
} else {
to = MAX_SEARCH_RESULTS + from -1;
}
-
+
if (count > 5) {
/* Translators: this will appear like "Search results: 5 - 10 of 30 items" */
label_str = g_strdup_printf (_("%d - %d of %d items"), from, to, count);
- } else
+ } else
/* Translators: this will appear like "Search results: 7 items" */
label_str = g_strdup_printf (ngettext ("%d item", "%d items", count), count);
@@ -1629,15 +1629,15 @@
g_ptr_array_foreach (out_array, (GFunc) populate_hit_counts, NULL);
g_ptr_array_free (out_array, TRUE);
out_array = NULL;
- }
+ }
/* reset and create categories with hits > 0 */
-
+
gtk_list_store_clear (gsearch->category_store);
for (service = services; service->service; ++service) {
-
+
if (service->hit_count == 0) {
continue;
}
@@ -1645,26 +1645,26 @@
has_hits = TRUE;
gtk_list_store_append (gsearch->category_store, &gsearch->category_iter);
-
+
gchar * label_tmp = g_strdup (_(service->display_name));
gchar * label_str = g_strdup_printf ("%s (%d)", label_tmp, service->hit_count);
g_free (label_tmp);
-
+
gtk_list_store_set (gsearch->category_store, &gsearch->category_iter,
CATEGORY_ICON_NAME, service->pixbuf,
- CATEGORY_TITLE, label_str,
+ CATEGORY_TITLE, label_str,
CATEGORY_SERVICE, service->service,
-1);
- g_free (label_str);
+ g_free (label_str);
if (gsearch->old_type == service->service_type) {
- first_service = TRUE;
+ first_service = TRUE;
gsearch->current_service = service;
gsearch->type = service->service_type;
- init_tab (gsearch, service);
- }
+ init_tab (gsearch, service);
+ }
}
if (!first_service) {
@@ -1691,7 +1691,7 @@
gsearch->old_type = gsearch->type;
init_tab (gsearch, service);
- break;
+ break;
}
}
@@ -1702,7 +1702,7 @@
void
select_category (GtkTreeSelection * treeselection,
- gpointer user_data)
+ gpointer user_data)
{
GSearchWindow * gsearch = user_data;
GtkTreeIter iter;
@@ -1711,7 +1711,7 @@
if (gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->category_selection)) == 0) {
return;
}
-
+
GtkTreeModel * model = gtk_tree_view_get_model (GTK_TREE_VIEW (gsearch->category_list));
gtk_tree_selection_get_selected (GTK_TREE_SELECTION (gsearch->category_selection),
@@ -1811,7 +1811,7 @@
gsearch->is_locate_database_check_finished = TRUE;
stop_animation (gsearch);
-
+
if (error) {
display_error_dialog (gsearch->window, _("Could not connect to search service as it may be busy"));
g_error_free (error);
@@ -1831,7 +1831,7 @@
} else {
gtk_widget_show (gsearch->warning_label);
}
-
+
g_free (status);
if (out_array) {
@@ -1840,12 +1840,12 @@
/* update hit count after search in case of dud hits */
- tracker_search_text_get_hit_count_async (tracker_client, gsearch->current_service->service_type,
+ tracker_search_text_get_hit_count_async (tracker_client, gsearch->current_service->service_type,
gsearch->search_term,
(TrackerIntReply)end_refresh_count,
gsearch);
-
+
gsearch->search_results_list_store = gsearch->current_service->store;
@@ -1886,7 +1886,7 @@
start_animation (gsearch, TRUE);
if (!new_search) {
-
+
if (gsearch->current_service->has_hits && (gsearch->current_service->offset == search_offset)) {
update_page_count_label (gsearch);
@@ -1901,7 +1901,7 @@
return;
}
}
-
+
gsearch->current_service->offset = search_offset;
tracker_search_text_detailed_async (tracker_client,
-1,
@@ -1938,7 +1938,7 @@
GtkIconTheme * theme = gtk_icon_theme_get_default ();
for (service = services; service->service; ++service) {
-
+
service->store = gtk_list_store_new (NUM_COLUMNS,
GDK_TYPE_PIXBUF,
G_TYPE_STRING,
@@ -1949,7 +1949,7 @@
G_TYPE_STRING,
G_TYPE_INT,
G_TYPE_BOOLEAN);
-
+
service->pixbuf = gtk_icon_theme_load_icon (theme, service->icon_name,
24,
GTK_ICON_LOOKUP_USE_BUILTIN,
@@ -1990,7 +1990,7 @@
main_container = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (gsearch->window), main_container);
gtk_container_set_border_width (GTK_CONTAINER (main_container), 0);
-
+
container = gtk_vbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (main_container), container);
gtk_container_set_border_width (GTK_CONTAINER (container), 1);
@@ -2011,7 +2011,7 @@
g_free (search_label);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
g_object_set (G_OBJECT (label), "xalign", 0.0, NULL);
-
+
gtk_table_attach (GTK_TABLE (gsearch->name_and_folder_table), label, 0, 1, 0, 1, GTK_FILL, 0, 6, 1);
gsearch->search_entry = sexy_icon_entry_new ();
@@ -2055,11 +2055,11 @@
gtk_box_pack_start (GTK_BOX (container), gsearch->pane, TRUE, TRUE, 3);
- /* layout container for results section */
+ /* layout container for results section */
vbox = gtk_vbox_new (FALSE, 2);
gsearch->message_box = vbox;
-
+
gsearch->no_results = NULL;
gtk_paned_pack2 (GTK_PANED (gsearch->pane), vbox, TRUE, FALSE);
@@ -2070,7 +2070,7 @@
gtk_tree_view_set_model (gsearch->search_results_tree_view, GTK_TREE_MODEL (services[0].store));
gtk_widget_set_sensitive (GTK_WIDGET (gsearch->search_results_vbox), FALSE);
- gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (gsearch->search_results_vbox), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (gsearch->search_results_vbox), TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS (gsearch->find_button, GTK_CAN_DEFAULT);
@@ -2090,7 +2090,7 @@
gtk_paned_pack1 (GTK_PANED (gsearch->pane), widget, TRUE, FALSE);
gtk_widget_set_sensitive (gsearch->category_list, FALSE);
-
+
gtk_widget_set_sensitive (gsearch->forward_button, FALSE);
gtk_widget_set_sensitive (gsearch->back_button, FALSE);
@@ -2202,7 +2202,7 @@
g_printerr ("invalid arguments: %s\n", error->message);
return 1;
}
-
+
bindtextdomain (GETTEXT_PACKAGE, TRACKER_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
@@ -2254,7 +2254,7 @@
}
gtk_widget_show (gsearch->window);
-
+
tracker_client = tracker_connect (FALSE);
tracker_search_setup_gconf_notifications (gsearch);
Modified: branches/indexer-split/src/tracker-search-tool/tracker-search-tool.h
==============================================================================
--- branches/indexer-split/src/tracker-search-tool/tracker-search-tool.h (original)
+++ branches/indexer-split/src/tracker-search-tool/tracker-search-tool.h Sat Sep 20 14:45:00 2008
@@ -5,7 +5,7 @@
* File: tracker_search.h modified from gnome-search.h
*
* (c) Mr Jamie McCracken
- *
+ *
* Original copyright :
* (C) 1998,2002 the Free Software Foundation
*
@@ -92,7 +92,7 @@
typedef enum {
CATEGORY_ICON_NAME,
- CATEGORY_TITLE,
+ CATEGORY_TITLE,
CATEGORY_SERVICE,
NUM_CATEGORY_COLUMNS
} CategoryColumns;
@@ -147,7 +147,7 @@
gint type;
guint old_type;
service_info_t *current_service;
-
+
GtkWidget *metatile;
GtkWidget *no_results;
GtkWidget *count_label;
@@ -170,7 +170,7 @@
GtkWidget * available_options_add_button;
GtkSizeGroup * available_options_button_size_group;
GList * available_options_selected_list;
-
+
GtkWidget * files_found_label;
GtkWidget * search_results_vbox;
GtkWidget * search_results_popup_menu;
Modified: branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c
==============================================================================
--- branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c (original)
+++ branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c Sat Sep 20 14:45:00 2008
@@ -45,7 +45,7 @@
static gboolean
create_thumbnails_dir (const gchar * const subdir)
{
-
+
gchar *thumbnails_dir = NULL;
const gchar *home_dir;
@@ -122,7 +122,7 @@
}
static gboolean
-generate_thumbnail (const gchar *filename, const gchar *thumbnail_filename, const gchar *mime, gint size)
+generate_thumbnail (const gchar *filename, const gchar *thumbnail_filename, const gchar *mime, gint size)
{
gchar *thumbnailer;
@@ -184,7 +184,7 @@
* see, libpng doesn't allow you to just set metadata, you have to do
* that when you create the file. Therefore, we need to copy the newly
* created thumbnail into a new one while setting the required attributes
- */
+ */
g_assert ((fp = g_fopen (thumbnail_filename, "r")));
g_assert ((png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)));
g_assert ((info_ptr = png_create_info_struct (png_ptr)));
@@ -211,7 +211,7 @@
}
png_read_image (png_ptr, row_pointers);
png_read_end (png_ptr, NULL);
-
+
png_destroy_info_struct (png_ptr, &info_ptr);
png_destroy_read_struct (&png_ptr, NULL, NULL);
fclose (fp);
@@ -227,7 +227,7 @@
png_init_io (png_ptr, fp);
- png_set_IHDR (png_ptr, info_ptr, width, height, bit_depth,
+ png_set_IHDR (png_ptr, info_ptr, width, height, bit_depth,
color_type, interlace_method, compression_method, filter_method);
if (palette && num_palette > 0)
@@ -248,7 +248,7 @@
pngtext[2].text = "Tracker thumbnail factory";
pngtext[2].compression = PNG_TEXT_COMPRESSION_NONE;
png_set_text(png_ptr, info_ptr, pngtext, 3);
-
+
png_write_info (png_ptr, info_ptr);
png_write_image (png_ptr, row_pointers);
png_write_end (png_ptr, info_ptr);
@@ -272,7 +272,7 @@
}
static gboolean
-validate_args (gint argc, gchar **argv)
+validate_args (gint argc, gchar **argv)
{
if (argc < 4) {
return FALSE;
@@ -293,7 +293,7 @@
* argv[3] == requested size: "normal", "large", "preview"
*/
-gint
+gint
main (gint argc, gchar *argv[])
{
gchar *uri;
Modified: branches/indexer-split/src/tracker-utils/tracker-files.c
==============================================================================
--- branches/indexer-split/src/tracker-utils/tracker-files.c (original)
+++ branches/indexer-split/src/tracker-utils/tracker-files.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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
*
@@ -38,27 +38,27 @@
static gint offset;
static GOptionEntry entries[] = {
- { "service", 's', 0, G_OPTION_ARG_STRING, &service,
- N_("Search from a specific service"),
- NULL
+ { "service", 's', 0, G_OPTION_ARG_STRING, &service,
+ N_("Search from a specific service"),
+ NULL
},
- { "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
- N_("Limit the number of results shown"),
- N_("512")
+ { "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
+ N_("Limit the number of results shown"),
+ N_("512")
},
- { "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
- N_("Offset the results"),
- N_("0")
+ { "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
+ N_("Offset the results"),
+ N_("0")
},
- { "add-mime", 'm', 0, G_OPTION_ARG_STRING_ARRAY, &mimes,
- N_("MIME types (can be used multiple times)"),
+ { "add-mime", 'm', 0, G_OPTION_ARG_STRING_ARRAY, &mimes,
+ N_("MIME types (can be used multiple times)"),
NULL
},
{ NULL }
};
int
-main (int argc, char **argv)
+main (int argc, char **argv)
{
TrackerClient *client;
@@ -101,16 +101,16 @@
type = tracker_service_name_to_type (service);
- array = tracker_files_get_by_service_type (client,
- time (NULL),
- type,
- offset,
- limit,
+ array = tracker_files_get_by_service_type (client,
+ time (NULL),
+ type,
+ offset,
+ limit,
&error);
if (error) {
g_printerr ("%s:'%s', %s\n",
- _("Could not get files by service type"),
+ _("Could not get files by service type"),
service,
error->message);
g_error_free (error);
@@ -139,16 +139,16 @@
gchar **array;
gchar **p;
- array = tracker_files_get_by_mime_type (client,
- time (NULL),
- mimes,
- offset,
- limit,
+ array = tracker_files_get_by_mime_type (client,
+ time (NULL),
+ mimes,
+ offset,
+ limit,
&error);
if (error) {
g_printerr ("%s, %s\n",
- _("Could not get files by MIME type"),
+ _("Could not get files by MIME type"),
error->message);
g_error_free (error);
Modified: branches/indexer-split/src/tracker-utils/tracker-meta-folder.c
==============================================================================
--- branches/indexer-split/src/tracker-utils/tracker-meta-folder.c (original)
+++ branches/indexer-split/src/tracker-utils/tracker-meta-folder.c Sat Sep 20 14:45:00 2008
@@ -36,12 +36,12 @@
static gchar **fields;
static GOptionEntry entries[] = {
- { "path", 'p', 0, G_OPTION_ARG_STRING, &path,
- N_("Path to use for directory to get metadata information about"),
+ { "path", 'p', 0, G_OPTION_ARG_STRING, &path,
+ N_("Path to use for directory to get metadata information about"),
NULL,
},
- { G_OPTION_REMAINING, 0, 0,
- G_OPTION_ARG_STRING_ARRAY, &fields,
+ { G_OPTION_REMAINING, 0, 0,
+ G_OPTION_ARG_STRING_ARRAY, &fields,
NULL,
NULL
},
@@ -54,23 +54,23 @@
gint cols;
gint width;
gint i;
-
+
/* Headers */
g_print (" %-*.*s ",
MAX_FILENAME_WIDTH,
MAX_FILENAME_WIDTH,
_("Filename"));
-
+
width = MAX_FILENAME_WIDTH;
width += 1;
-
+
cols = g_strv_length (fields_resolved);
-
+
for (i = 0; i < cols; i++) {
- g_print ("%s%s",
+ g_print ("%s%s",
fields_resolved[i],
i < cols - 1 ? ", " : "");
-
+
width += g_utf8_strlen (fields_resolved[i], -1);
width += i < cols - 1 ? 2 : 0;
}
@@ -85,7 +85,7 @@
}
static void
-get_meta_table_data (gpointer data,
+get_meta_table_data (gpointer data,
gpointer user_data)
{
gchar **meta;
@@ -102,11 +102,11 @@
basename = g_path_get_basename (*meta);
len = g_utf8_strlen (basename, -1);
cols = g_strv_length (meta);
-
+
for (p = meta, i = 0; *p; p++, i++) {
if (i == 0) {
- g_print (" %-*.*s",
- MAX (len, MAX_FILENAME_WIDTH),
+ g_print (" %-*.*s",
+ MAX (len, MAX_FILENAME_WIDTH),
MAX (len, MAX_FILENAME_WIDTH),
basename);
@@ -118,10 +118,10 @@
g_print (" ");
}
}
-
+
g_print (" (");
} else {
- g_print ("%s%s",
+ g_print ("%s%s",
*p,
i < cols - 1 ? ", " : "");
}
@@ -132,8 +132,8 @@
g_print (")\n");
}
-int
-main (int argc, char **argv)
+int
+main (int argc, char **argv)
{
TrackerClient *client;
GOptionContext *context;
@@ -149,13 +149,13 @@
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- /* Translators: this messagge will apper immediately after the
- * usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
+ /* Translators: this messagge will apper immediately after the
+ * usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
*/
context = g_option_context_new (_("Retrieve meta-data information about files in a directory"));
- /* Translators: this message will appear after the usage string
- * and before the list of options, showing an usage example.
+ /* Translators: this message will appear after the usage string
+ * and before the list of options, showing an usage example.
*/
summary = g_strconcat (_("To use multiple meta-data types simply list them, for example:"),
"\n"
@@ -214,26 +214,26 @@
path_in_utf8 = g_filename_to_utf8 (path, -1, NULL, NULL, &error);
if (error) {
g_printerr ("%s:'%s', %s\n",
- _("Could not get UTF-8 path from path"),
+ _("Could not get UTF-8 path from path"),
path,
error->message);
g_error_free (error);
tracker_disconnect (client);
-
+
return EXIT_FAILURE;
}
- array = tracker_files_get_metadata_for_files_in_folder (client,
- time (NULL),
- path_in_utf8,
- fields_resolved,
+ array = tracker_files_get_metadata_for_files_in_folder (client,
+ time (NULL),
+ path_in_utf8,
+ fields_resolved,
&error);
g_free (path_in_utf8);
if (error) {
g_printerr ("%s:'%s', %s\n",
- _("Could not get meta-data for files in directory"),
+ _("Could not get meta-data for files in directory"),
path,
error->message);
g_error_free (error);
@@ -244,16 +244,16 @@
}
if (!array) {
- g_print ("%s\n",
+ g_print ("%s\n",
_("No meta-data found for files in that directory"));
} else {
g_print ("%s:\n",
_("Results"));
print_header (fields_resolved);
-
- g_ptr_array_foreach (array,
- get_meta_table_data,
+
+ g_ptr_array_foreach (array,
+ get_meta_table_data,
fields_resolved);
g_ptr_array_free (array, TRUE);
}
Modified: branches/indexer-split/src/tracker-utils/tracker-query.c
==============================================================================
--- branches/indexer-split/src/tracker-utils/tracker-query.c (original)
+++ branches/indexer-split/src/tracker-utils/tracker-query.c Sat Sep 20 14:45:00 2008
@@ -44,7 +44,7 @@
static gint offset;
static GOptionEntry entries[] = {
- { "path", 'p', 0, G_OPTION_ARG_STRING, &path,
+ { "path", 'p', 0, G_OPTION_ARG_STRING, &path,
N_("Path to use in query"),
NULL,
},
@@ -52,25 +52,25 @@
N_("Search from a specific service"),
NULL
},
- { "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
- N_("Limit the number of results shown"),
+ { "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
+ N_("Limit the number of results shown"),
N_("512")
},
- { "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
- N_("Offset the results"),
- N_("0")
- },
- { "search-term", 't', 0, G_OPTION_ARG_STRING, &search,
- N_("Adds a fulltext search filter"),
- NULL,
+ { "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
+ N_("Offset the results"),
+ N_("0")
},
- { "keyword", 'k', 0, G_OPTION_ARG_STRING, &keyword,
+ { "search-term", 't', 0, G_OPTION_ARG_STRING, &search,
+ N_("Adds a fulltext search filter"),
+ NULL,
+ },
+ { "keyword", 'k', 0, G_OPTION_ARG_STRING, &keyword,
N_("Adds a keyword filter"),
NULL
},
- { G_OPTION_REMAINING, 0, 0,
- G_OPTION_ARG_STRING_ARRAY, &fields,
- N_("Metadata Fields"),
+ { G_OPTION_REMAINING, 0, 0,
+ G_OPTION_ARG_STRING_ARRAY, &fields,
+ N_("Metadata Fields"),
NULL
},
{ NULL }
@@ -97,7 +97,7 @@
}
int
-main (int argc, char **argv)
+main (int argc, char **argv)
{
TrackerClient *client;
ServiceType type;
@@ -164,25 +164,25 @@
path_in_utf8 = g_filename_to_utf8 (path, -1, NULL, NULL, &error);
if (error) {
g_printerr ("%s:'%s', %s\n",
- _("Could not get UTF-8 path from path"),
+ _("Could not get UTF-8 path from path"),
path,
error->message);
g_error_free (error);
tracker_disconnect (client);
-
+
return EXIT_FAILURE;
}
g_file_get_contents (path_in_utf8, &content, &size, &error);
if (error) {
g_printerr ("%s:'%s', %s\n",
- _("Could not read file"),
+ _("Could not read file"),
path_in_utf8,
error->message);
g_error_free (error);
g_free (path_in_utf8);
tracker_disconnect (client);
-
+
return EXIT_FAILURE;
}
@@ -201,15 +201,15 @@
return EXIT_FAILURE;
}
- array = tracker_search_query (client,
- time (NULL),
- type,
- fields,
- search,
- keyword,
- buffer,
- offset,
- limit,
+ array = tracker_search_query (client,
+ time (NULL),
+ type,
+ fields,
+ search,
+ keyword,
+ buffer,
+ offset,
+ limit,
FALSE,
NULL,
FALSE,
@@ -223,10 +223,10 @@
g_error_free (error);
return EXIT_FAILURE;
- }
-
+ }
+
if (!array) {
- g_print ("%s\n",
+ g_print ("%s\n",
_("No results found matching your query"));
} else {
g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
Modified: branches/indexer-split/src/tracker-utils/tracker-search.c
==============================================================================
--- branches/indexer-split/src/tracker-utils/tracker-search.c (original)
+++ branches/indexer-split/src/tracker-utils/tracker-search.c Sat Sep 20 14:45:00 2008
@@ -42,21 +42,21 @@
N_("Search from a specific service"),
NULL
},
- { "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
- N_("Limit the number of results shown"),
+ { "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
+ N_("Limit the number of results shown"),
N_("512")
},
- { "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
- N_("Offset the results"),
- N_("0")
+ { "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
+ N_("Offset the results"),
+ N_("0")
},
- { "detailed", 'd', 0, G_OPTION_ARG_NONE, &detailed,
- N_("Show more detailed results with service and mime type"),
+ { "detailed", 'd', 0, G_OPTION_ARG_NONE, &detailed,
+ N_("Show more detailed results with service and mime type"),
NULL
},
- { G_OPTION_REMAINING, 0, 0,
- G_OPTION_ARG_STRING_ARRAY, &terms,
- N_("search terms"),
+ { G_OPTION_REMAINING, 0, 0,
+ G_OPTION_ARG_STRING_ARRAY, &terms,
+ N_("search terms"),
NULL
},
{ NULL }
@@ -94,7 +94,7 @@
}
int
-main (int argc, char **argv)
+main (int argc, char **argv)
{
TrackerClient *client;
ServiceType type;
@@ -190,12 +190,12 @@
search = g_strjoinv (" ", terms);
if (detailed) {
- array = tracker_search_text_detailed (client,
- time (NULL),
- type,
- search,
- offset,
- limit,
+ array = tracker_search_text_detailed (client,
+ time (NULL),
+ type,
+ search,
+ offset,
+ limit,
&error);
g_free (search);
@@ -221,12 +221,12 @@
g_ptr_array_free (array, TRUE);
}
} else {
- strv = tracker_search_text (client,
- time (NULL),
- type,
- search,
- offset,
- limit,
+ strv = tracker_search_text (client,
+ time (NULL),
+ type,
+ search,
+ offset,
+ limit,
&error);
g_free (search);
@@ -250,13 +250,13 @@
for (p = strv; *p; p++) {
gchar *s;
-
+
s = g_locale_from_utf8 (*p, -1, NULL, NULL, NULL);
-
+
if (!s) {
continue;
}
-
+
g_print (" %s\n", s);
g_free (s);
}
@@ -264,8 +264,8 @@
g_free (strv);
}
}
-
+
tracker_disconnect (client);
- return EXIT_SUCCESS;
+ return EXIT_SUCCESS;
}
Modified: branches/indexer-split/src/tracker-utils/tracker-stats.c
==============================================================================
--- branches/indexer-split/src/tracker-utils/tracker-stats.c (original)
+++ branches/indexer-split/src/tracker-utils/tracker-stats.c Sat Sep 20 14:45:00 2008
@@ -51,8 +51,8 @@
g_print ("\n");
}
-int
-main (int argc, char **argv)
+int
+main (int argc, char **argv)
{
TrackerClient *client;
GOptionContext *context;
@@ -94,11 +94,11 @@
} else {
g_print ("%s\n",
_("Statistics:"));
-
+
g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
g_ptr_array_free (array, TRUE);
}
-
+
tracker_disconnect (client);
return EXIT_SUCCESS;
Modified: branches/indexer-split/src/tracker-utils/tracker-status.c
==============================================================================
--- branches/indexer-split/src/tracker-utils/tracker-status.c (original)
+++ branches/indexer-split/src/tracker-utils/tracker-status.c Sat Sep 20 14:45:00 2008
@@ -55,7 +55,7 @@
if (error) {
g_printerr ("%s, %s\n",
- _("Could not get Tracker status"),
+ _("Could not get Tracker status"),
error->message);
g_error_free (error);
Modified: branches/indexer-split/src/tracker-utils/tracker-tag.c
==============================================================================
--- branches/indexer-split/src/tracker-utils/tracker-tag.c (original)
+++ branches/indexer-split/src/tracker-utils/tracker-tag.c Sat Sep 20 14:45:00 2008
@@ -45,37 +45,37 @@
static gboolean list;
static GOptionEntry entries[] = {
- { "add", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &add,
- N_("Add specified tag to a file"),
+ { "add", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &add,
+ N_("Add specified tag to a file"),
N_("TAG")
},
- { "remove", 'r', 0, G_OPTION_ARG_STRING_ARRAY, &remove,
- N_("Remove specified tag from a file"),
+ { "remove", 'r', 0, G_OPTION_ARG_STRING_ARRAY, &remove,
+ N_("Remove specified tag from a file"),
N_("TAG")
},
- { "remove-all", 'R', 0, G_OPTION_ARG_NONE, &remove_all,
+ { "remove-all", 'R', 0, G_OPTION_ARG_NONE, &remove_all,
N_("Remove all tags from a file"),
NULL
},
- { "list", 't', 0, G_OPTION_ARG_NONE, &list,
- N_("List all defined tags"),
+ { "list", 't', 0, G_OPTION_ARG_NONE, &list,
+ N_("List all defined tags"),
NULL
},
- { "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
- N_("Limit the number of results shown"),
+ { "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
+ N_("Limit the number of results shown"),
N_("512")
},
- { "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
- N_("Offset the results"),
- N_("0")
+ { "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
+ N_("Offset the results"),
+ N_("0")
},
- { "search", 's', 0, G_OPTION_ARG_STRING_ARRAY, &search,
- N_("Search for files with specified tag"),
+ { "search", 's', 0, G_OPTION_ARG_STRING_ARRAY, &search,
+ N_("Search for files with specified tag"),
N_("TAG")
},
- { G_OPTION_REMAINING, 0,
+ { G_OPTION_REMAINING, 0,
G_OPTION_FLAG_FILENAME, G_OPTION_ARG_STRING_ARRAY, &files,
- N_("FILE..."),
+ N_("FILE..."),
NULL},
{ NULL }
};
@@ -100,8 +100,8 @@
g_print ("\n");
}
-int
-main (int argc, char **argv)
+int
+main (int argc, char **argv)
{
TrackerClient *client;
GOptionContext *context;
@@ -119,16 +119,16 @@
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- /* Translators: this messagge will apper immediately after the
- * usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
+ /* Translators: this messagge will apper immediately after the
+ * usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
*/
context = g_option_context_new (_("Add, remove or search for tags"));
- /* Translators: this message will appear after the usage string
- * and before the list of options, showing an usage example.
+ /* Translators: this message will appear after the usage string
+ * and before the list of options, showing an usage example.
*/
summary = g_strconcat (_("To add, remove, or search for multiple tags "
- "at the same time, join multiple options, for example:"),
+ "at the same time, join multiple options, for example:"),
"\n"
"\n"
" -a ", _("TAG"), " -a ", _("TAG"), " -a ", _("TAG"),
@@ -149,7 +149,7 @@
} else if (!add && !remove && !remove_all && !files && !search && !list) {
failed = _("No arguments were provided");
}
-
+
if (failed) {
gchar *help;
@@ -179,7 +179,7 @@
for (i = 0, j = 0; files[i] != NULL; i++) {
/* GFile *file; */
/* gchar *path; */
-
+
/* file = g_file_new_for_commandline_arg (files[i]); */
/* path = g_file_get_path (file); */
/* g_object_unref (file); */
@@ -219,9 +219,9 @@
for (i = 0; files_resolved[i] != NULL; i++) {
if (remove_all) {
- tracker_keywords_remove_all (client,
- SERVICE_FILES,
- files_resolved[i],
+ tracker_keywords_remove_all (client,
+ SERVICE_FILES,
+ files_resolved[i],
&error);
if (error) {
@@ -238,10 +238,10 @@
}
if (tags_to_add) {
- tracker_keywords_add (client,
- SERVICE_FILES,
- files_resolved[i],
- tags_to_add,
+ tracker_keywords_add (client,
+ SERVICE_FILES,
+ files_resolved[i],
+ tags_to_add,
&error);
if (error) {
@@ -258,10 +258,10 @@
}
if (tags_to_remove) {
- tracker_keywords_remove (client,
- SERVICE_FILES,
- files_resolved[i],
- tags_to_remove,
+ tracker_keywords_remove (client,
+ SERVICE_FILES,
+ files_resolved[i],
+ tags_to_remove,
&error);
if (error) {
@@ -279,11 +279,11 @@
}
}
- if (((!files && list) ||
+ if (((!files && list) ||
(!files && (!add && !remove && !remove_all))) && !search) {
GPtrArray *array;
- array = tracker_keywords_get_list (client,
+ array = tracker_keywords_get_list (client,
SERVICE_FILES,
&error);
@@ -304,7 +304,7 @@
}
}
- if ((files && list) ||
+ if ((files && list) ||
(files && (!add && !remove && !remove_all))) {
g_print ("%s:\n",
_("Tags found"));
@@ -312,9 +312,9 @@
for (i = 0, j = 0; files_resolved[i] != NULL; i++) {
gchar **tags;
- tags = tracker_keywords_get (client,
- SERVICE_FILES,
- files_resolved[i],
+ tags = tracker_keywords_get (client,
+ SERVICE_FILES,
+ files_resolved[i],
&error);
if (error) {
@@ -357,11 +357,11 @@
search_resolved[j] = NULL;
- results = tracker_keywords_search (client, -1,
- SERVICE_FILES,
- search_resolved,
- offset,
- limit,
+ results = tracker_keywords_search (client, -1,
+ SERVICE_FILES,
+ search_resolved,
+ offset,
+ limit,
&error);
if (error) {
@@ -386,7 +386,7 @@
g_strfreev (tags_to_add);
g_strfreev (search_resolved);
g_strfreev (files_resolved);
-
+
tracker_disconnect (client);
if (error_str) {
@@ -395,9 +395,9 @@
error->message);
g_free (error_str);
g_clear_error (&error);
-
+
return EXIT_FAILURE;
}
-
+
return EXIT_SUCCESS;
}
Modified: branches/indexer-split/src/tracker-utils/tracker-unique.c
==============================================================================
--- branches/indexer-split/src/tracker-utils/tracker-unique.c (original)
+++ branches/indexer-split/src/tracker-utils/tracker-unique.c Sat Sep 20 14:45:00 2008
@@ -42,7 +42,7 @@
static gboolean descending;
static GOptionEntry entries[] = {
- { "path", 'p', 0, G_OPTION_ARG_STRING, &path,
+ { "path", 'p', 0, G_OPTION_ARG_STRING, &path,
N_("Path to use in query"),
NULL
},
@@ -50,19 +50,19 @@
N_("Search from a specific service"),
NULL
},
- { "count", 'c', 0, G_OPTION_ARG_STRING, &count,
- N_("Count instances of unique fields of this type"),
+ { "count", 'c', 0, G_OPTION_ARG_STRING, &count,
+ N_("Count instances of unique fields of this type"),
"e.g. File:Mime"
},
- { "sum", 'u', 0, G_OPTION_ARG_STRING, &sum,
- N_("Sum the values of this field"),
+ { "sum", 'u', 0, G_OPTION_ARG_STRING, &sum,
+ N_("Sum the values of this field"),
"e.g. File:Mime"
- },
- { "desc", 'o', 0, G_OPTION_ARG_NONE, &descending,
- N_("Sort to descending order"),
+ },
+ { "desc", 'o', 0, G_OPTION_ARG_NONE, &descending,
+ N_("Sort to descending order"),
NULL},
- { G_OPTION_REMAINING, 0, 0,
- G_OPTION_ARG_STRING_ARRAY, &fields,
+ { G_OPTION_REMAINING, 0, 0,
+ G_OPTION_ARG_STRING_ARRAY, &fields,
N_("Required fields"), NULL},
{ NULL }
};
@@ -88,7 +88,7 @@
}
int
-main (int argc, char **argv)
+main (int argc, char **argv)
{
TrackerClient *client;
ServiceType type;
@@ -110,7 +110,7 @@
if (!fields) {
gchar *help;
- g_printerr ("%s\n\n",
+ g_printerr ("%s\n\n",
_("Fields are missing"));
help = g_option_context_get_help (context, TRUE, NULL);
@@ -151,52 +151,52 @@
path_in_utf8 = g_filename_to_utf8 (path, -1, NULL, NULL, &error);
if (error) {
g_printerr ("%s:'%s', %s\n",
- _("Could not get UTF-8 path from path"),
+ _("Could not get UTF-8 path from path"),
path,
error->message);
g_error_free (error);
tracker_disconnect (client);
-
+
return EXIT_FAILURE;
}
g_file_get_contents (path_in_utf8, &content, &size, &error);
if (error) {
g_printerr ("%s:'%s', %s\n",
- _("Could not read file"),
+ _("Could not read file"),
path_in_utf8,
error->message);
g_error_free (error);
g_free (path_in_utf8);
tracker_disconnect (client);
-
+
return EXIT_FAILURE;
}
-
+
g_free (path_in_utf8);
-
+
buffer = g_locale_to_utf8 (content, size, NULL, NULL, &error);
g_free (content);
-
+
if (error) {
g_printerr ("%s, %s\n",
_("Could not convert query file to UTF-8"),
error->message);
g_error_free (error);
tracker_disconnect (client);
-
+
return EXIT_FAILURE;
}
}
- array = tracker_metadata_get_unique_values_with_count (client,
- type,
- fields,
+ array = tracker_metadata_get_unique_values_with_count (client,
+ type,
+ fields,
buffer,
count,
- descending,
- 0,
- 512,
+ descending,
+ 0,
+ 512,
&error);
g_free (buffer);
@@ -207,8 +207,8 @@
g_error_free (error);
return EXIT_FAILURE;
- }
-
+ }
+
if (!array) {
g_print ("%s\n",
_("No results found matching your query"));
Modified: branches/indexer-split/src/trackerd/mingw-compat.h
==============================================================================
--- branches/indexer-split/src/trackerd/mingw-compat.h (original)
+++ branches/indexer-split/src/trackerd/mingw-compat.h Sat Sep 20 14:45:00 2008
@@ -94,7 +94,7 @@
#endif
#ifndef SIGUSR2
#define SIGUSR2 31 /* user defined signal 2 */
-#endif
+#endif
#define sigemptyset(pset) (*(pset) = 0)
#define sigfillset(pset) (*(pset) = (unsigned int)-1)
Modified: branches/indexer-split/src/trackerd/tracker-crawler.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-crawler.c (original)
+++ branches/indexer-split/src/trackerd/tracker-crawler.c Sat Sep 20 14:45:00 2008
@@ -194,7 +194,7 @@
g_slist_foreach (priv->no_watch_directory_roots, (GFunc) g_free, NULL);
g_slist_free (priv->no_watch_directory_roots);
-
+
g_slist_foreach (priv->watch_directory_roots, (GFunc) g_free, NULL);
g_slist_free (priv->watch_directory_roots);
@@ -299,7 +299,7 @@
strcmp (path, "/sys") == 0) {
return TRUE;
}
-
+
if (g_str_has_prefix (path, g_get_tmp_dir ())) {
return TRUE;
}
@@ -431,7 +431,7 @@
g_debug ("Found :'%s' (%d)",
path,
crawler->private->enumerations);
-
+
g_queue_push_tail (crawler->private->directories, g_object_ref (file));
}
@@ -474,10 +474,10 @@
/* Throttle the crawler, with testing, throttling every item
* took the time to crawl 130k files from 7 seconds up to 68
- * seconds. So it is important to get this figure right.
+ * seconds. So it is important to get this figure right.
*/
- tracker_throttle (priv->config, 25);
-
+ tracker_throttle (priv->config, 25);
+
/* Crawler files */
file = g_queue_pop_head (priv->files);
@@ -522,13 +522,13 @@
}
if (priv->current_path) {
- g_message (" Searching directory:'%s'",
+ g_message (" Searching directory:'%s'",
(gchar*) priv->current_path->data);
-
+
file = g_file_new_for_path (priv->current_path->data);
add_directory (crawler, file);
g_object_unref (file);
-
+
return TRUE;
}
@@ -549,13 +549,13 @@
}
if (priv->current_recurse_path) {
- g_message (" Searching directory:'%s' (recursively)",
+ g_message (" Searching directory:'%s' (recursively)",
(gchar *) priv->current_recurse_path->data);
-
+
file = g_file_new_for_path (priv->current_recurse_path->data);
add_directory (crawler, file);
g_object_unref (file);
-
+
return TRUE;
}
@@ -650,7 +650,7 @@
for (l = files; l; l = l->next) {
info = l->data;
child = g_file_get_child (parent, g_file_info_get_name (info));
-
+
if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
/* This is a bit of a hack, but we assume this is a
* recursive lookup because the current non-recursive
@@ -745,11 +745,11 @@
/* Check the currently set recurse paths are real */
for (l = priv->recurse_paths; l; l = l->next) {
path = l->data;
-
+
/* Check location exists before we do anything */
file = g_file_new_for_path (path);
exists = g_file_query_exists (file, NULL);
-
+
if (exists) {
g_message (" Directory:'%s' added to list to crawl (recursively)",
path);
@@ -761,7 +761,7 @@
g_object_unref (file);
}
-
+
new_list = g_slist_reverse (new_list);
g_slist_foreach (priv->recurse_paths, (GFunc) g_free, NULL);
g_slist_free (priv->recurse_paths);
@@ -796,54 +796,54 @@
tracker_module_config_get_monitor_recurse_directories (priv->module_name);
directories =
tracker_module_config_get_monitor_directories (priv->module_name);
-
+
if (recurse_directories || directories) {
/* First we do non-recursive directories */
for (l = directories; l; l = l->next) {
path = l->data;
-
+
/* Check location exists before we do anything */
file = g_file_new_for_path (path);
exists = g_file_query_exists (file, NULL);
-
+
if (!exists) {
g_message (" Directory:'%s' does not exist",
path);
g_object_unref (file);
continue;
}
-
+
g_message (" Directory:'%s' added to list to crawl",
path);
-
+
priv->paths = g_slist_append (priv->paths, g_strdup (l->data));
g_object_unref (file);
}
-
+
g_list_free (directories);
-
+
/* Second we do recursive directories */
for (l = recurse_directories; l; l = l->next) {
path = l->data;
-
+
/* Check location exists before we do anything */
file = g_file_new_for_path (path);
exists = g_file_query_exists (file, NULL);
-
+
if (!exists) {
g_message (" Directory:'%s' does not exist",
path);
g_object_unref (file);
continue;
}
-
+
g_message (" Directory:'%s' added to list to crawl (recursively)",
path);
-
+
priv->recurse_paths = g_slist_append (priv->recurse_paths, g_strdup (l->data));
g_object_unref (file);
}
-
+
g_list_free (recurse_directories);
} else {
g_message (" No directories from module config");
@@ -856,7 +856,7 @@
g_message (" No directories that actually exist to iterate, doing nothing");
return FALSE;
}
-
+
/* Filter duplicates */
sl = priv->paths;
priv->paths = tracker_path_list_filter_duplicates (priv->paths);
@@ -882,7 +882,7 @@
g_slist_free (priv->watch_directory_roots);
sl = tracker_config_get_watch_directory_roots (priv->config);
priv->watch_directory_roots = tracker_gslist_copy_with_string_data (sl);
-
+
g_slist_foreach (priv->crawl_directory_roots, (GFunc) g_free, NULL);
g_slist_free (priv->crawl_directory_roots);
sl = tracker_config_get_crawl_directory_roots (priv->config);
@@ -988,7 +988,7 @@
gboolean is_directory)
{
g_return_val_if_fail (TRACKER_IS_CRAWLER (crawler), TRUE);
-
+
/* We have an internal function here we call. The reason for
* this is that it is expensive to type check the Crawler
* object for EVERY file we process. Internally, we don't do
Modified: branches/indexer-split/src/trackerd/tracker-crawler.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-crawler.h (original)
+++ branches/indexer-split/src/trackerd/tracker-crawler.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- 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
Modified: branches/indexer-split/src/trackerd/tracker-daemon.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-daemon.c (original)
+++ branches/indexer-split/src/trackerd/tracker-daemon.c Sat Sep 20 14:45:00 2008
@@ -141,7 +141,7 @@
}
static void
-clean_last_stats (TrackerDaemonPrivate *priv)
+clean_last_stats (TrackerDaemonPrivate *priv)
{
if (priv->last_stats) {
g_ptr_array_foreach (priv->last_stats, (GFunc) g_strfreev, NULL);
@@ -171,7 +171,7 @@
/* GetStats has asc in its query. Therefore we don't have to
* lookup the in a to compare in b, just compare index based.
- * Maybe we want to change this nonetheless later?
+ * Maybe we want to change this nonetheless later?
*/
result_set = tracker_db_exec_proc (iface, "GetStats", 0);
new_stats = tracker_dbus_query_result_to_ptr_array (result_set);
@@ -320,7 +320,7 @@
return object;
}
-static void
+static void
indexer_pause_cb (DBusGProxy *proxy,
GError *error,
gpointer user_data)
@@ -331,7 +331,7 @@
}
}
-static void
+static void
indexer_continue_cb (DBusGProxy *proxy,
GError *error,
gpointer user_data)
@@ -342,7 +342,7 @@
}
}
-static void
+static void
indexer_paused_cb (DBusGProxy *proxy,
GError *error,
gpointer user_data)
@@ -350,7 +350,7 @@
g_message ("The indexer has paused");
}
-static void
+static void
indexer_continued_cb (DBusGProxy *proxy,
GError *error,
gpointer user_data)
@@ -532,14 +532,14 @@
tracker_status_set_is_paused_manually (value);
if (value) {
- org_freedesktop_Tracker_Indexer_pause_async (priv->indexer_proxy,
- indexer_pause_cb,
+ org_freedesktop_Tracker_Indexer_pause_async (priv->indexer_proxy,
+ indexer_pause_cb,
NULL);
} else {
/* Don't continue if we are paused from IO */
if (!tracker_status_get_is_paused_for_io ()) {
- org_freedesktop_Tracker_Indexer_continue_async (priv->indexer_proxy,
- indexer_continue_cb,
+ org_freedesktop_Tracker_Indexer_continue_async (priv->indexer_proxy,
+ indexer_continue_cb,
NULL);
}
}
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 Sat Sep 20 14:45:00 2008
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2007, Jason Kivlighn (jkivlighn gmail com)
- * Copyright (C) 2007, Creative Commons (http://creativecommons.org)
+ * Copyright (C) 2007, Creative Commons (http://creativecommons.org)
* Copyright (C) 2008, Nokia
*
* This library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
#include <glib/gstdio.h>
-#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-common/tracker-nfs-lock.h>
#include <libtracker-common/tracker-parser.h>
#include <libtracker-common/tracker-type-utils.h>
@@ -76,8 +76,8 @@
}
static gchar *
-compress_string (const gchar *ptr,
- gint size,
+compress_string (const gchar *ptr,
+ gint size,
gint *compressed_size)
{
z_stream zs;
@@ -85,7 +85,7 @@
unsigned char obuf[ZLIBBUFSIZ];
gint rv, asiz, bsiz, osiz;
- if (size < 0) {
+ if (size < 0) {
size = strlen (ptr);
}
@@ -167,8 +167,8 @@
}
static gboolean
-db_exec_proc_no_reply (TrackerDBInterface *iface,
- const gchar *procedure,
+db_exec_proc_no_reply (TrackerDBInterface *iface,
+ const gchar *procedure,
...)
{
TrackerDBResultSet *result_set;
@@ -178,9 +178,9 @@
g_return_val_if_fail (procedure != NULL, FALSE);
va_start (args, procedure);
- result_set = tracker_db_interface_execute_vprocedure (iface,
- NULL,
- procedure,
+ result_set = tracker_db_interface_execute_vprocedure (iface,
+ NULL,
+ procedure,
args);
va_end (args);
@@ -193,8 +193,8 @@
static void
db_save_full_text (TrackerDBInterface *iface,
- const gchar *str_file_id,
- const gchar *text,
+ const gchar *str_file_id,
+ const gchar *text,
gint length)
{
gchar *compressed, *value = NULL;
@@ -204,11 +204,11 @@
compressed = compress_string (text, length, &bytes_compressed);
if (compressed) {
- g_debug ("Compressed full text size of %d to %d",
+ g_debug ("Compressed full text size of %d to %d",
length, bytes_compressed);
value = compressed;
} else {
- g_warning ("Could not compress text'%*s...', length:%d",
+ g_warning ("Could not compress text'%*s...', length:%d",
16, text, length);
value = g_strdup (text);
bytes_compressed = length;
@@ -225,22 +225,22 @@
tracker_db_interface_execute_procedure_len (iface,
NULL,
"SaveServiceContents",
- str_file_id,
+ str_file_id,
-1,
field_id,
-1,
- value,
+ value,
bytes_compressed,
NULL);
g_free (value);
}
static void
-update_metadata_index (const gchar *id,
- const gchar *service,
- TrackerField *def,
- const gchar *old_value,
- const gchar *new_value)
+update_metadata_index (const gchar *id,
+ const gchar *service,
+ TrackerField *def,
+ const gchar *old_value,
+ const gchar *new_value)
{
TrackerDBPrivate *private;
GHashTable *old_table;
@@ -256,27 +256,27 @@
new_table = NULL;
if (old_value) {
- old_table = tracker_parser_text (old_table,
- old_value,
- tracker_field_get_weight (def),
- private->language,
+ old_table = tracker_parser_text (old_table,
+ old_value,
+ tracker_field_get_weight (def),
+ private->language,
tracker_config_get_max_words_to_index (private->config),
tracker_config_get_max_word_length (private->config),
tracker_config_get_min_word_length (private->config),
- tracker_field_get_filtered (def),
+ tracker_field_get_filtered (def),
tracker_field_get_delimited (def));
}
/* Parse new metadata value */
if (new_value) {
- new_table = tracker_parser_text (new_table,
- new_value,
- tracker_field_get_weight (def),
- private->language,
+ new_table = tracker_parser_text (new_table,
+ new_value,
+ tracker_field_get_weight (def),
+ private->language,
tracker_config_get_max_words_to_index (private->config),
tracker_config_get_max_word_length (private->config),
tracker_config_get_min_word_length (private->config),
- tracker_field_get_filtered (def),
+ tracker_field_get_filtered (def),
tracker_field_get_delimited (def));
}
@@ -297,9 +297,9 @@
TrackerDBResultSet *result_set;
gchar *backup_id = NULL;
- result_set = tracker_db_exec_proc (iface,
- "GetBackupServiceByID",
- id,
+ result_set = tracker_db_exec_proc (iface,
+ "GetBackupServiceByID",
+ id,
NULL);
if (result_set) {
@@ -310,9 +310,9 @@
if (!backup_id) {
gint64 last_insert_id;
- tracker_db_exec_proc (iface,
- "InsertBackupService",
- id,
+ tracker_db_exec_proc (iface,
+ "InsertBackupService",
+ id,
NULL);
last_insert_id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (iface));
backup_id = tracker_gint_to_string (last_insert_id);
@@ -322,30 +322,30 @@
}
static inline void
-backup_non_embedded_metadata (TrackerDBInterface *iface,
- const gchar *id,
- const gchar *key_id,
+backup_non_embedded_metadata (TrackerDBInterface *iface,
+ const gchar *id,
+ const gchar *key_id,
const gchar *value)
{
gchar *backup_id;
-
+
backup_id = get_backup_id (iface, id);
if (backup_id) {
- tracker_db_exec_proc (iface,
- "SetBackupMetadata",
- backup_id,
- key_id,
- value,
+ tracker_db_exec_proc (iface,
+ "SetBackupMetadata",
+ backup_id,
+ key_id,
+ value,
NULL);
g_free (backup_id);
}
}
static inline void
-backup_delete_non_embedded_metadata_value (TrackerDBInterface *iface,
- const gchar *id,
- const gchar *key_id,
+backup_delete_non_embedded_metadata_value (TrackerDBInterface *iface,
+ const gchar *id,
+ const gchar *key_id,
const gchar *value)
{
gchar *backup_id;
@@ -353,11 +353,11 @@
backup_id = get_backup_id (iface, id);
if (backup_id) {
- tracker_db_exec_proc (iface,
- "DeleteBackupMetadataValue",
- backup_id,
- key_id,
- value,
+ tracker_db_exec_proc (iface,
+ "DeleteBackupMetadataValue",
+ backup_id,
+ key_id,
+ value,
NULL);
g_free (backup_id);
}
@@ -365,7 +365,7 @@
static inline void
backup_delete_non_embedded_metadata (TrackerDBInterface *iface,
- const gchar *id,
+ const gchar *id,
const gchar *key_id)
{
gchar *backup_id;
@@ -373,18 +373,18 @@
backup_id = get_backup_id (iface, id);
if (backup_id) {
- tracker_db_exec_proc (iface,
- "DeleteBackupMetadata",
- backup_id,
- key_id,
+ tracker_db_exec_proc (iface,
+ "DeleteBackupMetadata",
+ backup_id,
+ key_id,
NULL);
g_free (backup_id);
}
}
static gchar *
-remove_value (const gchar *str,
- const gchar *del_str)
+remove_value (const gchar *str,
+ const gchar *del_str)
{
GString *s = NULL;
gchar **p;
@@ -417,8 +417,8 @@
/* Deprecated */
static guint32
-db_create_event (TrackerDBInterface *iface,
- const gchar *service_id_str,
+db_create_event (TrackerDBInterface *iface,
+ const gchar *service_id_str,
const gchar *type)
{
TrackerDBResultSet *result_set;
@@ -428,8 +428,8 @@
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), 0);
- result_set = tracker_db_exec_proc (iface,
- "GetNewEventID",
+ result_set = tracker_db_exec_proc (iface,
+ "GetNewEventID",
NULL);
if (!result_set) {
@@ -445,18 +445,18 @@
eid = tracker_gint_to_string (i);
result_set = tracker_db_exec_proc (iface,
- "UpdateNewEventID",
- eid,
+ "UpdateNewEventID",
+ eid,
NULL);
if (result_set)
g_object_unref (result_set);
/* Uses the Events table */
- result_set = tracker_db_exec_proc (iface,
- "CreateEvent",
- eid,
- service_id_str,
- type,
+ result_set = tracker_db_exec_proc (iface,
+ "CreateEvent",
+ eid,
+ service_id_str,
+ type,
NULL);
id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (iface));
@@ -530,7 +530,7 @@
services[count++] = tracker_ontology_get_service_id_by_name ("KMailEmails");
services[count++] = tracker_ontology_get_service_id_by_name ("ThunderbirdEmails");
}
-
+
if (add_conversations) {
services[count++] = tracker_ontology_get_service_id_by_name ("GaimConversations");
}
@@ -558,18 +558,18 @@
private = g_static_private_get (&private_key);
if (private) {
- g_warning ("Already initialized (%s)",
+ g_warning ("Already initialized (%s)",
__FUNCTION__);
return;
}
private = g_new0 (TrackerDBPrivate, 1);
-
+
private->config = g_object_ref (config);
private->language = g_object_ref (language);
- g_static_private_set (&private_key,
- private,
+ g_static_private_set (&private_key,
+ private,
private_free);
}
@@ -580,7 +580,7 @@
private = g_static_private_get (&private_key);
if (!private) {
- g_warning ("Not initialized (%s)",
+ g_warning ("Not initialized (%s)",
__FUNCTION__);
return;
}
@@ -589,8 +589,8 @@
}
gboolean
-tracker_db_exec_no_reply (TrackerDBInterface *iface,
- const gchar *query,
+tracker_db_exec_no_reply (TrackerDBInterface *iface,
+ const gchar *query,
...)
{
TrackerDBResultSet *result_set;
@@ -615,7 +615,7 @@
}
TrackerDBResultSet *
-tracker_db_exec (TrackerDBInterface *iface,
+tracker_db_exec (TrackerDBInterface *iface,
const gchar *query,
...)
{
@@ -628,9 +628,9 @@
tracker_nfs_lock_obtain ();
va_start (args, query);
- result_set = tracker_db_interface_execute_vquery (iface,
- NULL,
- query,
+ result_set = tracker_db_interface_execute_vquery (iface,
+ NULL,
+ query,
args);
va_end (args);
@@ -640,7 +640,7 @@
}
TrackerDBResultSet *
-tracker_db_exec_proc (TrackerDBInterface *iface,
+tracker_db_exec_proc (TrackerDBInterface *iface,
const gchar *procedure,
...)
{
@@ -652,8 +652,8 @@
va_start (args, procedure);
result_set = tracker_db_interface_execute_vprocedure (iface,
- NULL,
- procedure,
+ NULL,
+ procedure,
args);
va_end (args);
@@ -661,7 +661,7 @@
}
gchar *
-tracker_db_get_field_name (const gchar *service,
+tracker_db_get_field_name (const gchar *service,
const gchar *meta_name)
{
gint key_field;
@@ -671,7 +671,7 @@
if (key_field > 0) {
return g_strdup_printf ("KeyMetadata%d", key_field);
- }
+ }
if (strcasecmp (meta_name, "File:Path") == 0) return g_strdup ("Path");
if (strcasecmp (meta_name, "File:Name") == 0) return g_strdup ("Name");
@@ -684,12 +684,12 @@
}
TrackerDBResultSet *
-tracker_db_search_text (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *search_string,
- gint offset,
- gint limit,
- gboolean save_results,
+tracker_db_search_text (TrackerDBInterface *iface,
+ const gchar *service,
+ const gchar *search_string,
+ gint offset,
+ gint limit,
+ gboolean save_results,
gboolean detailed)
{
TrackerDBPrivate *private;
@@ -718,10 +718,10 @@
tracker_config_get_max_word_length (private->config),
tracker_config_get_min_word_length (private->config));
- result_set = tracker_db_exec_proc (iface,
- "GetRelatedServiceIDs",
- service,
- service,
+ result_set = tracker_db_exec_proc (iface,
+ "GetRelatedServiceIDs",
+ service,
+ service,
NULL);
if (result_set) {
@@ -743,7 +743,7 @@
}
/* FIXME: Do we need both index and services here? We used to have it */
- tree = tracker_query_tree_new (search_string,
+ tree = tracker_query_tree_new (search_string,
private->config,
private->language,
services);
@@ -752,8 +752,8 @@
if (save_results) {
tracker_db_interface_start_transaction (iface);
- tracker_db_exec_proc (iface,
- "DeleteSearchResults1",
+ tracker_db_exec_proc (iface,
+ "DeleteSearchResults1",
NULL);
}
@@ -771,16 +771,16 @@
str_id = tracker_guint_to_string (rank.service_id);
/* We save results into SearchResults table instead of
- * returing an array of array of strings
+ * returing an array of array of strings
*/
if (save_results) {
gchar *str_score;
str_score = tracker_gint_to_string (rank.score);
- tracker_db_exec_proc (iface,
- "InsertSearchResult1",
- str_id,
- str_score,
+ tracker_db_exec_proc (iface,
+ "InsertSearchResult1",
+ str_id,
+ str_score,
NULL);
g_free (str_id);
g_free (str_score);
@@ -803,8 +803,8 @@
}
result_set = tracker_db_exec_proc (iface,
- procedure,
- str_id,
+ procedure,
+ str_id,
NULL);
g_free (str_id);
@@ -860,11 +860,11 @@
email_index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
for (w = words; w; w = w->next) {
- tracker_db_index_remove_dud_hits (file_index,
- (const gchar *) w->data,
+ tracker_db_index_remove_dud_hits (file_index,
+ (const gchar *) w->data,
duds);
- tracker_db_index_remove_dud_hits (email_index,
- (const gchar *) w->data,
+ tracker_db_index_remove_dud_hits (email_index,
+ (const gchar *) w->data,
duds);
}
@@ -890,8 +890,8 @@
}
TrackerDBResultSet *
-tracker_db_search_text_and_mime (TrackerDBInterface *iface,
- const gchar *text,
+tracker_db_search_text_and_mime (TrackerDBInterface *iface,
+ const gchar *text,
gchar **mime_array)
{
TrackerDBPrivate *private;
@@ -900,7 +900,7 @@
GArray *hits;
GArray *services;
gint count = 0;
- guint i;
+ guint i;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (text != NULL, NULL);
@@ -912,7 +912,7 @@
result_set1 = NULL;
services = tracker_db_create_array_of_services (NULL, TRUE);
- tree = tracker_query_tree_new (text,
+ tree = tracker_query_tree_new (text,
private->config,
private->language,
services);
@@ -926,9 +926,9 @@
rank = g_array_index (hits, TrackerDBIndexItemRank, i);
str_id = tracker_guint_to_string (rank.service_id);
- result_set2 = tracker_db_exec_proc (iface,
- "GetFileByID",
- str_id,
+ result_set2 = tracker_db_exec_proc (iface,
+ "GetFileByID",
+ str_id,
NULL);
g_free (str_id);
@@ -962,7 +962,7 @@
}
if (count > 2047) {
- g_warning ("Count is > 2047? Breaking for loop in %s, why?",
+ g_warning ("Count is > 2047? Breaking for loop in %s, why?",
__FUNCTION__);
break;
}
@@ -988,7 +988,7 @@
TrackerDBResultSet *
tracker_db_search_text_and_location (TrackerDBInterface *iface,
- const gchar *text,
+ const gchar *text,
const gchar *location)
{
TrackerDBPrivate *private;
@@ -1011,7 +1011,7 @@
location_prefix = g_strconcat (location, G_DIR_SEPARATOR_S, NULL);
services = tracker_db_create_array_of_services (NULL, TRUE);
- tree = tracker_query_tree_new (text,
+ tree = tracker_query_tree_new (text,
private->config,
private->language,
services);
@@ -1025,16 +1025,16 @@
rank = g_array_index (hits, TrackerDBIndexItemRank, i);
str_id = tracker_guint_to_string (rank.service_id);
- result_set2 = tracker_db_exec_proc (iface,
- "GetFileByID",
- str_id,
+ result_set2 = tracker_db_exec_proc (iface,
+ "GetFileByID",
+ str_id,
NULL);
g_free (str_id);
if (result_set2) {
tracker_db_result_set_get (result_set2, 0, &path, -1);
- if (g_str_has_prefix (path, location_prefix) ||
+ if (g_str_has_prefix (path, location_prefix) ||
strcmp (path, location) == 0) {
GValue value = { 0, };
@@ -1061,7 +1061,7 @@
}
if (count > 2047) {
- g_warning ("Count is > 2047? Breaking for loop in %s, why?",
+ g_warning ("Count is > 2047? Breaking for loop in %s, why?",
__FUNCTION__);
break;
}
@@ -1088,8 +1088,8 @@
TrackerDBResultSet *
tracker_db_search_text_and_mime_and_location (TrackerDBInterface *iface,
- const gchar *text,
- gchar **mime_array,
+ const gchar *text,
+ gchar **mime_array,
const gchar *location)
{
TrackerDBPrivate *private;
@@ -1112,7 +1112,7 @@
location_prefix = g_strconcat (location, G_DIR_SEPARATOR_S, NULL);
services = tracker_db_create_array_of_services (NULL, TRUE);
- tree = tracker_query_tree_new (text,
+ tree = tracker_query_tree_new (text,
private->config,
private->language,
services);
@@ -1126,9 +1126,9 @@
rank = g_array_index (hits, TrackerDBIndexItemRank, i);
str_id = tracker_guint_to_string (rank.service_id);
- result_set2 = tracker_db_exec_proc (iface,
- "GetFileByID",
- str_id,
+ result_set2 = tracker_db_exec_proc (iface,
+ "GetFileByID",
+ str_id,
NULL);
g_free (str_id);
@@ -1138,7 +1138,7 @@
2, &mimetype,
-1);
- if ((g_str_has_prefix (path, location_prefix) ||
+ if ((g_str_has_prefix (path, location_prefix) ||
strcmp (path, location) == 0) &&
tracker_string_in_string_list (mimetype, mime_array) != -1) {
GValue value = { 0, };
@@ -1168,7 +1168,7 @@
}
if (count > 2047) {
- g_warning ("Count is > 2047? Breaking for loop in %s, why?",
+ g_warning ("Count is > 2047? Breaking for loop in %s, why?",
__FUNCTION__);
break;
}
@@ -1194,8 +1194,8 @@
}
TrackerDBResultSet *
-tracker_db_metadata_get (TrackerDBInterface *iface,
- const gchar *id,
+tracker_db_metadata_get (TrackerDBInterface *iface,
+ const gchar *id,
const gchar *key)
{
TrackerField *def;
@@ -1231,16 +1231,16 @@
case TRACKER_FIELD_TYPE_KEYWORD:
proc = "GetMetadataKeyword";
break;
-
+
default:
- g_warning ("Metadata could not be retrieved as type:%d is not supported",
- tracker_field_get_data_type (def));
+ g_warning ("Metadata could not be retrieved as type:%d is not supported",
+ tracker_field_get_data_type (def));
return NULL;
}
- return tracker_db_exec_proc (iface,
- proc,
- id,
+ return tracker_db_exec_proc (iface,
+ proc,
+ id,
tracker_field_get_id (def),
NULL);
}
@@ -1249,7 +1249,7 @@
tracker_db_metadata_get_array (TrackerDBInterface *iface,
const gchar *service_type,
const gchar *service_id,
- gchar ** keys)
+ gchar ** keys)
{
TrackerDBResultSet *result_set;
GString *sql, *sql_join;
@@ -1263,13 +1263,13 @@
for (i = 0; i < g_strv_length (keys); i++) {
TrackerFieldData *field_data;
- field_data = tracker_db_get_metadata_field (iface,
- service_type,
- keys[i],
- i,
- TRUE,
+ field_data = tracker_db_get_metadata_field (iface,
+ service_type,
+ keys[i],
+ i,
+ TRUE,
FALSE);
-
+
if (!field_data) {
g_string_free (sql_join, TRUE);
g_string_free (sql, TRUE);
@@ -1277,16 +1277,16 @@
}
if (i == 0) {
- g_string_append_printf (sql, " %s",
+ g_string_append_printf (sql, " %s",
tracker_field_data_get_select_field (field_data));
} else {
- g_string_append_printf (sql, ", %s",
+ g_string_append_printf (sql, ", %s",
tracker_field_data_get_select_field (field_data));
}
if (tracker_field_data_get_needs_join (field_data)) {
- g_string_append_printf (sql_join,
- "\n LEFT OUTER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID = %s) ",
+ g_string_append_printf (sql_join,
+ "\n LEFT OUTER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID = %s) ",
tracker_field_data_get_table_name (field_data),
tracker_field_data_get_alias (field_data),
tracker_field_data_get_alias (field_data),
@@ -1318,9 +1318,9 @@
/* Gets specified metadata value as a single row (multple values for a
* metadata type are returned delimited by "|" )
*/
-gchar *
-tracker_db_metadata_get_delimited (TrackerDBInterface *iface,
- const gchar *id,
+gchar *
+tracker_db_metadata_get_delimited (TrackerDBInterface *iface,
+ const gchar *id,
const gchar *key)
{
TrackerDBResultSet *result_set;
@@ -1369,9 +1369,9 @@
g_return_val_if_fail (name != NULL, NULL);
result_set = tracker_db_exec_proc (iface,
- "GetMetadataAliasesForName",
- name,
- name,
+ "GetMetadataAliasesForName",
+ name,
+ name,
NULL);
if (result_set) {
@@ -1401,17 +1401,17 @@
}
TrackerDBResultSet *
-tracker_db_xesam_get_metadata_names (TrackerDBInterface *iface,
+tracker_db_xesam_get_metadata_names (TrackerDBInterface *iface,
const gchar *name)
{
TrackerDBResultSet *result_set;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (name != NULL, NULL);
-
+
result_set = tracker_db_exec_proc (iface,
- "GetXesamMetaDataLookups",
- name,
+ "GetXesamMetaDataLookups",
+ name,
NULL);
return result_set;
@@ -1423,16 +1423,16 @@
TrackerDBResultSet *result_set;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
-
+
result_set = tracker_db_exec_proc (iface,
- "GetXesamMetaDataTextLookups",
+ "GetXesamMetaDataTextLookups",
NULL);
return result_set;
}
TrackerDBResultSet *
-tracker_db_xesam_get_service_names (TrackerDBInterface *iface,
+tracker_db_xesam_get_service_names (TrackerDBInterface *iface,
const gchar *name)
{
TrackerDBResultSet *result_set;
@@ -1440,9 +1440,9 @@
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (name != NULL, NULL);
- result_set = tracker_db_exec_proc (iface,
- "GetXesamServiceLookups",
- name,
+ result_set = tracker_db_exec_proc (iface,
+ "GetXesamServiceLookups",
+ name,
NULL);
return result_set;
@@ -1456,30 +1456,30 @@
case TRACKER_FIELD_TYPE_STRING:
case TRACKER_FIELD_TYPE_DOUBLE:
return "ServiceMetaData";
-
+
case TRACKER_FIELD_TYPE_INTEGER:
case TRACKER_FIELD_TYPE_DATE:
return "ServiceNumericMetaData";
-
- case TRACKER_FIELD_TYPE_BLOB:
+
+ case TRACKER_FIELD_TYPE_BLOB:
return "ServiceBlobMetaData";
-
- case TRACKER_FIELD_TYPE_KEYWORD:
+
+ case TRACKER_FIELD_TYPE_KEYWORD:
return "ServiceKeywordMetaData";
-
- default:
+
+ default:
break;
}
-
+
return NULL;
}
void
-tracker_db_metadata_set_single (TrackerDBInterface *iface,
- const gchar *service_type,
- const gchar *service_id,
- const gchar *key,
- const gchar *value,
+tracker_db_metadata_set_single (TrackerDBInterface *iface,
+ const gchar *service_type,
+ const gchar *service_id,
+ const gchar *key,
+ const gchar *value,
gboolean do_backup)
{
gchar *array[2];
@@ -1497,11 +1497,11 @@
}
gchar *
-tracker_db_metadata_set (TrackerDBInterface *iface,
- const gchar *service_type,
- const gchar *service_id,
- const gchar *key,
- gchar **values,
+tracker_db_metadata_set (TrackerDBInterface *iface,
+ const gchar *service_type,
+ const gchar *service_id,
+ const gchar *key,
+ gchar **values,
gboolean do_backup)
{
TrackerDBPrivate *private;
@@ -1514,7 +1514,7 @@
guint i;
guint length;
GString *str;
-
+
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (service_type != NULL, NULL);
g_return_val_if_fail (service_id != NULL, NULL);
@@ -1534,7 +1534,7 @@
g_warning ("Metadata type:'%s' not found", key);
return NULL;
}
-
+
res_service = tracker_db_service_get_by_entity (iface, service_id);
if (!res_service) {
@@ -1546,7 +1546,7 @@
new_value = NULL;
key_field = 0;
str = NULL;
-
+
length = g_strv_length (values);
if (tracker_field_get_multiple_values (def) && length > 1) {
@@ -1555,7 +1555,7 @@
key_field = tracker_ontology_service_get_key_metadata (res_service, key);
- update_index =
+ update_index =
tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_INDEX ||
tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_KEYWORD ||
tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_FULLTEXT;
@@ -1575,68 +1575,68 @@
if (!values[i] || !values[i][0]) {
continue;
}
-
- tracker_db_exec_proc (iface,
- "SetMetadataKeyword",
- service_id,
- tracker_field_get_id (def),
- values[i],
+
+ tracker_db_exec_proc (iface,
+ "SetMetadataKeyword",
+ service_id,
+ tracker_field_get_id (def),
+ values[i],
NULL);
/* Backup non-embedded data for embedded services */
- if (do_backup &&
- !tracker_field_get_embedded (def) &&
+ if (do_backup &&
+ !tracker_field_get_embedded (def) &&
tracker_ontology_service_has_embedded (service_type)) {
- backup_non_embedded_metadata (iface,
- service_id,
- tracker_field_get_id (def),
+ backup_non_embedded_metadata (iface,
+ service_id,
+ tracker_field_get_id (def),
values[i]);
}
if (str) {
g_string_append_printf (str, " %s ", values[i]);
} else {
- new_value = values[i];
+ new_value = values[i];
}
g_message ("Saving keyword:'%s'", values[i]);
}
break;
-
+
case TRACKER_FIELD_TYPE_INDEX:
for (i = 0; i < length; i++) {
gchar *mvalue;
-
+
if (!values[i] || !values[i][0]) {
continue;
}
-
+
if (str) {
g_string_append_printf (str, " %s ", values[i]);
} else {
- new_value = values[i];
+ new_value = values[i];
}
-
+
/* Backup non-embedded data for embedded services */
if (do_backup &&
- !tracker_field_get_embedded (def) &&
+ !tracker_field_get_embedded (def) &&
tracker_ontology_service_has_embedded (service_type)) {
backup_non_embedded_metadata (iface, service_id, tracker_field_get_id (def), values[i]);
}
- mvalue = tracker_parser_text_to_string (values[i],
+ mvalue = tracker_parser_text_to_string (values[i],
private->language,
tracker_config_get_max_word_length (private->config),
tracker_config_get_min_word_length (private->config),
- tracker_field_get_filtered (def),
- tracker_field_get_filtered (def),
+ tracker_field_get_filtered (def),
+ tracker_field_get_filtered (def),
tracker_field_get_delimited (def));
- tracker_db_exec_proc (iface,
- "SetMetadata",
- service_id,
- tracker_field_get_id (def),
- mvalue,
- values[i],
+ tracker_db_exec_proc (iface,
+ "SetMetadata",
+ service_id,
+ tracker_field_get_id (def),
+ mvalue,
+ values[i],
NULL);
g_free (mvalue);
}
@@ -1646,52 +1646,52 @@
/* We do not support multiple values for fulltext clobs */
if (values[0]) {
/* FIXME: is the blog the metadata blob/email
- * blob or something else?
+ * blob or something else?
*/
db_save_full_text (iface,
- service_id,
- values[0],
+ service_id,
+ values[0],
strlen (values[0]));
new_value = values[0];
}
break;
-
+
case TRACKER_FIELD_TYPE_STRING:
for (i = 0; i < length; i++) {
gchar *mvalue;
-
+
if (!values[i] || !values[i][0]) {
continue;
}
-
+
/* Backup non-embedded data for embedded services */
- if (do_backup &&
- !tracker_field_get_embedded (def) &&
+ if (do_backup &&
+ !tracker_field_get_embedded (def) &&
tracker_ontology_service_has_embedded (service_type)) {
- backup_non_embedded_metadata (iface,
- service_id,
- tracker_field_get_id (def),
+ backup_non_embedded_metadata (iface,
+ service_id,
+ tracker_field_get_id (def),
values[i]);
}
- mvalue = tracker_parser_text_to_string (values[i],
+ mvalue = tracker_parser_text_to_string (values[i],
private->language,
tracker_config_get_max_word_length (private->config),
tracker_config_get_min_word_length (private->config),
- tracker_field_get_filtered (def),
- tracker_field_get_filtered (def),
+ tracker_field_get_filtered (def),
+ tracker_field_get_filtered (def),
tracker_field_get_delimited (def));
- tracker_db_exec_proc (iface,
- "SetMetadata",
- service_id,
- tracker_field_get_id (def),
- mvalue,
- values[i],
+ tracker_db_exec_proc (iface,
+ "SetMetadata",
+ service_id,
+ tracker_field_get_id (def),
+ mvalue,
+ values[i],
NULL);
g_free (mvalue);
}
break;
-
+
case TRACKER_FIELD_TYPE_DOUBLE:
for (i = 0; i < length; i++) {
if (!values[i] || !values[i][0]) {
@@ -1699,21 +1699,21 @@
}
/* Backup non-embedded data for embedded services */
- if (do_backup &&
- !tracker_field_get_embedded (def) &&
+ if (do_backup &&
+ !tracker_field_get_embedded (def) &&
tracker_ontology_service_has_embedded (service_type)) {
- backup_non_embedded_metadata (iface,
- service_id,
- tracker_field_get_id (def),
+ backup_non_embedded_metadata (iface,
+ service_id,
+ tracker_field_get_id (def),
values[i]);
}
tracker_db_exec_proc (iface,
- "SetMetadata",
- service_id,
- tracker_field_get_id (def),
- " ",
- values[i],
+ "SetMetadata",
+ service_id,
+ tracker_field_get_id (def),
+ " ",
+ values[i],
NULL);
}
break;
@@ -1725,20 +1725,20 @@
}
/* Backup non-embedded data for embedded services */
- if (do_backup &&
- !tracker_field_get_embedded (def) &&
+ if (do_backup &&
+ !tracker_field_get_embedded (def) &&
tracker_ontology_service_has_embedded (service_type)) {
- backup_non_embedded_metadata (iface,
- service_id,
- tracker_field_get_id (def),
+ backup_non_embedded_metadata (iface,
+ service_id,
+ tracker_field_get_id (def),
values[i]);
}
tracker_db_exec_proc (iface,
- "SetMetadataNumeric",
- service_id,
- tracker_field_get_id (def),
- values[i],
+ "SetMetadataNumeric",
+ service_id,
+ tracker_field_get_id (def),
+ values[i],
NULL);
}
break;
@@ -1758,32 +1758,32 @@
continue;
}
- tracker_db_exec_proc (iface,
- "SetMetadataNumeric",
- service_id,
- tracker_field_get_id (def),
- mvalue,
+ tracker_db_exec_proc (iface,
+ "SetMetadataNumeric",
+ service_id,
+ tracker_field_get_id (def),
+ mvalue,
NULL);
/* backup non-embedded data for embedded services */
- if (do_backup &&
- !tracker_field_get_embedded (def) &&
+ if (do_backup &&
+ !tracker_field_get_embedded (def) &&
tracker_ontology_service_has_embedded (service_type)) {
backup_non_embedded_metadata (iface,
- service_id,
- tracker_field_get_id (def),
+ service_id,
+ tracker_field_get_id (def),
mvalue);
}
-
-
+
+
g_free (mvalue);
}
break;
default:
g_warning ("Metadata could not be set as type:%d for "
- "metadata:'%s' is not supported",
- tracker_field_get_data_type (def),
+ "metadata:'%s' is not supported",
+ tracker_field_get_data_type (def),
key);
break;
}
@@ -1808,8 +1808,8 @@
tracker_db_exec_no_reply (iface,
"update Services set KeyMetadata%d = '%s' where id = %s",
- key_field,
- esc_value,
+ key_field,
+ esc_value,
service_id);
g_free (esc_value);
@@ -1825,7 +1825,7 @@
update_metadata_index (service_id, res_service, def, old_value, str->str);
g_string_free (str, TRUE);
} else {
- update_metadata_index (service_id, res_service, def, old_value, new_value);
+ update_metadata_index (service_id, res_service, def, old_value, new_value);
}
}
@@ -1835,12 +1835,12 @@
return NULL;
}
-void
-tracker_db_metadata_delete_value (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *id,
- const gchar *key,
- const gchar *value)
+void
+tracker_db_metadata_delete_value (TrackerDBInterface *iface,
+ const gchar *service,
+ const gchar *id,
+ const gchar *key,
+ const gchar *value)
{
TrackerDBPrivate *private;
TrackerField *def;
@@ -1869,11 +1869,11 @@
old_value = NULL;
new_value = NULL;
- if (!tracker_field_get_embedded (def) &&
+ if (!tracker_field_get_embedded (def) &&
tracker_ontology_service_has_embedded (service)) {
- backup_delete_non_embedded_metadata_value (iface,
- id,
- tracker_field_get_id (def),
+ backup_delete_non_embedded_metadata_value (iface,
+ id,
+ tracker_field_get_id (def),
value);
}
@@ -1886,14 +1886,14 @@
key_field = tracker_ontology_service_get_key_metadata (res_service, key);
- update_index =
+ update_index =
tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_INDEX ||
tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_KEYWORD;
-
+
if (update_index) {
- /* Get current value and claculate the new value */
+ /* Get current value and claculate the new value */
old_value = tracker_db_metadata_get_delimited (iface, id, key);
-
+
if (old_value) {
new_value = remove_value (old_value, value);
} else {
@@ -1906,54 +1906,54 @@
switch (tracker_field_get_data_type (def)) {
case TRACKER_FIELD_TYPE_INDEX:
case TRACKER_FIELD_TYPE_STRING:
- mvalue = tracker_parser_text_to_string (value,
+ mvalue = tracker_parser_text_to_string (value,
private->language,
tracker_config_get_max_word_length (private->config),
tracker_config_get_min_word_length (private->config),
- tracker_field_get_filtered (def),
- tracker_field_get_filtered (def),
+ tracker_field_get_filtered (def),
+ tracker_field_get_filtered (def),
tracker_field_get_delimited (def));
- tracker_db_exec_proc (iface,
- "DeleteMetadataValue",
- id,
- tracker_field_get_id (def),
- mvalue,
+ tracker_db_exec_proc (iface,
+ "DeleteMetadataValue",
+ id,
+ tracker_field_get_id (def),
+ mvalue,
NULL);
g_free (mvalue);
break;
case TRACKER_FIELD_TYPE_DOUBLE:
- tracker_db_exec_proc (iface,
- "DeleteMetadataValue",
- id,
- tracker_field_get_id (def),
- value,
+ tracker_db_exec_proc (iface,
+ "DeleteMetadataValue",
+ id,
+ tracker_field_get_id (def),
+ value,
NULL);
break;
-
+
case TRACKER_FIELD_TYPE_INTEGER:
case TRACKER_FIELD_TYPE_DATE:
tracker_db_exec_proc (iface,
- "DeleteMetadataNumericValue",
- id,
- tracker_field_get_id (def),
- value,
+ "DeleteMetadataNumericValue",
+ id,
+ tracker_field_get_id (def),
+ value,
NULL);
break;
-
+
case TRACKER_FIELD_TYPE_KEYWORD:
- tracker_db_exec_proc (iface,
- "DeleteMetadataKeywordValue",
- id,
- tracker_field_get_id (def),
- value,
+ tracker_db_exec_proc (iface,
+ "DeleteMetadataKeywordValue",
+ id,
+ tracker_field_get_id (def),
+ value,
NULL);
break;
-
- default:
+
+ default:
g_warning ("Metadata could not be deleted as type:%d for "
- "metadata:'%s' is not supported",
- tracker_field_get_data_type (def),
+ "metadata:'%s' is not supported",
+ tracker_field_get_data_type (def),
key);
break;
}
@@ -1973,8 +1973,8 @@
esc_value = tracker_escape_string (value);
tracker_db_exec_no_reply (iface,
"update Services set KeyMetadata%d = '%s' where id = %s",
- key_field,
- esc_value,
+ key_field,
+ esc_value,
id);
g_free (esc_value);
@@ -1982,7 +1982,7 @@
} else {
tracker_db_exec_no_reply (iface,
"update Services set KeyMetadata%d = NULL where id = %s",
- key_field,
+ key_field,
id);
}
@@ -1990,17 +1990,17 @@
} else {
tracker_db_exec_no_reply (iface,
"update Services set KeyMetadata%d = NULL where id = %s",
- key_field,
+ key_field,
id);
}
}
/* Update fulltext index differentially with old and new values */
if (update_index) {
- update_metadata_index (id,
- service,
- def,
- old_value,
+ update_metadata_index (id,
+ service,
+ def,
+ old_value,
new_value);
}
@@ -2009,12 +2009,12 @@
g_free (res_service);
}
-void
+void
tracker_db_metadata_delete (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *id,
- const gchar *key,
- gboolean update_indexes)
+ const gchar *service,
+ const gchar *id,
+ const gchar *key,
+ gboolean update_indexes)
{
TrackerField *def;
gchar *old_value = NULL;
@@ -2034,10 +2034,10 @@
return;
}
- if (!tracker_field_get_embedded (def) &&
+ if (!tracker_field_get_embedded (def) &&
tracker_ontology_service_has_embedded (service)) {
backup_delete_non_embedded_metadata (iface,
- id,
+ id,
tracker_field_get_id (def));
}
@@ -2050,13 +2050,13 @@
key_field = tracker_ontology_service_get_key_metadata (res_service, key);
- update_index =
- update_indexes &&
- (tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_INDEX ||
+ update_index =
+ update_indexes &&
+ (tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_INDEX ||
tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_KEYWORD);
if (update_index) {
- /* Get current value */
+ /* Get current value */
old_value = tracker_db_metadata_get_delimited (iface, id, key);
}
@@ -2071,42 +2071,42 @@
case TRACKER_FIELD_TYPE_INDEX:
case TRACKER_FIELD_TYPE_STRING:
case TRACKER_FIELD_TYPE_DOUBLE:
- tracker_db_exec_proc (iface,
- "DeleteMetadata",
- id,
- tracker_field_get_id (def),
+ tracker_db_exec_proc (iface,
+ "DeleteMetadata",
+ id,
+ tracker_field_get_id (def),
NULL);
break;
-
+
case TRACKER_FIELD_TYPE_INTEGER:
case TRACKER_FIELD_TYPE_DATE:
tracker_db_exec_proc (iface,
- "DeleteMetadataNumeric",
- id,
- tracker_field_get_id (def),
+ "DeleteMetadataNumeric",
+ id,
+ tracker_field_get_id (def),
NULL);
break;
-
+
case TRACKER_FIELD_TYPE_KEYWORD:
tracker_db_exec_proc (iface,
- "DeleteMetadataKeyword",
- id,
- tracker_field_get_id (def),
+ "DeleteMetadataKeyword",
+ id,
+ tracker_field_get_id (def),
NULL);
break;
-
+
case TRACKER_FIELD_TYPE_FULLTEXT:
- tracker_db_exec_proc (iface,
- "DeleteContent",
- id,
- tracker_field_get_id (def),
+ tracker_db_exec_proc (iface,
+ "DeleteContent",
+ id,
+ tracker_field_get_id (def),
NULL);
break;
-
+
default:
g_warning ("Metadata could not be deleted as this "
"operation is not supported by type:%d "
- "for metadata:'%s'",
+ "for metadata:'%s'",
tracker_field_get_data_type (def),
key);
break;
@@ -2117,33 +2117,33 @@
if (update_index && old_value) {
update_metadata_index (id, service, def, old_value, " ");
}
-
+
g_free (old_value);
g_free (res_service);
}
-TrackerDBResultSet *
-tracker_db_live_search_get_hit_count (TrackerDBInterface *iface,
+TrackerDBResultSet *
+tracker_db_live_search_get_hit_count (TrackerDBInterface *iface,
const gchar *search_id)
{
- /* SELECT count(*)
- * FROM LiveSearches
+ /* SELECT count(*)
+ * FROM LiveSearches
* WHERE SearchID = ? */
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (search_id != NULL, NULL);
return tracker_db_exec_proc (iface,
- "GetLiveSearchHitCount",
- search_id,
+ "GetLiveSearchHitCount",
+ search_id,
NULL);
}
void
-tracker_db_live_search_start (TrackerDBInterface *iface,
- const gchar *from_query,
- const gchar *join_query,
- const gchar *where_query,
+tracker_db_live_search_start (TrackerDBInterface *iface,
+ const gchar *from_query,
+ const gchar *join_query,
+ const gchar *where_query,
const gchar *search_id)
{
/* INSERT
@@ -2157,16 +2157,16 @@
g_return_if_fail (search_id != NULL);
g_message ("INSERT INTO cache.LiveSearches SELECT S.ID, '%s' %s %s %s",
- search_id,
- from_query,
- join_query,
+ search_id,
+ from_query,
+ join_query,
where_query);
tracker_db_exec_no_reply (iface,
"INSERT INTO cache.LiveSearches SELECT S.ID, '%s' %s %s %s",
- search_id,
- from_query,
- join_query,
+ search_id,
+ from_query,
+ join_query,
where_query);
}
@@ -2174,21 +2174,21 @@
tracker_db_live_search_stop (TrackerDBInterface *iface,
const gchar *search_id)
{
- /* DELETE
- * FROM LiveSearches as X
+ /* DELETE
+ * FROM LiveSearches as X
* WHERE E.SearchID = ? */
g_return_if_fail (TRACKER_IS_DB_INTERFACE (iface));
g_return_if_fail (search_id != NULL);
- db_exec_proc_no_reply (iface,
- "LiveSearchStopSearch",
- search_id,
+ db_exec_proc_no_reply (iface,
+ "LiveSearchStopSearch",
+ search_id,
NULL);
}
-TrackerDBResultSet *
-tracker_db_live_search_get_all_ids (TrackerDBInterface *iface,
+TrackerDBResultSet *
+tracker_db_live_search_get_all_ids (TrackerDBInterface *iface,
const gchar *search_id)
{
/* Contract, in @result:
@@ -2203,21 +2203,21 @@
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (search_id != NULL, NULL);
- return tracker_db_exec_proc (iface,
- "GetLiveSearchAllIDs",
- search_id,
+ return tracker_db_exec_proc (iface,
+ "GetLiveSearchAllIDs",
+ search_id,
NULL);
}
-TrackerDBResultSet *
+TrackerDBResultSet *
tracker_db_live_search_get_new_ids (TrackerDBInterface *iface,
- const gchar *search_id,
- const gchar *from_query,
- const gchar *query_joins,
+ const gchar *search_id,
+ const gchar *from_query,
+ const gchar *query_joins,
const gchar *where_query)
{
TrackerDBResultSet *result_set;
-
+
/* Contract, in @result:
* ServiceID is #1
* EventType is #2 */
@@ -2240,8 +2240,8 @@
*/
/*
- * INSERT INTO LiveSearches
- * SELECT E.ServiceID, 'SEARCH_ID'
+ * INSERT INTO LiveSearches
+ * SELECT E.ServiceID, 'SEARCH_ID'
* FROM_QUERY, Events as E
* QUERY_JOINS
* WHERE_QUERY
@@ -2267,34 +2267,34 @@
"AND E.EventType = 'Update' "
"UNION "
"SELECT E.ServiceID, E.EventType "
- "%s%s Events as E " /* FROM B1 */
- "%s" /* JOINS B2 */
- "%s" /* WHERE B3 */
+ "%s%s Events as E " /* FROM B1 */
+ "%s" /* JOINS B2 */
+ "%s" /* WHERE B3 */
"%sE.ServiceID = S.ID "
"AND E.EventType = 'Create' ",
from_query ? from_query : "FROM", /* A1 */
from_query ? "," : "", /* A1 */
query_joins, /* A2 */
- where_query ? where_query : "WHERE", /* A3 */
+ where_query ? where_query : "WHERE", /* A3 */
where_query ? "AND " : "", /* A3 */
- search_id, /* A4 */
- from_query ? from_query : "FROM", /* B1 */
- from_query ? "," : "", /* B1 */
- query_joins, /* B2 */
- where_query ? where_query : "WHERE", /* B3 */
- where_query ? "AND " : ""); /* B3 */
-
+ search_id, /* A4 */
+ from_query ? from_query : "FROM", /* B1 */
+ from_query ? "," : "", /* B1 */
+ query_joins, /* B2 */
+ where_query ? where_query : "WHERE", /* B3 */
+ where_query ? "AND " : ""); /* B3 */
+
tracker_db_exec_no_reply (iface,
"INSERT INTO cache.LiveSearches "
"SELECT E.ServiceID, '%s' " /* B0 */
- "%s%s Events as E " /* FROM B1 */
- "%s" /* JOINS B2 */
+ "%s%s Events as E " /* FROM B1 */
+ "%s" /* JOINS B2 */
"%s" /* WHERE B3 */
"%sE.ServiceID = S.ID"
"AND E.EventType = 'Create' ",
- search_id, /* B0 */
- from_query ? from_query : "FROM", /* B1 */
- from_query ? "," : "", /* B1 */
+ search_id, /* B0 */
+ from_query ? from_query : "FROM", /* B1 */
+ from_query ? "," : "", /* B1 */
query_joins, /* B2 */
where_query ? where_query : "WHERE", /* B3 */
where_query ? "AND " : ""); /* B3 */
@@ -2302,20 +2302,20 @@
return result_set;
}
-TrackerDBResultSet*
-tracker_db_live_search_get_deleted_ids (TrackerDBInterface *iface,
+TrackerDBResultSet*
+tracker_db_live_search_get_deleted_ids (TrackerDBInterface *iface,
const gchar *search_id)
{
- /* SELECT E.ServiceID
- * FROM Events as E, LiveSearches as X
- * WHERE E.ServiceID = X.ServiceID
- * AND X.SearchID = ?
+ /* SELECT E.ServiceID
+ * FROM Events as E, LiveSearches as X
+ * WHERE E.ServiceID = X.ServiceID
+ * AND X.SearchID = ?
* AND E.EventType IS 'Delete' */
/* DELETE FROM LiveSearches AS Y WHERE Y.ServiceID IN
- * SELECT ServiceID FROM Events as E, LiveSearches as X
- * WHERE E.ServiceID = X.ServiceID
- * AND X.SearchID = ?
+ * SELECT ServiceID FROM Events as E, LiveSearches as X
+ * WHERE E.ServiceID = X.ServiceID
+ * AND X.SearchID = ?
* AND E.EventType IS 'Delete' */
TrackerDBResultSet *result_set;
@@ -2323,24 +2323,24 @@
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (search_id != NULL, NULL);
- result_set = tracker_db_exec_proc (iface,
- "GetLiveSearchDeletedIDs",
- search_id,
+ result_set = tracker_db_exec_proc (iface,
+ "GetLiveSearchDeletedIDs",
+ search_id,
NULL);
db_exec_proc_no_reply (iface,
- "DeleteLiveSearchDeletedIDs",
- search_id,
+ "DeleteLiveSearchDeletedIDs",
+ search_id,
NULL);
return result_set;
}
-/* FIXME This function should be moved with other help-functions somewhere.
+/* FIXME This function should be moved with other help-functions somewhere.
* It is used by xesam_live_search parsing. */
static GList *
add_live_search_metadata_field (TrackerDBInterface *iface,
- GSList **fields,
+ GSList **fields,
const char *xesam_name)
{
TrackerDBResultSet *result_set;
@@ -2373,9 +2373,9 @@
/* Check if field is already in list */
for (l = *fields; l; l = l->next) {
const gchar *this_field_name;
-
+
this_field_name = tracker_field_data_get_field_name (l->data);
-
+
if (!this_field_name) {
continue;
}
@@ -2388,32 +2388,32 @@
break;
}
-
+
if (!field_exists) {
- field_data = tracker_db_get_metadata_field (iface,
- "Files",
- field_name,
+ field_data = tracker_db_get_metadata_field (iface,
+ "Files",
+ field_name,
g_slist_length (*fields),
- FALSE,
+ FALSE,
FALSE);
if (field_data) {
*fields = g_slist_prepend (*fields, field_data);
- }
- }
-
+ }
+ }
+
reply = g_list_append (reply, field_data);
valid = tracker_db_result_set_iter_next (result_set);
g_free (field_name);
}
-
+
return reply;
}
TrackerDBResultSet *
-tracker_db_live_search_get_hit_data (TrackerDBInterface *iface,
+tracker_db_live_search_get_hit_data (TrackerDBInterface *iface,
const gchar *search_id,
GStrv field_names)
{
@@ -2433,8 +2433,8 @@
while (field_names[i]) {
GList *field_data_list = NULL;
- field_data_list = add_live_search_metadata_field (iface,
- &fields,
+ field_data_list = add_live_search_metadata_field (iface,
+ &fields,
field_names[i]);
if (!field_data_list) {
@@ -2443,23 +2443,23 @@
g_string_free (sql_join, TRUE);
return NULL;
}
-
+
if (i) {
g_string_append_printf (sql_select, ",");
}
- g_string_append_printf (sql_select, " %s",
+ g_string_append_printf (sql_select, " %s",
tracker_field_data_get_select_field (field_data_list->data) );
-
+
i++;
}
for (l = fields; l; l = l->next) {
gchar *field_name;
- field_name = tracker_db_metadata_get_related_names (iface,
+ field_name = tracker_db_metadata_get_related_names (iface,
tracker_field_data_get_field_name (l->data));
- g_string_append_printf (sql_join,
+ g_string_append_printf (sql_join,
"INNER JOIN 'files-meta'.%s %s ON (X.ServiceID = %s.ServiceID AND %s.MetaDataID in (%s))\n ",
tracker_field_data_get_table_name (l->data),
tracker_field_data_get_alias (l->data),
@@ -2471,13 +2471,13 @@
g_debug("Query : SELECT %s FROM cache.LiveSearches as X \n"
"%s"
- "WHERE X.SearchID = '%s'",
- sql_select->str, sql_join->str, search_id);
+ "WHERE X.SearchID = '%s'",
+ sql_select->str, sql_join->str, search_id);
- result = tracker_db_exec (iface,
+ result = tracker_db_exec (iface,
"SELECT %s FROM cache.LiveSearches as X \n"
"%s"
- "WHERE X.SearchID = '%s'",
+ "WHERE X.SearchID = '%s'",
sql_select->str, sql_join->str, search_id);
g_string_free (sql_select, TRUE);
@@ -2486,7 +2486,7 @@
return result;
}
-void
+void
tracker_db_xesam_delete_handled_events (TrackerDBInterface *iface)
{
g_return_if_fail (TRACKER_IS_DB_INTERFACE (iface));
@@ -2496,7 +2496,7 @@
/* Deprecated */
guint32
-tracker_db_service_create (TrackerDBInterface *iface,
+tracker_db_service_create (TrackerDBInterface *iface,
const gchar *service,
TrackerDBFileInfo *info)
{
@@ -2527,7 +2527,7 @@
g_return_val_if_fail (private != NULL, 0);
tracker_file_get_path_and_name (info->uri, &path, &name);
-
+
/* Get a new unique ID for the service - use mutex to prevent race conditions */
result_set = tracker_db_exec_proc (iface, "GetNewID", NULL);
@@ -2571,10 +2571,10 @@
service_type_id = tracker_ontology_get_service_id_by_name (service);
if (info->mime) {
- g_debug ("service id for %s is %d and sid is %s with mime %s",
+ g_debug ("service id for %s is %d and sid is %s with mime %s",
service, service_type_id, sid, info->mime);
} else {
- g_debug ("service id for %s is %d and sid is %s",
+ g_debug ("service id for %s is %d and sid is %s",
service, service_type_id, sid);
}
@@ -2585,23 +2585,23 @@
gchar *parent;
result_set_proc = tracker_db_exec_proc (iface,
- "CreateService",
+ "CreateService",
sid,
path,
name,
- str_service_type_id,
- info->mime,
+ str_service_type_id,
+ info->mime,
str_filesize,
- str_is_dir,
- str_is_link,
- str_offset,
- str_mtime,
- str_aux,
+ str_is_dir,
+ str_is_link,
+ str_offset,
+ str_mtime,
+ str_aux,
NULL);
-
+
if (result_set_proc) {
g_object_unref (result_set_proc);
- }
+ }
id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (iface));
@@ -2612,8 +2612,8 @@
}
result_set_proc = tracker_db_exec_proc (iface,
- "IncStat",
- service,
+ "IncStat",
+ service,
NULL);
if (result_set_proc) {
@@ -2621,11 +2621,11 @@
}
parent = tracker_ontology_get_service_parent (service);
-
+
if (parent) {
- result_set_proc = tracker_db_exec_proc (iface,
- "IncStat",
- parent,
+ result_set_proc = tracker_db_exec_proc (iface,
+ "IncStat",
+ parent,
NULL);
if (result_set_proc) {
g_object_unref (result_set_proc);
@@ -2653,10 +2653,10 @@
}
/*
- * Obtain the concrete service type name for the file id.
+ * Obtain the concrete service type name for the file id.
*/
gchar *
-tracker_db_service_get_by_entity (TrackerDBInterface *iface,
+tracker_db_service_get_by_entity (TrackerDBInterface *iface,
const gchar *id)
{
TrackerDBResultSet *result_set;
@@ -2683,7 +2683,7 @@
guint32
-tracker_db_file_get_id (TrackerDBInterface *iface,
+tracker_db_file_get_id (TrackerDBInterface *iface,
const gchar *uri)
{
TrackerDBResultSet *result_set;
@@ -2696,9 +2696,9 @@
tracker_file_get_path_and_name (uri, &path, &name);
result_set = tracker_db_exec_proc (iface,
- "GetServiceID",
- path,
- name,
+ "GetServiceID",
+ path,
+ name,
NULL);
g_free (path);
@@ -2715,8 +2715,8 @@
}
gchar *
-tracker_db_file_get_id_as_string (TrackerDBInterface *iface,
- const gchar *service,
+tracker_db_file_get_id_as_string (TrackerDBInterface *iface,
+ const gchar *service,
const gchar *uri)
{
gint service_id;
@@ -2742,7 +2742,7 @@
}
gchar **
-tracker_db_files_get (TrackerDBInterface *iface,
+tracker_db_files_get (TrackerDBInterface *iface,
const gchar *uri)
{
TrackerDBResultSet *result_set;
@@ -2752,8 +2752,8 @@
g_return_val_if_fail (uri != NULL, NULL);
result_set = tracker_db_exec_proc (iface,
- "SelectFileChild",
- uri,
+ "SelectFileChild",
+ uri,
NULL);
array = g_ptr_array_new ();
@@ -2783,9 +2783,9 @@
}
TrackerDBResultSet *
-tracker_db_files_get_by_service (TrackerDBInterface *iface,
- const gchar *service,
- gint offset,
+tracker_db_files_get_by_service (TrackerDBInterface *iface,
+ const gchar *service,
+ gint offset,
gint limit)
{
TrackerDBResultSet *result_set;
@@ -2799,11 +2799,11 @@
str_offset = tracker_gint_to_string (offset);
result_set = tracker_db_exec_proc (iface,
- "GetByServiceType",
- service,
- service,
- str_offset,
- str_limit,
+ "GetByServiceType",
+ service,
+ service,
+ str_offset,
+ str_limit,
NULL);
g_free (str_offset);
@@ -2813,11 +2813,11 @@
}
TrackerDBResultSet *
-tracker_db_files_get_by_mime (TrackerDBInterface *iface,
- gchar **mimes,
+tracker_db_files_get_by_mime (TrackerDBInterface *iface,
+ gchar **mimes,
gint n,
- gint offset,
- gint limit,
+ gint offset,
+ gint limit,
gboolean vfs)
{
TrackerDBResultSet *result_set;
@@ -2846,9 +2846,9 @@
g_string_append_printf (str,
")) AND (F.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) LIMIT %d,%d",
- service,
- service,
- offset,
+ service,
+ service,
+ offset,
limit);
query = g_string_free (str, FALSE);
@@ -2860,7 +2860,7 @@
TrackerDBResultSet *
tracker_db_metadata_get_types (TrackerDBInterface *iface,
- const gchar *class,
+ const gchar *class,
gboolean writeable)
{
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
@@ -2869,48 +2869,48 @@
if (strcmp (class, "*") == 0) {
if (writeable) {
return tracker_db_exec_proc (iface,
- "GetWriteableMetadataTypes",
+ "GetWriteableMetadataTypes",
NULL);
} else {
return tracker_db_exec_proc (iface,
- "GetMetadataTypes",
+ "GetMetadataTypes",
NULL);
}
} else {
if (writeable) {
- return tracker_db_exec_proc (iface,
+ return tracker_db_exec_proc (iface,
"GetWriteableMetadataTypesLike",
class,
NULL);
} else {
- return tracker_db_exec_proc (iface,
- "GetMetadataTypesLike",
- class,
+ return tracker_db_exec_proc (iface,
+ "GetMetadataTypesLike",
+ class,
NULL);
}
}
}
TrackerDBResultSet *
-tracker_db_keywords_get_list (TrackerDBInterface *iface,
+tracker_db_keywords_get_list (TrackerDBInterface *iface,
const gchar *service)
{
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (service != NULL, NULL);
- return tracker_db_exec_proc (iface,
- "GetKeywordList",
- service,
- service,
+ return tracker_db_exec_proc (iface,
+ "GetKeywordList",
+ service,
+ service,
NULL);
}
TrackerFieldData *
tracker_db_get_metadata_field (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *field_name,
- gint field_count,
- gboolean is_select,
+ const gchar *service,
+ const gchar *field_name,
+ gint field_count,
+ gboolean is_select,
gboolean is_condition)
{
TrackerFieldData *field_data = NULL;
@@ -2928,7 +2928,7 @@
gchar *this_field_name;
gchar *where_field;
- field_data = g_object_new (TRACKER_TYPE_FIELD_DATA,
+ field_data = g_object_new (TRACKER_TYPE_FIELD_DATA,
"is-select", is_select,
"is-condition", is_condition,
"field-name", field_name,
@@ -2937,9 +2937,9 @@
alias = g_strdup_printf ("M%d", field_count);
table_name = tracker_db_metadata_get_table (tracker_field_get_data_type (def));
- g_debug ("Field_name: %s :table_name is: %s for data_type: %i",
- field_name,
- table_name,
+ g_debug ("Field_name: %s :table_name is: %s for data_type: %i",
+ field_name,
+ table_name,
tracker_field_get_data_type(def));
tracker_field_data_set_alias (field_data, alias);
@@ -2947,7 +2947,7 @@
tracker_field_data_set_id_field (field_data, tracker_field_get_id (def));
tracker_field_data_set_data_type (field_data, tracker_field_get_data_type (def));
tracker_field_data_set_multiple_values (field_data, tracker_field_get_multiple_values (def));
-
+
this_field_name = tracker_db_get_field_name (service, field_name);
if (this_field_name) {
@@ -2969,7 +2969,7 @@
g_free (str);
g_free (display_field);
}
-
+
if ((tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_DOUBLE) ||
(tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_INDEX) ||
(tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_STRING)) {
@@ -3021,7 +3021,7 @@
}
void
-tracker_db_set_option_int (const gchar *option,
+tracker_db_set_option_int (const gchar *option,
gint value)
{
TrackerDBInterface *iface;
@@ -3042,7 +3042,7 @@
str = tracker_gint_to_string (value);
result_set = tracker_db_exec_proc (iface, "SetOption", str, option, NULL);
g_free (str);
-
+
if (result_set) {
g_object_unref (result_set);
}
Modified: branches/indexer-split/src/trackerd/tracker-db.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.h (original)
+++ branches/indexer-split/src/trackerd/tracker-db.h Sat Sep 20 14:45:00 2008
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2007, Jason Kivlighn (jkivlighn gmail com)
- * Copyright (C) 2007, Creative Commons (http://creativecommons.org)
+ * Copyright (C) 2007, Creative Commons (http://creativecommons.org)
* Copyright (C) 2008, Nokia
*
* This library is free software; you can redistribute it and/or
Modified: branches/indexer-split/src/trackerd/tracker-dbus.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus.c (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus.c Sat Sep 20 14:45:00 2008
@@ -62,7 +62,7 @@
guint result;
g_message ("Registering DBus service...\n"
- " Name:'%s'",
+ " Name:'%s'",
name);
if (!org_freedesktop_DBus_request_name (proxy,
@@ -102,28 +102,28 @@
dbus_g_connection_register_g_object (connection, path, object);
}
-static void
-dbus_name_owner_changed (gpointer data,
+static void
+dbus_name_owner_changed (gpointer data,
GClosure *closure)
{
g_object_unref (data);
}
-static gboolean
+static gboolean
dbus_register_names (TrackerConfig *config)
{
GError *error = NULL;
if (connection) {
- g_critical ("The DBusGConnection is already set, have we already initialized?");
+ g_critical ("The DBusGConnection is already set, have we already initialized?");
return FALSE;
}
if (proxy) {
- g_critical ("The DBusGProxy is already set, have we already initialized?");
+ g_critical ("The DBusGProxy is already set, have we already initialized?");
return FALSE;
}
-
+
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (!connection) {
@@ -178,7 +178,7 @@
if (!tracker_status_get_is_paused_manually () &&
!tracker_status_get_is_paused_for_io ()) {
- org_freedesktop_Tracker_Indexer_continue_async (g_object_ref (proxy),
+ org_freedesktop_Tracker_Indexer_continue_async (g_object_ref (proxy),
indexer_continue_async_cb,
NULL);
}
@@ -195,7 +195,7 @@
static void
dbus_request_new_cb (guint request_id,
- gpointer user_data)
+ gpointer user_data)
{
DBusGProxy *proxy;
GError *error = NULL;
@@ -214,12 +214,12 @@
g_source_remove (indexer_resume_timeout_id);
indexer_resume_timeout_id = 0;
}
-
+
/* Second reset it so we have another 10 seconds before
* continuing.
*/
proxy = tracker_dbus_indexer_get_proxy ();
- indexer_resume_timeout_id =
+ indexer_resume_timeout_id =
g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
INDEXER_PAUSE_TIME_FOR_REQUESTS,
indexer_resume_cb,
@@ -233,7 +233,7 @@
g_message ("Tracker is already manually paused, doing nothing");
return;
}
-
+
/* We really only do this because of the chance that we tell
* the indexer to pause but don't get notified until the next
* request. When we are notified of being paused,
@@ -273,7 +273,7 @@
}
/* Register request handler so we can pause the indexer */
- tracker_dbus_request_add_hook (dbus_request_new_cb,
+ tracker_dbus_request_add_hook (dbus_request_new_cb,
NULL,
NULL);
@@ -328,7 +328,7 @@
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_daemon_object_info,
@@ -342,7 +342,7 @@
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_files_object_info,
@@ -356,7 +356,7 @@
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_keywords_object_info,
@@ -370,7 +370,7 @@
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_metadata_object_info,
@@ -384,7 +384,7 @@
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_search_object_info,
@@ -399,7 +399,7 @@
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_xesam_object_info,
@@ -409,16 +409,16 @@
dbus_g_proxy_add_signal (proxy, "NameOwnerChanged",
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_INVALID);
-
- dbus_g_proxy_connect_signal (proxy, "NameOwnerChanged",
- G_CALLBACK (tracker_xesam_name_owner_changed),
+
+ dbus_g_proxy_connect_signal (proxy, "NameOwnerChanged",
+ G_CALLBACK (tracker_xesam_name_owner_changed),
g_object_ref (G_OBJECT (object)),
dbus_name_owner_changed);
}
-
+
/* Reverse list since we added objects at the top each time */
objects = g_slist_reverse (objects);
-
+
return TRUE;
}
@@ -426,7 +426,7 @@
tracker_dbus_get_object (GType type)
{
GSList *l;
-
+
for (l = objects; l; l = l->next) {
if (G_OBJECT_TYPE (l->data) == type) {
return l->data;
@@ -447,15 +447,15 @@
if (!proxy_for_indexer) {
/* Get proxy for Service / Path / Interface of the indexer */
proxy_for_indexer = dbus_g_proxy_new_for_name (connection,
- "org.freedesktop.Tracker.Indexer",
+ "org.freedesktop.Tracker.Indexer",
"/org/freedesktop/Tracker/Indexer",
"org.freedesktop.Tracker.Indexer");
-
+
if (!proxy_for_indexer) {
g_critical ("Couldn't create a DBusGProxy to the indexer service");
return NULL;
}
-
+
/* Add marshallers */
dbus_g_object_register_marshaller (tracker_marshal_VOID__DOUBLE_STRING_UINT_UINT,
G_TYPE_NONE,
Modified: branches/indexer-split/src/trackerd/tracker-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-files.c (original)
+++ branches/indexer-split/src/trackerd/tracker-files.c Sat Sep 20 14:45:00 2008
@@ -70,7 +70,7 @@
tracker_files_finalize (GObject *object)
{
TrackerFilesPrivate *priv;
-
+
priv = TRACKER_FILES_GET_PRIVATE (object);
g_object_unref (priv->processor);
@@ -126,7 +126,7 @@
GError *actual_error = NULL;
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"Request to check existence of file '%s' failed, "
"the 'auto-create' variable can not be TRUE, "
"this feature is no longer supported.",
@@ -136,7 +136,7 @@
return;
}
-
+
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
file_id = tracker_db_file_get_id (iface, uri);
@@ -175,12 +175,12 @@
"size:%d, mtime:%d",
uri,
is_directory ? "yes" : "no",
- mime,
+ mime,
size,
mtime);
priv = TRACKER_FILES_GET_PRIVATE (object);
-
+
file = g_file_new_for_path (uri);
tracker_processor_files_check (priv->processor, module_name, file, is_directory);
g_object_unref (file);
@@ -200,7 +200,7 @@
GFile *file;
const gchar *module_name = "files";
guint request_id;
-
+
request_id = tracker_dbus_get_next_request_id ();
tracker_dbus_async_return_if_fail (uri != NULL, context);
@@ -258,7 +258,7 @@
if (file_id < 1) {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"File '%s' was not found in the database",
uri);
dbus_g_method_return_error (context, actual_error);
@@ -270,8 +270,8 @@
file_id_str = tracker_guint_to_string (file_id);
mime = NULL;
- result_set = tracker_db_metadata_get (iface,
- file_id_str,
+ result_set = tracker_db_metadata_get (iface,
+ file_id_str,
"File:Mime");
if (result_set) {
@@ -283,7 +283,7 @@
if (!mime) {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"Metadata 'File:Mime' for '%s' doesn't exist",
uri);
dbus_g_method_return_error (context, actual_error);
@@ -310,7 +310,7 @@
} else {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"Unable to find service to mime '%s'",
mime);
dbus_g_method_return_error (context, actual_error);
@@ -335,7 +335,7 @@
gchar *max_length_str;
gchar *value;
GError *actual_error = NULL;
-
+
request_id = tracker_dbus_get_next_request_id ();
tracker_dbus_async_return_if_fail (uri != NULL, context);
@@ -360,13 +360,13 @@
if (!service_id) {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"Unable to retrieve service ID for uri '%s'",
uri);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
- }
+ }
}
offset_str = tracker_gint_to_string (offset);
@@ -374,15 +374,15 @@
result_set = tracker_db_exec_proc (iface,
"GetFileContents",
- offset_str,
- max_length_str,
- service_id,
+ offset_str,
+ max_length_str,
+ service_id,
NULL);
g_free (max_length_str);
g_free (offset_str);
g_free (service_id);
-
+
if (result_set) {
tracker_db_result_set_get (result_set, 0, &value, -1);
g_object_unref (result_set);
@@ -390,7 +390,7 @@
if (value == NULL) {
value = g_strdup ("");
}
-
+
dbus_g_method_return (context, value);
g_free (value);
@@ -399,7 +399,7 @@
} else {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"The contents of the uri '%s' are not stored",
uri);
dbus_g_method_return_error (context, actual_error);
@@ -412,7 +412,7 @@
const gchar *uri,
const gchar *text,
gint max_length,
- DBusGMethodInvocation *context,
+ DBusGMethodInvocation *context,
GError **error)
{
TrackerDBInterface *iface;
@@ -429,7 +429,7 @@
tracker_dbus_async_return_if_fail (uri != NULL, context);
tracker_dbus_async_return_if_fail (text != NULL, context);
tracker_dbus_async_return_if_fail (max_length >= 0, context);
-
+
tracker_dbus_request_new (request_id,
"DBus request to search text contents, "
"in uri:'%s' for text:'%s' with max length:%d",
@@ -440,7 +440,7 @@
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
tracker_file_get_path_and_name (uri, &path, &name);
-
+
max_length_str = tracker_gint_to_string (max_length);
/* result_set = tracker_exec_proc (iface, */
@@ -467,7 +467,7 @@
* change this function to the success variant.
*/
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"%s not implemented yet",
__PRETTY_FUNCTION__);
dbus_g_method_return_error (context, actual_error);
@@ -480,13 +480,13 @@
const gchar *service,
gint offset,
gint max_hits,
- DBusGMethodInvocation *context,
+ DBusGMethodInvocation *context,
GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
guint request_id;
- gchar **values = NULL;
+ gchar **values = NULL;
GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -505,8 +505,8 @@
if (!tracker_ontology_service_is_valid (service)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service '%s' is invalid or has not been implemented yet",
service);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -515,9 +515,9 @@
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
- result_set = tracker_db_files_get_by_service (iface,
- service,
- offset,
+ result_set = tracker_db_files_get_by_service (iface,
+ service,
+ offset,
max_hits);
values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
@@ -540,14 +540,14 @@
gchar **mime_types,
gint offset,
gint max_hits,
- DBusGMethodInvocation *context,
+ DBusGMethodInvocation *context,
GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
guint request_id;
gchar **values = NULL;
-
+
request_id = tracker_dbus_get_next_request_id ();
tracker_dbus_async_return_if_fail (mime_types != NULL, context);
@@ -566,10 +566,10 @@
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
result_set = tracker_db_files_get_by_mime (iface,
- mime_types,
- g_strv_length (mime_types),
- offset,
- max_hits,
+ mime_types,
+ g_strv_length (mime_types),
+ offset,
+ max_hits,
FALSE);
values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
@@ -592,7 +592,7 @@
gchar **mime_types,
gint offset,
gint max_hits,
- DBusGMethodInvocation *context,
+ DBusGMethodInvocation *context,
GError **error)
{
TrackerDBInterface *iface;
@@ -621,14 +621,14 @@
* non-VFS version is the boolean in this function call:
*/
result_set = tracker_db_files_get_by_mime (iface,
- mime_types,
- g_strv_length (mime_types),
- offset,
- max_hits,
+ mime_types,
+ g_strv_length (mime_types),
+ offset,
+ max_hits,
TRUE);
values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
-
+
if (result_set) {
g_object_unref (result_set);
}
@@ -644,7 +644,7 @@
void
tracker_files_get_mtime (TrackerFiles *object,
const gchar *uri,
- DBusGMethodInvocation *context,
+ DBusGMethodInvocation *context,
GError **error)
{
TrackerDBInterface *iface;
@@ -669,16 +669,16 @@
tracker_file_get_path_and_name (uri, &path, &name);
result_set = tracker_db_exec_proc (iface,
- "GetFileMTime",
- path,
- name,
+ "GetFileMTime",
+ path,
+ name,
NULL);
g_free (path);
g_free (name);
if (!result_set) {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"There is no file mtime in the database for '%s'",
uri);
dbus_g_method_return_error (context, actual_error);
@@ -699,7 +699,7 @@
gint live_query_id,
const gchar *uri,
gchar **fields,
- DBusGMethodInvocation *context,
+ DBusGMethodInvocation *context,
GError **error)
{
TrackerDBInterface *iface;
@@ -735,7 +735,7 @@
if (!defs[i]) {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"Metadata field '%s' was not found",
fields[i]);
dbus_g_method_return_error (context, actual_error);
@@ -761,7 +761,7 @@
if (file_id == 0) {
g_free (uri_filtered);
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"File or directory was not in database, uri:'%s'",
uri);
dbus_g_method_return_error (context, actual_error);
@@ -771,8 +771,8 @@
/* Build SELECT clause */
sql = g_string_new (" ");
- g_string_append_printf (sql,
- "SELECT (F.Path || '%s' || F.Name) as PathName ",
+ g_string_append_printf (sql,
+ "SELECT (F.Path || '%s' || F.Name) as PathName ",
G_DIR_SEPARATOR_S);
for (i = 1; i <= g_strv_length (fields); i++) {
@@ -795,7 +795,7 @@
}
/* Build FROM clause */
- g_string_append (sql,
+ g_string_append (sql,
" FROM Services F ");
for (i = 0; i < g_strv_length (fields); i++) {
@@ -807,20 +807,20 @@
table = tracker_db_metadata_get_table (tracker_field_get_data_type (defs[i]));
- g_string_append_printf (sql,
+ g_string_append_printf (sql,
" LEFT OUTER JOIN %s M%d ON "
"F.ID = M%d.ServiceID AND "
- "M%d.MetaDataID = %s ",
- table,
- i+1,
- i+1,
- i+1,
+ "M%d.MetaDataID = %s ",
+ table,
+ i+1,
+ i+1,
+ i+1,
tracker_field_get_id (defs[i]));
}
/* Build WHERE clause */
- g_string_append_printf (sql,
- " WHERE F.Path = '%s' ",
+ g_string_append_printf (sql,
+ " WHERE F.Path = '%s' ",
uri_filtered);
g_free (uri_filtered);
@@ -896,7 +896,7 @@
values = g_new0 (gchar *, 1);
values[0] = NULL;
}
-
+
dbus_g_method_return (context, values);
g_strfreev (values);
Modified: branches/indexer-split/src/trackerd/tracker-keywords.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-keywords.c (original)
+++ branches/indexer-split/src/trackerd/tracker-keywords.c Sat Sep 20 14:45:00 2008
@@ -93,7 +93,7 @@
tracker_keywords_finalize (GObject *object)
{
TrackerKeywordsPrivate *priv;
-
+
priv = TRACKER_KEYWORDS_GET_PRIVATE (object);
if (priv->fd_proxy) {
@@ -135,8 +135,8 @@
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service type '%s' is invalid or has not been implemented yet",
service_type);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -146,7 +146,7 @@
iface = tracker_db_manager_get_db_interface_by_service (service_type);
result_set = tracker_db_keywords_get_list (iface, service_type);
values = tracker_dbus_query_result_to_ptr_array (result_set);
-
+
if (result_set) {
g_object_unref (result_set);
}
@@ -179,19 +179,19 @@
tracker_dbus_request_new (request_id,
"DBus request to get keywords, "
"service type:'%s', uri:'%s'",
- service_type,
+ service_type,
uri);
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service type '%s' is invalid or has not been implemented yet",
service_type);
}
if (!actual_error && tracker_is_empty_string (uri)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"URI is empty");
}
@@ -206,18 +206,18 @@
if (!id) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "Entity '%s' was not found",
+ "Entity '%s' was not found",
uri);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
}
- result_set = tracker_db_metadata_get (iface,
- id,
+ result_set = tracker_db_metadata_get (iface,
+ id,
"User:Keywords");
values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
-
+
if (result_set) {
g_object_unref (result_set);
}
@@ -255,13 +255,13 @@
tracker_dbus_request_new (request_id,
"DBus request to add keywords, "
"service type:'%s', uri:'%s'",
- service_type,
+ service_type,
uri);
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service type '%s' is invalid or has not been implemented yet",
service_type);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -270,7 +270,7 @@
if (tracker_is_empty_string (uri)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"URI is empty");
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -282,7 +282,7 @@
if (!id) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "Entity '%s' was not found",
+ "Entity '%s' was not found",
uri);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -334,13 +334,13 @@
tracker_dbus_request_new (request_id,
"DBus request to remove keywords, "
"service type:'%s', uri:'%s'",
- service_type,
+ service_type,
uri);
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service type '%s' is invalid or has not been implemented yet",
service_type);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -349,7 +349,7 @@
if (tracker_is_empty_string (uri)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"URI is empty");
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -362,7 +362,7 @@
if (!service_id) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "Entity '%s' was not found",
+ "Entity '%s' was not found",
uri);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -384,7 +384,7 @@
g_error_free (actual_error);
return;
}
-
+
g_free (service_id);
dbus_g_method_return (context);
@@ -413,13 +413,13 @@
tracker_dbus_request_new (request_id,
"DBus request to remove all keywords, "
"service type:'%s', uri:'%s'",
- service_type,
+ service_type,
uri);
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service type '%s' is invalid or has not been implemented yet",
service_type);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -428,7 +428,7 @@
if (tracker_is_empty_string (uri)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"URI is empty");
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -441,7 +441,7 @@
if (!service_id) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "Entity '%s' was not found",
+ "Entity '%s' was not found",
uri);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -505,14 +505,14 @@
"query id:%d, service type:'%s', offset:%d, "
"max hits:%d",
live_query_id,
- service_type,
+ service_type,
offset,
max_hits);
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service_Type '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service_Type '%s' is invalid or has not been implemented yet",
service_type);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -523,11 +523,11 @@
/* Sanity check values */
offset = MAX (offset, 0);
-
+
/* Create keyword search string */
search = g_string_new ("");
g_string_append_printf (search,
- "'%s'",
+ "'%s'",
keywords[0]);
for (p = keywords + 1; *p; p++) {
@@ -535,35 +535,35 @@
}
tracker_dbus_request_comment (request_id,
- "Executing keyword search on %s",
+ "Executing keyword search on %s",
search->str);
/* Create select string */
select = g_string_new (" Select distinct S.Path || '");
select = g_string_append (select, G_DIR_SEPARATOR_S);
- select = g_string_append (select,
+ select = g_string_append (select,
"' || S.Name as EntityName from Services S, ServiceKeywordMetaData M ");
/* Create where string */
related_metadata = tracker_db_metadata_get_related_names (iface, "User:Keywords");
where = g_string_new ("");
- g_string_append_printf (where,
- " where S.ID = M.ServiceID and M.MetaDataID in (%s) and M.MetaDataValue in (%s) ",
- related_metadata,
+ g_string_append_printf (where,
+ " where S.ID = M.ServiceID and M.MetaDataID in (%s) and M.MetaDataValue in (%s) ",
+ related_metadata,
search->str);
g_free (related_metadata);
g_string_free (search, TRUE);
- g_string_append_printf (where,
- " and (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) ",
- service_type,
+ g_string_append_printf (where,
+ " and (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) ",
+ service_type,
service_type);
/* Add offset and max_hits */
- g_string_append_printf (where,
- " Limit %d,%d",
- offset,
+ g_string_append_printf (where,
+ " Limit %d,%d",
+ offset,
max_hits);
/* Finalize query */
Modified: branches/indexer-split/src/trackerd/tracker-main.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.c (original)
+++ branches/indexer-split/src/trackerd/tracker-main.c Sat Sep 20 14:45:00 2008
@@ -29,7 +29,7 @@
#include <string.h>
#include <signal.h>
#include <locale.h>
-#include <unistd.h>
+#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <time.h>
@@ -69,14 +69,14 @@
#define ABOUT \
"Tracker " VERSION "\n" \
- "Copyright (c) 2005-2008 Jamie McCracken (jamiemcc gnome org)\n"
+ "Copyright (c) 2005-2008 Jamie McCracken (jamiemcc gnome org)\n"
#define LICENSE \
"This program is free software and comes without any warranty.\n" \
"It is licensed under version 2 or later of the General Public " \
"License which can be viewed at:\n" \
"\n" \
- " http://www.gnu.org/licenses/gpl.txt\n";
+ " http://www.gnu.org/licenses/gpl.txt\n";
/* Throttle defaults */
#define THROTTLE_DEFAULT 0
@@ -91,11 +91,11 @@
typedef struct {
GMainLoop *main_loop;
gchar *log_filename;
-
+
gchar *data_dir;
gchar *user_data_dir;
gchar *sys_tmp_dir;
-
+
gboolean reindex_on_shutdown;
TrackerProcessor *processor;
@@ -118,50 +118,50 @@
static gchar *language_code;
static GOptionEntry entries_daemon[] = {
- { "verbosity", 'v', 0,
- G_OPTION_ARG_INT, &verbosity,
+ { "verbosity", 'v', 0,
+ G_OPTION_ARG_INT, &verbosity,
N_("Logging, 0 = errors only, "
- "1 = minimal, 2 = detailed and 3 = debug (default = 0)"),
+ "1 = minimal, 2 = detailed and 3 = debug (default = 0)"),
NULL },
- { "initial-sleep", 's', 0,
- G_OPTION_ARG_INT, &initial_sleep,
- N_("Seconds to wait before starting any crawling or indexing (default = 45)"),
+ { "initial-sleep", 's', 0,
+ G_OPTION_ARG_INT, &initial_sleep,
+ N_("Seconds to wait before starting any crawling or indexing (default = 45)"),
NULL },
- { "low-memory", 'm', 0,
- G_OPTION_ARG_NONE, &low_memory,
- N_("Minimizes the use of memory but may slow indexing down"),
+ { "low-memory", 'm', 0,
+ G_OPTION_ARG_NONE, &low_memory,
+ N_("Minimizes the use of memory but may slow indexing down"),
NULL },
- { "monitors-exclude-dirs", 'e', 0,
- G_OPTION_ARG_STRING_ARRAY, &monitors_to_exclude,
- N_("Directories to exclude for file change monitoring (you can do -e <path> -e <path>)"),
+ { "monitors-exclude-dirs", 'e', 0,
+ G_OPTION_ARG_STRING_ARRAY, &monitors_to_exclude,
+ N_("Directories to exclude for file change monitoring (you can do -e <path> -e <path>)"),
NULL },
- { "monitors-include-dirs", 'i', 0,
- G_OPTION_ARG_STRING_ARRAY, &monitors_to_include,
- N_("Directories to include for file change monitoring (you can do -i <path> -i <path>)"),
+ { "monitors-include-dirs", 'i', 0,
+ G_OPTION_ARG_STRING_ARRAY, &monitors_to_include,
+ N_("Directories to include for file change monitoring (you can do -i <path> -i <path>)"),
NULL },
- { "crawler-include-dirs", 'c', 0,
- G_OPTION_ARG_STRING_ARRAY, &crawl_dirs,
- N_("Directories to crawl to index files (you can do -c <path> -c <path>)"),
+ { "crawler-include-dirs", 'c', 0,
+ G_OPTION_ARG_STRING_ARRAY, &crawl_dirs,
+ N_("Directories to crawl to index files (you can do -c <path> -c <path>)"),
NULL },
- { "disable-modules", 'd', 0,
- G_OPTION_ARG_STRING_ARRAY, &disable_modules,
- N_("Disable modules from being processed (you can do -d <module> -d <module)"),
+ { "disable-modules", 'd', 0,
+ G_OPTION_ARG_STRING_ARRAY, &disable_modules,
+ N_("Disable modules from being processed (you can do -d <module> -d <module)"),
NULL },
{ NULL }
};
static GOptionEntry entries_indexer[] = {
- { "force-reindex", 'r', 0,
- G_OPTION_ARG_NONE, &force_reindex,
- N_("Force a re-index of all content"),
+ { "force-reindex", 'r', 0,
+ G_OPTION_ARG_NONE, &force_reindex,
+ N_("Force a re-index of all content"),
NULL },
- { "disable-indexing", 'n', 0,
- G_OPTION_ARG_NONE, &disable_indexing,
+ { "disable-indexing", 'n', 0,
+ G_OPTION_ARG_NONE, &disable_indexing,
N_("Disable any indexing and monitoring"), NULL },
- { "language", 'l', 0,
- G_OPTION_ARG_STRING, &language_code,
+ { "language", 'l', 0,
+ G_OPTION_ARG_STRING, &language_code,
N_("Language to use for stemmer and stop words "
- "(ISO 639-1 2 characters code)"),
+ "(ISO 639-1 2 characters code)"),
NULL },
{ NULL }
};
@@ -189,18 +189,18 @@
}
static gchar *
-get_lock_file (void)
+get_lock_file (void)
{
TrackerMainPrivate *private;
gchar *lock_filename;
gchar *filename;
private = g_static_private_get (&private_key);
-
+
filename = g_strconcat (g_get_user_name (), "_tracker_lock", NULL);
- lock_filename = g_build_filename (private->sys_tmp_dir,
- filename,
+ lock_filename = g_build_filename (private->sys_tmp_dir,
+ filename,
NULL);
g_free (filename);
@@ -232,7 +232,7 @@
const gchar *error_string;
error_string = g_strerror (errno);
- g_critical ("Can not open or create lock file:'%s', %s",
+ g_critical ("Can not open or create lock file:'%s', %s",
lock_file,
error_string);
g_free (lock_file);
@@ -242,7 +242,7 @@
g_free (lock_file);
- if (lockf (fd, F_TLOCK, 0) < 0) {
+ if (lockf (fd, F_TLOCK, 0) < 0) {
if (use_nfs) {
g_message ("Already running, running in "
"read-only mode (with NFS)");
@@ -256,15 +256,15 @@
g_message ("This is the first/main instance");
runlevel = TRACKER_RUNNING_MAIN_INSTANCE;
-
-#ifdef HAVE_HAL
+
+#ifdef HAVE_HAL
if (!tracker_hal_get_battery_exists (hal) ||
!tracker_hal_get_battery_in_use (hal)) {
return TRACKER_RUNNING_MAIN_INSTANCE;
}
- if (!tracker_status_get_is_first_time_index () &&
- tracker_config_get_disable_indexing_on_battery (config)) {
+ if (!tracker_status_get_is_first_time_index () &&
+ tracker_config_get_disable_indexing_on_battery (config)) {
g_message ("Battery in use");
g_message ("Config is set to not index on battery");
g_message ("Running in read only mode");
@@ -273,7 +273,7 @@
/* Special case first time situation which are
* overwritten by the config option to disable or not
- * indexing on battery initially.
+ * indexing on battery initially.
*/
if (tracker_status_get_is_first_time_index () &&
tracker_config_get_disable_indexing_on_battery_init (config)) {
@@ -310,20 +310,20 @@
sanity_check_option_values (TrackerConfig *config)
{
g_message ("General options:");
- g_message (" Initial sleep ........................ %d (seconds)",
+ g_message (" Initial sleep ........................ %d (seconds)",
tracker_config_get_initial_sleep (config));
- g_message (" Verbosity ............................ %d",
+ g_message (" Verbosity ............................ %d",
tracker_config_get_verbosity (config));
- g_message (" Low memory mode ...................... %s",
+ g_message (" Low memory mode ...................... %s",
tracker_config_get_low_memory_mode (config) ? "yes" : "no");
-
+
g_message ("Daemon options:");
g_message (" Throttle level ....................... %d",
tracker_config_get_throttle (config));
- g_message (" Indexing enabled ..................... %s",
+ g_message (" Indexing enabled ..................... %s",
tracker_config_get_enable_indexing (config) ? "yes" : "no");
- g_message (" Monitoring enabled ................... %s",
+ g_message (" Monitoring enabled ................... %s",
tracker_config_get_enable_watches (config) ? "yes" : "no");
log_option_list (tracker_config_get_watch_directory_roots (config),
@@ -338,7 +338,7 @@
"Disabled modules");
}
-static gboolean
+static gboolean
shutdown_timeout_cb (gpointer user_data)
{
g_critical ("Could not exit in a timely fashion - terminating...");
@@ -356,12 +356,12 @@
if (in_loop) {
exit (EXIT_FAILURE);
}
-
+
switch (signo) {
case SIGSEGV:
/* We are screwed if we get this so exit immediately! */
exit (EXIT_FAILURE);
-
+
case SIGBUS:
case SIGILL:
case SIGFPE:
@@ -371,11 +371,11 @@
case SIGINT:
in_loop = TRUE;
tracker_shutdown ();
-
+
default:
if (g_strsignal (signo)) {
- g_message ("Received signal:%d->'%s'",
- signo,
+ g_message ("Received signal:%d->'%s'",
+ signo,
g_strsignal (signo));
}
break;
@@ -413,31 +413,31 @@
gchar *filename;
private = g_static_private_get (&private_key);
-
+
/* Public locations */
- private->user_data_dir =
- g_build_filename (g_get_user_data_dir (),
- "tracker",
- "data",
+ private->user_data_dir =
+ g_build_filename (g_get_user_data_dir (),
+ "tracker",
+ "data",
NULL);
- private->data_dir =
- g_build_filename (g_get_user_cache_dir (),
- "tracker",
+ private->data_dir =
+ g_build_filename (g_get_user_cache_dir (),
+ "tracker",
NULL);
-
+
filename = g_strdup_printf ("tracker-%s", g_get_user_name ());
- private->sys_tmp_dir =
- g_build_filename (g_get_tmp_dir (),
- filename,
+ private->sys_tmp_dir =
+ g_build_filename (g_get_tmp_dir (),
+ filename,
NULL);
g_free (filename);
/* Private locations */
- private->log_filename =
- g_build_filename (g_get_user_data_dir (),
- "tracker",
- "trackerd.log",
+ private->log_filename =
+ g_build_filename (g_get_user_data_dir (),
+ "tracker",
+ "trackerd.log",
NULL);
}
@@ -451,7 +451,7 @@
/* NOTE: We don't create the database directories here, the
* tracker-db-manager does that for us.
- */
+ */
g_message ("Checking directory exists:'%s'", private->user_data_dir);
g_mkdir_with_parents (private->user_data_dir, 00755);
@@ -481,13 +481,13 @@
initialize_databases (void)
{
/*
- * Create SQLite databases
+ * Create SQLite databases
*/
if (!tracker_status_get_is_readonly () && force_reindex) {
TrackerDBInterface *iface;
-
+
tracker_status_set_is_first_time_index (TRUE);
-
+
/* Reset stats for embedded services if they are being reindexed */
/* Here it doesn't matter which one we ask, as long as it has common.db
@@ -500,22 +500,22 @@
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
g_message ("*** DELETING STATS *** ");
- tracker_db_exec_no_reply (iface,
+ tracker_db_exec_no_reply (iface,
"update ServiceTypes set TypeCount = 0 where Embedded = 1");
-
+
}
/* Check db integrity if not previously shut down cleanly */
- if (!tracker_status_get_is_readonly () &&
- !tracker_status_get_is_first_time_index () &&
+ if (!tracker_status_get_is_readonly () &&
+ !tracker_status_get_is_first_time_index () &&
tracker_db_get_option_int ("IntegrityCheck") == 1) {
g_message ("Performing integrity check as the daemon was not shutdown cleanly");
/* FIXME: Finish */
- }
+ }
if (!tracker_status_get_is_readonly ()) {
tracker_db_set_option_int ("IntegrityCheck", 1);
- }
+ }
if (tracker_status_get_is_first_time_index ()) {
tracker_db_set_option_int ("InitialIndex", 1);
@@ -556,7 +556,7 @@
}
}
-#ifdef HAVE_HAL
+#ifdef HAVE_HAL
static void
set_up_throttle (TrackerHal *hal,
@@ -624,7 +624,7 @@
if (private->processor) {
tracker_processor_start (private->processor);
}
-
+
return FALSE;
}
@@ -649,10 +649,10 @@
g_type_init ();
private = g_new0 (TrackerMainPrivate, 1);
- g_static_private_set (&private_key,
- private,
+ g_static_private_set (&private_key,
+ private,
private_free);
-
+
if (!g_thread_supported ())
g_thread_init (NULL);
@@ -668,24 +668,24 @@
tzset ();
/* Translators: this messagge will apper immediately after the
- * usage string - Usage: COMMAND <THIS_MESSAGE>
+ * usage string - Usage: COMMAND <THIS_MESSAGE>
*/
context = g_option_context_new (_("- start the tracker daemon"));
/* Daemon group */
- group = g_option_group_new ("daemon",
+ group = g_option_group_new ("daemon",
_("Daemon Options"),
- _("Show daemon options"),
- NULL,
+ _("Show daemon options"),
+ NULL,
NULL);
g_option_group_add_entries (group, entries_daemon);
g_option_context_add_group (context, group);
/* Indexer group */
- group = g_option_group_new ("indexer",
+ group = g_option_group_new ("indexer",
_("Indexer Options"),
- _("Show indexer options"),
- NULL,
+ _("Show indexer options"),
+ NULL,
NULL);
g_option_group_add_entries (group, entries_indexer);
g_option_context_add_group (context, group);
@@ -716,19 +716,19 @@
/* nice() uses attribute "warn_unused_result" and so complains
* if we do not check its returned value. But it seems that
* since glibc 2.2.4, nice() can return -1 on a successful
- * call so we have to check value of errno too. Stupid...
+ * call so we have to check value of errno too. Stupid...
*/
if (nice (19) == -1 && errno) {
const gchar *str;
str = g_strerror (errno);
- g_message ("Couldn't set nice value to 19, %s",
+ g_message ("Couldn't set nice value to 19, %s",
str ? str : "no error given");
}
/* This makes sure we have all the locations like the data
* dir, user data dir, etc all configured.
- *
+ *
* The initialize_directories() function makes sure everything
* exists physically and/or is reset depending on various
* options (like if we reindex, we remove the data dir).
@@ -820,7 +820,7 @@
tracker_db_manager_init (flags, &is_first_time_index);
tracker_status_set_is_first_time_index (is_first_time_index);
- if (!tracker_db_index_manager_init (index_flags,
+ if (!tracker_db_index_manager_init (index_flags,
tracker_config_get_min_bucket_count (config),
tracker_config_get_max_bucket_count (config))) {
return EXIT_FAILURE;
@@ -832,14 +832,14 @@
runtime_level = check_runtime_level (config, hal);
switch (runtime_level) {
- case TRACKER_RUNNING_NON_ALLOWED:
+ case TRACKER_RUNNING_NON_ALLOWED:
return EXIT_FAILURE;
- case TRACKER_RUNNING_READ_ONLY:
+ case TRACKER_RUNNING_READ_ONLY:
tracker_status_set_is_readonly (TRUE);
break;
- case TRACKER_RUNNING_MAIN_INSTANCE:
+ case TRACKER_RUNNING_MAIN_INSTANCE:
tracker_status_set_is_readonly (FALSE);
break;
}
@@ -852,7 +852,7 @@
file_update_index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE_UPDATE);
email_index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
- if (!TRACKER_IS_DB_INDEX (file_index) ||
+ if (!TRACKER_IS_DB_INDEX (file_index) ||
!TRACKER_IS_DB_INDEX (file_update_index) ||
!TRACKER_IS_DB_INDEX (email_index)) {
g_critical ("Could not create indexer for all indexes (file, file-update, email)");
@@ -882,9 +882,9 @@
if (!tracker_status_get_is_readonly ()) {
gint seconds;
-
+
seconds = tracker_config_get_initial_sleep (config);
-
+
if (seconds > 0) {
g_message ("Waiting %d seconds before starting",
seconds);
@@ -894,7 +894,7 @@
}
} else {
/* We set the state here because it is not set in the
- * processor otherwise.
+ * processor otherwise.
*/
g_message ("Running in read-only mode, not starting crawler/indexing");
tracker_status_set_and_signal (TRACKER_STATUS_IDLE);
@@ -914,7 +914,7 @@
NULL);
#endif
- /*
+ /*
* Shutdown the daemon
*/
g_message ("Shutdown started");
@@ -925,7 +925,7 @@
g_message ("Waiting for indexer to finish");
org_freedesktop_Tracker_Indexer_shutdown (tracker_dbus_indexer_get_proxy (), &error);
-
+
if (error) {
g_message ("Could not shutdown the indexer, %s", error->message);
g_message ("Continuing anyway...");
Modified: branches/indexer-split/src/trackerd/tracker-main.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.h (original)
+++ branches/indexer-split/src/trackerd/tracker-main.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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) 2007, Michal Pryc (Michal Pryc Sun Com)
* Copyright (C) 2008, Nokia
@@ -11,14 +11,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#ifndef __TRACKERD_MAIN_H__
#define __TRACKERD_MAIN_H__
@@ -32,7 +32,7 @@
const gchar *tracker_get_sys_tmp_dir (void);
void tracker_set_reindex_on_shutdown (gboolean value);
-
+
G_END_DECLS
#endif /* __TRACKERD_MAIN_H__ */
Modified: branches/indexer-split/src/trackerd/tracker-metadata.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-metadata.c (original)
+++ branches/indexer-split/src/trackerd/tracker-metadata.c Sat Sep 20 14:45:00 2008
@@ -78,9 +78,9 @@
static TrackerFieldData *
tracker_metadata_add_metadata_field (TrackerDBInterface *iface,
const gchar *service,
- GSList **fields,
- const gchar *field_name,
- gboolean is_select,
+ GSList **fields,
+ const gchar *field_name,
+ gboolean is_select,
gboolean is_condition)
{
TrackerFieldData *field_data;
@@ -110,19 +110,19 @@
break;
}
}
-
+
if (!field_exists) {
- field_data = tracker_db_get_metadata_field (iface,
- service,
- field_name,
- g_slist_length (*fields),
- is_select,
+ field_data = tracker_db_get_metadata_field (iface,
+ service,
+ field_name,
+ g_slist_length (*fields),
+ is_select,
is_condition);
if (field_data) {
*fields = g_slist_prepend (*fields, field_data);
- }
- }
-
+ }
+ }
+
return field_data;
}
@@ -156,8 +156,8 @@
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service '%s' is invalid or has not been implemented yet",
service_type);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -170,7 +170,7 @@
if (!service_id) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "Service URI '%s' not found",
+ "Service URI '%s' not found",
uri);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -179,20 +179,20 @@
/* Checking keys */
for (i = 0; i < g_strv_length (keys); i++) {
-
+
if (tracker_ontology_get_field_by_name (keys[i]) == NULL) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "Metadata field '%s' not registered in the system",
+ "Metadata field '%s' not registered in the system",
uri);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
}
}
-
- /* The parameter service_type can be "Files"
- * and the actual service type of the uri "Video"
+
+ /* The parameter service_type can be "Files"
+ * and the actual service type of the uri "Video"
*
* Note: Does this matter?
*/
@@ -200,15 +200,15 @@
if (!service_result) {
g_free (service_id);
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type can not be found for entity '%s'",
+ &actual_error,
+ "Service type can not be found for entity '%s'",
uri);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
}
- result_set = tracker_db_metadata_get_array (iface, service_result, service_id, keys);
+ result_set = tracker_db_metadata_get_array (iface, service_result, service_id, keys);
if (result_set) {
values = tracker_dbus_query_result_columns_to_strv (result_set, -1, -1, TRUE);
g_object_unref (result_set);
@@ -217,8 +217,8 @@
}
if (!values) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
+ tracker_dbus_request_failed (request_id,
+ &actual_error,
"No metadata information was available");
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -241,7 +241,7 @@
{
TrackerDBInterface *iface;
guint request_id;
- gchar *service_id;
+ gchar *service_id;
guint i;
GError *actual_error = NULL;
@@ -261,8 +261,8 @@
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service_Type '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service_Type '%s' is invalid or has not been implemented yet",
service_type);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -275,8 +275,8 @@
service_id = tracker_db_file_get_id_as_string (iface, service_type, uri);
if (!service_id) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service URI '%s' not found",
+ &actual_error,
+ "Service URI '%s' not found",
uri);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -293,7 +293,7 @@
if (field_def == NULL) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "Metadata field '%s' not registered in the system",
+ "Metadata field '%s' not registered in the system",
keys[i]);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -303,7 +303,7 @@
if (tracker_field_get_embedded (field_def)) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "Metadata field '%s' cannot be overwritten (is embedded)",
+ "Metadata field '%s' cannot be overwritten (is embedded)",
keys[i]);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -315,7 +315,7 @@
service_type,
uri,
keys[i],
- (const gchar **)value,
+ (const gchar **)value,
&actual_error);
g_strfreev (value);
if (actual_error) {
@@ -363,7 +363,7 @@
def = tracker_ontology_get_field_by_name (metadata);
if (!def) {
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
"Metadata name '%s' is invalid or unrecognized",
metadata);
dbus_g_method_return_error (context, actual_error);
@@ -407,8 +407,8 @@
if (strcmp (service_type, "*") != 0 &&
!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service_Type '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service_Type '%s' is invalid or has not been implemented yet",
service_type);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -508,8 +508,8 @@
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service_Type '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service_Type '%s' is invalid or has not been implemented yet",
service_type);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -526,16 +526,16 @@
for (i=0;i<g_strv_length(fields);i++) {
TrackerFieldData *def = NULL;
def = tracker_metadata_add_metadata_field (iface, service_type, &field_list, fields[i], FALSE, TRUE);
-
+
if (!def) {
g_string_free (sql_select, TRUE);
g_string_free (sql_from, TRUE);
g_string_free (sql_where, TRUE);
g_string_free (sql_order, TRUE);
-
+
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Invalid or non-existant metadata type '%s' specified",
+ &actual_error,
+ "Invalid or non-existant metadata type '%s' specified",
fields[i]);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -551,12 +551,12 @@
g_string_append_printf (sql_order, " %s %s",
tracker_field_data_get_select_field (def),
order_desc ? "DESC" : "ASC" );
-
+
}
-
+
tracker_rdf_filter_to_sql (iface, query_condition, service_type,
&field_list, &rdf_from, &rdf_where, &actual_error);
-
+
if (actual_error) {
g_string_free (sql_select, TRUE);
@@ -566,9 +566,9 @@
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
NULL);
-
+
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
@@ -668,8 +668,8 @@
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service_Type '%s' is invalid or has not been implemented yet",
+ &actual_error,
+ "Service_Type '%s' is invalid or has not been implemented yet",
service_type);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -688,17 +688,17 @@
for (i=0;i<g_strv_length(fields);i++) {
TrackerFieldData *def = NULL;
def = tracker_metadata_add_metadata_field (iface, service_type, &field_list, fields[i], FALSE, TRUE);
-
+
if (!def) {
g_string_free (sql_select, TRUE);
g_string_free (sql_from, TRUE);
g_string_free (sql_where, TRUE);
g_string_free (sql_order, TRUE);
g_string_free (sql_group, TRUE);
-
+
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Invalid or non-existant metadata type '%s' specified",
+ &actual_error,
+ "Invalid or non-existant metadata type '%s' specified",
fields[i]);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -716,9 +716,9 @@
tracker_field_data_get_select_field (def),
order_desc ? "DESC" : "ASC" );
g_string_append_printf (sql_group, "%s", tracker_field_data_get_select_field (def));
-
+
}
-
+
if (count_field && !(tracker_is_empty_string (count_field))) {
TrackerFieldData *def = NULL;
@@ -730,10 +730,10 @@
g_string_free (sql_where, TRUE);
g_string_free (sql_order, TRUE);
g_string_free (sql_group, TRUE);
-
+
tracker_dbus_request_failed (request_id,
- &actual_error,
- "Invalid or non-existant metadata type '%s' specified",
+ &actual_error,
+ "Invalid or non-existant metadata type '%s' specified",
count_field);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -745,7 +745,7 @@
tracker_rdf_filter_to_sql (iface, query_condition, service_type,
&field_list, &rdf_from, &rdf_where, &actual_error);
-
+
if (actual_error) {
g_string_free (sql_select, TRUE);
@@ -753,12 +753,12 @@
g_string_free (sql_where, TRUE);
g_string_free (sql_order, TRUE);
g_string_free (sql_group, TRUE);
-
+
tracker_dbus_request_failed (request_id,
- &actual_error,
+ &actual_error,
NULL);
-
+
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
@@ -775,8 +775,8 @@
g_string_append_printf (sql_order, " LIMIT %s,%s", str_offset, str_limit);
- sql = g_strconcat (sql_select->str, " ",
- sql_from->str, " ",
+ sql = g_strconcat (sql_select->str, " ",
+ sql_from->str, " ",
sql_where->str, " ",
sql_group->str, " ",
sql_order->str, NULL);
@@ -816,7 +816,7 @@
static gboolean
is_data_type_numeric (TrackerFieldType type) {
- return (type == TRACKER_FIELD_TYPE_INTEGER
+ return (type == TRACKER_FIELD_TYPE_INTEGER
|| type == TRACKER_FIELD_TYPE_DOUBLE);
}
@@ -876,7 +876,7 @@
sql_where = g_string_new ("\nWHERE ");
def = tracker_metadata_add_metadata_field (iface, service_type, &fields, field, FALSE, TRUE);
-
+
data_type = tracker_field_data_get_data_type (def);
if (!is_data_type_numeric (data_type)) {
g_string_free (sql_select, TRUE);
@@ -884,7 +884,7 @@
g_string_free (sql_where, TRUE);
tracker_dbus_request_failed (request_id,
&actual_error,
- "Cannot sum '%s': this metadata type is not numeric",
+ "Cannot sum '%s': this metadata type is not numeric",
field);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -898,7 +898,7 @@
g_string_free (sql_where, TRUE);
tracker_dbus_request_failed (request_id,
&actual_error,
- "Invalid or non-existant metadata type '%s' specified",
+ "Invalid or non-existant metadata type '%s' specified",
field);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -906,10 +906,10 @@
}
g_string_append_printf (sql_select, "SUM (%s)", tracker_field_data_get_select_field (def));
-
+
tracker_rdf_filter_to_sql (iface, query_condition, service_type,
&fields, &rdf_from, &rdf_where, &actual_error);
-
+
if (actual_error) {
g_string_free (sql_select, TRUE);
@@ -1019,7 +1019,7 @@
tracker_dbus_request_failed (request_id,
&actual_error,
- "Invalid or non-existant metadata type '%s' specified",
+ "Invalid or non-existant metadata type '%s' specified",
field);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -1027,10 +1027,10 @@
}
g_string_append_printf (sql_select, "COUNT (DISTINCT %s)", tracker_field_data_get_select_field (def));
-
+
tracker_rdf_filter_to_sql (iface, query_condition, service_type,
&fields, &rdf_from, &rdf_where, &actual_error);
-
+
if (actual_error) {
g_string_free (sql_select, TRUE);
Modified: branches/indexer-split/src/trackerd/tracker-monitor.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-monitor.c (original)
+++ branches/indexer-split/src/trackerd/tracker-monitor.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- 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
@@ -68,15 +68,15 @@
TrackerConfig *config;
GHashTable *modules;
-
+
gboolean enabled;
guint black_list_timeout_id;
GHashTable *black_list_count;
GHashTable *black_list_timestamps;
- GType monitor_backend;
-
+ GType monitor_backend;
+
guint monitor_limit;
gboolean monitor_limit_warned;
guint monitors_ignored;
@@ -124,7 +124,7 @@
static void black_list_print_all (TrackerMonitor *monitor);
static guint get_inotify_limit (void);
-#ifdef USE_LIBINOTIFY
+#ifdef USE_LIBINOTIFY
static INotifyHandle *libinotify_monitor_directory (TrackerMonitor *monitor,
GFile *file);
static void libinotify_monitor_cancel (gpointer data);
@@ -145,50 +145,50 @@
object_class->set_property = tracker_monitor_set_property;
object_class->get_property = tracker_monitor_get_property;
- signals[ITEM_CREATED] =
+ signals[ITEM_CREATED] =
g_signal_new ("item-created",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
tracker_marshal_VOID__STRING_OBJECT_BOOLEAN,
- G_TYPE_NONE,
+ G_TYPE_NONE,
3,
G_TYPE_STRING,
G_TYPE_OBJECT,
G_TYPE_BOOLEAN);
- signals[ITEM_UPDATED] =
+ signals[ITEM_UPDATED] =
g_signal_new ("item-updated",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
tracker_marshal_VOID__STRING_OBJECT_BOOLEAN,
- G_TYPE_NONE,
+ G_TYPE_NONE,
3,
G_TYPE_STRING,
G_TYPE_OBJECT,
G_TYPE_BOOLEAN);
- signals[ITEM_DELETED] =
+ signals[ITEM_DELETED] =
g_signal_new ("item-deleted",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
tracker_marshal_VOID__STRING_OBJECT_BOOLEAN,
- G_TYPE_NONE,
+ G_TYPE_NONE,
3,
G_TYPE_STRING,
G_TYPE_OBJECT,
G_TYPE_BOOLEAN);
- signals[ITEM_MOVED] =
+ signals[ITEM_MOVED] =
g_signal_new ("item-moved",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
tracker_marshal_VOID__STRING_OBJECT_OBJECT_BOOLEAN,
- G_TYPE_NONE,
+ G_TYPE_NONE,
4,
G_TYPE_STRING,
G_TYPE_OBJECT,
@@ -235,12 +235,12 @@
* the stack. This is black list is not saved, it is per
* session for the daemon only.
*/
- priv->black_list_count =
+ priv->black_list_count =
g_hash_table_new_full (g_file_hash,
(GEqualFunc) g_file_equal,
g_object_unref,
NULL);
- priv->black_list_timestamps =
+ priv->black_list_timestamps =
g_hash_table_new_full (g_file_hash,
(GEqualFunc) g_file_equal,
g_object_unref,
@@ -250,18 +250,18 @@
/* We have a hash table with cookies so we can pair up move
* events.
*/
- priv->event_pairs =
- g_hash_table_new_full (g_direct_hash,
+ priv->event_pairs =
+ g_hash_table_new_full (g_direct_hash,
g_direct_equal,
NULL,
g_object_unref);
- priv->event_time_by_cookie =
- g_hash_table_new_full (g_direct_hash,
+ priv->event_time_by_cookie =
+ g_hash_table_new_full (g_direct_hash,
g_direct_equal,
NULL,
NULL);
- priv->event_type_by_cookie =
- g_hash_table_new_full (g_direct_hash,
+ priv->event_type_by_cookie =
+ g_hash_table_new_full (g_direct_hash,
g_direct_equal,
NULL,
NULL);
@@ -274,19 +274,19 @@
/* Create monitors table for this module */
#ifdef USE_LIBINOTIFY
- monitors =
+ monitors =
g_hash_table_new_full (g_file_hash,
(GEqualFunc) g_file_equal,
(GDestroyNotify) g_object_unref,
(GDestroyNotify) libinotify_monitor_cancel);
#else /* USE_LIBINOTIFY */
- monitors =
+ monitors =
g_hash_table_new_full (g_file_hash,
(GEqualFunc) g_file_equal,
(GDestroyNotify) g_object_unref,
(GDestroyNotify) g_file_monitor_cancel);
#endif /* USE_LIBINOTIFY */
-
+
g_hash_table_insert (priv->modules, g_strdup (l->data), monitors);
}
@@ -300,9 +300,9 @@
G_FILE_MONITOR_WATCH_MOUNTS,
NULL,
NULL);
-
+
priv->monitor_backend = G_OBJECT_TYPE (monitor);
-
+
/* We use the name because the type itself is actually
* private and not available publically. Note this is
* subject to change, but unlikely of course.
@@ -313,12 +313,12 @@
if (strcmp (name, "GInotifyDirectoryMonitor") == 0) {
/* Using inotify */
g_message ("Monitor backend is INotify");
-
+
/* Setting limit based on kernel
* settings in /proc...
*/
priv->monitor_limit = get_inotify_limit ();
-
+
/* We don't use 100% of the monitors, we allow other
* applications to have at least 500 or so to use
* between them selves. This only
@@ -326,7 +326,7 @@
* user shared resource.
*/
priv->monitor_limit -= 500;
-
+
/* Make sure we don't end up with a
* negative maximum.
*/
@@ -335,9 +335,9 @@
else if (strcmp (name, "GFamDirectoryMonitor") == 0) {
/* Using Fam */
g_message ("Monitor backend is Fam");
-
+
/* Setting limit to an arbitary limit
- * based on testing
+ * based on testing
*/
priv->monitor_limit = 400;
priv->use_changed_event = TRUE;
@@ -345,30 +345,30 @@
else if (strcmp (name, "GFenDirectoryMonitor") == 0) {
/* Using Fen, what is this? */
g_message ("Monitor backend is Fen");
-
+
/* Guessing limit... */
priv->monitor_limit = 8192;
}
else if (strcmp (name, "GWin32DirectoryMonitor") == 0) {
/* Using Windows */
g_message ("Monitor backend is Windows");
-
+
/* Guessing limit... */
priv->monitor_limit = 8192;
}
else {
/* Unknown */
g_warning ("Monitor backend:'%s' is unknown, we have no limits "
- "in place because we don't know what we are dealing with!",
+ "in place because we don't know what we are dealing with!",
name);
-
+
/* Guessing limit... */
priv->monitor_limit = 100;
}
}
-
+
g_message ("Monitor limit is %d", priv->monitor_limit);
-
+
g_file_monitor_cancel (monitor);
g_object_unref (monitor);
g_object_unref (file);
@@ -399,13 +399,13 @@
g_hash_table_unref (priv->event_time_by_cookie);
g_hash_table_unref (priv->event_pairs);
#endif /* USE_LIBINOTIFY */
-
+
if (priv->black_list_timeout_id) {
- g_source_remove (priv->black_list_timeout_id);
+ g_source_remove (priv->black_list_timeout_id);
}
g_hash_table_unref (priv->modules);
-
+
g_object_unref (priv->config);
G_OBJECT_CLASS (tracker_monitor_parent_class)->finalize (object);
@@ -455,18 +455,18 @@
const gchar *filename;
gchar *contents = NULL;
guint limit;
-
+
filename = "/proc/sys/fs/inotify/max_user_watches";
-
+
if (!g_file_get_contents (filename,
- &contents,
- NULL,
+ &contents,
+ NULL,
&error)) {
- g_warning ("Couldn't get INotify monitor limit from:'%s', %s",
+ g_warning ("Couldn't get INotify monitor limit from:'%s', %s",
filename,
error ? error->message : "no error given");
g_clear_error (&error);
-
+
/* Setting limit to an arbitary limit */
limit = 8192;
} else {
@@ -519,7 +519,7 @@
GFile *parent;
/* Second we try to get the module name from the base
- * name of the file.
+ * name of the file.
*/
parent = g_file_get_parent (file);
module_name = get_queue_from_gfile (monitor->private->modules, parent);
@@ -527,17 +527,17 @@
if (!module_name) {
gchar *child_path;
gchar *parent_path;
-
- child_path = g_file_get_path (file);
- parent_path = g_file_get_path (parent);
+
+ child_path = g_file_get_path (file);
+ parent_path = g_file_get_path (parent);
g_warning ("Could not get module name from GFile (path:'%s' or parent:'%s')",
- child_path,
+ child_path,
parent_path);
g_free (parent_path);
g_free (child_path);
-
+
return NULL;
}
@@ -596,24 +596,24 @@
const gchar *module_name;
gboolean is_directory;
- module_name = get_module_name_from_gfile (data,
+ module_name = get_module_name_from_gfile (data,
key,
&is_directory);
if (!module_name) {
continue;
}
- g_signal_emit (data,
+ g_signal_emit (data,
signals[ITEM_CREATED], 0,
- module_name,
- key,
+ module_name,
+ key,
is_directory);
}
/* Remove from hash tables (i.e. white list it) */
g_hash_table_remove (monitor->private->black_list_count, key);
g_hash_table_remove (monitor->private->black_list_timestamps, key);
-
+
/* Reset iterators */
g_hash_table_iter_init (&iter, monitor->private->black_list_timestamps);
}
@@ -631,7 +631,7 @@
return TRUE;
}
-static gboolean
+static gboolean
black_list_file_check (TrackerMonitor *monitor,
GFile *file)
{
@@ -644,7 +644,7 @@
return count >= BLACK_LIST_MAX_HITS;
}
-static void
+static void
black_list_file_increment (TrackerMonitor *monitor,
GFile *file)
{
@@ -662,29 +662,29 @@
count++;
g_get_current_time (&t);
- g_hash_table_replace (monitor->private->black_list_count,
- g_object_ref (file),
+ g_hash_table_replace (monitor->private->black_list_count,
+ g_object_ref (file),
GUINT_TO_POINTER (count));
- g_hash_table_replace (monitor->private->black_list_timestamps,
- g_object_ref (file),
+ g_hash_table_replace (monitor->private->black_list_timestamps,
+ g_object_ref (file),
GSIZE_TO_POINTER (t.tv_sec));
-
+
if (monitor->private->black_list_timeout_id == 0) {
monitor->private->black_list_timeout_id =
- g_timeout_add_seconds (1,
+ g_timeout_add_seconds (1,
black_list_check_items_cb,
monitor);
}
path = g_file_get_path (file);
- g_debug ("Adding '%s' to black list count:%d (MAX is %d)",
+ g_debug ("Adding '%s' to black list count:%d (MAX is %d)",
path,
count,
BLACK_LIST_MAX_HITS);
g_free (path);
}
-static void
+static void
black_list_print_all (TrackerMonitor *monitor)
{
GHashTableIter iter;
@@ -700,7 +700,7 @@
g_hash_table_iter_init (&iter, monitor->private->black_list_count);
while (g_hash_table_iter_next (&iter, &key, &value)) {
count = GPOINTER_TO_UINT (value);
-
+
if (count < BLACK_LIST_MAX_HITS) {
continue;
}
@@ -717,7 +717,7 @@
}
}
-static void
+static void
indexer_pause_cb (DBusGProxy *proxy,
GError *error,
gpointer user_data)
@@ -728,7 +728,7 @@
}
}
-static void
+static void
indexer_continue_cb (DBusGProxy *proxy,
GError *error,
gpointer user_data)
@@ -745,7 +745,7 @@
TrackerMonitor *monitor;
monitor = data;
-
+
monitor->private->unpause_timeout_id = 0;
tracker_status_set_is_paused_for_io (FALSE);
@@ -754,8 +754,8 @@
PAUSE_FOR_IO_SECONDS);
if (!tracker_status_get_is_paused_manually ()) {
- org_freedesktop_Tracker_Indexer_continue_async (tracker_dbus_indexer_get_proxy (),
- indexer_continue_cb,
+ org_freedesktop_Tracker_Indexer_continue_async (tracker_dbus_indexer_get_proxy (),
+ indexer_continue_cb,
NULL);
}
@@ -773,72 +773,72 @@
if (event_type & IN_ACCESS) {
s = g_string_append (s, "IN_ACCESS | ");
- }
+ }
if (event_type & IN_MODIFY) {
s = g_string_append (s, "IN_MODIFY | ");
- }
+ }
if (event_type & IN_ATTRIB) {
s = g_string_append (s, "IN_ATTRIB | ");
- }
+ }
if (event_type & IN_CLOSE_WRITE) {
s = g_string_append (s, "IN_CLOSE_WRITE | ");
- }
+ }
if (event_type & IN_CLOSE_NOWRITE) {
s = g_string_append (s, "IN_CLOSE_NOWRITE | ");
- }
+ }
if (event_type & IN_OPEN) {
s = g_string_append (s, "IN_OPEN | ");
- }
+ }
if (event_type & IN_MOVED_FROM) {
s = g_string_append (s, "IN_MOVED_FROM | ");
- }
+ }
if (event_type & IN_MOVED_TO) {
s = g_string_append (s, "IN_MOVED_TO | ");
- }
+ }
if (event_type & IN_CREATE) {
s = g_string_append (s, "IN_CREATE | ");
- }
+ }
if (event_type & IN_DELETE) {
s = g_string_append (s, "IN_DELETE | ");
- }
+ }
if (event_type & IN_DELETE_SELF) {
s = g_string_append (s, "IN_DELETE_SELF | ");
- }
+ }
if (event_type & IN_MOVE_SELF) {
s = g_string_append (s, "IN_MOVE_SELF | ");
- }
+ }
if (event_type & IN_UNMOUNT) {
s = g_string_append (s, "IN_UNMOUNT | ");
- }
+ }
if (event_type & IN_Q_OVERFLOW) {
s = g_string_append (s, "IN_Q_OVERFLOW | ");
- }
+ }
if (event_type & IN_IGNORED) {
s = g_string_append (s, "IN_IGNORED | ");
- }
-
+ }
+
/* helper events */
if (event_type & IN_CLOSE) {
s = g_string_append (s, "IN_CLOSE* | ");
- }
+ }
if (event_type & IN_MOVE) {
s = g_string_append (s, "IN_MOVE* | ");
}
-
- /* special flags */
+
+ /* special flags */
if (event_type & IN_MASK_ADD) {
s = g_string_append (s, "IN_MASK_ADD^ | ");
- }
+ }
if (event_type & IN_ISDIR) {
s = g_string_append (s, "IN_ISDIR^ | ");
- }
+ }
if (event_type & IN_ONESHOT) {
s = g_string_append (s, "IN_ONESHOT^ | ");
- }
+ }
s->str[s->len - 3] = '\0';
- return g_string_free (s, FALSE);
+ return g_string_free (s, FALSE);
}
static gboolean
@@ -866,11 +866,11 @@
gpointer p;
seconds_then = GPOINTER_TO_SIZE (value);
-
+
seconds = t.tv_sec;
seconds -= seconds_then;
- g_debug ("Comparing now:%ld to then:%ld, diff:%ld",
+ g_debug ("Comparing now:%ld to then:%ld, diff:%ld",
t.tv_sec,
seconds_then,
seconds);
@@ -881,7 +881,7 @@
file = g_hash_table_lookup (monitor->private->event_pairs, key);
p = g_hash_table_lookup (monitor->private->event_type_by_cookie, key);
- event_type = GPOINTER_TO_UINT (p);
+ event_type = GPOINTER_TO_UINT (p);
/* We didn't receive an event pair for this
* cookie, so we just generate the CREATE or
@@ -891,11 +891,11 @@
event_type,
GPOINTER_TO_UINT (key),
seconds);
-
- module_name = get_module_name_from_gfile (monitor,
- file,
+
+ module_name = get_module_name_from_gfile (monitor,
+ file,
&is_directory);
-
+
switch (event_type) {
case IN_MOVE_SELF:
case IN_MOVED_FROM:
@@ -904,26 +904,26 @@
/* So we new the source, but not the
* target location for the event.
*/
- g_signal_emit (monitor,
+ g_signal_emit (monitor,
signals[ITEM_DELETED], 0,
- module_name,
- file,
+ module_name,
+ file,
is_directory);
break;
-
+
case IN_CREATE:
case IN_MOVED_TO:
/* So we new the target, but not the
* source location for the event.
*/
- g_signal_emit (monitor,
+ g_signal_emit (monitor,
signals[ITEM_CREATED], 0,
- module_name,
- file,
+ module_name,
+ file,
is_directory);
break;
}
-
+
/* Clean up */
g_hash_table_remove (monitor->private->event_pairs, key);
g_hash_table_remove (monitor->private->event_time_by_cookie, key);
@@ -942,7 +942,7 @@
return TRUE;
}
-static void
+static void
libinotify_monitor_event_cb (INotifyHandle *handle,
const char *monitor_name,
const char *filename,
@@ -990,8 +990,8 @@
other_file = NULL;
- module_name = get_module_name_from_gfile (monitor,
- file,
+ module_name = get_module_name_from_gfile (monitor,
+ file,
&is_directory);
if (!module_name) {
g_free (str1);
@@ -1002,7 +1002,7 @@
if (!str1) {
str1 = g_file_get_path (file);
}
-
+
/* This doesn't outright black list a file, it purely adds
* each file to the hash table so we have a count for every
* path we get an event for. If the count is too high, we
@@ -1014,7 +1014,7 @@
case IN_MOVED_TO:
/* If the event is a move type, we don't increment the
* black list count to avoid missing the second event
- * to pair the two up.
+ * to pair the two up.
*/
break;
@@ -1036,7 +1036,7 @@
str1 ? str1 : "",
cookie);
g_free (event_type_str);
-
+
if (!black_list_file_check (monitor, file)) {
if (monitor->private->unpause_timeout_id != 0) {
g_source_remove (monitor->private->unpause_timeout_id);
@@ -1046,12 +1046,12 @@
tracker_status_set_is_paused_for_io (TRUE);
- org_freedesktop_Tracker_Indexer_pause_async (tracker_dbus_indexer_get_proxy (),
- indexer_pause_cb,
+ org_freedesktop_Tracker_Indexer_pause_async (tracker_dbus_indexer_get_proxy (),
+ indexer_pause_cb,
NULL);
}
- monitor->private->unpause_timeout_id =
+ monitor->private->unpause_timeout_id =
g_timeout_add_seconds (PAUSE_FOR_IO_SECONDS,
unpause_cb,
monitor);
@@ -1060,19 +1060,19 @@
/* First check if we already have a file in
* the event pairs hash table.
*/
- other_file = g_hash_table_lookup (monitor->private->event_pairs,
+ other_file = g_hash_table_lookup (monitor->private->event_pairs,
GINT_TO_POINTER (cookie));
if (!other_file) {
GTimeVal t;
g_get_current_time (&t);
- g_hash_table_insert (monitor->private->event_pairs,
+ g_hash_table_insert (monitor->private->event_pairs,
GUINT_TO_POINTER (cookie),
g_object_ref (file));
- g_hash_table_insert (monitor->private->event_time_by_cookie,
+ g_hash_table_insert (monitor->private->event_time_by_cookie,
GUINT_TO_POINTER (cookie),
GSIZE_TO_POINTER (t.tv_sec));
- g_hash_table_insert (monitor->private->event_type_by_cookie,
+ g_hash_table_insert (monitor->private->event_type_by_cookie,
GUINT_TO_POINTER (cookie),
GUINT_TO_POINTER (event_type));
} else {
@@ -1088,7 +1088,7 @@
if (!monitor->private->event_check_timeout_id) {
g_debug ("Setting up event pair timeout check");
- monitor->private->event_check_timeout_id =
+ monitor->private->event_check_timeout_id =
g_timeout_add_seconds (2,
libinotify_event_check_timeout_cb,
monitor);
@@ -1101,31 +1101,31 @@
/* Do nothing */
break;
}
-
+
case IN_CLOSE_WRITE:
case IN_ATTRIB:
- g_signal_emit (monitor,
- signals[ITEM_UPDATED], 0,
- module_name,
- file,
+ g_signal_emit (monitor,
+ signals[ITEM_UPDATED], 0,
+ module_name,
+ file,
is_directory);
break;
-
+
case IN_MOVE_SELF:
case IN_MOVED_FROM:
case IN_DELETE:
case IN_DELETE_SELF:
if (cookie == 0) {
- g_signal_emit (monitor,
- signals[ITEM_DELETED], 0,
- module_name,
- file,
+ g_signal_emit (monitor,
+ signals[ITEM_DELETED], 0,
+ module_name,
+ file,
is_directory);
} else if (other_file) {
- g_signal_emit (monitor,
+ g_signal_emit (monitor,
signals[ITEM_MOVED], 0,
- module_name,
- file,
+ module_name,
+ file,
other_file,
is_directory);
g_hash_table_remove (monitor->private->event_pairs,
@@ -1137,23 +1137,23 @@
}
break;
-
+
case IN_CREATE:
case IN_MOVED_TO:
/* FIXME: What if we don't monitor the other
* location?
*/
if (cookie == 0) {
- g_signal_emit (monitor,
+ g_signal_emit (monitor,
signals[ITEM_CREATED], 0,
- module_name,
- file,
+ module_name,
+ file,
is_directory);
} else if (other_file) {
- g_signal_emit (monitor,
+ g_signal_emit (monitor,
signals[ITEM_MOVED], 0,
- module_name,
- other_file,
+ module_name,
+ other_file,
file,
is_directory);
g_hash_table_remove (monitor->private->event_pairs,
@@ -1165,15 +1165,15 @@
}
break;
-
+
case IN_UNMOUNT:
- g_signal_emit (monitor,
+ g_signal_emit (monitor,
signals[ITEM_DELETED], 0,
- module_name,
- file,
+ module_name,
+ file,
is_directory);
break;
-
+
case IN_Q_OVERFLOW:
case IN_OPEN:
case IN_CLOSE_NOWRITE:
@@ -1213,10 +1213,10 @@
}
path = g_file_get_path (file);
- handle = inotify_monitor_add (path,
- mask,
- flags,
- libinotify_monitor_event_cb,
+ handle = inotify_monitor_add (path,
+ mask,
+ flags,
+ libinotify_monitor_event_cb,
monitor);
g_free (path);
@@ -1263,7 +1263,7 @@
GFile *file,
GFile *other_file,
GFileMonitorEvent event_type,
- gpointer user_data)
+ gpointer user_data)
{
TrackerMonitor *monitor;
const gchar *module_name;
@@ -1278,15 +1278,15 @@
return;
}
- module_name = get_module_name_from_gfile (monitor,
- file,
+ module_name = get_module_name_from_gfile (monitor,
+ file,
&is_directory);
if (!module_name) {
return;
}
str1 = g_file_get_path (file);
-
+
/* This doesn't outright black list a file, it purely adds
* each file to the hash table so we have a count for every
* path we get an event for. If the count is too high, we
@@ -1305,7 +1305,7 @@
monitor_event_to_string (event_type),
str1,
str2 ? str2 : "");
-
+
if (!black_list_file_check (monitor, file)) {
if (monitor->private->unpause_timeout_id != 0) {
g_source_remove (monitor->private->unpause_timeout_id);
@@ -1315,12 +1315,12 @@
tracker_status_set_is_paused_for_io (TRUE);
- org_freedesktop_Tracker_Indexer_pause_async (tracker_dbus_indexer_get_proxy (),
- indexer_pause_cb,
+ org_freedesktop_Tracker_Indexer_pause_async (tracker_dbus_indexer_get_proxy (),
+ indexer_pause_cb,
NULL);
}
- monitor->private->unpause_timeout_id =
+ monitor->private->unpause_timeout_id =
g_timeout_add_seconds (PAUSE_FOR_IO_SECONDS,
unpause_cb,
monitor);
@@ -1332,39 +1332,39 @@
break;
}
- case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
+ case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
- g_signal_emit (monitor,
- signals[ITEM_UPDATED], 0,
- module_name,
- file,
+ g_signal_emit (monitor,
+ signals[ITEM_UPDATED], 0,
+ module_name,
+ file,
is_directory);
break;
-
+
case G_FILE_MONITOR_EVENT_DELETED:
- g_signal_emit (monitor,
- signals[ITEM_DELETED], 0,
- module_name,
- file,
+ g_signal_emit (monitor,
+ signals[ITEM_DELETED], 0,
+ module_name,
+ file,
is_directory);
break;
-
+
case G_FILE_MONITOR_EVENT_CREATED:
- g_signal_emit (monitor,
+ g_signal_emit (monitor,
signals[ITEM_CREATED], 0,
- module_name,
- file,
+ module_name,
+ file,
is_directory);
break;
-
+
case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
- g_signal_emit (monitor,
+ g_signal_emit (monitor,
signals[ITEM_DELETED], 0,
- module_name,
- file,
+ module_name,
+ file,
is_directory);
break;
-
+
case G_FILE_MONITOR_EVENT_UNMOUNTED:
/* Do nothing */
break;
@@ -1441,7 +1441,7 @@
monitors = g_hash_table_lookup (monitor->private->modules, module_name);
if (!monitors) {
- g_warning ("No monitor hash table for module:'%s'",
+ g_warning ("No monitor hash table for module:'%s'",
module_name);
return FALSE;
}
@@ -1485,16 +1485,16 @@
*/
#ifdef USE_LIBINOTIFY
file_monitor = libinotify_monitor_directory (monitor, file);
-
+
if (!file_monitor) {
- g_warning ("Could not add monitor for path:'%s'",
+ g_warning ("Could not add monitor for path:'%s'",
path);
g_free (path);
return FALSE;
}
g_hash_table_insert (monitors,
- g_object_ref (file),
+ g_object_ref (file),
file_monitor);
#else /* USE_LIBINOTIFY */
file_monitor = g_file_monitor_directory (file,
@@ -1503,8 +1503,8 @@
&error);
if (error) {
- g_warning ("Could not add monitor for path:'%s', %s",
- path,
+ g_warning ("Could not add monitor for path:'%s', %s",
+ path,
error->message);
g_free (path);
g_error_free (error);
@@ -1516,17 +1516,17 @@
monitor);
g_hash_table_insert (monitors,
- g_object_ref (file),
+ g_object_ref (file),
file_monitor);
#endif /* USE_LIBINOTIFY */
- g_debug ("Added monitor for module:'%s', path:'%s', total monitors:%d",
+ g_debug ("Added monitor for module:'%s', path:'%s', total monitors:%d",
module_name,
path,
g_hash_table_size (monitors));
g_free (path);
-
+
return TRUE;
}
@@ -1549,7 +1549,7 @@
monitors = g_hash_table_lookup (monitor->private->modules, module_name);
if (!monitors) {
- g_warning ("No monitor hash table for module:'%s'",
+ g_warning ("No monitor hash table for module:'%s'",
module_name);
return FALSE;
}
@@ -1566,7 +1566,7 @@
path = g_file_get_path (file);
- g_debug ("Removed monitor for module:'%s', path:'%s', total monitors:%d",
+ g_debug ("Removed monitor for module:'%s', path:'%s', total monitors:%d",
module_name,
path,
g_hash_table_size (monitors));
@@ -1589,7 +1589,7 @@
monitors = g_hash_table_lookup (monitor->private->modules, module_name);
if (!monitors) {
- g_warning ("No monitor hash table for module:'%s'",
+ g_warning ("No monitor hash table for module:'%s'",
module_name);
return FALSE;
}
@@ -1612,7 +1612,7 @@
monitors = g_hash_table_lookup (monitor->private->modules, module_name);
if (!monitors) {
- g_warning ("No monitor hash table for module:'%s'",
+ g_warning ("No monitor hash table for module:'%s'",
module_name);
return FALSE;
}
@@ -1637,21 +1637,21 @@
monitors = g_hash_table_lookup (monitor->private->modules, module_name);
if (!monitors) {
- g_warning ("No monitor hash table for module:'%s'",
+ g_warning ("No monitor hash table for module:'%s'",
module_name);
return 0;
}
-
+
count = g_hash_table_size (monitors);
} else {
GList *all_modules, *l;
all_modules = g_hash_table_get_values (monitor->private->modules);
-
+
for (l = all_modules, count = 0; l; l = l->next) {
count += g_hash_table_size (l->data);
}
-
+
g_list_free (all_modules);
}
Modified: branches/indexer-split/src/trackerd/tracker-monitor.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-monitor.h (original)
+++ branches/indexer-split/src/trackerd/tracker-monitor.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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
*
Modified: branches/indexer-split/src/trackerd/tracker-processor.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-processor.c (original)
+++ branches/indexer-split/src/trackerd/tracker-processor.c Sat Sep 20 14:45:00 2008
@@ -72,7 +72,7 @@
GHashTable *items_updated_queues;
GHashTable *items_deleted_queues;
GHashTable *items_moved_queues;
-
+
SentType sent_type;
GStrv sent_items;
const gchar *sent_module_name;
@@ -85,7 +85,7 @@
GTimer *timer;
- gboolean interrupted;
+ gboolean interrupted;
gboolean finished;
/* Statistics */
@@ -157,7 +157,7 @@
guint files_ignored,
gpointer user_data);
-#ifdef HAVE_HAL
+#ifdef HAVE_HAL
static void mount_point_added_cb (TrackerHal *hal,
const gchar *mount_point,
gpointer user_data);
@@ -204,7 +204,7 @@
/* For each module we create a TrackerCrawler and keep them in
* a hash table to look up.
*/
- priv->crawlers =
+ priv->crawlers =
g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
@@ -213,24 +213,24 @@
/* For each module we create a hash table for queues for items
* to update/create/delete in the indexer. This is sent on
- * when the queue is processed.
+ * when the queue is processed.
*/
- priv->items_created_queues =
+ priv->items_created_queues =
g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
item_queue_destroy_notify);
- priv->items_updated_queues =
+ priv->items_updated_queues =
g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
item_queue_destroy_notify);
- priv->items_deleted_queues =
+ priv->items_deleted_queues =
g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
item_queue_destroy_notify);
- priv->items_moved_queues =
+ priv->items_moved_queues =
g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
@@ -238,17 +238,17 @@
for (l = priv->modules; l; l = l->next) {
/* Create queues for this module */
- g_hash_table_insert (priv->items_created_queues,
- g_strdup (l->data),
+ g_hash_table_insert (priv->items_created_queues,
+ g_strdup (l->data),
g_queue_new ());
- g_hash_table_insert (priv->items_updated_queues,
- g_strdup (l->data),
+ g_hash_table_insert (priv->items_updated_queues,
+ g_strdup (l->data),
g_queue_new ());
- g_hash_table_insert (priv->items_deleted_queues,
- g_strdup (l->data),
+ g_hash_table_insert (priv->items_deleted_queues,
+ g_strdup (l->data),
g_queue_new ());
- g_hash_table_insert (priv->items_moved_queues,
- g_strdup (l->data),
+ g_hash_table_insert (priv->items_moved_queues,
+ g_strdup (l->data),
g_queue_new ());
}
}
@@ -321,7 +321,7 @@
g_signal_handlers_disconnect_by_func (priv->hal,
mount_point_removed_cb,
object);
-
+
g_object_unref (priv->hal);
}
#endif /* HAVE_HAL */
@@ -451,7 +451,7 @@
}
}
}
-
+
return found_queue;
}
@@ -465,21 +465,21 @@
if (crawler) {
guint signals;
- signals = g_signal_handlers_disconnect_matched (crawler,
+ signals = g_signal_handlers_disconnect_matched (crawler,
G_SIGNAL_MATCH_FUNC,
0,
0,
NULL,
G_CALLBACK (crawler_processing_file_cb),
NULL);
- signals = g_signal_handlers_disconnect_matched (crawler,
+ signals = g_signal_handlers_disconnect_matched (crawler,
G_SIGNAL_MATCH_FUNC,
0,
0,
NULL,
G_CALLBACK (crawler_processing_directory_cb),
NULL);
- signals = g_signal_handlers_disconnect_matched (crawler,
+ signals = g_signal_handlers_disconnect_matched (crawler,
G_SIGNAL_MATCH_FUNC,
0,
0,
@@ -503,13 +503,13 @@
}
static void
-item_queue_readd_items (GQueue *queue,
+item_queue_readd_items (GQueue *queue,
GStrv strv)
{
if (queue) {
GStrv p;
gint i;
-
+
for (p = strv, i = 0; *p; p++, i++) {
g_queue_push_nth (queue, g_file_new_for_path (*p), i);
}
@@ -535,19 +535,19 @@
/* Put files back into queue */
switch (processor->private->sent_type) {
case SENT_TYPE_CREATED:
- queue = g_hash_table_lookup (processor->private->items_created_queues,
+ queue = g_hash_table_lookup (processor->private->items_created_queues,
processor->private->sent_module_name);
break;
case SENT_TYPE_UPDATED:
- queue = g_hash_table_lookup (processor->private->items_updated_queues,
+ queue = g_hash_table_lookup (processor->private->items_updated_queues,
processor->private->sent_module_name);
break;
case SENT_TYPE_DELETED:
- queue = g_hash_table_lookup (processor->private->items_deleted_queues,
+ queue = g_hash_table_lookup (processor->private->items_deleted_queues,
processor->private->sent_module_name);
break;
case SENT_TYPE_MOVED:
- queue = g_hash_table_lookup (processor->private->items_moved_queues,
+ queue = g_hash_table_lookup (processor->private->items_moved_queues,
processor->private->sent_module_name);
break;
case SENT_TYPE_NONE:
@@ -555,7 +555,7 @@
queue = NULL;
break;
}
-
+
item_queue_readd_items (queue, processor->private->sent_items);
} else {
g_debug ("Sent!");
@@ -572,16 +572,16 @@
static gboolean
item_queue_handlers_cb (gpointer user_data)
{
- TrackerProcessor *processor;
+ TrackerProcessor *processor;
GQueue *queue;
- GStrv files;
+ GStrv files;
gchar *module_name;
processor = user_data;
/* This way we don't send anything to the indexer from monitor
* events but we still queue them ready to send when we are
- * unpaused.
+ * unpaused.
*/
if (tracker_status_get_is_paused_manually () ||
tracker_status_get_is_paused_for_io ()) {
@@ -594,7 +594,7 @@
/* This is here so we don't try to send something if we are
* still waiting for a response from the last send.
- */
+ */
if (processor->private->sent_type != SENT_TYPE_NONE) {
g_message ("Still waiting for response from indexer, "
"not sending more files yet");
@@ -603,13 +603,13 @@
/* Process the deleted items first */
queue = get_next_queue_with_data (processor->private->modules,
- processor->private->items_deleted_queues,
+ processor->private->items_deleted_queues,
&module_name);
if (queue) {
files = tracker_dbus_queue_gfile_to_strv (queue, ITEMS_QUEUE_PROCESS_MAX);
-
- g_message ("Queue for module:'%s' deleted items processed, sending first %d to the indexer",
+
+ g_message ("Queue for module:'%s' deleted items processed, sending first %d to the indexer",
module_name,
g_strv_length (files));
@@ -622,19 +622,19 @@
(const gchar **) files,
item_queue_processed_cb,
processor);
-
+
return TRUE;
}
/* Process the created items next */
queue = get_next_queue_with_data (processor->private->modules,
- processor->private->items_created_queues,
+ processor->private->items_created_queues,
&module_name);
if (queue) {
files = tracker_dbus_queue_gfile_to_strv (queue, ITEMS_QUEUE_PROCESS_MAX);
-
- g_message ("Queue for module:'%s' created items processed, sending first %d to the indexer",
+
+ g_message ("Queue for module:'%s' created items processed, sending first %d to the indexer",
module_name,
g_strv_length (files));
@@ -647,19 +647,19 @@
(const gchar **) files,
item_queue_processed_cb,
processor);
-
+
return TRUE;
}
/* Process the updated items next */
queue = get_next_queue_with_data (processor->private->modules,
- processor->private->items_updated_queues,
+ processor->private->items_updated_queues,
&module_name);
if (queue) {
files = tracker_dbus_queue_gfile_to_strv (queue, ITEMS_QUEUE_PROCESS_MAX);
-
- g_message ("Queue for module:'%s' updated items processed, sending first %d to the indexer",
+
+ g_message ("Queue for module:'%s' updated items processed, sending first %d to the indexer",
module_name,
g_strv_length (files));
@@ -672,13 +672,13 @@
(const gchar **) files,
item_queue_processed_cb,
processor);
-
+
return TRUE;
}
/* Process the moved items last */
queue = get_next_queue_with_data (processor->private->modules,
- processor->private->items_moved_queues,
+ processor->private->items_moved_queues,
&module_name);
if (queue) {
@@ -686,7 +686,7 @@
const gchar *target;
files = tracker_dbus_queue_gfile_to_strv (queue, 2);
-
+
if (files) {
source = files[0];
target = files[1];
@@ -695,7 +695,7 @@
target = NULL;
}
- g_message ("Queue for module:'%s' moved items processed, sending first %d to the indexer",
+ g_message ("Queue for module:'%s' moved items processed, sending first %d to the indexer",
module_name,
g_strv_length (files));
@@ -709,7 +709,7 @@
target,
item_queue_processed_cb,
processor);
-
+
return TRUE;
}
@@ -726,8 +726,8 @@
return;
}
- processor->private->item_queues_handler_id =
- g_timeout_add (ITEMS_QUEUE_PROCESS_INTERVAL,
+ processor->private->item_queues_handler_id =
+ g_timeout_add (ITEMS_QUEUE_PROCESS_INTERVAL,
item_queue_handlers_cb,
processor);
}
@@ -737,22 +737,22 @@
const gchar *path)
{
GSList *l;
-
+
if (!ignore_list || !path) {
return FALSE;
}
-
+
for (l = ignore_list; l; l = l->next) {
if (strcmp (path, l->data) == 0) {
return TRUE;
}
}
-
+
return FALSE;
}
static void
-process_module_files_add_removable_media (TrackerProcessor *processor)
+process_module_files_add_removable_media (TrackerProcessor *processor)
{
TrackerCrawler *crawler;
GSList *roots;
@@ -761,7 +761,7 @@
crawler = g_hash_table_lookup (processor->private->crawlers, module_name);
-#ifdef HAVE_HAL
+#ifdef HAVE_HAL
roots = tracker_hal_get_removable_device_roots (processor->private->hal);
#else /* HAVE_HAL */
roots = NULL;
@@ -777,9 +777,9 @@
g_message (" %s (ignored due to config)", (gchar*) l->data);
continue;
}
-
+
g_message (" %s", (gchar*) l->data);
-
+
file = g_file_new_for_path (l->data);
tracker_monitor_add (processor->private->monitor, module_name, file);
g_object_unref (file);
@@ -797,7 +797,7 @@
g_message (" %s (ignored due to config)", (gchar*) l->data);
continue;
}
-
+
g_message (" %s", (gchar*) l->data);
tracker_crawler_add_path (crawler, l->data);
}
@@ -810,7 +810,7 @@
}
static void
-process_module_files_add_legacy_options (TrackerProcessor *processor)
+process_module_files_add_legacy_options (TrackerProcessor *processor)
{
TrackerCrawler *crawler;
GSList *no_watch_roots;
@@ -839,7 +839,7 @@
for (l = no_watch_roots; l; l = l->next) {
g_message (" %s", (gchar*) l->data);
}
-
+
if (g_slist_length (no_watch_roots) == 0) {
g_message (" NONE");
}
@@ -848,13 +848,13 @@
g_message (" User monitors being added:");
for (l = watch_roots; l; l = l->next) {
GFile *file;
-
+
if (is_path_on_ignore_list (no_watch_roots, l->data)) {
continue;
}
g_message (" %s", (gchar*) l->data);
-
+
file = g_file_new_for_path (l->data);
tracker_monitor_add (processor->private->monitor, module_name, file);
g_object_unref (file);
@@ -865,9 +865,9 @@
if (g_slist_length (watch_roots) == 0) {
g_message (" NONE");
}
-
+
/* Add crawls, from WatchDirectoryRoots and
- * CrawlDirectoryRoots config keys.
+ * CrawlDirectoryRoots config keys.
*/
g_message (" User crawls being added:");
@@ -877,7 +877,7 @@
}
g_message (" %s", (gchar*) l->data);
- tracker_crawler_add_path (crawler, l->data);
+ tracker_crawler_add_path (crawler, l->data);
}
for (l = crawl_roots; l; l = l->next) {
@@ -886,12 +886,12 @@
}
g_message (" %s", (gchar*) l->data);
- tracker_crawler_add_path (crawler, l->data);
+ tracker_crawler_add_path (crawler, l->data);
crawl_root_count++;
}
- if (g_slist_length (watch_roots) == 0 &&
+ if (g_slist_length (watch_roots) == 0 &&
g_slist_length (crawl_roots) == 0) {
g_message (" NONE");
}
@@ -933,8 +933,8 @@
} else {
process_module_files_add_legacy_options (processor);
}
- }
-
+ }
+
/* Gets all files and directories */
tracker_status_set_and_signal (TRACKER_STATUS_PENDING);
@@ -984,7 +984,7 @@
} else {
module_name = processor->private->current_module->data;
}
-
+
/* Set up new crawler for new module */
process_module (processor, module_name, processor->private->iterated_removable_media);
}
@@ -1008,12 +1008,12 @@
processor = user_data;
/* Update our local copy */
- processor->private->items_done = items_done;
- processor->private->items_remaining = items_remaining;
+ processor->private->items_done = items_done;
+ processor->private->items_remaining = items_remaining;
processor->private->seconds_elapsed = seconds_elapsed;
if (items_remaining < 1 ||
- current_module_name == NULL ||
+ current_module_name == NULL ||
current_module_name[0] == '\0') {
return;
}
@@ -1024,7 +1024,7 @@
if (file) {
path = g_file_get_path (file);
}
-
+
g_signal_emit_by_name (tracker_dbus_get_object (TRACKER_TYPE_DAEMON),
"index-progress",
tracker_module_config_get_index_service (current_module_name),
@@ -1046,13 +1046,13 @@
tracker_db_index_set_reload (index, TRUE);
/* Message to the console about state */
- str1 = tracker_seconds_estimate_to_string (seconds_elapsed,
+ str1 = tracker_seconds_estimate_to_string (seconds_elapsed,
TRUE,
- items_done,
+ items_done,
items_remaining);
str2 = tracker_seconds_to_string (seconds_elapsed, TRUE);
-
- g_message ("Indexed %d/%d, module:'%s', %s left, %s elapsed",
+
+ g_message ("Indexed %d/%d, module:'%s', %s left, %s elapsed",
items_done,
items_done + items_remaining,
current_module_name,
@@ -1113,7 +1113,7 @@
/* Do we even need this step Optimizing ? */
tracker_status_set_and_signal (TRACKER_STATUS_OPTIMIZING);
- /* Now the indexer is done, we can signal our status as IDLE */
+ /* Now the indexer is done, we can signal our status as IDLE */
tracker_status_set_and_signal (TRACKER_STATUS_IDLE);
/* Signal to the applet we are finished */
@@ -1146,7 +1146,7 @@
path);
g_free (path);
-
+
if (ignored) {
return;
}
@@ -1177,7 +1177,7 @@
path);
g_free (path);
-
+
if (ignored) {
return;
}
@@ -1208,7 +1208,7 @@
path);
g_free (path);
-
+
if (ignored) {
return;
}
@@ -1400,7 +1400,7 @@
status == TRACKER_STATUS_IDLE) {
/* If we are indexing then we must have already
* crawled all locations so we need to start up the
- * processor again for the removable media once more.
+ * processor again for the removable media once more.
*/
process_module_next (processor);
}
@@ -1438,7 +1438,7 @@
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
-#ifdef HAVE_HAL
+#ifdef HAVE_HAL
g_return_val_if_fail (TRACKER_IS_HAL (hal), NULL);
#endif /* HAVE_HAL */
@@ -1465,7 +1465,7 @@
/* Set up the crawlers now we have config and hal */
for (l = priv->modules; l; l = l->next) {
crawler = tracker_crawler_new (priv->config, l->data);
-
+
g_signal_connect (crawler, "processing-file",
G_CALLBACK (crawler_processing_file_cb),
processor);
@@ -1476,8 +1476,8 @@
G_CALLBACK (crawler_finished_cb),
processor);
- g_hash_table_insert (priv->crawlers,
- g_strdup (l->data),
+ g_hash_table_insert (priv->crawlers,
+ g_strdup (l->data),
crawler);
}
@@ -1505,7 +1505,7 @@
*/
proxy = tracker_dbus_indexer_get_proxy ();
priv->indexer_proxy = g_object_ref (proxy);
-
+
dbus_g_proxy_connect_signal (proxy, "Status",
G_CALLBACK (indexer_status_cb),
processor,
@@ -1547,7 +1547,7 @@
if (processor->private->interrupted) {
TrackerCrawler *crawler;
- crawler = g_hash_table_lookup (processor->private->crawlers,
+ crawler = g_hash_table_lookup (processor->private->crawlers,
processor->private->current_module->data);
tracker_crawler_stop (crawler);
@@ -1569,7 +1569,7 @@
g_message ("Total time taken : %4.4f seconds",
elapsed);
- g_message ("Total directories: %d (%d ignored)",
+ g_message ("Total directories: %d (%d ignored)",
processor->private->directories_found,
processor->private->directories_ignored);
g_message ("Total files : %d (%d ignored)",
@@ -1650,58 +1650,58 @@
processor_files_move (processor, module_name, file, other_file, is_directory);
}
-guint
+guint
tracker_processor_get_directories_found (TrackerProcessor *processor)
{
g_return_val_if_fail (TRACKER_IS_PROCESSOR (processor), 0);
-
+
return processor->private->directories_found;
}
-guint
+guint
tracker_processor_get_directories_ignored (TrackerProcessor *processor)
{
g_return_val_if_fail (TRACKER_IS_PROCESSOR (processor), 0);
-
+
return processor->private->directories_ignored;
}
-guint
+guint
tracker_processor_get_directories_total (TrackerProcessor *processor)
{
g_return_val_if_fail (TRACKER_IS_PROCESSOR (processor), 0);
-
+
return processor->private->directories_found + processor->private->directories_ignored;
}
-guint
+guint
tracker_processor_get_files_found (TrackerProcessor *processor)
{
g_return_val_if_fail (TRACKER_IS_PROCESSOR (processor), 0);
-
+
return processor->private->files_found;
}
-guint
+guint
tracker_processor_get_files_ignored (TrackerProcessor *processor)
{
g_return_val_if_fail (TRACKER_IS_PROCESSOR (processor), 0);
-
+
return processor->private->files_ignored;
}
-guint
+guint
tracker_processor_get_files_total (TrackerProcessor *processor)
{
g_return_val_if_fail (TRACKER_IS_PROCESSOR (processor), 0);
-
+
return processor->private->files_found + processor->private->files_ignored;
}
-gdouble
+gdouble
tracker_processor_get_seconds_elapsed (TrackerProcessor *processor)
{
g_return_val_if_fail (TRACKER_IS_PROCESSOR (processor), 0);
-
+
return processor->private->seconds_elapsed;
}
Modified: branches/indexer-split/src/trackerd/tracker-processor.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-processor.h (original)
+++ branches/indexer-split/src/trackerd/tracker-processor.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- 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
Modified: branches/indexer-split/src/trackerd/tracker-query-tree.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-query-tree.c (original)
+++ branches/indexer-split/src/trackerd/tracker-query-tree.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- 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
@@ -517,7 +517,7 @@
}
static gboolean
-in_array (GArray *array,
+in_array (GArray *array,
gint element)
{
guint i;
@@ -576,7 +576,7 @@
priv = TRACKER_QUERY_TREE_GET_PRIVATE (tree);
- result = g_hash_table_new_full (NULL,
+ result = g_hash_table_new_full (NULL,
NULL,
NULL,
search_hit_data_free);
@@ -590,37 +590,37 @@
*/
indexes_checked = g_hash_table_new (g_direct_hash,
g_direct_equal);
-
+
for (i = 0; i < priv->services->len; i++) {
TrackerDBIndex *index;
guint id;
id = g_array_index (priv->services, gint, i);
index = tracker_db_index_manager_get_index_by_service_id (id);
-
+
if (g_hash_table_lookup (indexes_checked, index)) {
continue;
}
-
- g_hash_table_insert (indexes_checked,
- index,
+
+ g_hash_table_insert (indexes_checked,
+ index,
GINT_TO_POINTER (1));
-
+
items = tracker_db_index_get_word_hits (index, term, &item_count);
-
+
if (!items) {
continue;
}
-
- add_search_term_hits_to_hash_table (items,
- item_count,
- priv->services,
+
+ add_search_term_hits_to_hash_table (items,
+ item_count,
+ priv->services,
result);
g_free (items);
}
-
+
g_hash_table_unref (indexes_checked);
-
+
return result;
}
@@ -678,8 +678,8 @@
if (op == OP_OR) {
data.dest_table = g_hash_table_ref (data.other_table);
} else {
- data.dest_table = g_hash_table_new_full (NULL,
- NULL,
+ data.dest_table = g_hash_table_new_full (NULL,
+ NULL,
NULL,
search_hit_data_free);
}
@@ -850,13 +850,13 @@
gint count, parent_id;
rank = g_array_index (hits, TrackerDBIndexItemRank, i);
- p = g_hash_table_lookup (table,
+ p = g_hash_table_lookup (table,
GINT_TO_POINTER (rank.service_type_id));
count = GPOINTER_TO_INT (p);
count++;
- g_hash_table_insert (table,
- GINT_TO_POINTER (rank.service_type_id),
+ g_hash_table_insert (table,
+ GINT_TO_POINTER (rank.service_type_id),
GINT_TO_POINTER (count));
/* Update service's parent count too (if it has a
@@ -869,8 +869,8 @@
count = GPOINTER_TO_INT (p);
count++;
- g_hash_table_insert (table,
- GINT_TO_POINTER (parent_id),
+ g_hash_table_insert (table,
+ GINT_TO_POINTER (parent_id),
GINT_TO_POINTER (count));
}
}
Modified: branches/indexer-split/src/trackerd/tracker-query-tree.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-query-tree.h (original)
+++ branches/indexer-split/src/trackerd/tracker-query-tree.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- 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
Modified: branches/indexer-split/src/trackerd/tracker-rdf-query.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-rdf-query.c (original)
+++ branches/indexer-split/src/trackerd/tracker-rdf-query.c Sat Sep 20 14:45:00 2008
@@ -58,7 +58,7 @@
#define ELEMENT_RDF_LESS_OR_EQUAL "rdfq:lessOrEqual"
/* Extension operators - "contains" does a substring or full text
- * match, "in_Set" does string in list match
+ * match, "in_Set" does string in list match
*/
#define ELEMENT_RDF_CONTAINS "rdfq:contains"
#define ELEMENT_RDF_REGEX "rdfq:regex"
@@ -79,7 +79,7 @@
* other
* formats are
* supported
- * too
+ * too
*/
#define ELEMENT_RDF_STRING "rdf:String"
#define ELEMENT_RDF_FLOAT "rdf:Float"
@@ -192,48 +192,48 @@
static gboolean
is_operator (ParseState state)
{
- return
- state == STATE_EQUALS ||
- state == STATE_GREATER_THAN ||
+ return
+ state == STATE_EQUALS ||
+ state == STATE_GREATER_THAN ||
state == STATE_LESS_THAN ||
- state == STATE_CONTAINS ||
- state == STATE_IN_SET ||
+ state == STATE_CONTAINS ||
+ state == STATE_IN_SET ||
state == STATE_LESS_OR_EQUAL ||
- state == STATE_GREATER_OR_EQUAL ||
- state == STATE_STARTS_WITH ||
+ state == STATE_GREATER_OR_EQUAL ||
+ state == STATE_STARTS_WITH ||
state == STATE_REGEX;
}
static gboolean
is_end_operator (ParseState state)
{
- return
- state == STATE_END_EQUALS ||
- state == STATE_END_GREATER_THAN ||
+ return
+ state == STATE_END_EQUALS ||
+ state == STATE_END_GREATER_THAN ||
state == STATE_END_LESS_THAN ||
- state == STATE_END_CONTAINS ||
- state == STATE_END_IN_SET ||
+ state == STATE_END_CONTAINS ||
+ state == STATE_END_IN_SET ||
state == STATE_END_LESS_OR_EQUAL ||
- state == STATE_END_GREATER_OR_EQUAL ||
- state == STATE_END_STARTS_WITH ||
+ state == STATE_END_GREATER_OR_EQUAL ||
+ state == STATE_END_STARTS_WITH ||
state == STATE_REGEX;
}
static gboolean
is_logic (ParseState state)
{
- return
- state == STATE_AND ||
- state == STATE_OR ||
+ return
+ state == STATE_AND ||
+ state == STATE_OR ||
state == STATE_NOT;
}
static gboolean
is_end_logic (ParseState state)
{
- return
- state == STATE_END_AND ||
- state == STATE_END_NOT ||
+ return
+ state == STATE_END_AND ||
+ state == STATE_END_NOT ||
state == STATE_END_OR;
}
@@ -254,19 +254,19 @@
str = g_strdup_vprintf (format, args);
va_end (args);
- g_set_error (err,
- error_quark,
+ g_set_error (err,
+ error_quark,
error_code,
- "Line %d character %d: %s",
+ "Line %d character %d: %s",
line, ch, str);
g_free (str);
}
static gboolean
-set_error_on_fail (gboolean condition,
- GMarkupParseContext *context,
- const gchar *msg,
+set_error_on_fail (gboolean condition,
+ GMarkupParseContext *context,
+ const gchar *msg,
GError **err)
{
if (!condition) {
@@ -309,8 +309,8 @@
value = get_attribute_value (name, names, values);
if (!value) {
- set_error (error,
- context,
+ set_error (error,
+ context,
PARSE_ERROR,
"%s must have \"%s\" attribute",
tag, name);
@@ -356,9 +356,9 @@
}
static TrackerFieldData *
-add_metadata_field (ParserData *data,
- const gchar *field_name,
- gboolean is_select,
+add_metadata_field (ParserData *data,
+ const gchar *field_name,
+ gboolean is_select,
gboolean is_condition)
{
TrackerFieldData *field_data;
@@ -373,7 +373,7 @@
const gchar *this_field_name;
this_field_name = tracker_field_data_get_field_name (l->data);
-
+
if (!this_field_name) {
continue;
}
@@ -389,7 +389,7 @@
if (is_select) {
if (!tracker_field_data_get_is_select (field_data)) {
tracker_field_data_set_is_select (field_data, TRUE);
- g_string_append_printf (data->sql_select, ", %s",
+ g_string_append_printf (data->sql_select, ", %s",
tracker_field_data_get_select_field (field_data));
}
}
@@ -397,23 +397,23 @@
break;
}
}
-
+
if (!field_exists) {
- field_data = tracker_db_get_metadata_field (data->iface,
- data->service,
- field_name,
- g_slist_length (data->fields),
- is_select,
+ field_data = tracker_db_get_metadata_field (data->iface,
+ data->service,
+ field_name,
+ g_slist_length (data->fields),
+ is_select,
is_condition);
if (field_data) {
data->fields = g_slist_prepend (data->fields, field_data);
if (is_select) {
- g_string_append_printf (data->sql_select, ", %s",
+ g_string_append_printf (data->sql_select, ", %s",
tracker_field_data_get_select_field (field_data));
}
- }
- }
-
+ }
+ }
+
return field_data;
}
@@ -432,9 +432,9 @@
state = peek_state (data);
if (ELEMENT_IS (ELEMENT_RDF_CONDITION)) {
- if (set_error_on_fail (state == STATE_START,
- context,
- "Condition element not expected here",
+ if (set_error_on_fail (state == STATE_START,
+ context,
+ "Condition element not expected here",
error)) {
return;
}
@@ -444,14 +444,14 @@
} else if (ELEMENT_IS (ELEMENT_RDF_PROPERTY)) {
const char *name;
- if (set_error_on_fail (is_operator (state),
- context,
- "Property element not expected here",
+ if (set_error_on_fail (is_operator (state),
+ context,
+ "Property element not expected here",
error)) {
return;
}
- name = get_attribute_value_required (context,
+ name = get_attribute_value_required (context,
"<rdfq:Property>", "name",
attribute_names, attribute_values,
error);
@@ -460,10 +460,10 @@
return;
} else {
if (data->current_operator == OP_NONE) {
- set_error (error,
- context,
- PARSE_ERROR,
- "no operator found for Property \"%s\"",
+ set_error (error,
+ context,
+ PARSE_ERROR,
+ "no operator found for Property \"%s\"",
name);
return;
}
@@ -473,19 +473,19 @@
push_stack (data, STATE_PROPERTY);
}
} else if (ELEMENT_IS (ELEMENT_RDF_AND)) {
- if (set_error_on_fail (state == STATE_CONDITION ||
- is_logic (state) ||
- is_end_logic (state) ||
+ if (set_error_on_fail (state == STATE_CONDITION ||
+ is_logic (state) ||
+ is_end_logic (state) ||
is_end_operator (state),
- context,
- "AND element not expected here",
+ context,
+ "AND element not expected here",
error)) {
return;
}
if (data->statement_count >= 1) {
if (data->current_logic_operator == LOP_AND) {
- data->sql_where = g_string_append (data->sql_where,
+ data->sql_where = g_string_append (data->sql_where,
" AND ");
} else {
if (data->current_logic_operator == LOP_OR) {
@@ -500,23 +500,23 @@
data->current_logic_operator = LOP_AND;
push_stack (data, STATE_AND);
} else if (ELEMENT_IS (ELEMENT_RDF_OR)) {
- if (set_error_on_fail (state == STATE_CONDITION ||
- is_logic (state) ||
- is_end_logic (state) ||
+ if (set_error_on_fail (state == STATE_CONDITION ||
+ is_logic (state) ||
+ is_end_logic (state) ||
is_end_operator (state),
context,
- "OR element not expected here",
+ "OR element not expected here",
error)) {
return;
}
if (data->statement_count >= 1) {
if (data->current_logic_operator == LOP_AND) {
- data->sql_where = g_string_append (data->sql_where,
+ data->sql_where = g_string_append (data->sql_where,
" AND ");
} else {
if (data->current_logic_operator == LOP_OR) {
- data->sql_where = g_string_append (data->sql_where,
+ data->sql_where = g_string_append (data->sql_where,
" OR ");
}
}
@@ -528,19 +528,19 @@
push_stack (data, STATE_OR);
} else if (ELEMENT_IS (ELEMENT_RDF_NOT)) {
- if (set_error_on_fail (state == STATE_CONDITION ||
- is_logic (state) ||
- is_end_logic (state) ||
+ if (set_error_on_fail (state == STATE_CONDITION ||
+ is_logic (state) ||
+ is_end_logic (state) ||
is_end_operator (state),
- context,
- "NOT element not expected here",
+ context,
+ "NOT element not expected here",
error)) {
return;
}
-
+
if (data->statement_count >= 1) {
if (data->current_logic_operator == LOP_AND) {
- data->sql_where = g_string_append (data->sql_where,
+ data->sql_where = g_string_append (data->sql_where,
" AND ");
} else {
if (data->current_logic_operator == LOP_OR) {
@@ -557,7 +557,7 @@
} else if (ELEMENT_IS (ELEMENT_RDF_EQUALS)) {
if (set_error_on_fail (state == STATE_CONDITION ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
context,
@@ -571,13 +571,13 @@
} else if (ELEMENT_IS (ELEMENT_RDF_GREATER_THAN)) {
- if (set_error_on_fail (state == STATE_CONDITION ||
+ if (set_error_on_fail (state == STATE_CONDITION ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "GREATERTHAN element not expected here",
+ context,
+ "GREATERTHAN element not expected here",
error)) {
return;
}
@@ -585,13 +585,13 @@
data->current_operator = OP_GREATER;
push_stack (data, STATE_GREATER_THAN);
} else if (ELEMENT_IS (ELEMENT_RDF_GREATER_OR_EQUAL)) {
- if (set_error_on_fail (state == STATE_CONDITION ||
+ if (set_error_on_fail (state == STATE_CONDITION ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
context,
- "GREATEROREQUAL element not expected here",
+ "GREATEROREQUAL element not expected here",
error)) {
return;
}
@@ -599,13 +599,13 @@
data->current_operator = OP_GREATER_EQUAL;
push_stack (data, STATE_GREATER_OR_EQUAL);
} else if (ELEMENT_IS (ELEMENT_RDF_LESS_THAN )) {
- if (set_error_on_fail (state == STATE_CONDITION ||
+ if (set_error_on_fail (state == STATE_CONDITION ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
context,
- "LESSTHAN element not expected here",
+ "LESSTHAN element not expected here",
error)) {
return;
}
@@ -613,13 +613,13 @@
data->current_operator = OP_LESS;
push_stack (data, STATE_LESS_THAN);
} else if (ELEMENT_IS (ELEMENT_RDF_LESS_OR_EQUAL)) {
- if (set_error_on_fail (state == STATE_CONDITION ||
- is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ if (set_error_on_fail (state == STATE_CONDITION ||
+ is_logic (state) ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "LESSOREQUAL element not expected here",
+ context,
+ "LESSOREQUAL element not expected here",
error)) {
return;
}
@@ -627,13 +627,13 @@
data->current_operator = OP_LESS_EQUAL;
push_stack (data, STATE_LESS_OR_EQUAL);
} else if (ELEMENT_IS (ELEMENT_RDF_CONTAINS)) {
- if (set_error_on_fail (state == STATE_CONDITION ||
+ if (set_error_on_fail (state == STATE_CONDITION ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "CONTAINS element not expected here",
+ context,
+ "CONTAINS element not expected here",
error)) {
return;
}
@@ -641,13 +641,13 @@
data->current_operator = OP_CONTAINS;
push_stack (data, STATE_CONTAINS);
} else if (ELEMENT_IS (ELEMENT_RDF_REGEX)) {
- if (set_error_on_fail (state == STATE_CONDITION ||
+ if (set_error_on_fail (state == STATE_CONDITION ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "REGEX element not expected here",
+ context,
+ "REGEX element not expected here",
error)) {
return;
}
@@ -660,8 +660,8 @@
((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "STARTSWITH element not expected here",
+ context,
+ "STARTSWITH element not expected here",
error)) {
return;
}
@@ -669,13 +669,13 @@
data->current_operator = OP_STARTS;
push_stack (data, STATE_STARTS_WITH);
} else if (ELEMENT_IS (ELEMENT_RDF_IN_SET)) {
- if (set_error_on_fail (state == STATE_CONDITION ||
+ if (set_error_on_fail (state == STATE_CONDITION ||
is_logic (state) ||
((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
context,
- "IN SET element not expected here",
+ "IN SET element not expected here",
error)) {
return;
}
@@ -683,36 +683,36 @@
data->current_operator = OP_SET;
push_stack (data, STATE_IN_SET);
} else if (ELEMENT_IS (ELEMENT_RDF_INTEGER)) {
- if (set_error_on_fail (state == STATE_PROPERTY,
- context,
- "INTEGER element not expected here",
+ if (set_error_on_fail (state == STATE_PROPERTY,
+ context,
+ "INTEGER element not expected here",
error)) {
return;
}
push_stack (data, STATE_INTEGER);
} else if (ELEMENT_IS (ELEMENT_RDF_DATE)) {
- if (set_error_on_fail (state == STATE_PROPERTY,
- context,
- "DATE element not expected here",
+ if (set_error_on_fail (state == STATE_PROPERTY,
+ context,
+ "DATE element not expected here",
error)) {
return;
}
push_stack (data, STATE_DATE);
} else if (ELEMENT_IS (ELEMENT_RDF_STRING)) {
- if (set_error_on_fail (state == STATE_PROPERTY,
- context,
- "STRING element not expected here",
+ if (set_error_on_fail (state == STATE_PROPERTY,
+ context,
+ "STRING element not expected here",
error)) {
return;
}
push_stack (data, STATE_STRING);
} else if (ELEMENT_IS (ELEMENT_RDF_FLOAT)) {
- if (set_error_on_fail (state == STATE_PROPERTY,
+ if (set_error_on_fail (state == STATE_PROPERTY,
context,
- "FLOAT element not expected here",
+ "FLOAT element not expected here",
error)) {
return;
}
@@ -741,9 +741,9 @@
GString *str;
gchar **s;
- g_return_val_if_fail (data->current_field &&
- data->current_operator != OP_NONE &&
- data->current_value,
+ g_return_val_if_fail (data->current_field &&
+ data->current_operator != OP_NONE &&
+ data->current_value,
FALSE);
str = g_string_new ("");
@@ -752,8 +752,8 @@
state = peek_state (data);
- avalue = get_value (data->current_value, (state != STATE_END_DATE &&
- state != STATE_END_INTEGER &&
+ avalue = get_value (data->current_value, (state != STATE_END_DATE &&
+ state != STATE_END_INTEGER &&
state != STATE_END_FLOAT));
field_data = add_metadata_field (data, data->current_field, FALSE, TRUE);
@@ -797,8 +797,8 @@
case OP_EQUALS:
sub = strchr (data->current_value, '*');
if (sub) {
- g_string_append_printf (str, " (%s glob '%s') ",
- where_field,
+ g_string_append_printf (str, " (%s glob '%s') ",
+ where_field,
data->current_value);
} else {
TrackerFieldType data_type;
@@ -810,83 +810,83 @@
value);
}
break;
-
+
case OP_GREATER:
- g_string_append_printf (str, " (%s > %s) ",
- where_field,
+ g_string_append_printf (str, " (%s > %s) ",
+ where_field,
value);
break;
case OP_GREATER_EQUAL:
- g_string_append_printf (str, " (%s >= %s) ",
- where_field,
+ g_string_append_printf (str, " (%s >= %s) ",
+ where_field,
value);
break;
case OP_LESS:
- g_string_append_printf (str, " (%s < %s) ",
- where_field,
+ g_string_append_printf (str, " (%s < %s) ",
+ where_field,
value);
break;
case OP_LESS_EQUAL:
- g_string_append_printf (str, " (%s <= %s) ",
- where_field,
+ g_string_append_printf (str, " (%s <= %s) ",
+ where_field,
value);
break;
case OP_CONTAINS:
sub = strchr (data->current_value, '*');
-
+
if (sub) {
- g_string_append_printf (str, " (%s like '%%%%%s%%%%') ",
- where_field,
+ g_string_append_printf (str, " (%s like '%%%%%s%%%%') ",
+ where_field,
data->current_value);
} else {
- g_string_append_printf (str, " (%s like '%%%%%s%%%%') ",
+ g_string_append_printf (str, " (%s like '%%%%%s%%%%') ",
where_field,
data->current_value);
}
break;
-
+
case OP_STARTS:
sub = strchr (data->current_value, '*');
-
+
if (sub) {
- g_string_append_printf (str, " (%s like '%s') ",
- where_field,
+ g_string_append_printf (str, " (%s like '%s') ",
+ where_field,
data->current_value);
} else {
- g_string_append_printf (str, " (%s like '%s%%%%') ",
- where_field,
+ g_string_append_printf (str, " (%s like '%s%%%%') ",
+ where_field,
data->current_value);
}
break;
-
+
case OP_REGEX:
- g_string_append_printf (str, " (%s REGEXP '%s') ",
- where_field,
+ g_string_append_printf (str, " (%s REGEXP '%s') ",
+ where_field,
data->current_value);
break;
case OP_SET:
s = g_strsplit (data->current_value, ",", 0);
-
+
if (s && s[0]) {
gchar **p;
- g_string_append_printf (str, " (%s in ('%s'",
- where_field,
+ g_string_append_printf (str, " (%s in ('%s'",
+ where_field,
s[0]);
-
+
for (p = s + 1; *p; p++) {
- g_string_append_printf (str, ",'%s'", *p);
+ g_string_append_printf (str, ",'%s'", *p);
}
- g_string_append_printf (str, ") ) " );
+ g_string_append_printf (str, ") ) " );
}
break;
-
+
default:
break;
}
@@ -1097,11 +1097,11 @@
static GString *
-get_select_header (const char *service)
+get_select_header (const char *service)
{
GString *result;
int type;
-
+
result = g_string_new ("");
type = tracker_ontology_get_service_id_by_name (service);
@@ -1114,20 +1114,20 @@
case 4:
case 5:
case 6:
- case 7:
+ case 7:
case 8:
- g_string_append_printf (result, " Select DISTINCT (S.Path || '%s' || S.Name) as uri, GetServiceName(S.ServiceTypeID) as stype ", G_DIR_SEPARATOR_S);
+ g_string_append_printf (result, " Select DISTINCT (S.Path || '%s' || S.Name) as uri, GetServiceName(S.ServiceTypeID) as stype ", G_DIR_SEPARATOR_S);
break;
-
+
default :
- g_string_append_printf (result, " Select DISTINCT (S.Path || '%s' || S.Name) as uri, GetServiceName(S.ServiceTypeID) as stype ", G_DIR_SEPARATOR_S);
+ g_string_append_printf (result, " Select DISTINCT (S.Path || '%s' || S.Name) as uri, GetServiceName(S.ServiceTypeID) as stype ", G_DIR_SEPARATOR_S);
break;
}
-
+
return result;
}
-
+
gchar *
tracker_rdf_query_to_sql (TrackerDBInterface *iface,
@@ -1179,13 +1179,13 @@
if (!field_data) {
g_set_error (error,
- error_quark,
+ error_quark,
PARSE_ERROR,
- "RDF Query failed, field:'%s' not found",
+ "RDF Query failed, field:'%s' not found",
sort_fields[i]);
- g_slist_foreach (data.fields,
- (GFunc) g_object_unref,
+ g_slist_foreach (data.fields,
+ (GFunc) g_object_unref,
NULL);
g_slist_free (data.fields);
g_string_free (data.sql_select, TRUE);
@@ -1202,37 +1202,37 @@
if (!tracker_is_empty_string (search_text)) {
do_search = TRUE;
g_string_append_printf (data.sql_from,
- "\n FROM %s S INNER JOIN SearchResults1 M ON S.ID = M.SID ",
+ "\n FROM %s S INNER JOIN SearchResults1 M ON S.ID = M.SID ",
table_name);
} else {
g_string_append_printf (data.sql_from,
- "\n FROM %s S ",
+ "\n FROM %s S ",
table_name);
}
if (!tracker_is_empty_string (keyword)) {
gchar *keyword_metadata;
- keyword_metadata = tracker_db_metadata_get_related_names (iface,
+ keyword_metadata = tracker_db_metadata_get_related_names (iface,
"DC:Keywords");
- g_string_append_printf (data.sql_from,
- "\n INNER JOIN ServiceKeywordMetaData K ON S.ID = K.ServiceID and K.MetaDataID in (%s) and K.MetaDataValue = '%s' ",
- keyword_metadata,
+ g_string_append_printf (data.sql_from,
+ "\n INNER JOIN ServiceKeywordMetaData K ON S.ID = K.ServiceID and K.MetaDataID in (%s) and K.MetaDataValue = '%s' ",
+ keyword_metadata,
keyword);
g_free (keyword_metadata);
- }
+ }
data.sql_where = g_string_new ("");
if (strlen (query) < 10) {
- g_string_append_printf (data.sql_where,
- "\n WHERE (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) ",
- service,
+ g_string_append_printf (data.sql_where,
+ "\n WHERE (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) ",
+ service,
service);
} else {
- g_string_append_printf (data.sql_where,
- "\n WHERE (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) AND ",
- service,
+ g_string_append_printf (data.sql_where,
+ "\n WHERE (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) AND ",
+ service,
service);
}
@@ -1267,12 +1267,12 @@
if (!field_data) {
g_set_error (error,
- error_quark,
+ error_quark,
PARSE_ERROR,
- "RDF Query failed, sort field:'%s' not found",
+ "RDF Query failed, sort field:'%s' not found",
sort_fields[i]);
- g_slist_foreach (data.fields,
- (GFunc) g_object_unref,
+ g_slist_foreach (data.fields,
+ (GFunc) g_object_unref,
NULL);
g_slist_free (data.fields);
g_string_free (data.sql_select, TRUE);
@@ -1286,17 +1286,17 @@
g_string_append_printf (data.sql_order, ", ");
}
- g_string_append_printf (data.sql_order, "%s %s",
+ g_string_append_printf (data.sql_order, "%s %s",
tracker_field_data_get_select_field (field_data),
sort_desc ? "DESC" : "ASC");
}
}
-
+
if (!tracker_is_empty_string (data.sql_order->str)) {
g_string_prepend (data.sql_order, "\n ORDER BY ");
}
- g_string_append_printf (data.sql_order, " LIMIT ");
+ g_string_append_printf (data.sql_order, " LIMIT ");
g_string_append_printf (data.sql_order, "%d,%d ", offset, limit);
@@ -1327,9 +1327,9 @@
for (l = data.fields; l; l = l->next) {
if (!tracker_field_data_get_is_condition (l->data)) {
if (tracker_field_data_get_needs_join (l->data)) {
- g_string_append_printf (data.sql_from,
- "\n LEFT OUTER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID = %s) ",
- tracker_field_data_get_table_name (l->data),
+ g_string_append_printf (data.sql_from,
+ "\n LEFT OUTER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID = %s) ",
+ tracker_field_data_get_table_name (l->data),
tracker_field_data_get_alias (l->data),
tracker_field_data_get_alias (l->data),
tracker_field_data_get_alias (l->data),
@@ -1338,11 +1338,11 @@
} else {
gchar *related_metadata;
- related_metadata = tracker_db_metadata_get_related_names (iface,
+ related_metadata = tracker_db_metadata_get_related_names (iface,
tracker_field_data_get_field_name (l->data));
- g_string_append_printf (data.sql_from,
- "\n INNER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID in (%s)) ",
- tracker_field_data_get_table_name (l->data),
+ g_string_append_printf (data.sql_from,
+ "\n INNER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID in (%s)) ",
+ tracker_field_data_get_table_name (l->data),
tracker_field_data_get_alias (l->data),
tracker_field_data_get_alias (l->data),
tracker_field_data_get_alias (l->data),
@@ -1351,15 +1351,15 @@
}
}
- result = g_strconcat (data.sql_select->str,
- " ",
- data.sql_from->str,
- " ",
- data.sql_where->str,
- " ",
- data.sql_order->str,
+ result = g_strconcat (data.sql_select->str,
+ " ",
+ data.sql_from->str,
+ " ",
+ data.sql_where->str,
+ " ",
+ data.sql_order->str,
NULL);
-
+
g_string_free (data.sql_select, TRUE);
g_string_free (data.sql_from, TRUE);
g_string_free (data.sql_where, TRUE);
@@ -1386,7 +1386,7 @@
}
-/*
+/*
* The following function turns an rdf query into a filter that can be used for example
* for getting unique values of a field with a certain query.
* FIXME It is not pretty. The calling function needs to define Services S that is joined in this method.
@@ -1394,8 +1394,8 @@
void
tracker_rdf_filter_to_sql (TrackerDBInterface *iface,
- const char *query,
- const char *service,
+ const char *query,
+ const char *service,
GSList **fields,
char **from,
char **where,
@@ -1454,13 +1454,13 @@
} else {
GSList *l;
-
+
for (l = data.fields; l; l = l->next) {
if (!tracker_field_data_get_is_condition (l->data)) {
if (tracker_field_data_get_needs_join (l->data)) {
- g_string_append_printf (data.sql_from,
- "\n LEFT OUTER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID = %s) ",
- tracker_field_data_get_table_name (l->data),
+ g_string_append_printf (data.sql_from,
+ "\n LEFT OUTER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID = %s) ",
+ tracker_field_data_get_table_name (l->data),
tracker_field_data_get_alias (l->data),
tracker_field_data_get_alias (l->data),
tracker_field_data_get_alias (l->data),
@@ -1469,11 +1469,11 @@
} else {
gchar *related_metadata;
- related_metadata = tracker_db_metadata_get_related_names (iface,
+ related_metadata = tracker_db_metadata_get_related_names (iface,
tracker_field_data_get_field_name (l->data));
- g_string_append_printf (data.sql_from,
- "\n INNER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID in (%s)) ",
- tracker_field_data_get_table_name (l->data),
+ g_string_append_printf (data.sql_from,
+ "\n INNER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID in (%s)) ",
+ tracker_field_data_get_table_name (l->data),
tracker_field_data_get_alias (l->data),
tracker_field_data_get_alias (l->data),
tracker_field_data_get_alias (l->data),
@@ -1482,12 +1482,12 @@
}
}
-
+
*from = g_strdup (data.sql_from->str);
*where = g_strdup (data.sql_where->str);
g_string_free (data.sql_from, TRUE);
g_string_free (data.sql_where, TRUE);
-
+
}
Modified: branches/indexer-split/src/trackerd/tracker-rdf-query.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-rdf-query.h (original)
+++ branches/indexer-split/src/trackerd/tracker-rdf-query.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
*
* This library is free software; you can redistribute it and/or
Modified: branches/indexer-split/src/trackerd/tracker-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-search.c (original)
+++ branches/indexer-split/src/trackerd/tracker-search.c Sat Sep 20 14:45:00 2008
@@ -1,5 +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
*
@@ -78,7 +78,7 @@
tracker_search_finalize (GObject *object)
{
TrackerSearchPrivate *priv;
-
+
priv = TRACKER_SEARCH_GET_PRIVATE (object);
g_object_unref (priv->email_index);
@@ -103,7 +103,7 @@
g_return_val_if_fail (TRACKER_IS_DB_INDEX (file_index), NULL);
g_return_val_if_fail (TRACKER_IS_DB_INDEX (email_index), NULL);
- object = g_object_new (TRACKER_TYPE_SEARCH, NULL);
+ object = g_object_new (TRACKER_TYPE_SEARCH, NULL);
priv = TRACKER_SEARCH_GET_PRIVATE (object);
@@ -153,7 +153,7 @@
}
static const char *
-search_utf8_strcasestr_array (const gchar *haystack,
+search_utf8_strcasestr_array (const gchar *haystack,
gchar **needles)
{
gsize needle_len;
@@ -219,7 +219,7 @@
words = g_strsplit_set (a, "\t\n\v\f\r !\"#$%&'()*/<=>?[\\]^`{|}~+,.:;@\"[]" , -1);
- if (!words) {
+ if (!words) {
return 0;
}
@@ -246,7 +246,7 @@
}
static char *
-search_highlight_terms (const gchar *text,
+search_highlight_terms (const gchar *text,
gchar **terms)
{
GStrv p;
@@ -302,8 +302,8 @@
}
static gchar *
-search_get_snippet (const gchar *text,
- gchar **terms,
+search_get_snippet (const gchar *text,
+ gchar **terms,
gint length)
{
const gchar *ptr = NULL;
@@ -356,8 +356,8 @@
i = 0;
/* Get snippet after match */
- while ((end_ptr = g_utf8_next_char (end_ptr)) &&
- end_ptr <= text_len + text &&
+ while ((end_ptr = g_utf8_next_char (end_ptr)) &&
+ end_ptr <= text_len + text &&
i < length) {
i++;
@@ -455,7 +455,7 @@
g_set_error (&actual_error,
TRACKER_DBUS_ERROR,
0,
- "Service '%s' is invalid or has not been implemented yet",
+ "Service '%s' is invalid or has not been implemented yet",
service);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -475,7 +475,7 @@
priv = TRACKER_SEARCH_GET_PRIVATE (object);
array = tracker_db_create_array_of_services (service, FALSE);
- tree = tracker_query_tree_new (search_text,
+ tree = tracker_query_tree_new (search_text,
priv->config,
priv->language,
array);
@@ -526,7 +526,7 @@
priv = TRACKER_SEARCH_GET_PRIVATE (object);
array = tracker_db_create_array_of_services (NULL, FALSE);
- tree = tracker_query_tree_new (search_text,
+ tree = tracker_query_tree_new (search_text,
priv->config,
priv->language,
array);
@@ -546,7 +546,7 @@
_tracker_db_result_set_append (result_set);
g_value_init (&value, G_TYPE_STRING);
- g_value_take_string (&value,
+ g_value_take_string (&value,
tracker_ontology_get_service_by_id (count.service_type_id));
_tracker_db_result_set_set_value (result_set, 0, &value);
g_value_unset (&value);
@@ -609,7 +609,7 @@
g_set_error (&actual_error,
TRACKER_DBUS_ERROR,
0,
- "Service '%s' is invalid or has not been implemented yet",
+ "Service '%s' is invalid or has not been implemented yet",
service);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -628,12 +628,12 @@
iface = tracker_db_manager_get_db_interface_by_service (service);
- result_set = tracker_db_search_text (iface,
- service,
- search_text,
- offset,
- search_sanity_check_max_hits (max_hits),
- FALSE,
+ result_set = tracker_db_search_text (iface,
+ service,
+ search_text,
+ offset,
+ search_sanity_check_max_hits (max_hits),
+ FALSE,
FALSE);
if (result_set) {
@@ -663,7 +663,7 @@
g_object_unref (result_set);
}
-
+
if (!strv) {
strv = g_new (gchar*, 1);
strv[0] = NULL;
@@ -713,7 +713,7 @@
g_set_error (&actual_error,
TRACKER_DBUS_ERROR,
0,
- "Service '%s' is invalid or has not been implemented yet",
+ "Service '%s' is invalid or has not been implemented yet",
service);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -732,12 +732,12 @@
iface = tracker_db_manager_get_db_interface_by_service (service);
- result_set = tracker_db_search_text (iface,
- service,
- search_text,
- offset,
- search_sanity_check_max_hits (max_hits),
- FALSE,
+ result_set = tracker_db_search_text (iface,
+ service,
+ search_text,
+ offset,
+ search_sanity_check_max_hits (max_hits),
+ FALSE,
TRUE);
values = tracker_dbus_query_result_to_ptr_array (result_set);
@@ -785,7 +785,7 @@
g_set_error (&actual_error,
TRACKER_DBUS_ERROR,
0,
- "Service '%s' is invalid or has not been implemented yet",
+ "Service '%s' is invalid or has not been implemented yet",
service);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
@@ -816,9 +816,9 @@
return;
}
- result_set = tracker_db_exec_proc (iface,
- "GetAllContents",
- service_id,
+ result_set = tracker_db_exec_proc (iface,
+ "GetAllContents",
+ service_id,
NULL);
g_free (service_id);
@@ -830,7 +830,7 @@
priv = TRACKER_SEARCH_GET_PRIVATE (object);
tracker_db_result_set_get (result_set, 0, &text, -1);
- strv = tracker_parser_text_into_array (text,
+ strv = tracker_parser_text_into_array (text,
priv->language,
tracker_config_get_max_word_length (priv->config),
tracker_config_get_min_word_length (priv->config));
@@ -1100,7 +1100,7 @@
keyword,
query_condition,
offset,
- max_hits,
+ max_hits,
sort_by_service ? "yes" : "no",
sort_desc ? "yes" : "no");
@@ -1130,24 +1130,24 @@
search_text,
keyword);
- query_translated = tracker_rdf_query_to_sql (iface,
- query_condition,
- service,
- fields,
- g_strv_length (fields),
- search_text,
- keyword,
+ query_translated = tracker_rdf_query_to_sql (iface,
+ query_condition,
+ service,
+ fields,
+ g_strv_length (fields),
+ search_text,
+ keyword,
sort_by_service,
sort_fields,
g_strv_length (sort_fields),
sort_desc,
- offset,
- search_sanity_check_max_hits (max_hits),
+ offset,
+ search_sanity_check_max_hits (max_hits),
&query_error);
if (query_error) {
tracker_dbus_request_failed (request_id,
- &query_error,
+ &query_error,
NULL);
dbus_g_method_return_error (context, query_error);
g_error_free (query_error);
@@ -1167,17 +1167,17 @@
query_translated);
if (!tracker_is_empty_string (search_text)) {
- tracker_db_search_text (iface,
- service,
- search_text,
- 0,
- 999999,
- TRUE,
+ tracker_db_search_text (iface,
+ service,
+ search_text,
+ 0,
+ 999999,
+ TRUE,
FALSE);
}
- result_set = tracker_db_interface_execute_query (iface,
- NULL,
+ result_set = tracker_db_interface_execute_query (iface,
+ NULL,
query_translated);
g_free (query_translated);
}
@@ -1220,13 +1220,13 @@
priv = TRACKER_SEARCH_GET_PRIVATE (object);
/* First we try the file index */
- value = tracker_db_index_get_suggestion (priv->file_index,
- search_text,
+ value = tracker_db_index_get_suggestion (priv->file_index,
+ search_text,
max_dist);
if (!value) {
/* Second we try the email index */
- value = tracker_db_index_get_suggestion (priv->email_index,
- search_text,
+ value = tracker_db_index_get_suggestion (priv->email_index,
+ search_text,
max_dist);
}
Modified: branches/indexer-split/src/trackerd/tracker-status.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-status.c (original)
+++ branches/indexer-split/src/trackerd/tracker-status.c Sat Sep 20 14:45:00 2008
@@ -32,12 +32,12 @@
TrackerConfig *config;
- gboolean is_running;
+ gboolean is_running;
gboolean is_readonly;
- gboolean is_first_time_index;
+ gboolean is_first_time_index;
gboolean is_paused_manually;
gboolean is_paused_for_io;
- gboolean in_merge;
+ gboolean in_merge;
} TrackerStatusPrivate;
static GStaticPrivate private_key = G_STATIC_PRIVATE_INIT;
@@ -70,7 +70,7 @@
private = g_static_private_get (&private_key);
if (private) {
- g_warning ("Already initialized (%s)",
+ g_warning ("Already initialized (%s)",
__FUNCTION__);
return FALSE;
}
@@ -83,10 +83,10 @@
* it here to make sure it exists when we call
* g_type_class_peek(). This wouldn't be necessary if
* it was a param in a GObject for example.
- *
+ *
* This does mean that we are leaking by 1 reference
* here and should clean it up, but it doesn't grow so
- * this is acceptable.
+ * this is acceptable.
*/
type = tracker_status_get_type ();
private->type_class = g_type_class_ref (type);
@@ -100,8 +100,8 @@
private->is_paused_for_io = FALSE;
private->in_merge = FALSE;
- g_static_private_set (&private_key,
- private,
+ g_static_private_set (&private_key,
+ private,
private_free);
return TRUE;
@@ -114,7 +114,7 @@
private = g_static_private_get (&private_key);
if (!private) {
- g_warning ("Not initialized (%s)",
+ g_warning ("Not initialized (%s)",
__FUNCTION__);
return;
}
@@ -169,7 +169,7 @@
type = tracker_status_get_type ();
enum_class = G_ENUM_CLASS (g_type_class_peek (type));
enum_value = g_enum_get_value (enum_class, status);
-
+
if (!enum_value) {
enum_value = g_enum_get_value (enum_class, TRACKER_STATUS_IDLE);
}
@@ -230,21 +230,21 @@
}
if (private->is_first_time_index) {
- pause_on_battery =
+ pause_on_battery =
tracker_config_get_disable_indexing_on_battery_init (private->config);
} else {
- pause_on_battery =
+ pause_on_battery =
tracker_config_get_disable_indexing_on_battery (private->config);
}
- g_signal_emit_by_name (object,
- "index-state-change",
+ g_signal_emit_by_name (object,
+ "index-state-change",
tracker_status_to_string (private->status),
private->is_first_time_index,
private->in_merge,
private->is_paused_manually,
- pause_on_battery,
- private->is_paused_for_io,
+ pause_on_battery,
+ private->is_paused_for_io,
!private->is_readonly);
}
@@ -258,7 +258,7 @@
g_return_if_fail (private != NULL);
emit = private->status != new_status;
-
+
if (!emit) {
return;
}
@@ -428,7 +428,7 @@
if (!emit) {
return;
}
-
+
/* Set value */
private->is_paused_manually = value;
@@ -461,7 +461,7 @@
if (!emit) {
return;
}
-
+
/* Set value */
private->is_paused_for_io = value;
Modified: branches/indexer-split/src/trackerd/tracker-status.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-status.h (original)
+++ branches/indexer-split/src/trackerd/tracker-status.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia
*
Modified: branches/indexer-split/src/trackerd/tracker-utils.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-utils.c (original)
+++ branches/indexer-split/src/trackerd/tracker-utils.c Sat Sep 20 14:45:00 2008
@@ -31,7 +31,7 @@
#include "tracker-xesam-manager.h"
gchar *
-tracker_get_radix_by_suffix (const gchar *str,
+tracker_get_radix_by_suffix (const gchar *str,
const gchar *suffix)
{
g_return_val_if_fail (str, NULL);
@@ -45,8 +45,8 @@
}
void
-tracker_add_metadata_to_table (GHashTable *meta_table,
- const gchar *key,
+tracker_add_metadata_to_table (GHashTable *meta_table,
+ const gchar *key,
const gchar *value)
{
GSList *list;
Modified: branches/indexer-split/src/trackerd/tracker-utils.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-utils.h (original)
+++ branches/indexer-split/src/trackerd/tracker-utils.h Sat Sep 20 14:45:00 2008
@@ -1,5 +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) 2007, Michal Pryc (Michal Pryc Sun Com)
* Copyright (C) 2008, Nokia
@@ -11,14 +11,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#ifndef __TRACKERD_UTILS_H__
#define __TRACKERD_UTILS_H__
Modified: branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-live-search.c (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-live-search.c Sat Sep 20 14:45:00 2008
@@ -15,7 +15,7 @@
*
* 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,
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -68,7 +68,7 @@
}
void
-tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
+tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
gpointer session)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
@@ -88,7 +88,7 @@
}
void
-tracker_xesam_live_search_set_xml_query (TrackerXesamLiveSearch *self,
+tracker_xesam_live_search_set_xml_query (TrackerXesamLiveSearch *self,
const gchar *query)
{
TrackerXesamLiveSearchPriv *priv;
@@ -124,8 +124,8 @@
}
-static void
-tracker_xesam_live_search_class_init (TrackerXesamLiveSearchClass *klass)
+static void
+tracker_xesam_live_search_class_init (TrackerXesamLiveSearchClass *klass)
{
GObjectClass *object_class;
@@ -145,8 +145,8 @@
}
-static void
-tracker_xesam_live_search_init (TrackerXesamLiveSearch *self)
+static void
+tracker_xesam_live_search_init (TrackerXesamLiveSearch *self)
{
TrackerXesamLiveSearchPriv *priv;
@@ -172,18 +172,18 @@
*
* Emits the @hits-added signal on the DBus proxy for Xesam
**/
-void
-tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self,
- guint count)
+void
+tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self,
+ guint count)
{
GObject *xesam;
-
+
g_return_if_fail (TRACKER_IS_XESAM_LIVE_SEARCH (self));
xesam = tracker_dbus_get_object (TRACKER_TYPE_XESAM);
- g_signal_emit_by_name (xesam, "hits-added",
- tracker_xesam_live_search_get_id (self),
+ g_signal_emit_by_name (xesam, "hits-added",
+ tracker_xesam_live_search_get_id (self),
count);
}
@@ -195,12 +195,12 @@
*
* Emits the @hits-removed signal on the DBus proxy for Xesam
*
- * The hit ids in the array no longer match the query. Any calls to GetHitData
+ * The hit ids in the array no longer match the query. Any calls to GetHitData
* on any of the given hit ids should return unset fields.
**/
-void
-tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self,
- GArray *hit_ids)
+void
+tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self,
+ GArray *hit_ids)
{
GObject *xesam;
@@ -209,9 +209,9 @@
xesam = tracker_dbus_get_object (TRACKER_TYPE_XESAM);
- g_signal_emit_by_name (xesam, "hits-removed",
- tracker_xesam_live_search_get_id (self),
- hit_ids);
+ g_signal_emit_by_name (xesam, "hits-removed",
+ tracker_xesam_live_search_get_id (self),
+ hit_ids);
}
/**
@@ -222,12 +222,12 @@
*
* Emits the @hits-modified signal on the DBus proxy for Xesam
*
- * The documents corresponding to the hit ids in the array have been modified.
+ * The documents corresponding to the hit ids in the array have been modified.
* They can have been moved in which case their uri will have changed.
**/
-void
-tracker_xesam_live_search_emit_hits_modified (TrackerXesamLiveSearch *self,
- GArray *hit_ids)
+void
+tracker_xesam_live_search_emit_hits_modified (TrackerXesamLiveSearch *self,
+ GArray *hit_ids)
{
GObject *xesam;
@@ -236,9 +236,9 @@
xesam = tracker_dbus_get_object (TRACKER_TYPE_XESAM);
- g_signal_emit_by_name (xesam, "hits-modified",
- tracker_xesam_live_search_get_id (self),
- hit_ids);
+ g_signal_emit_by_name (xesam, "hits-modified",
+ tracker_xesam_live_search_get_id (self),
+ hit_ids);
}
/**
@@ -246,14 +246,14 @@
* @self: A #TrackerXesamLiveSearch
*
* Emits the @search-done signal on the DBus proxy for Xesam.
- *
- * The given search has scanned the entire index. For non-live searches this
- * means that no more hits will be available. For a live search this means that
- * all future signals (@hits-Added, @hits-removed, @hits-modified) will be
+ *
+ * The given search has scanned the entire index. For non-live searches this
+ * means that no more hits will be available. For a live search this means that
+ * all future signals (@hits-Added, @hits-removed, @hits-modified) will be
* related to objects that changed in the index.
**/
-void
-tracker_xesam_live_search_emit_done (TrackerXesamLiveSearch *self)
+void
+tracker_xesam_live_search_emit_done (TrackerXesamLiveSearch *self)
{
GObject *xesam;
@@ -261,29 +261,29 @@
xesam = tracker_dbus_get_object (TRACKER_TYPE_XESAM);
- g_signal_emit_by_name (xesam, "search-done",
- tracker_xesam_live_search_get_id (self));
+ g_signal_emit_by_name (xesam, "search-done",
+ tracker_xesam_live_search_get_id (self));
}
/* Created and Modified items */
static void
-get_hits_added_modified (TrackerXesamLiveSearch *self,
+get_hits_added_modified (TrackerXesamLiveSearch *self,
MatchWithEventsFlags flags,
- TrackerDBInterface *iface,
- GArray **added,
- GArray **modified)
+ TrackerDBInterface *iface,
+ GArray **added,
+ GArray **modified)
{
gboolean ls_valid = TRUE;
GArray *m_added = NULL;
GArray *m_modified = NULL;
TrackerDBResultSet *result_set;
- /* Right now we are ignoring flags (both creates and updates are
+ /* Right now we are ignoring flags (both creates and updates are
* searched) */
- result_set = tracker_db_live_search_get_new_ids (iface,
+ result_set = tracker_db_live_search_get_new_ids (iface,
tracker_xesam_live_search_get_id (self),
tracker_xesam_live_search_get_from_query (self),
tracker_xesam_live_search_get_join_query (self),
@@ -341,9 +341,9 @@
/* Created and Modified items */
static void
-get_all_hits (TrackerXesamLiveSearch *self,
- TrackerDBInterface *iface,
- GArray **hits)
+get_all_hits (TrackerXesamLiveSearch *self,
+ TrackerDBInterface *iface,
+ GArray **hits)
{
TrackerDBResultSet *result_set;
gboolean valid;
@@ -352,9 +352,9 @@
*hits = NULL;
- result_set = tracker_db_live_search_get_all_ids (iface,
+ result_set = tracker_db_live_search_get_all_ids (iface,
tracker_xesam_live_search_get_id (self));
-
+
if (!result_set) {
return;
}
@@ -394,8 +394,8 @@
void
tracker_xesam_live_search_match_with_events (TrackerXesamLiveSearch *self,
MatchWithEventsFlags flags,
- GArray **added,
- GArray **removed,
+ GArray **added,
+ GArray **removed,
GArray **modified)
{
TrackerDBInterface *iface;
@@ -414,7 +414,7 @@
if (flags & MATCH_WITH_EVENTS_DELETES) {
/* Deleted items */
- result_set = tracker_db_live_search_get_deleted_ids (iface,
+ result_set = tracker_db_live_search_get_deleted_ids (iface,
tracker_xesam_live_search_get_id (self));
if (result_set) {
@@ -425,24 +425,24 @@
while (valid) {
GValue ls_value = { 0, };
gint ls_i_value;
-
- _tracker_db_result_set_get_value (result_set,
- 0,
+
+ _tracker_db_result_set_get_value (result_set,
+ 0,
&ls_value);
ls_i_value = g_value_get_int (&ls_value);
-
+
if (*removed == NULL) {
- *removed = g_array_new (FALSE,
- TRUE,
+ *removed = g_array_new (FALSE,
+ TRUE,
sizeof (guint32));
}
g_array_append_val (*removed, ls_i_value);
g_value_unset (&ls_value);
-
+
valid = tracker_db_result_set_iter_next (result_set);
}
-
+
g_object_unref (result_set);
}
}
@@ -461,8 +461,8 @@
*
* Close @self. An error will be thrown if @self was already closed.
**/
-void
-tracker_xesam_live_search_close (TrackerXesamLiveSearch *self,
+void
+tracker_xesam_live_search_close (TrackerXesamLiveSearch *self,
GError **error)
{
TrackerXesamLiveSearchPriv *priv;
@@ -472,8 +472,8 @@
priv = self->priv;
if (priv->closed) {
- g_set_error (error,
- TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error,
+ TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SEARCH_CLOSED,
"Search was already closed");
} else {
@@ -481,10 +481,10 @@
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
- g_message ("Closing search '%s'",
+ g_message ("Closing search '%s'",
tracker_xesam_live_search_get_id (self));
- tracker_db_live_search_stop (iface,
+ tracker_db_live_search_stop (iface,
tracker_xesam_live_search_get_id (self));
}
@@ -500,12 +500,12 @@
*
* Get the current number of found hits.
*
- * An error will be thrown if the search has not been started with
+ * An error will be thrown if the search has not been started with
* @tracker_xesam_live_search_activate yet.
**/
-void
-tracker_xesam_live_search_get_hit_count (TrackerXesamLiveSearch *self,
- guint *count,
+void
+tracker_xesam_live_search_get_hit_count (TrackerXesamLiveSearch *self,
+ guint *count,
GError **error)
{
TrackerXesamLiveSearchPriv *priv;
@@ -517,7 +517,7 @@
if (!priv->active) {
g_set_error (error,
- TRACKER_XESAM_ERROR_DOMAIN,
+ TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SEARCH_NOT_ACTIVE,
"Search is not active");
} else {
@@ -527,7 +527,7 @@
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
- result_set = tracker_db_live_search_get_hit_count (iface,
+ result_set = tracker_db_live_search_get_hit_count (iface,
tracker_xesam_live_search_get_id (self));
_tracker_db_result_set_get_value (result_set, 0, &value);
*count = g_value_get_int (&value);
@@ -541,7 +541,7 @@
gpointer value;
} OneRow;
-static inline gpointer
+static inline gpointer
rows_lookup (GPtrArray *rows, gint key)
{
guint i;
@@ -581,7 +581,7 @@
g_ptr_array_add (rows, row);
}
-static inline void
+static inline void
rows_migrate (GPtrArray *rows, GPtrArray *result)
{
guint i;
@@ -595,16 +595,16 @@
/**
* Retrieving Hits
- * The return value of GetHits and GetHitData is a sorted array of hits. A hit
- * consists of an array of fields as requested through the session property
- * hit.fields, or as method parameter in the case of GetHitData. All available
- * fields can be found in the Xesam Ontology. Since the signature of the return
- * value is aav a single hit is on the form av. This allows hit properties to be
- * integers, strings or arrays of any type. An array of strings is fx. needed
+ * The return value of GetHits and GetHitData is a sorted array of hits. A hit
+ * consists of an array of fields as requested through the session property
+ * hit.fields, or as method parameter in the case of GetHitData. All available
+ * fields can be found in the Xesam Ontology. Since the signature of the return
+ * value is aav a single hit is on the form av. This allows hit properties to be
+ * integers, strings or arrays of any type. An array of strings is fx. needed
* for email CC fields and keywords/tags for example.
*
- * The returned fields are ordered according to hit.fields. Fx.
- * if hit.fields = ["xesam:title", "xesam:userKeywords", "xesam:size"], a
+ * The returned fields are ordered according to hit.fields. Fx.
+ * if hit.fields = ["xesam:title", "xesam:userKeywords", "xesam:size"], a
* return value would look like:
*
* [
@@ -616,7 +616,7 @@
* elements contain GValue instances.
**/
static void
-get_hit_data (TrackerXesamLiveSearch *self,
+get_hit_data (TrackerXesamLiveSearch *self,
TrackerDBResultSet *result_set,
GPtrArray **hit_data,
GStrv fields)
@@ -642,7 +642,7 @@
/* key must be the first column, as an int, unique per row that
* must actually be returned. Example:
- *
+ *
* 1, a, b, c, 1
* 1, a, b, c, 2
* 1, a, b, c, 3
@@ -651,9 +651,9 @@
* 3, a, b, c, 1
* 4, a, b, c, 2
* 5, a, b, c, 2
- *
+ *
* for:
- *
+ *
* [
* [a, b, c, [1, 2, 3, 4]]
* [a, b, c, [1]]
@@ -679,8 +679,8 @@
for (column = 1; column < field_count + 1; column++) {
GValue cur_value = {0, };
- _tracker_db_result_set_get_value (result_set,
- column,
+ _tracker_db_result_set_get_value (result_set,
+ column,
&cur_value);
field_def = tracker_ontology_get_field_by_name (fields[column-1]);
@@ -693,27 +693,27 @@
case TRACKER_FIELD_TYPE_STRING: {
GValue *variant;
GPtrArray *my_array;
-
+
if (row->len <= (unsigned int) column) {
variant = g_new0 (GValue, 1);
- g_value_init (variant,
- dbus_g_type_get_collection ("GPtrArray",
+ g_value_init (variant,
+ dbus_g_type_get_collection ("GPtrArray",
G_TYPE_STRING));
-
+
my_array = g_ptr_array_new ();
- g_value_set_boxed_take_ownership (variant,
+ g_value_set_boxed_take_ownership (variant,
my_array);
-
+
g_ptr_array_add (row, variant);
-
+
} else {
variant = g_ptr_array_index (row, column-1);
my_array = g_value_get_boxed (variant);
}
-
- g_ptr_array_add (my_array,
+
+ g_ptr_array_add (my_array,
g_value_dup_string (&cur_value));
-
+
break;
}
@@ -721,26 +721,26 @@
GValue *variant;
GArray *my_array;
gint int_val;
-
+
if (row->len <= (unsigned int) column) {
variant = g_new0 (GValue, 1);
- g_value_init (variant,
- dbus_g_type_get_collection ("GArray",
+ g_value_init (variant,
+ dbus_g_type_get_collection ("GArray",
G_TYPE_INT));
-
- my_array = g_array_new (FALSE,
- TRUE,
+
+ my_array = g_array_new (FALSE,
+ TRUE,
sizeof (gfloat));
g_value_set_boxed_take_ownership (variant, my_array);
-
+
g_ptr_array_add (row, variant);
} else {
variant = g_ptr_array_index (row, column);
my_array = g_value_get_boxed (variant);
}
-
+
int_val = g_value_get_int (&cur_value);
- g_array_append_val (my_array, int_val);
+ g_array_append_val (my_array, int_val);
break;
}
@@ -749,15 +749,15 @@
GValue *variant;
GArray *my_array;
gfloat float_val;
-
+
if (row->len <= (unsigned int) column) {
variant = g_new0 (GValue, 1);
- g_value_init (variant,
- dbus_g_type_get_collection ("GArray",
+ g_value_init (variant,
+ dbus_g_type_get_collection ("GArray",
G_TYPE_FLOAT));
- my_array = g_array_new (FALSE,
- TRUE,
+ my_array = g_array_new (FALSE,
+ TRUE,
sizeof (gboolean));
g_value_set_boxed_take_ownership (variant, my_array);
@@ -778,24 +778,24 @@
} else {
if (insert) {
GValue *value = g_new0 (GValue, 1);
-
- g_value_init (value,
+
+ g_value_init (value,
G_VALUE_TYPE (&cur_value));
-
+
g_value_copy (&cur_value, value);
g_ptr_array_add (row, value);
}
-
- /* Else it's a redundant cell (a previous
+
+ /* Else it's a redundant cell (a previous
* loop-cycle has added this item to the
* final to-return result already, using
* the top-row). */
-
+
}
g_value_unset (&cur_value);
}
-
-
+
+
if (insert) {
rows_insert (rows, key, row);
}
@@ -814,19 +814,19 @@
* tracker_xesam_live_search_get_hits:
* @self: a #TrackerXesamLiveSearch
* @num: Number of hits to retrieve
- * @hits: (out) (caller-owns): An array of field data for each hit as requested
- * via the hit fields property
+ * @hits: (out) (caller-owns): An array of field data for each hit as requested
+ * via the hit fields property
* @error: (null-ok) (out): a #GError
*
- * Get the field data for the next num hits. This call blocks until there is num
+ * Get the field data for the next num hits. This call blocks until there is num
* hits available or the index has been fully searched (and SearchDone emitted).
*
- * An error will be thrown if the search has not been started with
+ * An error will be thrown if the search has not been started with
* @tracker_xesam_live_search_activate yet.
**/
-void
-tracker_xesam_live_search_get_hits (TrackerXesamLiveSearch *self,
- guint count,
+void
+tracker_xesam_live_search_get_hits (TrackerXesamLiveSearch *self,
+ guint count,
GPtrArray **hits,
GError **error)
{
@@ -838,7 +838,7 @@
priv = self->priv;
if (!priv->active)
- g_set_error (error, TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error, TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SEARCH_NOT_ACTIVE,
"Search is not active");
else {
@@ -848,9 +848,9 @@
session = priv->session;
- tracker_xesam_session_get_property (session,
- "hit.fields",
- &value,
+ tracker_xesam_session_get_property (session,
+ "hit.fields",
+ &value,
&tmp_error);
if (tmp_error) {
@@ -875,8 +875,8 @@
if (result_set) {
- get_hit_data (self,
- result_set,
+ get_hit_data (self,
+ result_set,
hits,
fields);
@@ -906,8 +906,8 @@
priv = self->priv;
if (!priv->active) {
- g_set_error (error,
- TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error,
+ TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SEARCH_NOT_ACTIVE,
"Search is not active");
} else {
@@ -919,9 +919,9 @@
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
- tracker_xesam_session_get_property (session,
- "hit.fields",
- &value,
+ tracker_xesam_session_get_property (session,
+ "hit.fields",
+ &value,
&tmp_error);
if (tmp_error) {
@@ -937,11 +937,11 @@
result_set = tracker_db_live_search_get_hit_data (iface,
tracker_xesam_live_search_get_id (self),
fields);
-
+
if (result_set) {
- get_hit_data (self,
- result_set,
+ get_hit_data (self,
+ result_set,
hits,
fields);
@@ -960,34 +960,34 @@
* tracker_xesam_live_search_get_hit_data:
* @self: a #TrackerXesamLiveSearch
* @hit_ids: Array of hit serial numbers for which to retrieve data
- * @fields: The names of the fields to retrieve for the listed hits. It is
- * recommended that this is a subset of the fields listed in hit.fields and
+ * @fields: The names of the fields to retrieve for the listed hits. It is
+ * recommended that this is a subset of the fields listed in hit.fields and
* hit.fields.extended
- * @hit_data: Array of hits in the same order as the hit ids specified. See
- * the section about hit retrieval below. If @hits-removed has been emitted on
- * a hit, the returned hit data will consist of unset fields, ie this is not an
+ * @hit_data: Array of hits in the same order as the hit ids specified. See
+ * the section about hit retrieval below. If @hits-removed has been emitted on
+ * a hit, the returned hit data will consist of unset fields, ie this is not an
* error condition.
* @error: (null-ok) (out): a #GError
*
- * Get renewed or additional hit metadata. Primarily intended for snippets or
+ * Get renewed or additional hit metadata. Primarily intended for snippets or
* modified hits. The hit_ids argument is an array of serial numbers as per hit
- * entries returned by GetHits. The returned hits will be in the same order as
- * the provided @hit_ids. The requested properties does not have to be the ones
- * listed in in the hit.fields or hit.fields.extended session properties,
+ * entries returned by GetHits. The returned hits will be in the same order as
+ * the provided @hit_ids. The requested properties does not have to be the ones
+ * listed in in the hit.fields or hit.fields.extended session properties,
* although this is the recommended behavior.
*
- * An error will be raised if the search handle has been closed or is unknown.
- * An error will also be thrown if the search has not been started with
+ * An error will be raised if the search handle has been closed or is unknown.
+ * An error will also be thrown if the search has not been started with
* @tracker_xesam_live_search_activate yet
*
- * Calling on a hit that has been marked removed by the @hits-removed signal
+ * Calling on a hit that has been marked removed by the @hits-removed signal
* will not result in an error, but return only unset fields.
**/
-void
-tracker_xesam_live_search_get_hit_data (TrackerXesamLiveSearch *self,
- GArray *hit_ids,
- GStrv fields,
- GPtrArray **hit_data,
+void
+tracker_xesam_live_search_get_hit_data (TrackerXesamLiveSearch *self,
+ GArray *hit_ids,
+ GStrv fields,
+ GPtrArray **hit_data,
GError **error)
{
TrackerXesamLiveSearchPriv *priv;
@@ -999,8 +999,8 @@
priv = self->priv;
if (!priv->active) {
- g_set_error (error,
- TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error,
+ TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SEARCH_NOT_ACTIVE,
"Search is not active yet");
} else {
@@ -1015,8 +1015,8 @@
if (result_set) {
- get_hit_data (self,
- result_set,
+ get_hit_data (self,
+ result_set,
hit_data,
fields);
@@ -1031,7 +1031,7 @@
tracker_xesam_live_search_get_range_hit_data (TrackerXesamLiveSearch *self,
guint a,
guint b,
- GStrv fields,
+ GStrv fields,
GPtrArray **hit_data,
GError **error)
{
@@ -1043,9 +1043,9 @@
priv = self->priv;
- if (!priv->active) {
+ if (!priv->active) {
g_set_error (error,
- TRACKER_XESAM_ERROR_DOMAIN,
+ TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SEARCH_NOT_ACTIVE,
"Search is not active yet");
} else {
@@ -1060,8 +1060,8 @@
if (result_set) {
- get_hit_data (self,
- result_set,
+ get_hit_data (self,
+ result_set,
hit_data,
fields);
@@ -1080,7 +1080,7 @@
*
* @returns: whether or not @self is active
**/
-gboolean
+gboolean
tracker_xesam_live_search_is_active (TrackerXesamLiveSearch *self)
{
TrackerXesamLiveSearchPriv *priv;
@@ -1100,14 +1100,14 @@
*
* An error will be thrown if @self is closed.
**/
-void
-tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self,
+void
+tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self,
GError **error)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
if (priv->closed)
- g_set_error (error, TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error, TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SEARCH_CLOSED,
"Search is closed");
else {
@@ -1134,8 +1134,8 @@
}
g_timeout_add_full (G_PRIORITY_DEFAULT,
- 100,
- (GSourceFunc) tracker_xesam_live_search_emit_done,
+ 100,
+ (GSourceFunc) tracker_xesam_live_search_emit_done,
g_object_ref (self),
(GDestroyNotify) g_object_unref);
}
@@ -1153,7 +1153,7 @@
*
* @returns: a read-only string with the query
**/
-const gchar *
+const gchar *
tracker_xesam_live_search_get_xml_query (TrackerXesamLiveSearch *self)
{
TrackerXesamLiveSearchPriv *priv;
@@ -1172,8 +1172,8 @@
*
* Set a read-only unique ID string for @self.
**/
-void
-tracker_xesam_live_search_set_id (TrackerXesamLiveSearch *self,
+void
+tracker_xesam_live_search_set_id (TrackerXesamLiveSearch *self,
const gchar *search_id)
{
TrackerXesamLiveSearchPriv *priv;
@@ -1199,7 +1199,7 @@
*
* returns: a unique id
**/
-const gchar*
+const gchar*
tracker_xesam_live_search_get_id (TrackerXesamLiveSearch *self)
{
TrackerXesamLiveSearchPriv *priv;
@@ -1247,19 +1247,19 @@
priv->where_sql = NULL;
tracker_xesam_query_to_sql (iface,
- priv->query,
+ priv->query,
&priv->from_sql,
&priv->join_sql,
- &priv->where_sql,
+ &priv->where_sql,
&parse_error);
if (parse_error) {
gchar *str;
- str = g_strdup_printf ("Parse error: %s",
+ str = g_strdup_printf ("Parse error: %s",
parse_error->message);
- g_set_error (error,
- TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error,
+ TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_PARSING_FAILED,
str);
g_free (str);
@@ -1280,7 +1280,7 @@
g_free (orig_where);
}
- g_message ("Parsed to:\n\t%s\n\t%s\n\t%s",
+ g_message ("Parsed to:\n\t%s\n\t%s\n\t%s",
priv->from_sql,
priv->join_sql,
priv->where_sql);
@@ -1296,7 +1296,7 @@
*
* @returns: a read-only string with the FROM query
**/
-const gchar*
+const gchar*
tracker_xesam_live_search_get_from_query (TrackerXesamLiveSearch *self)
{
TrackerXesamLiveSearchPriv *priv;
@@ -1316,7 +1316,7 @@
*
* @returns: a read-only string with the JOIN query
**/
-const gchar*
+const gchar*
tracker_xesam_live_search_get_join_query (TrackerXesamLiveSearch *self)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
@@ -1331,7 +1331,7 @@
*
* @returns: a read-only string with the WHERE query
**/
-const gchar*
+const gchar*
tracker_xesam_live_search_get_where_query (TrackerXesamLiveSearch *self)
{
TrackerXesamLiveSearchPriv *priv;
@@ -1350,11 +1350,11 @@
*
* @returns: (caller-owns): a new #TrackerXesamLiveSearch
**/
-TrackerXesamLiveSearch*
-tracker_xesam_live_search_new (const gchar *query_xml)
+TrackerXesamLiveSearch*
+tracker_xesam_live_search_new (const gchar *query_xml)
{
- return g_object_new (TRACKER_TYPE_XESAM_LIVE_SEARCH,
- "xml-query", query_xml,
+ return g_object_new (TRACKER_TYPE_XESAM_LIVE_SEARCH,
+ "xml-query", query_xml,
NULL);
}
Modified: branches/indexer-split/src/trackerd/tracker-xesam-live-search.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-live-search.h (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-live-search.h Sat Sep 20 14:45:00 2008
@@ -56,7 +56,7 @@
GObjectClass parent_class;
};
-TrackerXesamLiveSearch *
+TrackerXesamLiveSearch *
tracker_xesam_live_search_new (const gchar *query_xml);
GType tracker_xesam_live_search_get_type (void);
void tracker_xesam_live_search_set_id (TrackerXesamLiveSearch *self,
@@ -66,11 +66,11 @@
const gchar* tracker_xesam_live_search_get_from_query (TrackerXesamLiveSearch *self);
const gchar* tracker_xesam_live_search_get_join_query (TrackerXesamLiveSearch *self);
const gchar* tracker_xesam_live_search_get_xml_query (TrackerXesamLiveSearch *self);
-void tracker_xesam_live_search_set_xml_query (TrackerXesamLiveSearch *self,
+void tracker_xesam_live_search_set_xml_query (TrackerXesamLiveSearch *self,
const gchar *xml_query);
-void tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
+void tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
gpointer session);
-void tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
+void tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
gpointer session);
void tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self,
GError **error);
@@ -89,7 +89,7 @@
void tracker_xesam_live_search_get_range_hit_data (TrackerXesamLiveSearch *self,
guint a,
guint b,
- GStrv fields,
+ GStrv fields,
GPtrArray **hit_data,
GError **error);
void tracker_xesam_live_search_get_range_hits (TrackerXesamLiveSearch *self,
@@ -109,10 +109,10 @@
void tracker_xesam_live_search_emit_hits_modified (TrackerXesamLiveSearch *self,
GArray *hit_ids);
void tracker_xesam_live_search_emit_done (TrackerXesamLiveSearch *self);
-void tracker_xesam_live_search_match_with_events (TrackerXesamLiveSearch *self,
+void tracker_xesam_live_search_match_with_events (TrackerXesamLiveSearch *self,
MatchWithEventsFlags flags,
- GArray **added,
- GArray **removed,
+ GArray **added,
+ GArray **removed,
GArray **modified);
G_END_DECLS
Modified: branches/indexer-split/src/trackerd/tracker-xesam-manager.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-manager.c (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-manager.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia
* Authors: Philip Van Hoof (pvanhoof gnome org)
*
@@ -10,14 +10,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include "config.h"
@@ -35,7 +35,7 @@
static gboolean initialized;
static TrackerDBInterface *xesam_db_iface;
-static GHashTable *xesam_sessions;
+static GHashTable *xesam_sessions;
static gchar *xesam_dir;
static gboolean indexing_finished;
static guint live_search_handler_id;
@@ -91,7 +91,7 @@
return quark;
}
-void
+void
tracker_xesam_manager_init (void)
{
DBusGProxy *proxy;
@@ -101,9 +101,9 @@
}
/* Set up sessions hash table */
- xesam_sessions = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
+ xesam_sessions = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ (GDestroyNotify) g_free,
(GDestroyNotify) g_object_unref);
/* Set up locations */
@@ -137,7 +137,7 @@
* the indexer, we couldn't create the interface quickly
* because the database is being used heavily by the indexer
* already. It is best to do this initially to avoid that.
- */
+ */
xesam_db_iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
}
@@ -180,8 +180,8 @@
}
TrackerXesamSession *
-tracker_xesam_manager_create_session (TrackerXesam *xesam,
- gchar **session_id,
+tracker_xesam_manager_create_session (TrackerXesam *xesam,
+ gchar **session_id,
GError **error)
{
TrackerXesamSession *session;
@@ -189,7 +189,7 @@
session = tracker_xesam_session_new ();
tracker_xesam_session_set_id (session, tracker_xesam_manager_generate_unique_key ());
- g_hash_table_insert (xesam_sessions,
+ g_hash_table_insert (xesam_sessions,
g_strdup (tracker_xesam_session_get_id (session)),
g_object_ref (session));
@@ -200,15 +200,15 @@
return session;
}
-void
-tracker_xesam_manager_close_session (const gchar *session_id,
+void
+tracker_xesam_manager_close_session (const gchar *session_id,
GError **error)
{
gpointer inst = g_hash_table_lookup (xesam_sessions, session_id);
if (!inst) {
- g_set_error (error,
- TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error,
+ TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SESSION_ID_NOT_REGISTERED,
"Session ID is not registered");
} else {
@@ -217,7 +217,7 @@
}
TrackerXesamSession *
-tracker_xesam_manager_get_session (const gchar *session_id,
+tracker_xesam_manager_get_session (const gchar *session_id,
GError **error)
{
TrackerXesamSession *session = g_hash_table_lookup (xesam_sessions, session_id);
@@ -226,7 +226,7 @@
g_object_ref (session);
} else {
g_set_error (error,
- TRACKER_XESAM_ERROR_DOMAIN,
+ TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SESSION_ID_NOT_REGISTERED,
"Session ID is not registered");
}
@@ -235,8 +235,8 @@
}
TrackerXesamSession *
-tracker_xesam_manager_get_session_for_search (const gchar *search_id,
- TrackerXesamLiveSearch **search_in,
+tracker_xesam_manager_get_session_for_search (const gchar *search_id,
+ TrackerXesamLiveSearch **search_in,
GError **error)
{
TrackerXesamSession *session = NULL;
@@ -267,8 +267,8 @@
g_list_free (sessions);
if (!session) {
- g_set_error (error,
- TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error,
+ TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SEARCH_ID_NOT_REGISTERED,
"Search ID is not registered");
}
@@ -277,7 +277,7 @@
}
TrackerXesamLiveSearch *
-tracker_xesam_manager_get_live_search (const gchar *search_id,
+tracker_xesam_manager_get_live_search (const gchar *search_id,
GError **error)
{
TrackerXesamLiveSearch *search = NULL;
@@ -302,8 +302,8 @@
g_list_free (sessions);
if (!search) {
- g_set_error (error,
- TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error,
+ TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SEARCH_ID_NOT_REGISTERED,
"Search ID is not registered");
}
@@ -311,7 +311,7 @@
return search;
}
-static gboolean
+static gboolean
live_search_handler (gpointer data)
{
GList *sessions;
@@ -322,7 +322,7 @@
while (sessions) {
GList *searches;
- g_debug ("Session being handled, ID :%s",
+ g_debug ("Session being handled, ID :%s",
tracker_xesam_session_get_id (sessions->data));
searches = tracker_xesam_session_get_searches (sessions->data);
@@ -333,19 +333,19 @@
GArray *removed = NULL;
GArray *modified = NULL;
- g_debug ("Search being handled, ID :%s",
+ g_debug ("Search being handled, ID :%s",
tracker_xesam_live_search_get_id (searches->data));
search = searches->data;
/* TODO: optimize by specifying what exactly got changed
- * during this event ping in the MatchWithEventsFlags
+ * during this event ping in the MatchWithEventsFlags
being passed (second parameter) */
tracker_xesam_live_search_match_with_events (search,
MATCH_WITH_EVENTS_ALL_FLAGS,
- &added,
- &removed,
+ &added,
+ &removed,
&modified);
if (added && added->len > 0) {
@@ -390,24 +390,24 @@
return reason_to_live;
}
-static void
+static void
live_search_handler_destroy (gpointer data)
{
live_search_handler_id = 0;
}
-void
+void
tracker_xesam_manager_wakeup (void)
{
/* This happens each time a new event is created:
*
* We could do this in a thread too, in case blocking the
* GMainLoop is not ideal (it's not, because during these
- * blocks of code, no DBus request handler can run).
- *
+ * blocks of code, no DBus request handler can run).
+ *
* In case of a thread we could use usleep() and stop the
* thread if we didn't get a wakeup-call nor we had items to
- * process this loop
+ * process this loop
*
* There are problems with this. Right now we WAIT until
* after indexing has completed otherwise we are in a
@@ -423,7 +423,7 @@
}
if (live_search_handler_id == 0) {
- live_search_handler_id =
+ live_search_handler_id =
g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
2000, /* 2 seconds */
live_search_handler,
@@ -464,7 +464,7 @@
}
gboolean
-tracker_xesam_manager_is_uri_in_xesam_dir (const gchar *uri)
+tracker_xesam_manager_is_uri_in_xesam_dir (const gchar *uri)
{
g_return_val_if_fail (uri != NULL, FALSE);
Modified: branches/indexer-split/src/trackerd/tracker-xesam-manager.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-manager.h (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-manager.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia
* Authors: Philip Van Hoof (pvanhoof gnome org)
*
@@ -10,14 +10,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#ifndef __TRACKERD_XESAM_MANAGER_H__
#define __TRACKERD_XESAM_MANAGER_H__
@@ -45,20 +45,20 @@
void tracker_xesam_manager_init (void);
void tracker_xesam_manager_shutdown (void);
-TrackerXesamSession*
+TrackerXesamSession*
tracker_xesam_manager_create_session (TrackerXesam *xesam,
gchar **session_id,
GError **error);
void tracker_xesam_manager_close_session (const gchar *session_id,
GError **error);
-TrackerXesamSession*
+TrackerXesamSession*
tracker_xesam_manager_get_session (const gchar *session_id,
GError **error);
TrackerXesamSession*
tracker_xesam_manager_get_session_for_search (const gchar *search_id,
TrackerXesamLiveSearch **search_in,
GError **error);
-TrackerXesamLiveSearch*
+TrackerXesamLiveSearch*
tracker_xesam_manager_get_live_search (const gchar *search_id,
GError **error);
gchar * tracker_xesam_manager_generate_unique_key (void);
Modified: branches/indexer-split/src/trackerd/tracker-xesam-query.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-query.c (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-query.c Sat Sep 20 14:45:00 2008
@@ -212,16 +212,16 @@
static gboolean
is_operator (ParseState state)
{
- return
- state == STATE_EQUALS ||
- state == STATE_GREATER_THAN ||
+ return
+ state == STATE_EQUALS ||
+ state == STATE_GREATER_THAN ||
state == STATE_LESS_THAN ||
- state == STATE_CONTAINS ||
- state == STATE_IN_SET ||
+ state == STATE_CONTAINS ||
+ state == STATE_IN_SET ||
state == STATE_FULL_TEXT ||
state == STATE_LESS_OR_EQUAL ||
- state == STATE_GREATER_OR_EQUAL ||
- state == STATE_STARTS_WITH ||
+ state == STATE_GREATER_OR_EQUAL ||
+ state == STATE_STARTS_WITH ||
state == STATE_REGEX;
}
@@ -229,32 +229,32 @@
static gboolean
is_end_operator (ParseState state)
{
- return
- state == STATE_END_EQUALS ||
- state == STATE_END_GREATER_THAN ||
+ return
+ state == STATE_END_EQUALS ||
+ state == STATE_END_GREATER_THAN ||
state == STATE_END_LESS_THAN ||
- state == STATE_END_CONTAINS ||
+ state == STATE_END_CONTAINS ||
state == STATE_END_IN_SET ||
state == STATE_END_FULL_TEXT ||
state == STATE_END_LESS_OR_EQUAL ||
- state == STATE_END_GREATER_OR_EQUAL ||
- state == STATE_END_STARTS_WITH ||
+ state == STATE_END_GREATER_OR_EQUAL ||
+ state == STATE_END_STARTS_WITH ||
state == STATE_END_REGEX;
}
static gboolean
is_logic (ParseState state)
{
- return
- state == STATE_AND ||
+ return
+ state == STATE_AND ||
state == STATE_OR;
}
static gboolean
is_end_logic (ParseState state)
{
- return
- state == STATE_END_AND ||
+ return
+ state == STATE_END_AND ||
state == STATE_END_OR;
}
@@ -275,9 +275,9 @@
str = g_strdup_vprintf (format, args);
va_end (args);
- g_set_error (err,
- error_quark,
- error_code,
+ g_set_error (err,
+ error_quark,
+ error_code,
"Line %d character %d: %s",
line,
ch,
@@ -287,9 +287,9 @@
}
static gboolean
-set_error_on_fail (gboolean condition,
- GMarkupParseContext *context,
- const gchar *msg,
+set_error_on_fail (gboolean condition,
+ GMarkupParseContext *context,
+ const gchar *msg,
GError **err)
{
if (!condition) {
@@ -332,11 +332,11 @@
value = get_attribute_value (name, names, values);
if (!value) {
- set_error (error,
- context,
+ set_error (error,
+ context,
PARSE_ERROR,
"%s must have \"%s\" attribute",
- tag,
+ tag,
name);
}
@@ -377,9 +377,9 @@
}
static GList *
-add_metadata_field (ParserData *data,
- const gchar *xesam_name,
- gboolean is_select,
+add_metadata_field (ParserData *data,
+ const gchar *xesam_name,
+ gboolean is_select,
gboolean is_condition)
{
TrackerDBResultSet *result_set;
@@ -397,7 +397,7 @@
/* Do the xesam mapping */
if (!strcmp(xesam_name,FIELD_NAME_FULL_TEXT_FIELDS)) {
result_set = tracker_db_xesam_get_all_text_metadata_names (data->iface);
- } else {
+ } else {
result_set = tracker_db_xesam_get_metadata_names (data->iface, xesam_name);
}
@@ -407,42 +407,42 @@
while (valid) {
gchar *field_name;
-
+
tracker_db_result_set_get (result_set, 0, &field_name, -1);
/* Check if field is already in list */
for (l = data->fields; l; l = l->next) {
const gchar *this_field_name;
-
+
this_field_name = tracker_field_data_get_field_name (l->data);
-
+
if (!this_field_name) {
continue;
}
-
+
if (strcasecmp (this_field_name, field_name) == 0) {
field_data = l->data;
field_exists = TRUE;
-
+
tracker_field_data_set_is_condition (l->data, is_condition);
tracker_field_data_set_is_select (l->data, is_select);
-
+
break;
}
}
-
+
if (!field_exists) {
- field_data = tracker_db_get_metadata_field (data->iface,
- data->service,
- field_name,
- g_slist_length (data->fields),
- is_select,
+ field_data = tracker_db_get_metadata_field (data->iface,
+ data->service,
+ field_name,
+ g_slist_length (data->fields),
+ is_select,
is_condition);
if (field_data) {
data->fields = g_slist_prepend (data->fields, field_data);
- }
- }
-
+ }
+ }
+
if (field_data) {
reply = g_list_append (reply, field_data);
}
@@ -450,7 +450,7 @@
valid = tracker_db_result_set_iter_next (result_set);
g_free (field_name);
}
-
+
return reply;
}
@@ -473,34 +473,34 @@
const char *source;
if (set_error_on_fail (state == STATE_START,
- context,
- "Query element not expected here",
+ context,
+ "Query element not expected here",
error)) {
return;
}
- content = get_attribute_value ("content",
- attribute_names,
+ content = get_attribute_value ("content",
+ attribute_names,
attribute_values);
- source = get_attribute_value ("source",
- attribute_names,
+ source = get_attribute_value ("source",
+ attribute_names,
attribute_values);
/* FIXME This is a bit clumsy, check that OK and get
* the defaults (all) from somewhere. CHECK MEMORY
- * LEAKS!
+ * LEAKS!
*/
if(content) {
TrackerDBResultSet *result_set;
- result_set = tracker_db_xesam_get_service_names (data->iface,
+ result_set = tracker_db_xesam_get_service_names (data->iface,
content);
-
+
content = g_strdup (content);
} else {
content = g_strdup ("Files");
}
-
+
data->service = g_strdup ("Files");
if (source) {
@@ -511,25 +511,25 @@
}
g_string_append_printf (data->sql_where,
- " WHERE (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) AND ",
- content,
+ " WHERE (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) AND ",
+ content,
source);
push_stack (data, STATE_QUERY);
} else if (ELEMENT_IS (ELEMENT_XESAM_FIELD)) {
const gchar *name;
- if (set_error_on_fail (is_operator (state),
- context,
- "Field element not expected here",
+ if (set_error_on_fail (is_operator (state),
+ context,
+ "Field element not expected here",
error)) {
return;
}
name = get_attribute_value_required (context,
- "<field>",
+ "<field>",
"name",
- attribute_names,
+ attribute_names,
attribute_values,
error);
@@ -537,10 +537,10 @@
return;
} else {
if (data->current_operator == OP_NONE) {
- set_error (error,
- context,
+ set_error (error,
+ context,
PARSE_ERROR,
- "no operator found for field \"%s\"",
+ "no operator found for field \"%s\"",
name);
return;
}
@@ -550,33 +550,33 @@
}
} else if (ELEMENT_IS (ELEMENT_XESAM_FULL_TEXT_FIELDS)) {
- if (set_error_on_fail (is_operator (state),
- context,
- "Field element (fullTextFields) not expected here",
+ if (set_error_on_fail (is_operator (state),
+ context,
+ "Field element (fullTextFields) not expected here",
error)) {
return;
}
-
+
if (data->current_operator == OP_NONE) {
- set_error (error,
- context,
+ set_error (error,
+ context,
PARSE_ERROR,
"no operator found for fullTextFields");
return;
}
-
+
data->current_field = g_strdup (FIELD_NAME_FULL_TEXT_FIELDS);
push_stack (data, STATE_FIELD); /* We don't need to differentiate */
-
+
} else if (ELEMENT_IS (ELEMENT_XESAM_AND)) {
const gchar *negate;
- if (set_error_on_fail (state == STATE_QUERY ||
- is_logic (state) ||
- is_end_logic (state) ||
+ if (set_error_on_fail (state == STATE_QUERY ||
+ is_logic (state) ||
+ is_end_logic (state) ||
is_end_operator (state),
context,
- "AND element not expected here",
+ "AND element not expected here",
error)) {
return;
}
@@ -590,13 +590,13 @@
}
}
}
-
- negate = get_attribute_value ("negate",
- attribute_names,
+
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
if (negate && !strcmp (negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
data->statement_count = 0;
@@ -605,17 +605,17 @@
push_stack (data, STATE_AND);
} else if (ELEMENT_IS (ELEMENT_XESAM_OR)) {
const gchar *negate;
-
- if (set_error_on_fail (state == STATE_QUERY ||
- is_logic (state) ||
- is_end_logic (state) ||
+
+ if (set_error_on_fail (state == STATE_QUERY ||
+ is_logic (state) ||
+ is_end_logic (state) ||
is_end_operator (state),
context,
- "OR element not expected here",
+ "OR element not expected here",
error)) {
return;
}
-
+
if (data->statement_count > 1) {
if (data->current_logic_operator == LOP_AND) {
data->sql_where = g_string_append (data->sql_where, " AND ");
@@ -625,15 +625,15 @@
}
}
}
-
- negate = get_attribute_value ("negate",
- attribute_names,
+
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
-
+
if (negate && !strcmp (negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
-
+
data->statement_count = 0;
data->sql_where = g_string_append (data->sql_where, " ( ");
data->current_logic_operator = LOP_OR;
@@ -641,71 +641,71 @@
} else if (ELEMENT_IS (ELEMENT_XESAM_EQUALS)) {
const gchar *negate;
- if (set_error_on_fail (state == STATE_QUERY ||
+ if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "EQUALS element not expected here",
+ context,
+ "EQUALS element not expected here",
error)) {
return;
}
-
- negate = get_attribute_value ("negate",
- attribute_names,
+
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
-
+
if (negate && !strcmp (negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
-
+
data->current_operator = OP_EQUALS;
push_stack (data, STATE_EQUALS);
} else if (ELEMENT_IS (ELEMENT_XESAM_GREATER_THAN)) {
const gchar *negate;
- if (set_error_on_fail (state == STATE_QUERY ||
+ if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "GREATERTHAN element not expected here",
+ context,
+ "GREATERTHAN element not expected here",
error)) {
return;
}
- negate = get_attribute_value ("negate",
- attribute_names,
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
if (negate && !strcmp (negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
-
+
data->current_operator = OP_GREATER;
push_stack (data, STATE_GREATER_THAN);
} else if (ELEMENT_IS (ELEMENT_XESAM_GREATER_OR_EQUAL)) {
const gchar *negate;
- if (set_error_on_fail (state == STATE_QUERY ||
+ if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
context,
- "GREATEROREQUAL element not expected here",
+ "GREATEROREQUAL element not expected here",
error)) {
return;
}
- negate = get_attribute_value ("negate",
- attribute_names,
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
if (negate && !strcmp(negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
data->current_operator = OP_GREATER_EQUAL;
@@ -724,11 +724,11 @@
return;
}
- negate = get_attribute_value ("negate",
- attribute_names,
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
if (negate && !strcmp (negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
data->current_operator = OP_LESS;
@@ -736,23 +736,23 @@
} else if (ELEMENT_IS (ELEMENT_XESAM_LESS_OR_EQUAL)) {
const gchar *negate;
- if (set_error_on_fail (state == STATE_QUERY ||
+ if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
context,
- "LESSOREQUAL element not expected here",
+ "LESSOREQUAL element not expected here",
error)) {
return;
}
- negate = get_attribute_value ("negate",
- attribute_names,
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
if (negate && !strcmp(negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
data->current_operator = OP_LESS_EQUAL;
@@ -760,23 +760,23 @@
} else if (ELEMENT_IS (ELEMENT_XESAM_CONTAINS)) {
const gchar *negate;
- if (set_error_on_fail (state == STATE_QUERY ||
+ if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
context,
- "CONTAINS element not expected here",
+ "CONTAINS element not expected here",
error)) {
return;
}
- negate = get_attribute_value ("negate",
- attribute_names,
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
if (negate && !strcmp(negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
data->current_operator = OP_CONTAINS;
@@ -784,46 +784,46 @@
} else if (ELEMENT_IS (ELEMENT_XESAM_REGEX)) {
const gchar *negate;
- if (set_error_on_fail (state == STATE_QUERY ||
+ if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "REGEX element not expected here",
+ context,
+ "REGEX element not expected here",
error)) {
return;
}
- negate = get_attribute_value ("negate",
- attribute_names,
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
if (negate && !strcmp (negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
-
+
data->current_operator = OP_REGEX;
push_stack (data, STATE_REGEX);
} else if (ELEMENT_IS (ELEMENT_XESAM_STARTS_WITH)) {
const gchar *negate;
- if (set_error_on_fail (state == STATE_QUERY ||
+ if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "STARTSWITH element not expected here",
+ context,
+ "STARTSWITH element not expected here",
error)) {
return;
}
- negate = get_attribute_value ("negate",
- attribute_names,
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
if (negate && !strcmp(negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
data->current_operator = OP_STARTS;
@@ -831,23 +831,23 @@
} else if (ELEMENT_IS (ELEMENT_XESAM_IN_SET)) {
const gchar *negate;
- if (set_error_on_fail (state == STATE_QUERY ||
+ if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "IN SET element not expected here",
+ context,
+ "IN SET element not expected here",
error)) {
return;
}
- negate = get_attribute_value ("negate",
- attribute_names,
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
if (negate && !strcmp(negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
data->current_operator = OP_SET;
@@ -855,68 +855,68 @@
} else if (ELEMENT_IS (ELEMENT_XESAM_FULL_TEXT)) {
const gchar *negate;
- if (set_error_on_fail (state == STATE_QUERY ||
+ if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
- ((data->current_logic_operator == LOP_AND ||
+ ((data->current_logic_operator == LOP_AND ||
data->current_logic_operator == LOP_OR) &&
is_end_operator (state)),
- context,
- "fullText element not expected here",
+ context,
+ "fullText element not expected here",
error)) {
return;
}
- negate = get_attribute_value ("negate",
- attribute_names,
+ negate = get_attribute_value ("negate",
+ attribute_names,
attribute_values);
if (negate && !strcmp(negate,"true")) {
- data->sql_where = g_string_append (data->sql_where, " NOT ");
+ data->sql_where = g_string_append (data->sql_where, " NOT ");
}
data->current_operator = OP_FULL_TEXT;
data->current_field = g_strdup (FIELD_NAME_FULL_TEXT_FIELDS);
push_stack (data, STATE_FULL_TEXT);
} else if (ELEMENT_IS (ELEMENT_XESAM_INTEGER)) {
- if (set_error_on_fail (state == STATE_FIELD || state == STATE_FULL_TEXT,
- context,
- "INTEGER element not expected here",
+ if (set_error_on_fail (state == STATE_FIELD || state == STATE_FULL_TEXT,
+ context,
+ "INTEGER element not expected here",
error)) {
return;
}
push_stack (data, STATE_INTEGER);
} else if (ELEMENT_IS (ELEMENT_XESAM_DATE)) {
- if (set_error_on_fail (state == STATE_FIELD || state == STATE_FULL_TEXT,
+ if (set_error_on_fail (state == STATE_FIELD || state == STATE_FULL_TEXT,
context,
- "DATE element not expected here",
+ "DATE element not expected here",
error)) {
return;
}
push_stack (data, STATE_DATE);
} else if (ELEMENT_IS (ELEMENT_XESAM_STRING)) {
- if (set_error_on_fail (state == STATE_FIELD || state == STATE_FULL_TEXT,
+ if (set_error_on_fail (state == STATE_FIELD || state == STATE_FULL_TEXT,
context,
- "STRING element not expected here",
+ "STRING element not expected here",
error)) {
return;
}
push_stack (data, STATE_STRING);
} else if (ELEMENT_IS (ELEMENT_XESAM_FLOAT)) {
- if (set_error_on_fail (state == STATE_FIELD || state == STATE_FULL_TEXT,
- context,
- "FLOAT element not expected here",
+ if (set_error_on_fail (state == STATE_FIELD || state == STATE_FULL_TEXT,
+ context,
+ "FLOAT element not expected here",
error)) {
return;
}
push_stack (data, STATE_FLOAT);
} else if (ELEMENT_IS (ELEMENT_XESAM_BOOLEAN)) {
- if (set_error_on_fail (state == STATE_FIELD || state == STATE_FULL_TEXT,
- context,
- "BOOLEAN element not expected here",
+ if (set_error_on_fail (state == STATE_FIELD || state == STATE_FULL_TEXT,
+ context,
+ "BOOLEAN element not expected here",
error)) {
return;
}
@@ -926,9 +926,9 @@
} else {
g_warning ("%s not supported", element_name);
- if (set_error_on_fail (FALSE,
- context,
- "Unsupported query",
+ if (set_error_on_fail (FALSE,
+ context,
+ "Unsupported query",
error)) {
return;
}
@@ -955,9 +955,9 @@
GString *str;
gint i;
- g_return_val_if_fail (data->current_field &&
- data->current_operator != OP_NONE &&
- data->current_value,
+ g_return_val_if_fail (data->current_field &&
+ data->current_operator != OP_NONE &&
+ data->current_value,
FALSE);
value = NULL;
@@ -969,10 +969,10 @@
state = peek_state (data);
- avalue = get_value (data->current_value,
- (state != STATE_END_DATE &&
- state != STATE_END_INTEGER &&
- state != STATE_END_FLOAT &&
+ avalue = get_value (data->current_value,
+ (state != STATE_END_DATE &&
+ state != STATE_END_INTEGER &&
+ state != STATE_END_FLOAT &&
state != STATE_END_BOOLEAN));
field_data_list = add_metadata_field (data, data->current_field, FALSE, TRUE);
@@ -996,22 +996,22 @@
i++;
str = g_string_new ("");
-
+
if (i>1) {
g_string_append (str, " OR ");
}
-
+
if (tracker_field_data_get_data_type (field_data->data) == TRACKER_FIELD_TYPE_DATE) {
gchar *bvalue;
gint cvalue;
-
+
bvalue = tracker_date_format (avalue);
g_debug (bvalue);
cvalue = tracker_string_to_date (bvalue);
g_debug ("%d", cvalue);
value = tracker_gint_to_string (cvalue);
g_free (bvalue);
- } else if (state == STATE_END_BOOLEAN) {
+ } else if (state == STATE_END_BOOLEAN) {
/* FIXME We do a state check here, because
* TRACKER_FIELD_TYPE_BOOLEAN is not in db.
*/
@@ -1019,7 +1019,7 @@
} else {
value = g_strdup (avalue);
}
-
+
if (data->statement_count > 1) {
if (data->current_logic_operator == LOP_AND) {
data->sql_where = g_string_append (data->sql_where, " AND ");
@@ -1031,54 +1031,54 @@
}
where_field = tracker_field_data_get_where_field (field_data->data);
-
+
switch (data->current_operator) {
- case OP_EQUALS:
+ case OP_EQUALS:
sub = strchr (data->current_value, '*');
-
+
if (sub) {
- g_string_append_printf (str, " (%s glob '%s') ",
- where_field,
+ g_string_append_printf (str, " (%s glob '%s') ",
+ where_field,
data->current_value);
} else {
TrackerFieldType data_type;
-
+
data_type = tracker_field_data_get_data_type (field_data->data);
-
+
if (data_type == TRACKER_FIELD_TYPE_DATE ||
data_type == TRACKER_FIELD_TYPE_INTEGER ||
data_type == TRACKER_FIELD_TYPE_DOUBLE) {
- g_string_append_printf (str, " (%s = %s) ",
- where_field,
+ g_string_append_printf (str, " (%s = %s) ",
+ where_field,
value);
} else {
- g_string_append_printf (str, " (%s = '%s') ",
- where_field,
+ g_string_append_printf (str, " (%s = '%s') ",
+ where_field,
value);
}
}
break;
-
+
case OP_GREATER:
- g_string_append_printf (str, " (%s > %s) ",
+ g_string_append_printf (str, " (%s > %s) ",
where_field,
value);
break;
case OP_GREATER_EQUAL:
- g_string_append_printf (str, " (%s >= %s) ",
+ g_string_append_printf (str, " (%s >= %s) ",
where_field,
value);
break;
case OP_LESS:
- g_string_append_printf (str, " (%s < %s) ",
+ g_string_append_printf (str, " (%s < %s) ",
where_field,
value);
break;
case OP_LESS_EQUAL:
- g_string_append_printf (str, " (%s <= %s) ",
+ g_string_append_printf (str, " (%s <= %s) ",
where_field,
value);
break;
@@ -1087,11 +1087,11 @@
sub = strchr (data->current_value, '*');
if (sub) {
- g_string_append_printf (str, " (%s like '%%%s%%') ",
- where_field,
+ g_string_append_printf (str, " (%s like '%%%s%%') ",
+ where_field,
data->current_value);
} else {
- g_string_append_printf (str, " (%s like '%%%s%%') ",
+ g_string_append_printf (str, " (%s like '%%%s%%') ",
where_field,
data->current_value);
}
@@ -1101,38 +1101,38 @@
sub = strchr (data->current_value, '*');
if (sub) {
- g_string_append_printf (str, " (%s like '%s') ",
- where_field,
+ g_string_append_printf (str, " (%s like '%s') ",
+ where_field,
data->current_value);
} else {
- g_string_append_printf (str, " (%s like '%s%%') ",
+ g_string_append_printf (str, " (%s like '%s%%') ",
where_field,
data->current_value);
}
-
+
break;
case OP_REGEX:
- g_string_append_printf (str, " (%s REGEXP '%s') ",
+ g_string_append_printf (str, " (%s REGEXP '%s') ",
where_field,
data->current_value);
break;
case OP_SET:
s = g_strsplit (data->current_value, ",", 0);
-
+
if (s && s[0]) {
gchar **p;
- g_string_append_printf (str, " (%s in ('%s'",
- where_field,
+ g_string_append_printf (str, " (%s in ('%s'",
+ where_field,
s[0]);
for (p = s + 1; *p; p++) {
g_string_append_printf (str, ",'%s'", *p);
}
- g_string_append_printf (str, ") ) " );
+ g_string_append_printf (str, ") ) " );
}
break;
@@ -1140,11 +1140,11 @@
sub = strchr (data->current_value, '*');
if (sub) {
- g_string_append_printf (str, " (%s like '%%%s%%') ",
- where_field,
+ g_string_append_printf (str, " (%s like '%%%s%%') ",
+ where_field,
data->current_value);
} else {
- g_string_append_printf (str, " (%s like '%%%s%%') ",
+ g_string_append_printf (str, " (%s like '%%%s%%') ",
where_field,
data->current_value);
}
@@ -1153,7 +1153,7 @@
default:
break;
}
-
+
data->sql_where = g_string_append (data->sql_where, str->str);
g_string_free (str, TRUE);
field_data = g_list_next (field_data);
@@ -1404,7 +1404,7 @@
data.sql_from = g_string_new ("");
g_string_append_printf (data.sql_from, " FROM %s S ", table_name);
-
+
data.sql_join = g_string_new ("");
data.sql_where = g_string_new ("");
@@ -1438,8 +1438,8 @@
for (l = data.fields; l; l = l->next) {
if (!tracker_field_data_get_is_condition (l->data)) {
if (tracker_field_data_get_needs_join (l->data)) {
- g_string_append_printf (data.sql_join,
- " LEFT OUTER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID = %s) ",
+ g_string_append_printf (data.sql_join,
+ " LEFT OUTER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID = %s) ",
tracker_field_data_get_table_name (l->data),
tracker_field_data_get_alias (l->data),
tracker_field_data_get_alias (l->data),
@@ -1449,9 +1449,9 @@
} else {
gchar *related_metadata;
- related_metadata = tracker_db_metadata_get_related_names (iface,
+ related_metadata = tracker_db_metadata_get_related_names (iface,
tracker_field_data_get_field_name (l->data));
- g_string_append_printf (data.sql_join,
+ g_string_append_printf (data.sql_join,
" INNER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID in (%s)) ",
tracker_field_data_get_table_name (l->data),
tracker_field_data_get_alias (l->data),
@@ -1480,7 +1480,7 @@
if (data.current_field) {
g_free (data.current_field);
}
-
+
if (data.current_value) {
g_free (data.current_value);
}
Modified: branches/indexer-split/src/trackerd/tracker-xesam-session.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-session.c (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-session.c Sat Sep 20 14:45:00 2008
@@ -46,7 +46,7 @@
*
* Get the properties of @self. The returned value is a hashtable with key as
* Xesam session property key strings and value a #GValue being either a string,
- * an integer, a boolean or an array (either TRACKER_TYPE_XESAM_STRV_ARRAY or
+ * an integer, a boolean or an array (either TRACKER_TYPE_XESAM_STRV_ARRAY or
* G_TYPE_STRV).
*
* The returned value must be unreferenced using @g_hash_table_unref.
@@ -80,7 +80,7 @@
priv->session_id = NULL;
- priv->searches = g_hash_table_new_full (g_str_hash, g_str_equal,
+ priv->searches = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_object_unref);
@@ -190,8 +190,8 @@
}
-static void
-tracker_xesam_session_class_init (TrackerXesamSessionClass *klass)
+static void
+tracker_xesam_session_class_init (TrackerXesamSessionClass *klass)
{
GObjectClass *object_class;
object_class = G_OBJECT_CLASS (klass);
@@ -207,8 +207,8 @@
*
* Set a read-only unique ID string for @self.
**/
-void
-tracker_xesam_session_set_id (TrackerXesamSession *self,
+void
+tracker_xesam_session_set_id (TrackerXesamSession *self,
const gchar *session_id)
{
TrackerXesamSessionPriv *priv = self->priv;
@@ -226,7 +226,7 @@
*
* returns: a unique id
**/
-const gchar*
+const gchar*
tracker_xesam_session_get_id (TrackerXesamSession *self)
{
TrackerXesamSessionPriv *priv = self->priv;
@@ -238,7 +238,7 @@
* tracker_xesam_session_get_searches:
* @self: A #TrackerXesamSession
*
- * Get all searches in @self as a doubly linked list containing
+ * Get all searches in @self as a doubly linked list containing
* #TrackerXesamLiveSearch objects.
*
* @returns: (caller-owns) (null-ok): all searches in @self
@@ -254,40 +254,40 @@
/**
* tracker_xesam_session_set_property:
* @self: A #TrackerXesamSession
- * @prop: The name or the property to set, see the list of session properties
+ * @prop: The name or the property to set, see the list of session properties
* for valid property names at http://xesam.org/main/XesamSearchAPI#properties
* @val: The value to set the property to
- * @new_val: (out) (caller-owns): The actual value the search engine will use.
- * As noted above it is not guaranteed that the requested value will be
+ * @new_val: (out) (caller-owns): The actual value the search engine will use.
+ * As noted above it is not guaranteed that the requested value will be
* respected
* @error: (null-ok) (out): a #GError
- *
- * Set a property on the session. It is not guaranteed that the session property
- * will actually be used, the return value is the property value that will be
- * used. Search engines must respect the default property values however. For a
+ *
+ * Set a property on the session. It is not guaranteed that the session property
+ * will actually be used, the return value is the property value that will be
+ * used. Search engines must respect the default property values however. For a
* list of properties and descriptions see below.
- *
- * Calling this method after the first search has been created with
- * @tracker_xesam_session_create_search is illegal. The server will raise an
+ *
+ * Calling this method after the first search has been created with
+ * @tracker_xesam_session_create_search is illegal. The server will raise an
* error if you do. Ie. once you create the first search the properties are set
- * in stone for the parent session. The search engine will also throw an error
+ * in stone for the parent session. The search engine will also throw an error
* if the session handle has been closed or is invalid.
- *
- * An error will also be thrown if the prop parameter is not a valid session
- * property, if it is a property marked as read-only, or if the requested value
+ *
+ * An error will also be thrown if the prop parameter is not a valid session
+ * property, if it is a property marked as read-only, or if the requested value
* is invalid.
**/
-void
-tracker_xesam_session_set_property (TrackerXesamSession *self,
- const gchar *prop,
- const GValue *val,
- GValue **new_val,
- GError **error)
+void
+tracker_xesam_session_set_property (TrackerXesamSession *self,
+ const gchar *prop,
+ const GValue *val,
+ GValue **new_val,
+ GError **error)
{
TrackerXesamSessionPriv *priv = self->priv;
- const gchar *read_only[11] = {"vendor.id", "vendor.version", "vendor.display",
- "vendor.xesam", "vendor.ontology.fields", "vendor.ontology.contents",
- "vendor.ontology.sources", "vendor.extensions", "vendor.ontologies",
+ const gchar *read_only[11] = {"vendor.id", "vendor.version", "vendor.display",
+ "vendor.xesam", "vendor.ontology.fields", "vendor.ontology.contents",
+ "vendor.ontology.sources", "vendor.extensions", "vendor.ontologies",
"vendor.maxhits", NULL};
GValue *property = NULL;
gboolean found = FALSE;
@@ -305,7 +305,7 @@
property = g_hash_table_lookup (priv->props, prop);
if (!property) {
- g_set_error (error, TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error, TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_PROPERTY_NOT_SUPPORTED,
"Property not supported");
*new_val = NULL;
@@ -321,27 +321,27 @@
/**
* tracker_xesam_session_get_property:
* @self: A #TrackerXesamSession
- * @prop: The name or the property to set, see the list of session properties
+ * @prop: The name or the property to set, see the list of session properties
* for valid property names at http://xesam.org/main/XesamSearchAPI#properties
* @value: (out) (caller-owns): The value of a session property
* @error: (null-ok) (out): a #GError
- *
- * Get the value of a session property. The server should throw an error if the
+ *
+ * Get the value of a session property. The server should throw an error if the
* session handle is closed or does not exist. An error should also be raised if
* prop is not a valid session property.
**/
void
-tracker_xesam_session_get_property (TrackerXesamSession *self,
- const gchar *prop,
- GValue **value,
- GError **error)
+tracker_xesam_session_get_property (TrackerXesamSession *self,
+ const gchar *prop,
+ GValue **value,
+ GError **error)
{
TrackerXesamSessionPriv *priv = self->priv;
GValue *property = g_hash_table_lookup (priv->props, prop);
if (!property) {
- g_set_error (error, TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error, TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_PROPERTY_NOT_SUPPORTED,
"Property not supported");
*value = NULL;
@@ -359,23 +359,23 @@
* tracker_xesam_session_create_search:
* @self: A #TrackerXesamSession
* @query_xml: A string in the xesam query language
- * @search_id: (out) (caller-owns): An opaque handle for the Search object
+ * @search_id: (out) (caller-owns): An opaque handle for the Search object
* @error: (null-ok) (out): a #GError
*
- * Create a new search from @query_xml. If there are errors parsing the
+ * Create a new search from @query_xml. If there are errors parsing the
* @query_xml parameter an error will be set in @error.
- *
- * Notifications of hits can be obtained by listening to the @hits-added signal.
+ *
+ * Notifications of hits can be obtained by listening to the @hits-added signal.
* Signals will not be emitted before a call to @tracker_xesam_live_search_activate
- * has been made.
+ * has been made.
*
* @returns: (null-ok) (caller-owns): a new non-activated #TrackerXesamLiveSearch
**/
-TrackerXesamLiveSearch*
-tracker_xesam_session_create_search (TrackerXesamSession *self,
- const gchar *query_xml,
- gchar **search_id,
- GError **error)
+TrackerXesamLiveSearch*
+tracker_xesam_session_create_search (TrackerXesamSession *self,
+ const gchar *query_xml,
+ gchar **search_id,
+ GError **error)
{
TrackerXesamLiveSearch *search;
TrackerXesamSessionPriv *priv = self->priv;
@@ -385,17 +385,17 @@
search = tracker_xesam_live_search_new (query_xml);
tracker_xesam_live_search_set_session (search, self);
- tracker_xesam_live_search_set_id (search,
+ tracker_xesam_live_search_set_id (search,
tracker_xesam_manager_generate_unique_key ());
if (tracker_xesam_live_search_parse_query (search, error)) {
g_debug ("Xesam live search added");
- g_hash_table_insert (priv->searches,
+ g_hash_table_insert (priv->searches,
g_strdup (tracker_xesam_live_search_get_id (search)),
g_object_ref (search));
- if (search_id)
+ if (search_id)
*search_id = g_strdup (tracker_xesam_live_search_get_id (search));
} else {
@@ -410,16 +410,16 @@
/**
* tracker_xesam_session_get_search:
* @self: A #TrackerXesamSession
- * @search_id: (in): An opaque handle for the Search object
+ * @search_id: (in): An opaque handle for the Search object
* @error: (null-ok) (out): a #GError
*
* Get the #TrackerXesamLiveSearch identified by @search_id in @self.
*
* @returns: (null-ok) (caller-owns): a #TrackerXesamLiveSearch or NULL
**/
-TrackerXesamLiveSearch*
-tracker_xesam_session_get_search (TrackerXesamSession *self,
- const gchar *search_id,
+TrackerXesamLiveSearch*
+tracker_xesam_session_get_search (TrackerXesamSession *self,
+ const gchar *search_id,
GError **error)
{
TrackerXesamSessionPriv *priv = self->priv;
@@ -428,7 +428,7 @@
if (search)
g_object_ref (search);
else {
- g_set_error (error, TRACKER_XESAM_ERROR_DOMAIN,
+ g_set_error (error, TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_SEARCH_ID_NOT_REGISTERED,
"SearchID not registered");
}
@@ -443,8 +443,8 @@
*
* @returns: (caller-owns): a new #TrackerXesamSession
**/
-TrackerXesamSession*
-tracker_xesam_session_new (void)
+TrackerXesamSession*
+tracker_xesam_session_new (void)
{
return g_object_newv (TRACKER_TYPE_XESAM_SESSION, 0, NULL);
}
Modified: branches/indexer-split/src/trackerd/tracker-xesam.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.c (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia
* Authors: Philip Van Hoof (pvanhoof gnome org)
*
@@ -65,7 +65,7 @@
NULL, NULL,
tracker_marshal_VOID__STRING_UINT,
G_TYPE_NONE,
- 2,
+ 2,
G_TYPE_STRING,
G_TYPE_UINT);
@@ -77,7 +77,7 @@
NULL, NULL,
tracker_marshal_VOID__STRING_BOXED,
G_TYPE_NONE,
- 2,
+ 2,
G_TYPE_STRING,
DBUS_TYPE_G_UINT_ARRAY);
@@ -89,7 +89,7 @@
NULL, NULL,
tracker_marshal_VOID__STRING_BOXED,
G_TYPE_NONE,
- 2,
+ 2,
G_TYPE_STRING,
DBUS_TYPE_G_UINT_ARRAY);
@@ -101,7 +101,7 @@
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE,
- 1,
+ 1,
G_TYPE_STRING);
@@ -113,7 +113,7 @@
NULL, NULL,
g_cclosure_marshal_VOID__BOXED,
G_TYPE_NONE,
- 1,
+ 1,
G_TYPE_STRV);
}
@@ -157,7 +157,7 @@
g_list_free (data);
}
-void
+void
tracker_xesam_name_owner_changed (DBusGProxy *proxy,
const char *name,
const char *prev_owner,
@@ -192,7 +192,7 @@
/*
* Functions
*/
-void
+void
tracker_xesam_new_session (TrackerXesam *object,
DBusGMethodInvocation *context)
{
@@ -208,9 +208,9 @@
key = dbus_g_method_get_sender (context);
if (!sessions)
- sessions = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
+ sessions = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ (GDestroyNotify) g_free,
NULL);
my_sessions = g_hash_table_lookup (sessions, key);
@@ -224,18 +224,18 @@
dbus_g_method_return_error (context, error);
g_error_free (error);
} else {
- my_sessions = g_list_prepend (my_sessions,
+ my_sessions = g_list_prepend (my_sessions,
g_strdup (session_id));
-
+
if (insert)
- g_hash_table_insert (sessions,
- g_strdup (key),
+ g_hash_table_insert (sessions,
+ g_strdup (key),
my_sessions);
else
- g_hash_table_replace (sessions,
- g_strdup (key),
+ g_hash_table_replace (sessions,
+ g_strdup (key),
my_sessions);
-
+
dbus_g_method_return (context, session_id);
g_message ("Created new xesam session: %s", session_id);
@@ -247,7 +247,7 @@
tracker_dbus_request_success (request_id);
}
-void
+void
tracker_xesam_close_session (TrackerXesam *object,
const gchar *session_id,
DBusGMethodInvocation *context)
@@ -273,15 +273,15 @@
if (my_sessions) {
GList *found;
- found = g_list_find_custom (my_sessions,
- session_id,
+ found = g_list_find_custom (my_sessions,
+ session_id,
(GCompareFunc) strcmp);
if (found) {
g_free (found->data);
my_sessions = g_list_delete_link (my_sessions, found);
- g_hash_table_replace (sessions,
- g_strdup (key),
+ g_hash_table_replace (sessions,
+ g_strdup (key),
my_sessions);
}
}
@@ -296,11 +296,11 @@
tracker_dbus_request_success (request_id);
}
-void
+void
tracker_xesam_set_property (TrackerXesam *object,
const gchar *session_id,
const gchar *prop,
- GValue *val,
+ GValue *val,
DBusGMethodInvocation *context)
{
TrackerXesamSession *session;
@@ -315,10 +315,10 @@
g_clear_error (&error);
- tracker_xesam_session_set_property (session,
- prop,
- val,
- &new_val,
+ tracker_xesam_session_set_property (session,
+ prop,
+ val,
+ &new_val,
&error);
if (error) {
@@ -359,9 +359,9 @@
g_clear_error (&error);
- tracker_xesam_session_get_property (session,
- prop,
- &value,
+ tracker_xesam_session_get_property (session,
+ prop,
+ &value,
&error);
if (error) {
@@ -406,8 +406,8 @@
g_clear_error (&error);
- search = tracker_xesam_session_create_search (session,
- query_xml,
+ search = tracker_xesam_session_create_search (session,
+ query_xml,
&search_id,
&error);
@@ -509,15 +509,15 @@
}
inline static void
-unsetvalue (gpointer data,
+unsetvalue (gpointer data,
gpointer user_data)
{
g_value_unset (data);
g_free (data);
}
-inline static void
-foreach_hits_data (gpointer hits_data,
+inline static void
+foreach_hits_data (gpointer hits_data,
gpointer user_data)
{
g_ptr_array_foreach ((GPtrArray *) hits_data, unsetvalue, NULL);
@@ -548,9 +548,9 @@
g_clear_error (&error);
- tracker_xesam_live_search_get_hits (search,
- count,
- &hits,
+ tracker_xesam_live_search_get_hits (search,
+ count,
+ &hits,
&error);
if (error) {
@@ -593,10 +593,10 @@
g_clear_error (&error);
- tracker_xesam_live_search_get_range_hits (search,
- a,
- b,
- &hits,
+ tracker_xesam_live_search_get_range_hits (search,
+ a,
+ b,
+ &hits,
&error);
if (error) {
@@ -620,11 +620,11 @@
}
-void
+void
tracker_xesam_get_hit_data (TrackerXesam *object,
const gchar *search_id,
- GArray *hit_ids,
- GStrv fields,
+ GArray *hit_ids,
+ GStrv fields,
DBusGMethodInvocation *context)
{
TrackerXesamLiveSearch *search;
@@ -640,9 +640,9 @@
g_clear_error (&error);
- tracker_xesam_live_search_get_hit_data (search,
- hit_ids,
- fields,
+ tracker_xesam_live_search_get_hit_data (search,
+ hit_ids,
+ fields,
&hit_data,
&error);
@@ -666,12 +666,12 @@
tracker_dbus_request_success (request_id);
}
-void
+void
tracker_xesam_get_range_hit_data (TrackerXesam *object,
const gchar *search_id,
guint a,
guint b,
- GStrv fields,
+ GStrv fields,
DBusGMethodInvocation *context)
{
TrackerXesamLiveSearch *search;
@@ -687,11 +687,11 @@
g_clear_error (&error);
- tracker_xesam_live_search_get_range_hit_data (search,
- a,
- b,
- fields,
- &hit_data,
+ tracker_xesam_live_search_get_range_hit_data (search,
+ a,
+ b,
+ fields,
+ &hit_data,
&error);
if (error) {
@@ -714,7 +714,7 @@
tracker_dbus_request_success (request_id);
}
-void
+void
tracker_xesam_close_search (TrackerXesam *object,
const gchar *search_id,
DBusGMethodInvocation *context)
@@ -749,7 +749,7 @@
tracker_dbus_request_success (request_id);
}
-void
+void
tracker_xesam_get_state (TrackerXesam *object,
DBusGMethodInvocation *context)
{
@@ -777,17 +777,17 @@
* Emits the @state-changed signal on the DBus proxy for Xesam.
*
* When the state as returned by @tracker_get_state changes this @state-changed
- * signal must be fired with an argument as described in said method. If the
- * indexer expects to only enter the UPDATE state for a very brief period
+ * signal must be fired with an argument as described in said method. If the
+ * indexer expects to only enter the UPDATE state for a very brief period
* - indexing one changed file - it is not required that the @state-changed
- * signal is fired. The signal only needs to be fired if the process of updating
- * the index is going to be non-negligible. The purpose of this signal is not to
- * provide exact details on the engine, just to provide hints for a user
+ * signal is fired. The signal only needs to be fired if the process of updating
+ * the index is going to be non-negligible. The purpose of this signal is not to
+ * provide exact details on the engine, just to provide hints for a user
* interface.
**/
-void
-tracker_xesam_emit_state_changed (TrackerXesam *self,
- GStrv state_info)
+void
+tracker_xesam_emit_state_changed (TrackerXesam *self,
+ GStrv state_info)
{
g_signal_emit (self, signals[XESAM_STATE_CHANGED], 0, state_info);
}
Modified: branches/indexer-split/tests/common/tracker-test-helpers.c
==============================================================================
--- branches/indexer-split/tests/common/tracker-test-helpers.c (original)
+++ branches/indexer-split/tests/common/tracker-test-helpers.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,25 +9,25 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include "tracker-test-helpers.h"
static gchar *nonutf8_str = NULL;
gboolean
tracker_test_helpers_cmpstr_equal (const gchar *obtained,
- const gchar *expected)
+ const gchar *expected)
{
gboolean result;
- if (expected == obtained) {
+ if (expected == obtained) {
return TRUE;
}
@@ -43,7 +43,7 @@
}
}
-const gchar *
+const gchar *
tracker_test_helpers_get_nonutf8 (void)
{
GMappedFile *file = NULL;
Modified: branches/indexer-split/tests/common/tracker-test-helpers.h
==============================================================================
--- branches/indexer-split/tests/common/tracker-test-helpers.h (original)
+++ branches/indexer-split/tests/common/tracker-test-helpers.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#ifndef __TRACKER_TEST_HELPERS_H__
#define __TRACKER_TEST_HELPERS_H__
Modified: branches/indexer-split/tests/libtracker-common/tracker-dbus-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-common/tracker-dbus-test.c (original)
+++ branches/indexer-split/tests/libtracker-common/tracker-dbus-test.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <glib.h>
#include <glib/gtestutils.h>
#include <libtracker-common/tracker-dbus.h>
@@ -24,7 +24,7 @@
static void
-slist_to_strv (gboolean utf8)
+slist_to_strv (gboolean utf8)
{
GSList *input = NULL;
gint i;
@@ -128,7 +128,7 @@
}
static void
-test_dbus_request_failed (void)
+test_dbus_request_failed (void)
{
GError *error = NULL;
@@ -180,8 +180,8 @@
g_test_add_func ("/libtracker-common/tracker-dbus/dbus_request_failed", test_dbus_request_failed);
result = g_test_run ();
-
+
tracker_test_helpers_free_nonutf8 ();
-
+
return result;
}
Modified: branches/indexer-split/tests/libtracker-common/tracker-field-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-common/tracker-field-test.c (original)
+++ branches/indexer-split/tests/libtracker-common/tracker-field-test.c Sat Sep 20 14:45:00 2008
@@ -7,7 +7,7 @@
test_type_to_string ()
{
const gchar *result;
- TrackerFieldType type;
+ TrackerFieldType type;
type = TRACKER_FIELD_TYPE_KEYWORD;
result = tracker_field_type_to_string (type);
@@ -69,7 +69,7 @@
test_type_to_string);
result = g_test_run ();
-
+
/* End */
return result;
Modified: branches/indexer-split/tests/libtracker-common/tracker-file-utils-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-common/tracker-file-utils-test.c (original)
+++ branches/indexer-split/tests/libtracker-common/tracker-file-utils-test.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <string.h>
@@ -29,21 +29,21 @@
#include <tracker-test-helpers.h>
static GSList *
-array_as_list (gchar **array)
+array_as_list (gchar **array)
{
gint i;
GSList *result = NULL;
for (i = 0; array[i] != NULL; i++) {
result = g_slist_prepend (result, g_strdup(array[i]));
-
- }
-
+
+ }
+
return result;
}
static gboolean
-string_in_list (GSList *list, const gchar *string)
+string_in_list (GSList *list, const gchar *string)
{
GSList *it;
for ( it = list; it != NULL; it = it->next) {
@@ -67,7 +67,7 @@
result = tracker_path_list_filter_duplicates (input_as_list);
g_assert_cmpint (3, ==, g_slist_length (result));
-
+
g_assert (string_in_list (result, "/home"));
g_assert (string_in_list (result, "/tmp"));
g_assert (string_in_list (result, "/usr"));
@@ -79,7 +79,7 @@
test_path_evaluate_name (void)
{
gchar *result, *expected;
-
+
const gchar *home = g_getenv ("HOME");
const gchar *pwd = g_getenv ("PWD");
@@ -87,13 +87,13 @@
gchar *parent_dir;
g_setenv ("TEST_TRACKER_DIR", test, TRUE);
-
+
result = tracker_path_evaluate_name ("/home/user/all/ok");
tracker_test_helpers_cmpstr_equal (result, "/home/user/all/ok");
g_free (result);
- /* The result of this test and the next one are not consistent!
+ /* The result of this test and the next one are not consistent!
* Must it remove the end '/' or not?
*/
result = tracker_path_evaluate_name ("/home/user/all/dir/");
@@ -196,7 +196,7 @@
g_assert_cmpint (g_strcmp0 (name, "file.txt"), ==, 0);
g_assert_cmpint (g_strcmp0 (path, "/home/ivan/test"), ==, 0);
-
+
g_free (name);
g_free (path);
name = NULL;
@@ -208,7 +208,7 @@
g_assert_cmpint (g_strcmp0 (name, "file.txt"), ==, 0);
g_assert_cmpint (g_strcmp0 (path, "/home/ivan/test"), ==, 0);
-
+
g_free (name);
g_free (path);
name = NULL;
@@ -223,7 +223,7 @@
g_assert_cmpint (g_strcmp0 (name, "file.txt"), ==, 0);
g_print ("%s\n", path);
g_assert_cmpint (g_strcmp0 (path, "file:///home/ivan/test"), ==, 0);
-
+
g_free (name);
g_free (path);
name = NULL;
@@ -233,7 +233,7 @@
}
int
-main (int argc, char **argv)
+main (int argc, char **argv)
{
int result;
Modified: branches/indexer-split/tests/libtracker-common/tracker-ontology-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-common/tracker-ontology-test.c (original)
+++ branches/indexer-split/tests/libtracker-common/tracker-ontology-test.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <string.h>
@@ -30,7 +30,7 @@
#include <tracker-test-helpers.h>
static gboolean
-test_cmp_servicedef_equals (TrackerService *one,
+test_cmp_servicedef_equals (TrackerService *one,
TrackerService *two)
{
if (one && !two) {
@@ -42,11 +42,11 @@
}
if (!one && one == two) {
- return TRUE;
+ return TRUE;
}
return (tracker_service_get_id (one) == tracker_service_get_id (two) &&
- tracker_test_helpers_cmpstr_equal (tracker_service_get_name (one),
+ tracker_test_helpers_cmpstr_equal (tracker_service_get_name (one),
tracker_service_get_name (two)) &&
tracker_test_helpers_cmpstr_equal (tracker_service_get_parent (one),
tracker_service_get_parent (two)) &&
@@ -55,31 +55,31 @@
}
static gboolean
-element_in_list (GSList *list, gchar *element)
+element_in_list (GSList *list, gchar *element)
{
return (g_slist_find_custom (list, element, (GCompareFunc) strcmp) != NULL);
}
static GSList *
-array_to_list (char **array)
-{
+array_to_list (char **array)
+{
GSList *list = NULL;
int i;
for (i = 0; array[i] != NULL; i++) {
list = g_slist_prepend (list, g_strdup (array[i]));
- }
-
- return list;
+ }
+
+ return list;
}
static TrackerField *
-create_field_definition (const gchar *id,
- const gchar *name,
+create_field_definition (const gchar *id,
+ const gchar *name,
TrackerFieldType data_type,
const gchar *field_name,
gboolean multiple_values,
- GSList *child_ids)
+ GSList *child_ids)
{
TrackerField *field;
@@ -96,20 +96,20 @@
}
static TrackerService *
-create_service_definition (gint id,
- const gchar *name,
- const gchar *parent,
+create_service_definition (gint id,
+ const gchar *name,
+ const gchar *parent,
const gchar *prefix,
- gboolean embedded)
+ gboolean embedded)
{
TrackerService *def;
/* array_to_list use prepend, so use reverse order here */
- gchar *key_metadata [] = {
- "Key:Metadata2",
- "Key:MetaData1",
+ gchar *key_metadata [] = {
+ "Key:Metadata2",
+ "Key:MetaData1",
NULL
};
-
+
def = tracker_service_new ();
tracker_service_set_id (def, id);
tracker_service_set_name (def, name);
@@ -150,8 +150,8 @@
gossip_def = create_service_definition (5, "GossipConversations", "Conversations", NULL, FALSE);
new_gaim_def = create_service_definition (6, "NewGaimConversations", "GaimConversations", NULL, FALSE);
- field_title = create_field_definition ("0",
- "App.Title",
+ field_title = create_field_definition ("0",
+ "App.Title",
TRACKER_FIELD_TYPE_INDEX,
"Title",
TRUE,
@@ -163,18 +163,18 @@
char *mp[] = {"images/", "video/", "other.mimes.", NULL};
mime_prefixes = array_to_list (mp);
tracker_ontology_init ();
-
+
expected_results = g_new0 (ExpectedResults, 1);
expected_results->def = def;
expected_results->parent_def = parent_def;
- tracker_ontology_service_add (def, NULL, NULL);
+ tracker_ontology_service_add (def, NULL, NULL);
tracker_ontology_service_add (parent_def, mimes, mime_prefixes);
- tracker_ontology_service_add (other_def, NULL, NULL);
- tracker_ontology_service_add (conv_def, NULL, NULL);
- tracker_ontology_service_add (gaim_def, NULL, NULL);
- tracker_ontology_service_add (gossip_def, NULL, NULL);
- tracker_ontology_service_add (new_gaim_def, NULL, NULL);
+ tracker_ontology_service_add (other_def, NULL, NULL);
+ tracker_ontology_service_add (conv_def, NULL, NULL);
+ tracker_ontology_service_add (gaim_def, NULL, NULL);
+ tracker_ontology_service_add (gossip_def, NULL, NULL);
+ tracker_ontology_service_add (new_gaim_def, NULL, NULL);
tracker_ontology_field_add (field_title);
@@ -332,7 +332,7 @@
service_types = tracker_ontology_get_service_names_registered ();
g_assert_cmpint (7, ==, g_slist_length (service_types));
-
+
g_assert (element_in_list (service_types, "Applications"));
g_slist_foreach (service_types, (GFunc)g_free, NULL);
@@ -343,7 +343,7 @@
test_get_registered_field_types (void)
{
GSList *field_types = NULL;
-
+
/* All registered field types */
field_types = tracker_ontology_get_field_names_registered (NULL);
@@ -385,7 +385,7 @@
}
int
-main (int argc, char **argv)
+main (int argc, char **argv)
{
int result;
@@ -394,29 +394,29 @@
tracker_services_general_setup ();
- g_test_add_func ("/libtracker-common/tracker-ontology/get_id_for_service",
+ g_test_add_func ("/libtracker-common/tracker-ontology/get_id_for_service",
test_get_id_for_service);
- g_test_add_func ("/libtracker-common/tracker-ontology/get_service_for_id",
+ g_test_add_func ("/libtracker-common/tracker-ontology/get_service_for_id",
test_get_service_by_id);
- g_test_add_func ("/libtracker-common/tracker-ontology/get_parent_service_by_id",
- test_get_parent_service_by_id);
- g_test_add_func ("/libtracker-common/tracker-ontology/get_parent_id_for_service_id",
+ g_test_add_func ("/libtracker-common/tracker-ontology/get_parent_service_by_id",
+ test_get_parent_service_by_id);
+ g_test_add_func ("/libtracker-common/tracker-ontology/get_parent_id_for_service_id",
test_get_parent_id_for_service_id);
- g_test_add_func ("/libtracker-common/tracker-ontology/get_parent_service",
+ g_test_add_func ("/libtracker-common/tracker-ontology/get_parent_service",
test_get_parent_service);
- g_test_add_func ("/libtracker-common/tracker-ontology/get_service_type_for_mime",
+ g_test_add_func ("/libtracker-common/tracker-ontology/get_service_type_for_mime",
test_get_service_type_for_mime);
- g_test_add_func ("/libtracker-common/tracker-ontology/get_service",
+ g_test_add_func ("/libtracker-common/tracker-ontology/get_service",
test_get_service);
- g_test_add_func ("/libtracker-common/tracker-ontology/get_db_for_service",
+ g_test_add_func ("/libtracker-common/tracker-ontology/get_db_for_service",
test_get_db_for_service);
- g_test_add_func ("/libtracker-common/tracker-ontology/is_service_embedded",
+ g_test_add_func ("/libtracker-common/tracker-ontology/is_service_embedded",
test_is_service_embedded);
- g_test_add_func ("/libtracker-common/tracker-ontology/has_thumbnails",
+ g_test_add_func ("/libtracker-common/tracker-ontology/has_thumbnails",
test_has_thumbnails);
- g_test_add_func ("/libtracker-common/tracker-ontology/has_text",
+ g_test_add_func ("/libtracker-common/tracker-ontology/has_text",
test_has_text);
- g_test_add_func ("/libtracker-common/tracker-ontology/has_metadata",
+ g_test_add_func ("/libtracker-common/tracker-ontology/has_metadata",
test_has_metadata);
g_test_add_func ("/libtracker-common/tracker-ontology/test_field_in_ontology",
test_field_in_ontology);
@@ -430,7 +430,7 @@
test_metadata_key_in_service);
result = g_test_run ();
-
+
tracker_ontology_shutdown ();
return result;
Modified: branches/indexer-split/tests/libtracker-common/tracker-parser-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-common/tracker-parser-test.c (original)
+++ branches/indexer-split/tests/libtracker-common/tracker-parser-test.c Sat Sep 20 14:45:00 2008
@@ -6,8 +6,8 @@
#include <libtracker-common/tracker-language.h>
#include <libtracker-common/tracker-parser.h>
-/*
- * len(word) > 3 : 6 words
+/*
+ * len(word) > 3 : 6 words
* longest word: 10 chars
* stop words ("here", "a", "of", "various", "to", "after")
*/
@@ -24,11 +24,11 @@
g_assert_cmpint (strlen (key), <=, max_length);
}
-/*
+/*
* Test max_words_to_index and min_length of the word
*/
-static void
-test_parser_text_max_words_to_index (void)
+static void
+test_parser_text_max_words_to_index (void)
{
GHashTable *result = NULL;
@@ -40,7 +40,7 @@
18, /* max length of the word */
3, /* min length of the word */
FALSE, FALSE); /* Filter / Delimit */
-
+
g_assert_cmpint (g_hash_table_size (result), ==, 5);
g_hash_table_unref (result);
@@ -71,7 +71,7 @@
}
/*
- * Filter numbers
+ * Filter numbers
*/
static void
test_parser_text_filter_numbers_stop_words (void)
@@ -117,7 +117,7 @@
test_parser_stop_words (void)
{
GHashTable *stop_words, *result = NULL;
-
+
/* Check we have the default stop words */
stop_words = tracker_language_get_stop_words (language);
g_assert (stop_words);
@@ -134,7 +134,7 @@
100, /* max words to index */
100, /* max length of the word */
1, /* min length of the word */
- TRUE, FALSE); /* Filter / Delimit */
+ TRUE, FALSE); /* Filter / Delimit */
}
static void
@@ -153,7 +153,7 @@
result = tracker_parser_text_fast (result, contents, 1);
g_assert_cmpint (g_hash_table_size (result), ==, 8);
-
+
}
int
@@ -185,7 +185,7 @@
test_parser_text_fast);
result = g_test_run ();
-
+
/* End */
g_object_unref (config);
g_object_unref (language);
Modified: branches/indexer-split/tests/libtracker-common/tracker-type-utils-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-common/tracker-type-utils-test.c (original)
+++ branches/indexer-split/tests/libtracker-common/tracker-type-utils-test.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <time.h>
#include <string.h>
@@ -38,7 +38,7 @@
g_assert (result == NULL);
- /* Fails
+ /* Fails
result = tracker_date_format ("1978"); //Audio.ReleaseDate
g_assert (tracker_test_helpers_cmpstr_equal (result, "1978-01-01T00:00:00"));
*/
@@ -79,7 +79,7 @@
gchar *input = "2008-06-16T11:10:10+0600";
expected = g_date_new_dmy (16, G_DATE_JUNE, 2008);
-
+
result_time_t = tracker_string_to_date (input);
result = g_date_new ();
@@ -99,7 +99,7 @@
result_time_t = tracker_string_to_date ("i am not a date");
g_assert_cmpint (result_time_t, ==, -1);
-
+
/* Fails! Check the code
result_time_t = tracker_string_to_date ("2008-06-32T04:23:10+0000");
g_assert_cmpint (result_time_t, ==, -1);
@@ -121,7 +121,7 @@
original->tm_mon = 5;
original->tm_year = 108;
original->tm_isdst = 1;
-
+
input = mktime (original);
result = tracker_date_to_string (input);
@@ -217,7 +217,7 @@
guint num_result, rc;
rc = tracker_string_to_uint ("10", &num_result);
-
+
g_assert (rc);
g_assert_cmpint (num_result, ==, 10);
@@ -270,7 +270,7 @@
}
static void
-test_gslist_to_string_list ()
+test_gslist_to_string_list ()
{
GSList *input = NULL;
gchar **result;
@@ -297,14 +297,14 @@
static void
-test_string_list_to_string ()
+test_string_list_to_string ()
{
gchar *input = "one two three four";
gchar **pieces;
gchar *result;
pieces = g_strsplit (input, " ", 4);
-
+
result = tracker_string_list_to_string (pieces, 4, ' ');
g_assert (tracker_test_helpers_cmpstr_equal (input, result));
g_free (result);
@@ -376,7 +376,7 @@
g_assert (tracker_test_helpers_cmpstr_equal (result, "Other invalid value"));
g_free (result);
-
+
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
result = tracker_string_boolean_to_string_gint (NULL);
}
@@ -419,6 +419,6 @@
g_test_add_func ("/libtracker-common/tracker-type-utils/string_to_date",
test_string_to_date);
result = g_test_run ();
-
+
return result;
}
Modified: branches/indexer-split/tests/libtracker-db/tracker-db-dbus-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-db-dbus-test.c (original)
+++ branches/indexer-split/tests/libtracker-db/tracker-db-dbus-test.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <glib.h>
#include <glib/gtestutils.h>
@@ -72,7 +72,7 @@
/* 5 results, 1 column */
result_set = get_mock_tracker_db_result (5, 1, FALSE);
result = tracker_dbus_query_result_to_strv (result_set, 0, &count);
-
+
g_assert_cmpint (count, ==, 5);
g_assert_cmpint (g_strv_length (result), ==, 5);
@@ -89,7 +89,7 @@
g_object_unref (result_set);
-
+
/* 1 result ... NULL */
result_set = get_mock_tracker_db_result (1, 1, TRUE);
result = tracker_dbus_query_result_to_strv (result_set, 0, &count);
@@ -125,7 +125,7 @@
result = tracker_dbus_query_result_to_ptr_array (result_set);
g_assert_cmpint (result->len, ==, 0);
free_string_ptr_array (result);
-
+
/* 5 results, 1 column */
result_set = get_mock_tracker_db_result (5, 1, FALSE);
result = tracker_dbus_query_result_to_ptr_array (result_set);
@@ -143,9 +143,9 @@
}
g_test_trap_assert_failed ();
/* Should raise g_critical (priv->array...); */
-
+
g_object_unref (result_set);
-
+
/* 1 result ... NULL */
result_set = get_mock_tracker_db_result (1, 1, TRUE);
result = tracker_dbus_query_result_to_ptr_array (result_set);
@@ -156,7 +156,7 @@
}
gint
-main (gint argc, gchar **argv)
+main (gint argc, gchar **argv)
{
int result;
@@ -173,7 +173,7 @@
result = g_test_run ();
-
+
/* End */
return result;
Modified: branches/indexer-split/tests/libtracker-db/tracker-db-manager-common.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-db-manager-common.c (original)
+++ branches/indexer-split/tests/libtracker-db/tracker-db-manager-common.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,21 +9,21 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include "tracker-db-manager-common.h"
gboolean
test_assert_query_run (TrackerDB db, const gchar *query)
{
TrackerDBInterface *iface;
-
+
iface = tracker_db_manager_get_db_interface (db);
return test_assert_query_run_on_iface (iface, query);
@@ -36,8 +36,8 @@
TrackerDBResultSet *result_set;
GError *error = NULL;
- result_set = tracker_db_interface_execute_query (iface,
- &error,
+ result_set = tracker_db_interface_execute_query (iface,
+ &error,
query);
if (error && error->message) {
Modified: branches/indexer-split/tests/libtracker-db/tracker-db-manager-common.h
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-db-manager-common.h (original)
+++ branches/indexer-split/tests/libtracker-db/tracker-db-manager-common.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#ifndef __TRACKER_DB_MANAGER_TEST_COMMON__
#define __TRACKER_DB_MANAGER_TEST_COMMON__
Modified: branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c (original)
+++ branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-attach.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <glib.h>
#include <glib/gtestutils.h>
@@ -32,7 +32,7 @@
static gboolean db_manager_status = NO_INIT;
-void
+void
ensure_db_manager_is_reindex (gboolean must_reindex)
{
gint first;
@@ -75,13 +75,13 @@
void
-test_assert_tables_in_db (TrackerDB db, gchar *query)
+test_assert_tables_in_db (TrackerDB db, gchar *query)
{
g_assert (test_assert_query_run (db, query));
}
static void
-test_creation_common_db_no_reindex ()
+test_creation_common_db_no_reindex ()
{
ensure_db_manager_is_reindex (FALSE);
test_assert_tables_in_db (TRACKER_DB_COMMON, "SELECT * FROM MetaDataTypes");
@@ -89,14 +89,14 @@
static void
-test_creation_xesam_db_no_reindex_multiple_interfaces ()
+test_creation_xesam_db_no_reindex_multiple_interfaces ()
{
TrackerDBInterface *iface;
ensure_db_manager_is_reindex (FALSE);
- iface = tracker_db_manager_get_db_interfaces (2,
- TRACKER_DB_XESAM,
+ iface = tracker_db_manager_get_db_interfaces (2,
+ TRACKER_DB_XESAM,
TRACKER_DB_COMMON);
test_assert_query_run_on_iface (iface, "SELECT * FROM XesamServiceTypes");
@@ -104,7 +104,7 @@
static void
-test_creation_xesam_db_no_reindex ()
+test_creation_xesam_db_no_reindex ()
{
ensure_db_manager_is_reindex (FALSE);
test_assert_tables_in_db (TRACKER_DB_XESAM, "SELECT * FROM XesamServiceTypes");
@@ -153,7 +153,7 @@
result = g_test_run ();
-
+
/* End */
return result;
Modified: branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-custom.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-custom.c (original)
+++ branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-custom.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <glib.h>
#include <glib/gtestutils.h>
@@ -25,7 +25,7 @@
#include "tracker-db-manager-common.h"
void
-test_assert_tables_in_db (TrackerDBInterface *iface, gchar *query)
+test_assert_tables_in_db (TrackerDBInterface *iface, gchar *query)
{
g_assert (test_assert_query_run_on_iface (iface, query));
}
@@ -35,7 +35,7 @@
{
TrackerDBInterface *iface;
- iface = tracker_db_manager_get_db_interfaces (3,
+ iface = tracker_db_manager_get_db_interfaces (3,
TRACKER_DB_COMMON,
TRACKER_DB_FILE_METADATA,
TRACKER_DB_FILE_CONTENTS);
@@ -51,7 +51,7 @@
{
TrackerDBInterface *iface;
- iface = tracker_db_manager_get_db_interfaces (1,
+ iface = tracker_db_manager_get_db_interfaces (1,
TRACKER_DB_XESAM);
test_assert_tables_in_db (iface, "SELECT * FROM XesamMetaDataTypes");
@@ -70,7 +70,7 @@
g_test_init (&argc, &argv, NULL);
/* Init */
- tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
+ tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
&first_time);
g_test_add_func ("/libtracker-db/tracker-db-manager/custom/common_filemeta_filecontents",
@@ -80,7 +80,7 @@
test_custom_xesam_no_common);
result = g_test_run ();
-
+
/* End */
tracker_db_manager_shutdown ();
Modified: branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-unattach.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-unattach.c (original)
+++ branches/indexer-split/tests/libtracker-db/tracker-db-manager-test-unattach.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <glib.h>
#include <glib/gtestutils.h>
@@ -25,13 +25,13 @@
#include "tracker-db-manager-common.h"
void
-test_assert_tables_in_db (TrackerDB db, gchar *query)
+test_assert_tables_in_db (TrackerDB db, gchar *query)
{
g_assert (test_assert_query_run (db, query));
}
static void
-test_creation_common_db ()
+test_creation_common_db ()
{
test_assert_tables_in_db (TRACKER_DB_COMMON, "SELECT * FROM MetaDataTypes");
}
@@ -78,7 +78,7 @@
g_test_init (&argc, &argv, NULL);
/* Init */
- tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
+ tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
&first_time);
g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/common_db_tables",
@@ -102,7 +102,7 @@
test_creation_email_contents_db);
result = g_test_run ();
-
+
/* End */
tracker_db_manager_shutdown ();
Modified: branches/indexer-split/tests/libtracker-db/tracker-index-reader-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-index-reader-test.c (original)
+++ branches/indexer-split/tests/libtracker-db/tracker-index-reader-test.c Sat Sep 20 14:45:00 2008
@@ -16,19 +16,19 @@
TrackerDBIndex *index;
gchar *suggestion;
- index = tracker_db_index_new ("./example.index",
+ index = tracker_db_index_new ("./example.index",
DEFAULT_MIN_BUCKET_COUNT,
DEFAULT_MAX_BUCKET_COUNT,
TRUE);
-
+
g_assert (!tracker_db_index_get_reload (index));
-
+
suggestion = tracker_db_index_get_suggestion (index, "Thiz", 9);
-
+
g_assert (tracker_test_helpers_cmpstr_equal (suggestion, "this"));
-
+
g_free (suggestion);
-
+
g_object_unref (index);
}
@@ -39,11 +39,11 @@
TrackerDBIndexItem *hits = NULL;
guint count;
- index = tracker_db_index_new ("./example.index",
+ index = tracker_db_index_new ("./example.index",
DEFAULT_MIN_BUCKET_COUNT,
DEFAULT_MAX_BUCKET_COUNT,
TRUE);
-
+
tracker_db_index_set_reload (index, TRUE);
g_assert (tracker_db_index_get_reload (index)); /* Trivial check of get/set */
@@ -98,7 +98,7 @@
/* Now the first operation reload the index */
g_assert (tracker_db_index_get_word_hits (index, "this", &count));
-
+
/* Reload false: It is already reloaded */
g_assert (!tracker_db_index_get_reload (index));
@@ -126,7 +126,7 @@
g_test_add_func ("/libtracker-db/tracker-index/created_file_in_the_mean_time",
test_created_file_in_the_mean_time);
result = g_test_run ();
-
+
/* End */
return result;
Modified: branches/indexer-split/tests/libtracker-db/tracker-index-writer-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/tracker-index-writer-test.c (original)
+++ branches/indexer-split/tests/libtracker-db/tracker-index-writer-test.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <qdbm/depot.h>
@@ -48,7 +48,7 @@
}
static gint
-get_results_for_word (const gchar *index_file, const gchar *word)
+get_results_for_word (const gchar *index_file, const gchar *word)
{
DEPOT *index;
gint result;
@@ -93,7 +93,7 @@
g_remove (indexname);
index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
-
+
tracker_db_index_add_word (index, "word1", 1, 1, 1);
tracker_db_index_flush (index);
g_object_unref (index);
@@ -117,7 +117,7 @@
g_remove (indexname);
index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
-
+
for ( i = 0; i < 20; i++) {
word = g_strdup_printf ("word%d", i);
tracker_db_index_add_word (index, word, 1, 1, 1);
@@ -141,7 +141,7 @@
g_remove (indexname);
index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
-
+
for ( i = 0; i < 20; i++) {
tracker_db_index_add_word (index, "test-word", i, 1, 1);
}
@@ -164,7 +164,7 @@
g_remove (indexname);
index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
-
+
for ( i = 0; i < 20; i++) {
tracker_db_index_add_word (index, "test-word", 1, 1, 1);
}
@@ -179,11 +179,11 @@
g_assert_cmpint (get_score_for_word (indexname, "test-word"), ==, 20);
g_remove (indexname);
-
+
}
static gint
-insert_in_index (TrackerDBIndex *index, const gchar *text)
+insert_in_index (TrackerDBIndex *index, const gchar *text)
{
gchar **pieces;
gint i;
@@ -201,7 +201,7 @@
}
static void
-test_add_with_flushs ()
+test_add_with_flushs ()
{
TrackerDBIndex *index;
@@ -209,7 +209,7 @@
const gchar *text1 = "this is a text to try a kind of real use case of the indexer";
const gchar *text2 = "this is another text with some common words";
-
+
g_remove (indexname);
index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
@@ -232,7 +232,7 @@
}
static void
-remove_in_index (TrackerDBIndex *index, const gchar *text, gint docid)
+remove_in_index (TrackerDBIndex *index, const gchar *text, gint docid)
{
gchar **pieces;
gint i;
@@ -256,7 +256,7 @@
const gchar *doc1 = "this is a text to try a kind of real use case of the indexer";
const gchar *doc2 = "this is another text with some common words";
-
+
g_remove (indexname);
index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
@@ -274,7 +274,7 @@
g_assert_cmpint (get_number_words_in_index (indexname), ==, 18);
index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
-
+
/* Remove doc1 */
remove_in_index (index, doc1, id1);
tracker_db_index_flush (index);
@@ -294,14 +294,14 @@
gint id1;
const gchar *doc1 = "this is a text";
-
+
g_remove (indexname);
index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
/* Doc 1 */
id1 = insert_in_index (index, doc1);
-
+
/* Remove before flush */
remove_in_index (index, doc1, id1);
@@ -315,7 +315,7 @@
}
int
-main (int argc, char **argv)
+main (int argc, char **argv)
{
int result;
@@ -346,6 +346,6 @@
test_remove_before_flush);
result = g_test_run ();
-
+
return result;
}
Modified: branches/indexer-split/tests/libtracker-db/union-performance.c
==============================================================================
--- branches/indexer-split/tests/libtracker-db/union-performance.c (original)
+++ branches/indexer-split/tests/libtracker-db/union-performance.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <glib.h>
#include <glib/gtestutils.h>
@@ -60,8 +60,8 @@
result_set = tracker_db_interface_execute_query (iface, &error,
"SELECT M0.MetaDataValue "
"FROM XesamServicesView S "
- "INNER JOIN XesamServiceMetaDataView M0 ON (S.ID = M0.ServiceID and "
- "M0.MetaDataID in (82)) WHERE (S.ServiceTypeID in (select TypeId from "
+ "INNER JOIN XesamServiceMetaDataView M0 ON (S.ID = M0.ServiceID and "
+ "M0.MetaDataID in (82)) WHERE (S.ServiceTypeID in (select TypeId from "
"ServiceTypes where TypeName = 'Files' or Parent = 'Files')) AND "
" ( (M0.MetaDataValue like '%%test%%') )");
@@ -98,8 +98,8 @@
result_set = tracker_db_interface_execute_query (iface, &error,
"SELECT M0.MetaDataValue "
"FROM 'file-meta'.Services S "
- "INNER JOIN 'file-meta'.ServiceMetaData M0 ON (S.ID = M0.ServiceID and "
- "M0.MetaDataID in (82)) WHERE (S.ServiceTypeID in (select TypeId from "
+ "INNER JOIN 'file-meta'.ServiceMetaData M0 ON (S.ID = M0.ServiceID and "
+ "M0.MetaDataID in (82)) WHERE (S.ServiceTypeID in (select TypeId from "
"ServiceTypes where TypeName = 'Files' or Parent = 'Files')) AND "
" ( (M0.MetaDataValue like '%%test%%') ) "
@@ -107,8 +107,8 @@
"SELECT M0.MetaDataValue "
"FROM 'email-meta'.Services S "
- "INNER JOIN 'email-meta'.ServiceMetaData M0 ON (S.ID = M0.ServiceID and "
- "M0.MetaDataID in (82)) WHERE (S.ServiceTypeID in (select TypeId from "
+ "INNER JOIN 'email-meta'.ServiceMetaData M0 ON (S.ID = M0.ServiceID and "
+ "M0.MetaDataID in (82)) WHERE (S.ServiceTypeID in (select TypeId from "
"ServiceTypes where TypeName = 'Email' or Parent = 'Email')) AND "
" ( (M0.MetaDataValue like '%%test%%') ) ");
@@ -123,7 +123,7 @@
int
-main (int argc, char **argv)
+main (int argc, char **argv)
{
int result;
gint first_time;
@@ -133,7 +133,7 @@
g_test_init (&argc, &argv, NULL);
/* Init */
- tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
+ tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
&first_time);
g_test_add_func ("/libtracker-db/union-performance/xesam/view",
Modified: branches/indexer-split/tests/tracker-fts/tracker-fts-test.c
==============================================================================
--- branches/indexer-split/tests/tracker-fts/tracker-fts-test.c (original)
+++ branches/indexer-split/tests/tracker-fts/tracker-fts-test.c Sat Sep 20 14:45:00 2008
@@ -27,10 +27,10 @@
#include <glib.h>
#include <glib-object.h>
-static gint
-callback (void *NotUsed,
- gint argc,
- gchar **argv,
+static gint
+callback (void *NotUsed,
+ gint argc,
+ gchar **argv,
gchar **azColName)
{
gint i;
@@ -38,28 +38,28 @@
for (i = 0; i < argc; i++) {
printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
}
-
+
printf("\n");
return 0;
}
static void
-exec_sql (sqlite3 *db,
+exec_sql (sqlite3 *db,
const gchar *sql)
{
gchar *zErrMsg;
gint rc;
rc = sqlite3_exec (db, sql , callback, 0, &zErrMsg);
-
+
if (rc != SQLITE_OK) {
g_printerr ("SQL error: %s\n", zErrMsg);
sqlite3_free (zErrMsg);
}
}
-int
+int
main (int argc, char **argv)
{
sqlite3 *db;
@@ -70,30 +70,30 @@
g_type_init ();
g_thread_init (NULL);
-
+
if (argc != 2) {
g_printerr ("Usage: %s MATCH_TERM\n", argv[0]);
g_printerr ("EG: %s stew\n", argv[0]);
return EXIT_FAILURE;
}
-
+
db_exists = g_file_test ("/tmp/test.db", G_FILE_TEST_EXISTS);
-
+
rc = sqlite3_open ("/tmp/test.db", &db);
if (rc) {
g_printerr ("Can't open database: %s\n", sqlite3_errmsg(db));
sqlite3_close(db);
return EXIT_FAILURE;
}
-
+
sqlite3_enable_load_extension (db, 1);
sqlite3_load_extension (db, "tracker-fts.so", NULL, &st);
-
+
if (st) {
fprintf(stderr, "SQL error: %s\n", st);
sqlite3_free(st);
}
-
+
if (!db_exists) {
exec_sql (db, "create virtual table recipe using trackerfts (name, ingredients)");
exec_sql (db, "insert into recipe (name, ingredients) values ('broccoli stew', 'broccoli,peppers,cheese and tomatoes')");
@@ -101,11 +101,11 @@
exec_sql (db, "insert into recipe (name, ingredients) values ('broccoli pie', 'broccoli,cheese,onions and flour.')");
exec_sql (db, "insert into recipe (name, ingredients) values ('pumpkin pie', 'pumpkin,sugar,flour and butter.')");
}
-
+
sql = g_strdup_printf ("select rowid, name, ingredients, snippet(recipe), offsets(recipe) from recipe where recipe match '%s'", argv[1]);
exec_sql (db, sql);
g_free (sql);
-
+
sqlite3_close(db);
return EXIT_SUCCESS;
Modified: branches/indexer-split/tests/trackerd/tracker-xesam-hit-test.c
==============================================================================
--- branches/indexer-split/tests/trackerd/tracker-xesam-hit-test.c (original)
+++ branches/indexer-split/tests/trackerd/tracker-xesam-hit-test.c Sat Sep 20 14:45:00 2008
@@ -3,17 +3,17 @@
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* This program 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with main.c; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
*/
-
+
#include <glib.h>
#include <glib/gtestutils.h>
#include <glib-object.h>
@@ -37,7 +37,7 @@
#define NUM_FIELDS _get_num_fields()
/* Fields set in the session's hit-fields property */
-const gchar *TEST_FIELDS[2] =
+const gchar *TEST_FIELDS[2] =
{
// "xesam:url",
// "xesam:title",
@@ -63,10 +63,10 @@
{
int i;
static guint num_fields = 0;
-
+
if (num_fields != 0)
return num_fields;
-
+
for (i = 0; ; i++) {
if (TEST_FIELDS[i] == NULL) {
num_fields = i;
@@ -84,21 +84,21 @@
fix->mainloop = g_main_loop_new (NULL, FALSE);
fix->searcher = XESAM_G_SEARCHER(xesam_g_dbus_searcher_new_default ());
fix->session = xesam_g_session_new (fix->searcher);
-
+
g_object_set (fix->session, "hit-fields", TEST_FIELDS, NULL);
-
+
fix->search = xesam_g_session_new_search (fix->session, xesam_g_query_new_from_xml(TEST_XML));
-
+
g_assert (XESAM_IS_G_SEARCHER (fix->searcher));
g_assert (XESAM_IS_G_SESSION (fix->session));
g_assert (XESAM_IS_G_SEARCH (fix->search));
-
+
xesam_g_search_start (fix->search);
if (gtx_wait_for_signal(G_OBJECT(fix->search), TIMEOUT, "hits-added",
&fix->hits))
g_critical ("Test search '%s' did not spawn any hits",
TEST_XML);
-
+
g_assert (XESAM_IS_G_HITS (fix->hits));
g_assert_cmpint (xesam_g_hits_get_count (fix->hits), >, 0);
}
@@ -112,25 +112,25 @@
g_assert (XESAM_IS_G_SESSION(fix->session));
g_assert (XESAM_IS_G_SEARCH(fix->search));
g_assert (XESAM_IS_G_HITS(fix->hits));
-
+
/* Allow to process any dangling async calls. This is needed
* to make the leak detecction below work. */
gtx_yield_main_loop (TIMEOUT);
-
+
g_main_loop_unref (fix->mainloop);
gtx_assert_last_unref (fix->hits);
gtx_assert_last_unref (fix->search);
gtx_assert_last_unref (fix->session);
-
+
/* Allow to process any dangling async calls. This is needed
* to make the leak detecction below work. Yes, we need it two times */
gtx_yield_main_loop (TIMEOUT);
-
+
gtx_assert_last_unref (fix->searcher);
-
+
if (fix->error)
g_error_free (fix->error);
-
+
}
static void
@@ -140,18 +140,18 @@
guint hit_count, i, j;
XesamGHit *hit;
const GPtrArray *raw;
-
+
hit_count = xesam_g_hits_get_count (fix->hits);
g_assert_cmpint (hit_count, >, 0);
-
+
for (i = 0; i < hit_count; i++) {
hit = xesam_g_hits_get (fix->hits, i);
g_assert (XESAM_IS_G_HIT (hit));
-
+
raw = xesam_g_hit_get_data (hit);
g_assert (raw != NULL);
g_assert_cmpint (raw->len, ==, NUM_FIELDS);
-
+
/* Assert that all field data members are valid GValues */
for (j = 0; j < raw->len; j++) {
g_assert (G_IS_VALUE(g_ptr_array_index(raw, j)));
@@ -166,10 +166,10 @@
XesamGHit *hit;
const GValue *field_value;
guint i;
-
+
/* We just check the first Hit in the Hits object */
hit = xesam_g_hits_get (fix->hits, 0);
-
+
for (i = 0; i < NUM_FIELDS; i++) {
field_value = xesam_g_hit_get_field (hit, TEST_FIELDS[i]);
g_assert (G_IS_VALUE (field_value));
@@ -183,14 +183,14 @@
XesamGHit *hit;
const GValue *field_value_by_key, *field_value_by_id;
guint i;
-
+
/* We just check the first Hit in the Hits object */
hit = xesam_g_hits_get (fix->hits, 0);
-
+
for (i = 0; i < NUM_FIELDS; i++) {
field_value_by_key = xesam_g_hit_get_field (hit, TEST_FIELDS[i]);
field_value_by_id = xesam_g_hit_get_field_by_id (hit, i);
-
+
g_assert (field_value_by_key == field_value_by_id);
g_assert (G_IS_VALUE (field_value_by_key));
g_assert (G_IS_VALUE (field_value_by_id));
@@ -204,10 +204,10 @@
XesamGHit *hit;
guint i;
guint count = xesam_g_hits_get_count (fix->hits);
-
+
for (i = 0; i < count; i++) {
hit = xesam_g_hits_get (fix->hits, i);
-
+
/* This assumes that hit is the first XesamGHit to be delievered */
g_assert_cmpint (i, ==, xesam_g_hit_get_id (hit));
}
@@ -220,20 +220,20 @@
XesamGHit *hit;
GStrv field_names;
guint i;
-
+
hit = xesam_g_hits_get (fix->hits, 0);
field_names = xesam_g_hit_get_field_names (hit);
-
+
/* This also tests that both arrays ends with NULL */
for (i = 0; i <= NUM_FIELDS; i++) {
g_assert_cmpstr (TEST_FIELDS[i], ==, field_names[i]);
}
-
+
g_strfreev (field_names);
}
-void
+void
g_test_add_hit_tests (void)
{
@@ -242,6 +242,6 @@
TEST (get_field_by_id);
TEST (get_id);
TEST (get_field_names);
-
+
return;
}
Modified: branches/indexer-split/tests/trackerd/tracker-xesam-hit-test.h
==============================================================================
--- branches/indexer-split/tests/trackerd/tracker-xesam-hit-test.h (original)
+++ branches/indexer-split/tests/trackerd/tracker-xesam-hit-test.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#ifndef _TRACKER_XESAM_HIT_TEST_H_
#define _TRACKER_XESAM_HIT_TEST_H_
Modified: branches/indexer-split/tests/trackerd/tracker-xesam-hits-test.c
==============================================================================
--- branches/indexer-split/tests/trackerd/tracker-xesam-hits-test.c (original)
+++ branches/indexer-split/tests/trackerd/tracker-xesam-hits-test.c Sat Sep 20 14:45:00 2008
@@ -3,17 +3,17 @@
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* This program 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with main.c; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
*/
-
+
#include <glib.h>
#include <glib/gtestutils.h>
#include <glib-object.h>
@@ -47,7 +47,7 @@
} Fixture;
/* Fields set in the session's hit-fields property */
-const gchar *HITS_TEST_FIELDS[2] =
+const gchar *HITS_TEST_FIELDS[2] =
{
// "xesam:url",
// "xesam:title",
@@ -70,21 +70,21 @@
fix->mainloop = g_main_loop_new (NULL, FALSE);
fix->searcher = XESAM_G_SEARCHER(xesam_g_dbus_searcher_new_default ());
fix->session = xesam_g_session_new (fix->searcher);
-
+
g_object_set (fix->session, "hit-fields", HITS_TEST_FIELDS, NULL);
-
+
fix->search = xesam_g_session_new_search (fix->session, xesam_g_query_new_from_xml(TEST_XML));
-
+
g_assert (XESAM_IS_G_SEARCHER (fix->searcher));
g_assert (XESAM_IS_G_SESSION (fix->session));
g_assert (XESAM_IS_G_SEARCH (fix->search));
-
+
xesam_g_search_start (fix->search);
if (gtx_wait_for_signal(G_OBJECT(fix->search), TIMEOUT, "hits-added",
&fix->hits))
g_critical ("Test search '%s' did not spawn any hits",
TEST_XML);
-
+
g_assert (XESAM_IS_G_HITS (fix->hits));
g_assert_cmpint (xesam_g_hits_get_count (fix->hits), >, 0);
}
@@ -101,22 +101,22 @@
g_assert (XESAM_IS_G_SESSION(fix->session));
g_assert (XESAM_IS_G_SEARCH(fix->search));
g_assert (XESAM_IS_G_HITS(fix->hits));
-
+
/* Allow to process any dangling async calls. This is needed
* to make the leak detecction below work. */
gtx_yield_main_loop (TIMEOUT);
-
+
g_main_loop_unref (fix->mainloop);
gtx_assert_last_unref (fix->hits);
gtx_assert_last_unref (fix->search);
gtx_assert_last_unref (fix->session);
-
+
/* Allow to process any dangling async calls. This is needed
* to make the leak detecction below work. Yes, we need it two times */
gtx_yield_main_loop (TIMEOUT);
-
+
gtx_assert_last_unref (fix->searcher);
-
+
if (fix->error)
g_error_free (fix->error);
}
@@ -126,9 +126,9 @@
gconstpointer data)
{
guint hit_count;
-
+
hit_count = xesam_g_hits_get_count (fix->hits);
-
+
g_assert_cmpint (hit_count, >, 0);
}
@@ -138,14 +138,14 @@
{
guint hit_count, i;
XesamGHit *hit;
-
+
hit_count = xesam_g_hits_get_count (fix->hits);
g_assert_cmpint (hit_count, >, 0);
-
+
for (i = 0; i < hit_count; i++) {
hit = xesam_g_hits_get (fix->hits, i);
g_assert (XESAM_IS_G_HIT (hit));
-
+
/* Build a list of hit objects with refs. We use this
* to assert that they are properly freed later */
fix->hit_list = g_list_prepend (fix->hit_list, hit);
@@ -153,7 +153,7 @@
}
}
-void
+void
g_test_add_hits_tests (void)
{
TEST (count);
Modified: branches/indexer-split/tests/trackerd/tracker-xesam-hits-test.h
==============================================================================
--- branches/indexer-split/tests/trackerd/tracker-xesam-hits-test.h (original)
+++ branches/indexer-split/tests/trackerd/tracker-xesam-hits-test.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#ifndef _TRACKER_XESAM_HITS_TEST_H_
#define _TRACKER_XESAM_HITS_TEST_H_
Modified: branches/indexer-split/tests/trackerd/tracker-xesam-session-test.c
==============================================================================
--- branches/indexer-split/tests/trackerd/tracker-xesam-session-test.c (original)
+++ branches/indexer-split/tests/trackerd/tracker-xesam-session-test.c Sat Sep 20 14:45:00 2008
@@ -3,17 +3,17 @@
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* This program 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with main.c; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
*/
-
+
#include <glib.h>
#include <glib/gtestutils.h>
#include <glib-object.h>
@@ -55,14 +55,14 @@
{
gchar *notify_signal;
GParamSpec *tmp_pspec;
-
+
notify_signal = g_strconcat ("notify::", property, NULL);
-
+
if (xesam_g_session_test_property (session, property)) {
g_free (notify_signal);
return TRUE;
}
-
+
if (gtx_wait_for_signal (G_OBJECT(session), TIMEOUT,
notify_signal, &tmp_pspec)) {
g_param_spec_unref (tmp_pspec);
@@ -72,14 +72,14 @@
}
g_free (notify_signal);
return FALSE;
-
+
}
-
+
if (xesam_g_session_test_property (session, property)) {
g_free (notify_signal);
return TRUE;
}
-
+
g_critical ("'%s' emitted, but test_property() returns FALSE", notify_signal);
g_free (notify_signal);
return FALSE;
@@ -94,7 +94,7 @@
fix->mainloop = g_main_loop_new (NULL, FALSE);
fix->searcher = XESAM_G_SEARCHER(xesam_g_dbus_searcher_new_default ());
fix->session = xesam_g_session_new (fix->searcher);
-
+
g_assert (XESAM_IS_G_SEARCHER(fix->searcher));
g_assert (XESAM_IS_G_SESSION(fix->session));
}
@@ -106,11 +106,11 @@
/* Make sure we did not screw up the searcher and session in the test */
g_assert (XESAM_IS_G_SEARCHER(fix->searcher));
g_assert (XESAM_IS_G_SESSION(fix->session));
-
+
g_main_loop_unref (fix->mainloop);
g_object_unref (fix->searcher);
g_object_unref (fix->session);
-
+
if (fix->error)
g_error_free (fix->error);
}
@@ -122,7 +122,7 @@
{
if (gtx_wait_for_signal (G_OBJECT(fix->session), TIMEOUT, "ready"))
g_critical ("'ready' signal never emitted");
-
+
if (!gtx_wait_for_signal (G_OBJECT(fix->session), TIMEOUT, "ready"))
g_critical ("'ready' signal emitted twice");
@@ -135,10 +135,10 @@
gconstpointer test_data)
{
xesam_g_session_close (fix->session);
-
+
if (gtx_wait_for_signal (G_OBJECT(fix->session), TIMEOUT, "closed"))
g_critical ("'closed' signal never emitted");
-
+
g_assert (xesam_g_session_is_closed (fix->session));
}
@@ -152,13 +152,13 @@
if (gtx_wait_for_signal (G_OBJECT(fix->session), TIMEOUT, "closed"))
g_critical ("'closed' signal never emitted");
g_assert (xesam_g_session_is_closed (fix->session));
-
+
/* Next close should not emit 'closed' */
xesam_g_session_close (fix->session);
if (!gtx_wait_for_signal (G_OBJECT(fix->session), TIMEOUT, "closed"))
g_critical ("'closed' signal emitted, but session already closed");
g_assert (xesam_g_session_is_closed (fix->session));
-
+
/* Even more closing should not emit 'closed' */
xesam_g_session_close (fix->session);
if (!gtx_wait_for_signal (G_OBJECT(fix->session), TIMEOUT, "closed"))
@@ -172,61 +172,61 @@
gconstpointer test_data)
{
XesamGSession *session;
-
+
session = fix->session;
-
+
xesam_g_session_sync_property (session, "search-live");
if (!check_property (session, "search-live"))
g_critical ("search-live not synced");
-
+
xesam_g_session_sync_property (session, "hit-fields");
if (!check_property(session, "hit-fields"))
g_critical ("hit-fields not synced");
-
+
xesam_g_session_sync_property (session, "hit-fields-extended");
if (!check_property(session, "hit-fields-extended"))
g_critical ("hit-fields-extended not synced");
-
+
xesam_g_session_sync_property (session, "hit-snippet-length");
if (!check_property(session, "hit-snippet-length"))
g_critical ("hit-snippet-length not synced");
-
+
xesam_g_session_sync_property (session, "sort-primary");
if (!check_property(session, "sort-primary"))
g_critical ("sort-primary not synced");
-
+
xesam_g_session_sync_property (session, "sort-secondary");
if (!check_property(session, "sort-secondary"))
g_critical ("sort-secondary not synced");
-
+
xesam_g_session_sync_property (session, "sort-order");
if (!check_property(session, "sort-order"))
g_critical ("sort-order not synced");
-
+
xesam_g_session_sync_property (session, "vendor-id");
if (!check_property(session, "vendor-id"))
g_critical ("vendor-id not synced");
-
+
xesam_g_session_sync_property (session, "vendor-version");
if (!check_property(session, "vendor-version"))
g_critical ("vendor-version not synced");
-
+
xesam_g_session_sync_property (session, "vendor-display");
if (!check_property(session, "vendor-display"))
g_critical ("vendor-display not synced");
-
+
xesam_g_session_sync_property (session, "vendor-xesam");
if (!check_property(session, "vendor-xesam"))
g_critical ("vendor-xesam not synced");
-
+
xesam_g_session_sync_property (session, "vendor-ontology-fields");
if (!check_property(session, "vendor-ontology-fields"))
g_critical ("vendor-ontology-fields not synced");
-
+
xesam_g_session_sync_property (session, "vendor-ontology-contents");
if (!check_property(session, "vendor-ontology-contents"))
g_critical ("vendor-ontology-ceontents not synced");
-
+
xesam_g_session_sync_property (session, "vendor-ontology-sources");
if (!check_property(session, "vendor-ontology-sources"))
g_critical ("vendor-ontology-sources not synced");
@@ -238,7 +238,7 @@
xesam_g_session_sync_property (session, "vendor-ontologies");
if (!check_property(session, "vendor-ontologies"))
g_critical ("vendor-ontologies not synced");
-
+
xesam_g_session_sync_property (session, "vendor-maxhits");
if (!check_property(session, "vendor-maxhits"))
g_critical ("vendor-maxhits not synced");
@@ -252,16 +252,16 @@
gconstpointer test_data)
{
XesamGSearch *search;
-
+
/* Don't bother to wait for 'ready'. This should work regardless. */
search = xesam_g_session_new_search_from_text (fix->session,
"hello world");
-
+
g_assert (XESAM_IS_G_SEARCH (search));
g_assert (xesam_g_search_get_session (search) == fix->session);
-
+
g_object_unref (search);
-
+
/* search will not be finalized before it has received a handle */
gtx_yield_main_loop (TIMEOUT);
}
@@ -273,26 +273,26 @@
{
GHashTable *map;
GParamSpec *pspec;
-
+
if (gtx_wait_for_signal (G_OBJECT(fix->session),TIMEOUT, "ready"))
g_critical ("'ready' never emitted on session");
-
+
map = xesam_g_session_get_field_map (fix->session);
g_assert (map != NULL);
g_assert_cmpint (g_hash_table_size (map), == , 1);
g_assert_cmpint (*((int*)g_hash_table_lookup (map, "xesam:url")), ==, 0);
-
+
/* Update hit-fields */
gchar *hit_fields[4] = {"xesam:url", "xesam:title", "xesam:subject", NULL};
g_object_set (fix->session, "hit-fields", hit_fields, NULL);
-
+
/* Wait for propoerty change to be registered remotely */
if (gtx_wait_for_signal (G_OBJECT(fix->session),TIMEOUT,
"notify::hit-fields", &pspec))
g_critical ("'notify::hit-fields' never emitted on session");
-
+
g_param_spec_unref (pspec);
-
+
map = xesam_g_session_get_field_map (fix->session);
g_assert_cmpint (g_hash_table_size (map), == , 3);
g_assert_cmpint (*((int*)g_hash_table_lookup (map, "xesam:url")), ==, 0);
Modified: branches/indexer-split/tests/trackerd/tracker-xesam-session-test.h
==============================================================================
--- branches/indexer-split/tests/trackerd/tracker-xesam-session-test.h (original)
+++ branches/indexer-split/tests/trackerd/tracker-xesam-session-test.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#ifndef _TRACKER_XESAM_SESSION_TEST_H_
#define _TRACKER_XESAM_SESSION_TEST_H_
Modified: branches/indexer-split/tests/trackerd/tracker-xesam-test.c
==============================================================================
--- branches/indexer-split/tests/trackerd/tracker-xesam-test.c (original)
+++ branches/indexer-split/tests/trackerd/tracker-xesam-test.c Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#include <glib.h>
#include <glib/gtestutils.h>
Modified: branches/indexer-split/tests/trackerd/tracker-xesam-test.h
==============================================================================
--- branches/indexer-split/tests/trackerd/tracker-xesam-test.h (original)
+++ branches/indexer-split/tests/trackerd/tracker-xesam-test.h Sat Sep 20 14:45:00 2008
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -9,14 +9,14 @@
*
* 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
+ * 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.
- */
+ * Boston, MA 02110-1301, USA.
+ */
#ifndef _TRACKER_XESAM_TEST_H_
#define _TRACKER_XESAM_TEST_H_
Modified: branches/indexer-split/tests/trackerd/xesam/gtestextensions.c
==============================================================================
--- branches/indexer-split/tests/trackerd/xesam/gtestextensions.c (original)
+++ branches/indexer-split/tests/trackerd/xesam/gtestextensions.c Sat Sep 20 14:45:00 2008
@@ -3,17 +3,17 @@
* gtestextensions
* Copyright (C) Mikkel Kamstrup Erlandsen 2008 <mikkel kamstrup gmail com>
* Scott Asofyet 2008 (wait_for_signal code)
- *
+ *
* gtestextensions is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* gtestextensions 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with xesam-glib. If not, write to:
* The Free Software Foundation, Inc.,
@@ -45,9 +45,9 @@
gtx_flush_sources (gboolean may_block)
{
GMainContext *ctx;
-
+
ctx = g_main_context_default ();
-
+
while (g_main_context_pending (ctx))
g_main_context_iteration (ctx, may_block);
}
@@ -64,12 +64,12 @@
gtx_quit_main_loop (GMainLoop *loop)
{
g_assert (loop != NULL);
-
+
if (g_main_loop_is_running (loop))
g_main_loop_quit (loop);
else
g_warning ("Tried to quit non-running GMainLoop %p", loop);
-
+
return FALSE;
}
@@ -84,14 +84,14 @@
gtx_yield_main_loop (guint millis)
{
GMainLoop *recursive_main;
-
+
recursive_main = g_main_loop_new (NULL, FALSE);
-
+
g_timeout_add (millis, (GSourceFunc)gtx_quit_main_loop, recursive_main);
g_main_loop_run (recursive_main);
-
+
gtx_flush_sources (FALSE);
-
+
g_main_loop_unref (recursive_main);
}
@@ -102,10 +102,10 @@
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
-{
+{
WaitForSignalClosure * wfsclosure = (WaitForSignalClosure *) closure;
guint i;
-
+
wfsclosure->param_values = g_value_array_new (n_param_values);
for (i = 0 ; i < n_param_values ; i++)
g_value_array_append (wfsclosure->param_values, param_values + i);
@@ -147,7 +147,7 @@
wfs->loop);
g_main_loop_run (wfs->loop);
-
+
g_closure_invalidate (&wfs->closure);
if (wfs->param_values) {
@@ -161,14 +161,14 @@
} else {
timed_out = TRUE;
}
-
+
g_main_loop_unref (wfs->loop);
wfs->loop = NULL;
-
+
/* Closure will be destroyed here */
g_signal_handler_disconnect (object, handler_id);
g_source_remove (max_timeout_id);
-
+
return timed_out;
}
Modified: branches/indexer-split/tests/trackerd/xesam/gtestextensions.h
==============================================================================
--- branches/indexer-split/tests/trackerd/xesam/gtestextensions.h (original)
+++ branches/indexer-split/tests/trackerd/xesam/gtestextensions.h Sat Sep 20 14:45:00 2008
@@ -2,17 +2,17 @@
/*
* gtestextensions
* Copyright (C) Mikkel Kamstrup Erlandsen 2008 <mikkel kamstrup gmail com>
- *
+ *
* gtestextensions is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* gtestextensions 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with xesam-glib. If not, write to:
* The Free Software Foundation, Inc.,
@@ -97,7 +97,7 @@
* gtx_assert_last_unref
* @o: A #GObject
*
- * Calls g_object_unref on @o and raises a critical error if the
+ * Calls g_object_unref on @o and raises a critical error if the
* #GObject is not finalized after this call.
*/
/* This macro is based on code by Benjamin Otte, April, 2008 */
@@ -108,7 +108,7 @@
if (_tmp != NULL) \
g_critical ("Leak detected. Object %s %p is not unreferenced",\
g_type_name(G_OBJECT_TYPE(o)), o);\
-} G_STMT_END
+} G_STMT_END
G_END_DECLS
Modified: branches/indexer-split/tests/trackerd/xesam/xesam-g-debug-private.h
==============================================================================
--- branches/indexer-split/tests/trackerd/xesam/xesam-g-debug-private.h (original)
+++ branches/indexer-split/tests/trackerd/xesam/xesam-g-debug-private.h Sat Sep 20 14:45:00 2008
@@ -3,12 +3,12 @@
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* This program 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with main.c; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
@@ -17,7 +17,7 @@
/*
* This file contains special tools for debugging, used in xesam-glib
*/
-
+
#ifndef _XESAM_G_DEBUG_PRIVATE_H_
#define _XESAM_G_DEBUG_PRIVATE_H_
Modified: branches/indexer-split/tests/trackerd/xesam/xesam-g-globals-private.h
==============================================================================
--- branches/indexer-split/tests/trackerd/xesam/xesam-g-globals-private.h (original)
+++ branches/indexer-split/tests/trackerd/xesam/xesam-g-globals-private.h Sat Sep 20 14:45:00 2008
@@ -3,20 +3,20 @@
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* This program 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with main.c; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
*/
-
+
/*
* This file contains declarations that are considered to be "package private"
- * in Java terminology. Ie methods and constants for shared use inside
+ * in Java terminology. Ie methods and constants for shared use inside
* xesam-glib only.
*/
@@ -29,10 +29,10 @@
G_BEGIN_DECLS
-XesamGSearch* xesam_g_search_new (XesamGSession *session,
+XesamGSearch* xesam_g_search_new (XesamGSession *session,
XesamGQuery *query);
-XesamGSearch* xesam_g_search_new_from_text (XesamGSession *session,
+XesamGSearch* xesam_g_search_new_from_text (XesamGSession *session,
gchar *search_text);
XesamGHit* xesam_g_hit_new (guint id,
@@ -40,7 +40,7 @@
GPtrArray *field_data);
XesamGHits* xesam_g_hits_new (XesamGSearch *search,
- guint batch_offset,
+ guint batch_offset,
guint count,
GPtrArray *hits_data);
Modified: branches/indexer-split/tests/trackerd/xesam/xesam-g-test-query-builder.c
==============================================================================
--- branches/indexer-split/tests/trackerd/xesam/xesam-g-test-query-builder.c (original)
+++ branches/indexer-split/tests/trackerd/xesam/xesam-g-test-query-builder.c Sat Sep 20 14:45:00 2008
@@ -2,17 +2,17 @@
/*
* xesam-glib
* Copyright (C) Mikkel Kamstrup Erlandsen 2008 <mikkel kamstrup gmail com>
- *
+ *
* xesam-glib is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* xesam-glib 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with xesam-glib. If not, write to:
* The Free Software Foundation, Inc.,
@@ -105,17 +105,17 @@
GError **error)
{
XesamGTestQueryBuilder *self;
-
+
g_return_val_if_fail (XESAM_IS_G_TEST_QUERY_BUILDER (base), FALSE);
-
+
self = XESAM_G_TEST_QUERY_BUILDER (base);
-
+
xesam_g_debug_object (self, "start_query (%s, content='%s', source='%s')",
xesam_g_query_token_get_name (token),
content_cat, source_cat);
-
+
check_expected_data (self, token, content_cat, source_cat, NULL, NULL);
-
+
return TRUE;
}
@@ -129,18 +129,18 @@
GError **error)
{
XesamGTestQueryBuilder *self;
-
+
g_return_val_if_fail (XESAM_IS_G_TEST_QUERY_BUILDER (base), FALSE);
-
+
self = XESAM_G_TEST_QUERY_BUILDER (base);
-
+
xesam_g_debug_object (self, "add_clause (%s, negate='%s' boost='%s')",
xesam_g_query_token_get_name (token),
negate ? (*negate ? "True" : "False") : "NULL",
boost);
-
+
check_expected_data (self, token, boost, NULL, negate, NULL);
-
+
return TRUE;
}
@@ -151,16 +151,16 @@
GError **error)
{
XesamGTestQueryBuilder *self;
-
+
g_return_val_if_fail (XESAM_IS_G_TEST_QUERY_BUILDER (base), FALSE);
-
+
self = XESAM_G_TEST_QUERY_BUILDER (base);
-
+
xesam_g_debug_object (self, "add_field (%s, name='%s')",
xesam_g_query_token_get_name (token), name);
-
+
check_expected_data (self, token, name, NULL, NULL, NULL);
-
+
return TRUE;
}
@@ -174,25 +174,25 @@
{
XesamGTestQueryBuilder *self;
const gchar *attr1 = NULL, *attr2 = NULL;
-
+
g_return_val_if_fail (XESAM_IS_G_TEST_QUERY_BUILDER (base), FALSE);
-
+
self = XESAM_G_TEST_QUERY_BUILDER (base);
-
+
if (attr_names[0]) {
attr1 = attr_names[0];
if (attr_names[1])
attr2 = attr_names[1];
}
-
+
xesam_g_debug_object (self, "add_value (%s='%s', attr1='%s', attr2='%s')",
xesam_g_query_token_get_name (token),
value,
attr1,
attr2);
-
+
check_expected_data (self, token, attr1, attr2, NULL, value);
-
+
return TRUE;
}
@@ -201,15 +201,15 @@
GError **error)
{
XesamGTestQueryBuilder *self;
-
+
g_return_val_if_fail (XESAM_IS_G_TEST_QUERY_BUILDER (base), FALSE);
-
+
self = XESAM_G_TEST_QUERY_BUILDER (base);
-
+
xesam_g_debug_object (self, "close_clause ()");
-
+
check_expected_data (self, XESAM_G_QUERY_TOKEN_NONE, NULL, NULL, NULL, NULL);
-
+
return TRUE;
}
@@ -218,15 +218,15 @@
GError **error)
{
XesamGTestQueryBuilder *self;
-
+
g_return_val_if_fail (XESAM_IS_G_TEST_QUERY_BUILDER (base), FALSE);
-
+
self = XESAM_G_TEST_QUERY_BUILDER (base);
-
+
xesam_g_debug_object (self, "close_query ()");
-
+
check_expected_data (self, XESAM_G_QUERY_TOKEN_NONE, NULL, NULL, NULL, NULL);
-
+
return TRUE;
}
@@ -237,30 +237,30 @@
GSList *iter;
XesamGTestQueryBuilderPrivate *priv;
ExpectedElementData *exp_data;
-
+
xesam_g_debug_object (obj, "Finalizing");
-
+
priv = XESAM_G_TEST_QUERY_BUILDER(obj)->priv;
-
+
for (iter = priv->expected_data; iter; iter = iter->next) {
exp_data = (ExpectedElementData*)iter->data;
expected_element_data_destroy (exp_data);
}
-
+
if (priv->expected_data) {
g_slist_free (priv->expected_data);
g_critical ("TestQueryBuilder still contains expected data");
}
-
+
}
static void
xesam_g_test_query_builder_class_init (XesamGTestQueryBuilderClass * klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
-
+
xesam_g_test_query_builder_parent_class = g_type_class_peek_parent (klass);
-
+
object_class->finalize = xesam_g_test_query_builder_finalize;
}
@@ -269,7 +269,7 @@
xesam_g_test_query_builder_interface_init (XesamGQueryBuilderIface * iface)
{
xesam_g_test_query_builder_parent_iface = g_type_interface_peek_parent (iface);
-
+
iface->start_query = xesam_g_test_query_builder_real_start_query;
iface->add_clause = xesam_g_test_query_builder_real_add_clause;
iface->add_field = xesam_g_test_query_builder_real_add_field;
@@ -281,9 +281,9 @@
static void
xesam_g_test_query_builder_init (XesamGTestQueryBuilder *self)
-{
+{
self->priv = g_new0 (XesamGTestQueryBuilderPrivate, 1);
-
+
}
@@ -291,9 +291,9 @@
xesam_g_test_query_builder_get_type (void)
{
static GType xesam_g_test_query_builder_type_id = 0;
-
+
if (G_UNLIKELY (xesam_g_test_query_builder_type_id == 0)) {
-
+
static const GTypeInfo g_define_type_info = {
sizeof (XesamGTestQueryBuilderClass),
(GBaseInitFunc) NULL,
@@ -305,23 +305,23 @@
0,
(GInstanceInitFunc) xesam_g_test_query_builder_init
};
-
+
static const GInterfaceInfo xesam_g_query_builder_info = {
(GInterfaceInitFunc) xesam_g_test_query_builder_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
-
+
xesam_g_test_query_builder_type_id = g_type_register_static (G_TYPE_OBJECT,
"XesamGTestQueryBuilder",
&g_define_type_info,
0);
-
+
g_type_add_interface_static (xesam_g_test_query_builder_type_id,
XESAM_TYPE_G_QUERY_BUILDER,
&xesam_g_query_builder_info);
}
-
+
return xesam_g_test_query_builder_type_id;
}
@@ -329,9 +329,9 @@
xesam_g_test_query_builder_new (void)
{
XesamGTestQueryBuilder *self;
-
+
self = g_object_new (XESAM_TYPE_G_TEST_QUERY_BUILDER, NULL);
-
+
return self;
}
@@ -344,22 +344,22 @@
const gchar *text)
{
ExpectedElementData *exp_data;
-
+
g_return_if_fail (XESAM_IS_G_TEST_QUERY_BUILDER(self));
-
+
exp_data = expected_element_data_new (token, attr1, attr2, bool_attr, text);
-
+
/* Yes, appending data to a GSList is silly, but we don't care the slightest
* about performance here */
self->priv->expected_data = g_slist_append (self->priv->expected_data, exp_data);
-
+
}
void
xesam_g_test_query_builder_expect_close_clause (XesamGTestQueryBuilder *self)
{
g_return_if_fail (XESAM_IS_G_TEST_QUERY_BUILDER (self));
-
+
xesam_g_test_query_builder_expect_data (self,
XESAM_G_QUERY_TOKEN_NONE,
NULL, NULL, NULL, NULL);
@@ -369,7 +369,7 @@
xesam_g_test_query_builder_expect_close_query (XesamGTestQueryBuilder *self)
{
g_return_if_fail (XESAM_IS_G_TEST_QUERY_BUILDER (self));
-
+
xesam_g_test_query_builder_expect_data (self,
XESAM_G_QUERY_TOKEN_NONE,
NULL, NULL, NULL, NULL);
@@ -383,14 +383,14 @@
const gchar *text)
{
ExpectedElementData *exp_data;
-
+
exp_data = g_slice_new (ExpectedElementData);
exp_data->token = token;
exp_data->attr1 = g_strdup (attr1);
exp_data->attr2 = g_strdup (attr2);
exp_data->bool_attr = g_memdup (bool_attr, sizeof(gboolean));
exp_data->text = g_strdup (text);
-
+
return exp_data;
}
@@ -401,7 +401,7 @@
if (exp_data->attr2) g_free (exp_data->attr2);
if (exp_data->bool_attr != NULL) g_free (exp_data->bool_attr);
if (exp_data->text) g_free (exp_data->text);
-
+
g_slice_free (ExpectedElementData, exp_data);
}
@@ -414,23 +414,23 @@
const gchar *text)
{
ExpectedElementData *exp_data;
-
+
g_return_if_fail (XESAM_IS_G_TEST_QUERY_BUILDER(self));
-
+
if (!self->priv->expected_data) {
/* No data to check */
return;
}
-
+
exp_data = (ExpectedElementData*) self->priv->expected_data->data;
-
+
g_assert_cmpstr (xesam_g_query_token_get_name (token), ==,
xesam_g_query_token_get_name (exp_data->token));
-
+
g_assert_cmpstr (attr1, ==, exp_data->attr1);
g_assert_cmpstr (attr2, ==, exp_data->attr2);
g_assert_cmpstr (text, ==, exp_data->text);
-
+
if (bool_attr != NULL && exp_data->bool_attr != NULL)
g_assert_cmpuint (*bool_attr, ==, *exp_data->bool_attr);
else if (bool_attr != NULL && !*bool_attr && exp_data->bool_attr == NULL)
@@ -439,10 +439,10 @@
g_critical ("bool_attr and exp_data->bool_attr differ. %p != %p",
bool_attr, exp_data->bool_attr);
/* else : both bool_attr are NULL */
-
-
+
+
self->priv->expected_data = g_slist_delete_link (self->priv->expected_data,
self->priv->expected_data);
-
+
expected_element_data_destroy (exp_data);
}
Modified: branches/indexer-split/tests/trackerd/xesam/xesam-g-test-query-builder.h
==============================================================================
--- branches/indexer-split/tests/trackerd/xesam/xesam-g-test-query-builder.h (original)
+++ branches/indexer-split/tests/trackerd/xesam/xesam-g-test-query-builder.h Sat Sep 20 14:45:00 2008
@@ -2,17 +2,17 @@
/*
* xesam-glib
* Copyright (C) Mikkel Kamstrup Erlandsen 2008 <mikkel kamstrup gmail com>
- *
+ *
* xesam-glib is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* xesam-glib 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with xesam-glib. If not, write to:
* The Free Software Foundation, Inc.,
Modified: branches/indexer-split/tests/trackerd/xesam/xesam-g-testsearcher.c
==============================================================================
--- branches/indexer-split/tests/trackerd/xesam/xesam-g-testsearcher.c (original)
+++ branches/indexer-split/tests/trackerd/xesam/xesam-g-testsearcher.c Sat Sep 20 14:45:00 2008
@@ -2,17 +2,17 @@
/*
* xesam-glib
* Copyright (C) Mikkel Kamstrup Erlandsen 2007 <mikkel kamstrup gmail com>
- *
+ *
* xesam-glib is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* xesam-glib 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with xesam-glib. If not, write to:
* The Free Software Foundation, Inc.,
@@ -100,7 +100,7 @@
static void xesam_g_test_searcher_real_get_hit_data (XesamGSearcher *base,
const gchar *search_handle,
GArray *hit_ids,
- GStrv field_names,
+ GStrv field_names,
XesamGSearcherGotHits callback,
gpointer user_data);
@@ -122,16 +122,16 @@
xesam_g_test_searcher_real_new_session (XesamGSearcher *base,
XesamGSearcherGotHandle callback,
gpointer user_data)
-{
+{
static int session_num = 0;
-
+
XesamGTestSearcher * self;
GString *session_handle_s;
-
+
self = XESAM_G_TEST_SEARCHER (base);
session_handle_s = g_string_new (NULL);
g_string_printf (session_handle_s, "dummy-session-%d", session_num);
-
+
callback (base, g_string_free (session_handle_s, FALSE), user_data, NULL);
}
@@ -145,7 +145,7 @@
XesamGTestSearcher * self;
self = XESAM_G_TEST_SEARCHER (base);
g_return_if_fail (session_handle != NULL);
-
+
callback (base, user_data, NULL);
}
@@ -159,11 +159,11 @@
{
XesamGTestSearcher *self;
GValue *target_val;
-
+
self = XESAM_G_TEST_SEARCHER (base);
g_return_if_fail (session_handle != NULL);
g_return_if_fail (prop_name != NULL);
-
+
if (g_str_equal (prop_name, "search.live"))
target_val = &self->priv->props->live;
else if (g_str_equal (prop_name, "hit.fields"))
@@ -172,7 +172,7 @@
target_val = &self->priv->props->hit_fields_extended;
else
g_critical ("GetProperty '%s' not supported by test searcher", prop_name);
-
+
callback (base, g_strdup (prop_name),
xesam_g_clone_value(target_val), user_data, NULL);
}
@@ -188,21 +188,21 @@
{
XesamGTestSearcher *self;
GValue *target_val;
-
+
self = XESAM_G_TEST_SEARCHER (base);
g_return_if_fail (session_handle != NULL);
g_return_if_fail (prop_name != NULL);
g_return_if_fail (G_IS_VALUE(value));
-
+
if (g_str_equal (prop_name, "search.live")) {
target_val = &self->priv->props->live;
} else if (g_str_equal (prop_name, "hit.fields")) {
target_val = &self->priv->props->hit_fields;
} else if (g_str_equal (prop_name, "hit.fields.extended")) {
target_val = &self->priv->props->hit_fields_extended;
- } else
+ } else
g_critical ("SetProperty '%s' not supported by test searcher", prop_name);
-
+
callback (base, g_strdup(prop_name),
xesam_g_clone_value(target_val), user_data, NULL);
}
@@ -263,7 +263,7 @@
xesam_g_test_searcher_real_get_hit_data (XesamGSearcher *base,
const gchar *search_handle,
GArray *hit_ids,
- GStrv field_names,
+ GStrv field_names,
XesamGSearcherGotHits callback,
gpointer user_data)
{
@@ -312,16 +312,16 @@
Properties *props;
XesamGTestSearcher *self;
XesamGTestSearcherPrivate *priv;
-
+
self = XESAM_G_TEST_SEARCHER (obj);
priv = self->priv;
props = priv->props;
-
+
/* FIXME: Free prop GValue contents */
-
+
g_free (props);
g_free (priv);
-
+
g_debug ("Finalized test searcher\n");
}
@@ -329,9 +329,9 @@
xesam_g_test_searcher_class_init (XesamGTestSearcherClass * klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
-
+
xesam_g_test_searcher_parent_class = g_type_class_peek_parent (klass);
-
+
object_class->finalize = xesam_g_test_searcher_finalize;
}
@@ -358,11 +358,11 @@
xesam_g_test_searcher_init (XesamGTestSearcher *self)
{
Properties *props;
-
+
self->priv = g_new0 (XesamGTestSearcherPrivate, 1);
props = g_new0 (Properties, 1);
self->priv->props = props;
-
+
g_value_init(&props->live, G_TYPE_BOOLEAN);
g_value_init(&props->hit_fields, G_TYPE_STRV);
g_value_init(&props->hit_fields_extended, G_TYPE_STRV);
@@ -380,7 +380,7 @@
g_value_init(&props->vendor_extensions, G_TYPE_STRV);
g_value_init(&props->vendor_ontologies, XESAM_TYPE_STRV_ARRAY);
g_value_init(&props->vendor_maxhits, G_TYPE_UINT);
-
+
const gchar *hit_fields[2] = {"xesam:url", NULL};
const gchar *hit_fields_extended[1] = {NULL};
const gchar *fields[3] = {"xesam:url", "xesam:relevancyRating", NULL};
@@ -390,7 +390,7 @@
const gchar *dummy_onto[4] = {"dummy-onto","0.1","/usr/share/xesam/ontologies/dummy-onto-0.1", NULL};
GPtrArray *ontos = g_ptr_array_new ();
g_ptr_array_add (ontos, dummy_onto);
-
+
g_value_set_boolean (&props->live, FALSE);
g_value_set_boxed (&props->hit_fields, hit_fields);
g_value_set_boxed (&props->hit_fields_extended, hit_fields_extended);
@@ -415,9 +415,9 @@
xesam_g_test_searcher_get_type (void)
{
static GType xesam_g_test_searcher_type_id = 0;
-
+
if (G_UNLIKELY (xesam_g_test_searcher_type_id == 0)) {
-
+
static const GTypeInfo g_define_type_info = {
sizeof (XesamGTestSearcherClass),
(GBaseInitFunc) NULL,
@@ -429,21 +429,21 @@
0,
(GInstanceInitFunc) xesam_g_test_searcher_init
};
-
+
static const GInterfaceInfo xesam_g_searcher_info = {
(GInterfaceInitFunc) xesam_g_test_searcher_xesam_g_searcher_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL};
-
+
xesam_g_test_searcher_type_id = g_type_register_static (G_TYPE_OBJECT,
"XesamGTestSearcher",
&g_define_type_info,
0);
-
+
g_type_add_interface_static (xesam_g_test_searcher_type_id,
XESAM_TYPE_G_SEARCHER,
&xesam_g_searcher_info);
}
-
+
return xesam_g_test_searcher_type_id;
}
Modified: branches/indexer-split/tests/trackerd/xesam/xesam-g-testsearcher.h
==============================================================================
--- branches/indexer-split/tests/trackerd/xesam/xesam-g-testsearcher.h (original)
+++ branches/indexer-split/tests/trackerd/xesam/xesam-g-testsearcher.h Sat Sep 20 14:45:00 2008
@@ -2,17 +2,17 @@
/*
* xesam-glib
* Copyright (C) Mikkel Kamstrup Erlandsen 2007 <mikkel kamstrup gmail com>
- *
+ *
* xesam-glib is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* xesam-glib 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with xesam-glib. If not, write to:
* The Free Software Foundation, Inc.,
Modified: branches/indexer-split/tests/trackerd/xesam/xesam-g-utils.h
==============================================================================
--- branches/indexer-split/tests/trackerd/xesam/xesam-g-utils.h (original)
+++ branches/indexer-split/tests/trackerd/xesam/xesam-g-utils.h Sat Sep 20 14:45:00 2008
@@ -2,17 +2,17 @@
/*
* xesam-glib
* Copyright (C) Mikkel Kamstrup Erlandsen 2007 <mikkel kamstrup gmail com>
- *
+ *
* xesam-glib is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* xesam-glib 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with xesam-glib. If not, write to:
* The Free Software Foundation, Inc.,
Modified: branches/indexer-split/utils/qdbm/print-words.c
==============================================================================
--- branches/indexer-split/utils/qdbm/print-words.c (original)
+++ branches/indexer-split/utils/qdbm/print-words.c Sat Sep 20 14:45:00 2008
@@ -30,13 +30,13 @@
static gboolean print_services;
static GOptionEntry entries[] = {
- { "index-file", 'f', 0,
- G_OPTION_ARG_STRING, &filename,
- "QDBM index file",
+ { "index-file", 'f', 0,
+ G_OPTION_ARG_STRING, &filename,
+ "QDBM index file",
NULL },
- { "print-services", 's', 0,
- G_OPTION_ARG_NONE, &print_services,
- "Print service ID and service type ID for each word",
+ { "print-services", 's', 0,
+ G_OPTION_ARG_NONE, &print_services,
+ "Print service ID and service type ID for each word",
NULL },
{ NULL }
};
@@ -83,15 +83,15 @@
if (depot == NULL) {
g_print ("Unable to open file: %s "
- "(Could be a lock problem: is tracker running?)\n",
+ "(Could be a lock problem: is tracker running?)\n",
filename);
- g_print ("Using version %s of qdbm\n",
+ g_print ("Using version %s of qdbm\n",
dpversion);
return;
}
dpiterinit (depot);
-
+
key = dpiternext (depot, NULL);
while (key != NULL) {
@@ -100,7 +100,7 @@
if (print_services) {
results = get_word_hits (depot, key, &hits);
for (i = 0; i < hits; i++) {
- g_print (" (id:%d t:%d s:%d) ",
+ g_print (" (id:%d t:%d s:%d) ",
tracker_db_index_item_get_id (&results[i]),
tracker_db_index_item_get_service_type (&results[i]),
tracker_db_index_item_get_score (&results[i]));
@@ -141,9 +141,9 @@
return EXIT_FAILURE;
}
- if (!filename) {
+ if (!filename) {
gchar *help;
-
+
help = g_option_context_get_help (context, TRUE, NULL);
g_printerr (help);
Modified: branches/indexer-split/utils/qdbm/search-word.c
==============================================================================
--- branches/indexer-split/utils/qdbm/search-word.c (original)
+++ branches/indexer-split/utils/qdbm/search-word.c Sat Sep 20 14:45:00 2008
@@ -28,13 +28,13 @@
static gchar *word;
static GOptionEntry entries[] = {
- { "index-file", 'f', 0,
- G_OPTION_ARG_STRING, &filename,
- "QDBM index file",
+ { "index-file", 'f', 0,
+ G_OPTION_ARG_STRING, &filename,
+ "QDBM index file",
NULL },
- { "word", 'w', 0,
+ { "word", 'w', 0,
G_OPTION_ARG_STRING, &word,
- "Print service ID and service type ID of every hit for this word",
+ "Print service ID and service type ID of every hit for this word",
NULL },
{ NULL }
};
@@ -47,7 +47,7 @@
TrackerDBIndexItem *items;
gchar *tmp;
gint tsiz;
-
+
g_return_val_if_fail (word != NULL, NULL);
items = NULL;
@@ -70,7 +70,7 @@
}
static void
-show_term_in_index (const gchar *filename,
+show_term_in_index (const gchar *filename,
const gchar *word)
{
TrackerDBIndexItem *items;
@@ -83,9 +83,9 @@
if (depot == NULL) {
g_print ("Unable to open file: %s "
- "(Could be a lock problem: is tracker running?)\n",
+ "(Could be a lock problem: is tracker running?)\n",
filename);
- g_print ("Using version %s of qdbm\n",
+ g_print ("Using version %s of qdbm\n",
dpversion);
return;
}
@@ -100,11 +100,11 @@
g_print (" - %s ", word);
for (i = 0; i < hits; i++) {
- g_print (" (id:%d t:%d) ",
+ g_print (" (id:%d t:%d) ",
items[i].id,
tracker_db_index_item_get_service_type (&items[i]));
}
-
+
g_print ("\n");
g_print ("Total: %d terms.\n", dprnum (depot));
@@ -136,9 +136,9 @@
return EXIT_FAILURE;
}
- if (!filename || !word) {
+ if (!filename || !word) {
gchar *help;
-
+
help = g_option_context_get_help (context, TRUE, NULL);
g_printerr (help);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
