tracker r2251 - in branches/indexer-split: . src/libinotify src/libstemmer src/libtracker src/libtracker-common src/libtracker-db src/libtracker-gtk src/qdbm 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/tracker-indexer tests/trackerd tests/trackerd/xesam utils/qdbm
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r2251 - in branches/indexer-split: . src/libinotify src/libstemmer src/libtracker src/libtracker-common src/libtracker-db src/libtracker-gtk src/qdbm 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/tracker-indexer tests/trackerd tests/trackerd/xesam utils/qdbm
- Date: Sat, 20 Sep 2008 15:12:20 +0000 (UTC)
Author: mr
Date: Sat Sep 20 15:12:19 2008
New Revision: 2251
URL: http://svn.gnome.org/viewvc/tracker?rev=2251&view=rev
Log:
Modified:
branches/indexer-split/ChangeLog
branches/indexer-split/src/libinotify/inotify-handle.c
branches/indexer-split/src/libinotify/inotify-handle.h
branches/indexer-split/src/libinotify/inotify-log.h
branches/indexer-split/src/libinotify/inotify-monitor.c
branches/indexer-split/src/libinotify/inotify-monitor.h
branches/indexer-split/src/libinotify/linux-inotify-syscalls.h
branches/indexer-split/src/libstemmer/api.c
branches/indexer-split/src/libstemmer/libstemmer.c
branches/indexer-split/src/libstemmer/libstemmer.h
branches/indexer-split/src/libstemmer/stem_UTF_8_danish.c
branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.c
branches/indexer-split/src/libstemmer/stem_UTF_8_english.c
branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.c
branches/indexer-split/src/libstemmer/stem_UTF_8_french.c
branches/indexer-split/src/libstemmer/stem_UTF_8_german.c
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_norwegian.c
branches/indexer-split/src/libstemmer/stem_UTF_8_porter.c
branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.c
branches/indexer-split/src/libstemmer/stem_UTF_8_russian.c
branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.c
branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.c
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-configuration.c
branches/indexer-split/src/libtracker-common/tracker-configuration.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-file-utils.h
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-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-log.h
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-os-dependant.h
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-type-utils.h
branches/indexer-split/src/libtracker-common/tracker-utils.c
branches/indexer-split/src/libtracker-common/tracker-utils.h
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-manager.h
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-sqlite.h
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-db/tracker-db-manager.h
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.c
branches/indexer-split/src/libtracker-gtk/tracker-ui.h
branches/indexer-split/src/libtracker/tracker.c
branches/indexer-split/src/libtracker/tracker.h
branches/indexer-split/src/qdbm/depot.c
branches/indexer-split/src/qdbm/depot.h
branches/indexer-split/src/qdbm/myconf.c
branches/indexer-split/src/qdbm/myconf.h
branches/indexer-split/src/tracker-applet/tracker-applet-marshallers.c
branches/indexer-split/src/tracker-applet/tracker-applet-marshallers.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-extract/tracker-extract.h
branches/indexer-split/src/tracker-extract/tracker-xmp.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-fts/tracker-fts.h
branches/indexer-split/src/tracker-indexer/modules/applications.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/modules/files.c
branches/indexer-split/src/tracker-indexer/tracker-dbus.c
branches/indexer-split/src/tracker-indexer/tracker-dbus.h
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-module.c
branches/indexer-split/src/tracker-indexer/tracker-indexer-module.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-indexer/tracker-metadata-utils.h
branches/indexer-split/src/tracker-indexer/tracker-metadata.c
branches/indexer-split/src/tracker-indexer/tracker-metadata.h
branches/indexer-split/src/tracker-indexer/tracker-module.h
branches/indexer-split/src/tracker-preferences/tracker-preferences.c
branches/indexer-split/src/tracker-preferences/tracker-preferences.h
branches/indexer-split/src/tracker-search-tool/sexy-icon-entry.c
branches/indexer-split/src/tracker-search-tool/sexy-icon-entry.h
branches/indexer-split/src/tracker-search-tool/tracker-search-tool-callbacks.c
branches/indexer-split/src/tracker-search-tool/tracker-search-tool-callbacks.h
branches/indexer-split/src/tracker-search-tool/tracker-search-tool-support.c
branches/indexer-split/src/tracker-search-tool/tracker-search-tool-support.h
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-daemon.h
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-dbus.h
branches/indexer-split/src/trackerd/tracker-files.c
branches/indexer-split/src/trackerd/tracker-files.h
branches/indexer-split/src/trackerd/tracker-keywords.c
branches/indexer-split/src/trackerd/tracker-keywords.h
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-metadata.h
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-search.h
branches/indexer-split/src/trackerd/tracker-status.c
branches/indexer-split/src/trackerd/tracker-status.h
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-query.h
branches/indexer-split/src/trackerd/tracker-xesam-session.c
branches/indexer-split/src/trackerd/tracker-xesam-session.h
branches/indexer-split/src/trackerd/tracker-xesam.c
branches/indexer-split/src/trackerd/tracker-xesam.h
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-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/tracker-indexer/tracker-metadata-utils-test.c
branches/indexer-split/tests/trackerd/tracker-xesam-test.c
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 15:12:19 2008
@@ -141,7 +141,7 @@
void
inotify_handle_set_callback( INotifyHandle *inh, INotifyCallback callback,
- gpointer user_data )
+ gpointer user_data )
{
inh->callback = callback;
inh->user_data = user_data;
@@ -149,12 +149,12 @@
static guint32
inotify_handle_event_applicable( INotifyHandle *inh, guint32 type,
- const char *filename )
+ const char *filename )
{
enum inh_state state = inh->state;
inotify_debug( "Juding applicability of event %x on %p/%s",
- type, inh, filename );
+ type, inh, filename );
if( type & IN_SYNTHETIC )
{
@@ -163,45 +163,45 @@
/* Synthetic events should not be delivered except as the first event. */
if( state != inh_state_initial )
{
- inotify_debug( " dropping synthetic event on non-initial state" );
+ inotify_debug( " dropping synthetic event on non-initial state" );
return 0;
}
/* Synthetic create event... */
if( type & IN_CREATE )
{
- inotify_debug( " synthetic create event" );
+ inotify_debug( " synthetic create event" );
inh->state = inh_state_created;
/* Only deliver if the user wants to receive synthetic create events. */
if( inh->flags & IN_FLAG_SYNTH_CREATE )
{
- inotify_debug( " user wants it -- delivering" );
- return IN_CREATE | (IN_SYNTHETIC & inh->mask);
+ inotify_debug( " user wants it -- delivering" );
+ return IN_CREATE | (IN_SYNTHETIC & inh->mask);
}
else
{
- inotify_debug( " user doesn't want it -- dropping" );
- return 0;
+ inotify_debug( " user doesn't want it -- dropping" );
+ return 0;
}
}
if( type & IN_DELETE )
{
- inotify_debug( " synthetic delete event" );
+ inotify_debug( " synthetic delete event" );
inh->state = inh_state_deleted;
/* Only deliver if the user wants to receive synthetic delete events. */
if( inh->flags & IN_FLAG_SYNTH_DELETE )
{
- inotify_debug( " user wants it -- delivering" );
- return IN_DELETE | (IN_SYNTHETIC & inh->mask);
+ inotify_debug( " user wants it -- delivering" );
+ return IN_DELETE | (IN_SYNTHETIC & inh->mask);
}
else
{
- inotify_debug( " user doesn't want it -- dropping" );
- return 0;
+ inotify_debug( " user doesn't want it -- dropping" );
+ return 0;
}
}
@@ -231,9 +231,9 @@
inh->state = inh_state_created;
if( state == inh_state_created )
- inotify_warn( "Create on already-existing file" );
+ inotify_warn( "Create on already-existing file" );
- inotify_debug( " event is create-type. passing through" );
+ inotify_debug( " event is create-type. passing through" );
return type;
@@ -244,19 +244,19 @@
if( state == inh_state_deleted )
{
- inotify_debug( " dropping remove event on already-removed file" );
- return 0;
+ inotify_debug( " dropping remove event on already-removed file" );
+ return 0;
}
- inotify_debug( " event is delete-type. passing through" );
+ inotify_debug( " event is delete-type. passing through" );
return type;
default:
if( state != inh_state_created )
- inotify_warn( "Received direct event on non-created inh" );
+ inotify_warn( "Received direct event on non-created inh" );
- inotify_debug( " event is other type. passing through" );
+ inotify_debug( " event is other type. passing through" );
return type;
}
@@ -264,11 +264,11 @@
void
inotify_handle_invoke_callback( INotifyHandle *inh, const char *filename,
- guint32 type, guint32 cookie )
+ guint32 type, guint32 cookie )
{
type = inotify_handle_event_applicable( inh, type, filename );
if( type != 0 && inh->callback )
inh->callback( inh, inh->filename, filename, type,
- cookie, inh->user_data );
+ cookie, inh->user_data );
}
Modified: branches/indexer-split/src/libinotify/inotify-handle.h
==============================================================================
--- branches/indexer-split/src/libinotify/inotify-handle.h (original)
+++ branches/indexer-split/src/libinotify/inotify-handle.h Sat Sep 20 15:12:19 2008
@@ -21,25 +21,25 @@
#ifndef _libinotify_inotify_handle_h_
#define _libinotify_inotify_handle_h_
-#define IN_FLAG_NONE 0x00000000
-#define IN_FLAG_FILE_BASED 0x00000001
-#define IN_FLAG_SYNTH_CREATE 0x00000002
-#define IN_FLAG_SYNTH_DELETE 0x00000004
+#define IN_FLAG_NONE 0x00000000
+#define IN_FLAG_FILE_BASED 0x00000001
+#define IN_FLAG_SYNTH_CREATE 0x00000002
+#define IN_FLAG_SYNTH_DELETE 0x00000004
-#define IN_SYNTHETIC 0x00001000
+#define IN_SYNTHETIC 0x00001000
#include <glib.h>
typedef struct _INotifyHandle INotifyHandle;
typedef void (*INotifyCallback)( INotifyHandle *inh,
- const char *monitor_name,
- const char *filename,
- guint32 event_type,
- guint32 cookie,
- gpointer user_data );
+ const char *monitor_name,
+ const char *filename,
+ guint32 event_type,
+ guint32 cookie,
+ gpointer user_data );
INotifyHandle *inotify_handle_new( const char *filename, guint32 mask,
- unsigned long flags );
+ unsigned long flags );
void inotify_handle_ref( INotifyHandle *inh );
void inotify_handle_unref( INotifyHandle *inh );
gint32 inotify_handle_get_wd( INotifyHandle *inh );
@@ -50,8 +50,8 @@
void inotify_handle_set_parent( INotifyHandle *inh, INotifyHandle *parent );
INotifyHandle *inotify_handle_get_parent( INotifyHandle *inh );
void inotify_handle_set_callback( INotifyHandle *inh, INotifyCallback callback,
- gpointer user_data );
+ gpointer user_data );
void inotify_handle_invoke_callback( INotifyHandle *inh, const char *filename,
- guint32 event_type, guint32 cookie );
+ guint32 event_type, guint32 cookie );
#endif /* _libinotify_inotify_handle_h_ */
Modified: branches/indexer-split/src/libinotify/inotify-log.h
==============================================================================
--- branches/indexer-split/src/libinotify/inotify-log.h (original)
+++ branches/indexer-split/src/libinotify/inotify-log.h Sat Sep 20 15:12:19 2008
@@ -28,16 +28,16 @@
#ifdef LIBINOTIFY_DEBUG
# define inotify_debug(x, ...) g_log("libinotify", G_LOG_LEVEL_DEBUG, \
- x, ## __VA_ARGS__)
+ x, ## __VA_ARGS__)
#else
# define inotify_debug(x, ...) 0
#endif
#define inotify_warn(x, ...) g_log("libinotify", G_LOG_LEVEL_WARNING, \
- x, ## __VA_ARGS__)
+ x, ## __VA_ARGS__)
#define inotify_fatal(x, ...) g_log("libinotify", G_LOG_LEVEL_ERROR, \
- x, ## __VA_ARGS__)
+ x, ## __VA_ARGS__)
static inline void
inotify_debug_initialise()
@@ -45,7 +45,7 @@
#ifdef LIBINOTIFY_DEBUG
if( getenv( "DEBUG_LIBINOTIFY" ) == NULL )
g_log_set_handler( "libinotify", G_LOG_LEVEL_DEBUG,
- (GLogFunc) strlen, NULL );
+ (GLogFunc) strlen, NULL );
#endif
}
Modified: branches/indexer-split/src/libinotify/inotify-monitor.c
==============================================================================
--- branches/indexer-split/src/libinotify/inotify-monitor.c (original)
+++ branches/indexer-split/src/libinotify/inotify-monitor.c Sat Sep 20 15:12:19 2008
@@ -51,7 +51,7 @@
{
inotify_debug( " dispatch to %p", list->data );
inotify_handle_invoke_callback( list->data, filename,
- ine->mask, ine->cookie );
+ ine->mask, ine->cookie );
}
if( ine->mask & IN_IGNORED )
@@ -83,8 +83,8 @@
if( namesize > size )
{
- // XXX might be false if lots of events stack up
- inotify_fatal( "namesize > size!" );
+ // XXX might be false if lots of events stack up
+ inotify_fatal( "namesize > size!" );
}
size -= namesize;
@@ -162,7 +162,7 @@
*/
if( wd2 != wd )
inotify_warn( "race condition in inotify_monitor_add! (%d vs %d)",
- wd, wd2 );
+ wd, wd2 );
if( wd2 < 0 )
{
@@ -174,18 +174,18 @@
if( inotify_listhash_length( wd2 ) == 0 )
{
- /* We're not supposed to be watching this inode. */
- inotify_rm_watch( inotify_monitor_fd, wd2 );
+ /* We're not supposed to be watching this inode. */
+ inotify_rm_watch( inotify_monitor_fd, wd2 );
}
else
{
- /* If we did hit an inode we're already watching then we just
- * modified its mask. Ow. We could go hunting with the list of
- * filenames that we have in the listhash in hopes that one of them
- * still references the inode that we're looking for but this is
- * such a rare case and going hunting is likely to cause further
- * errors anyway...
- */
+ /* If we did hit an inode we're already watching then we just
+ * modified its mask. Ow. We could go hunting with the list of
+ * filenames that we have in the listhash in hopes that one of them
+ * still references the inode that we're looking for but this is
+ * such a rare case and going hunting is likely to cause further
+ * errors anyway...
+ */
}
}
@@ -213,7 +213,7 @@
}
/* We currently have no way of safely reducing the event mask on an
- * inode that we're watching. As such, just leave it alone. This means
+ * inode that we're watching. As such, just leave it alone. This means
* that we'll receive extra events (which we'll filter out), but at least
* we won't potentially put ourselves in an inconsistent state.
*/
@@ -221,15 +221,15 @@
static void
inotify_internal_callback( INotifyHandle *inh, const char *monitor_name,
- const char *filename, guint32 event_type,
- guint32 cookie, gpointer user_data )
+ const char *filename, guint32 event_type,
+ guint32 cookie, gpointer user_data )
{
INotifyHandle *child = user_data;
int result;
inotify_debug( "Got event for %s:%x while watching for %s on %s",
- filename, event_type, inotify_handle_get_basename( child ),
- monitor_name );
+ filename, event_type, inotify_handle_get_basename( child ),
+ monitor_name );
event_type &= ~IN_ISDIR;
@@ -239,25 +239,25 @@
{
case IN_CREATE:
case IN_MOVED_TO:
- result = inotify_monitor_add_raw( child );
+ result = inotify_monitor_add_raw( child );
- /* If child exists... */
- if( result == 0 )
- inotify_handle_invoke_callback( child, NULL, event_type, cookie );
+ /* If child exists... */
+ if( result == 0 )
+ inotify_handle_invoke_callback( child, NULL, event_type, cookie );
- break;
+ break;
case IN_DELETE:
case IN_DELETE_SELF:
case IN_MOVE_SELF:
case IN_MOVED_FROM:
- /* Parent just disappeared. Report that we've also been deleted. */
- inotify_handle_invoke_callback( child, NULL, event_type, cookie );
+ /* Parent just disappeared. Report that we've also been deleted. */
+ inotify_handle_invoke_callback( child, NULL, event_type, cookie );
- /* Then unregister our watch with the kernel. */
- inotify_monitor_remove_raw( child );
+ /* Then unregister our watch with the kernel. */
+ inotify_monitor_remove_raw( child );
- break;
+ break;
}
return;
@@ -275,13 +275,13 @@
inotify_handle_invoke_callback( child, NULL, event_type, cookie );
if( result != 0 )
- inotify_handle_invoke_callback( child, NULL, IN_DELETE, cookie );
+ inotify_handle_invoke_callback( child, NULL, IN_DELETE, cookie );
break;
case IN_DELETE:
case IN_MOVED_FROM:
- /* We just disappeared. Report that we've been deleted. We must
+ /* We just disappeared. Report that we've been deleted. We must
* send the event manually since the remove_raw might cause the
* event not to be delivered normally.
*/
@@ -295,7 +295,7 @@
INotifyHandle *
inotify_monitor_add( const char *filename, guint32 mask, unsigned long flags,
- INotifyCallback callback, gpointer user_data )
+ INotifyCallback callback, gpointer user_data )
{
INotifyHandle *pinh, *inh;
int result;
@@ -324,13 +324,13 @@
flags = IN_FLAG_FILE_BASED | IN_FLAG_SYNTH_CREATE;
mask = IN_MOVED_FROM | IN_MOVED_TO | IN_CREATE | IN_DELETE |
- IN_DELETE_SELF | IN_MOVE_SELF | IN_SYNTHETIC;
+ IN_DELETE_SELF | IN_MOVE_SELF | IN_SYNTHETIC;
inotify_debug( "Adding internal callback %p for %p(%s)",
- inotify_internal_callback, inh, parent );
+ inotify_internal_callback, inh, parent );
pinh = inotify_monitor_add( parent, mask, flags,
- inotify_internal_callback, inh );
+ inotify_internal_callback, inh );
inotify_handle_set_parent( inh, pinh );
Modified: branches/indexer-split/src/libinotify/inotify-monitor.h
==============================================================================
--- branches/indexer-split/src/libinotify/inotify-monitor.h (original)
+++ branches/indexer-split/src/libinotify/inotify-monitor.h Sat Sep 20 15:12:19 2008
@@ -24,10 +24,10 @@
#include "inotify-handle.h"
INotifyHandle *inotify_monitor_add( const char *filename,
- guint32 mask,
- unsigned long flags,
- INotifyCallback callback,
- gpointer user_data );
+ guint32 mask,
+ unsigned long flags,
+ INotifyCallback callback,
+ gpointer user_data );
void inotify_monitor_remove( INotifyHandle *inh );
gboolean inotify_is_available( void );
Modified: branches/indexer-split/src/libinotify/linux-inotify-syscalls.h
==============================================================================
--- branches/indexer-split/src/libinotify/linux-inotify-syscalls.h (original)
+++ branches/indexer-split/src/libinotify/linux-inotify-syscalls.h Sat Sep 20 15:12:19 2008
@@ -34,37 +34,37 @@
# define __NR_inotify_add_watch 254
# define __NR_inotify_rm_watch 255
#elif defined(__alpha__)
-# define __NR_inotify_init 444
+# define __NR_inotify_init 444
# define __NR_inotify_add_watch 445
-# define __NR_inotify_rm_watch 446
+# define __NR_inotify_rm_watch 446
#elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
-# define __NR_inotify_init 275
+# define __NR_inotify_init 275
# define __NR_inotify_add_watch 276
-# define __NR_inotify_rm_watch 277
+# define __NR_inotify_rm_watch 277
#elif defined(__sparc__) || defined (__sparc64__)
-# define __NR_inotify_init 151
+# define __NR_inotify_init 151
# define __NR_inotify_add_watch 152
-# define __NR_inotify_rm_watch 156
+# define __NR_inotify_rm_watch 156
#elif defined (__ia64__)
# define __NR_inotify_init 1277
# define __NR_inotify_add_watch 1278
-# define __NR_inotify_rm_watch 1279
+# define __NR_inotify_rm_watch 1279
#elif defined (__s390__) || defined (__s390x__)
# define __NR_inotify_init 284
# define __NR_inotify_add_watch 285
-# define __NR_inotify_rm_watch 286
+# define __NR_inotify_rm_watch 286
#elif defined (__arm__)
# define __NR_inotify_init 316
# define __NR_inotify_add_watch 317
-# define __NR_inotify_rm_watch 318
+# define __NR_inotify_rm_watch 318
#elif defined (__SH4__)
# define __NR_inotify_init 290
# define __NR_inotify_add_watch 291
-# define __NR_inotify_rm_watch 292
+# define __NR_inotify_rm_watch 292
#elif defined (__SH5__)
# define __NR_inotify_init 318
# define __NR_inotify_add_watch 319
-# define __NR_inotify_rm_watch 320
+# define __NR_inotify_rm_watch 320
#else
# error "Unsupported architecture"
#endif
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 15:12:19 2008
@@ -23,30 +23,30 @@
if (z->p == NULL) goto error;
if (S_size)
{
- int i;
- z->S = (symbol * *) calloc(S_size, sizeof(symbol *));
- if (z->S == NULL) goto error;
-
- for (i = 0; i < S_size; i++)
- {
- z->S[i] = create_s();
- if (z->S[i] == NULL) goto error;
- }
- z->S_size = S_size;
+ int i;
+ z->S = (symbol * *) calloc(S_size, sizeof(symbol *));
+ if (z->S == NULL) goto error;
+
+ for (i = 0; i < S_size; i++)
+ {
+ z->S[i] = create_s();
+ if (z->S[i] == NULL) goto error;
+ }
+ z->S_size = S_size;
}
if (I_size)
{
- z->I = (int *) calloc(I_size, sizeof(int));
- if (z->I == NULL) goto error;
- z->I_size = I_size;
+ z->I = (int *) calloc(I_size, sizeof(int));
+ if (z->I == NULL) goto error;
+ z->I_size = I_size;
}
if (B_size)
{
- z->B = (symbol *) calloc(B_size, sizeof(symbol));
- if (z->B == NULL) goto error;
- z->B_size = B_size;
+ z->B = (symbol *) calloc(B_size, sizeof(symbol));
+ if (z->B == NULL) goto error;
+ z->B_size = B_size;
}
return z;
@@ -60,12 +60,12 @@
if (z == NULL) return;
if (z->S_size)
{
- int i;
- for (i = 0; i < z->S_size; i++)
- {
- lose_s(z->S[i]);
- }
- free(z->S);
+ int i;
+ for (i = 0; i < z->S_size; i++)
+ {
+ lose_s(z->S[i]);
+ }
+ free(z->S);
}
if (z->I_size) free(z->I);
if (z->B_size) free(z->B);
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 15:12:19 2008
@@ -67,8 +67,8 @@
stemmer->env = stemmer->create();
if (stemmer->env == NULL)
{
- sb_stemmer_delete(stemmer);
- return NULL;
+ sb_stemmer_delete(stemmer);
+ return NULL;
}
return stemmer;
@@ -90,8 +90,8 @@
int ret;
if (SN_set_current(stemmer->env, size, (const symbol *)(word)))
{
- stemmer->env->l = 0;
- return NULL;
+ stemmer->env->l = 0;
+ return NULL;
}
ret = stemmer->stem(stemmer->env);
if (ret < 0) return NULL;
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 15:12:19 2008
@@ -67,7 +67,7 @@
* It is safe to pass a null pointer to this function - this will have
* no effect.
*/
-void sb_stemmer_delete(struct sb_stemmer * stemmer);
+void sb_stemmer_delete(struct sb_stemmer * stemmer);
/** Stem a word.
*
@@ -85,7 +85,7 @@
/** Get the length of the result of the last stemmed word.
* This should not be called before sb_stemmer_stem() has been called.
*/
-int sb_stemmer_length(struct sb_stemmer * stemmer);
+int sb_stemmer_length(struct sb_stemmer * stemmer);
#ifdef __cplusplus
}
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 15:12:19 2008
@@ -133,34 +133,34 @@
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
- { int c_test = z->c; /* test, line 33 */
- { int c = skip_utf8(z->p, z->c, 0, z->l, + 3);
- if (c < 0) return 0;
- z->c = c; /* hop, line 33 */
- }
- z->I[1] = z->c; /* setmark x, line 33 */
- z->c = c_test;
+ { int c_test = z->c; /* test, line 33 */
+ { int c = skip_utf8(z->p, z->c, 0, z->l, + 3);
+ if (c < 0) return 0;
+ z->c = c; /* hop, line 33 */
+ }
+ z->I[1] = z->c; /* setmark x, line 33 */
+ z->c = c_test;
}
while(1) { /* goto, line 34 */
- int c = z->c;
- if (!(in_grouping_U(z, g_v, 97, 248))) goto lab0;
- z->c = c;
- break;
+ int c = z->c;
+ if (!(in_grouping_U(z, g_v, 97, 248))) goto lab0;
+ z->c = c;
+ break;
lab0:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* goto, line 34 */
- }
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* goto, line 34 */
+ }
}
while(1) { /* gopast, line 34 */
- if (!(out_grouping_U(z, g_v, 97, 248))) goto lab1;
- break;
+ if (!(out_grouping_U(z, g_v, 97, 248))) goto lab1;
+ break;
lab1:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 34 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 34 */
+ }
}
z->I[0] = z->c; /* setmark p1, line 34 */
/* try, line 35 */
@@ -172,180 +172,180 @@
static int r_main_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 41 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 41 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 41 */
- among_var = find_among_b(z, a_0, 32); /* substring, line 41 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 41 */
- z->lb = m3;
+ { int m3; /* setlimit, line 41 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 41 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 41 */
+ among_var = find_among_b(z, a_0, 32); /* substring, line 41 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 41 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 48 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- if (!(in_grouping_b_U(z, g_s_ending, 97, 229))) return 0;
- { int ret;
- ret = slice_del(z); /* delete, line 50 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 48 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ if (!(in_grouping_b_U(z, g_s_ending, 97, 229))) return 0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 50 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
static int r_consonant_pair(struct SN_env * z) {
- { int m_test = z->l - z->c; /* test, line 55 */
- { int m3; /* setlimit, line 56 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 56 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 56 */
- if (!(find_among_b(z, a_1, 4))) { z->lb = m3; return 0; } /* substring, line 56 */
- z->bra = z->c; /* ], line 56 */
- z->lb = m3;
- }
- z->c = z->l - m_test;
- }
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* next, line 62 */
+ { int m_test = z->l - z->c; /* test, line 55 */
+ { int m3; /* setlimit, line 56 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 56 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 56 */
+ if (!(find_among_b(z, a_1, 4))) { z->lb = m3; return 0; } /* substring, line 56 */
+ z->bra = z->c; /* ], line 56 */
+ z->lb = m3;
+ }
+ z->c = z->l - m_test;
+ }
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* next, line 62 */
}
z->bra = z->c; /* ], line 62 */
- { int ret;
- ret = slice_del(z); /* delete, line 62 */
- if (ret < 0) return ret;
+ { int ret;
+ ret = slice_del(z); /* delete, line 62 */
+ if (ret < 0) return ret;
}
return 1;
}
static int r_other_suffix(struct SN_env * z) {
int among_var;
- { int m = z->l - z->c; (void) m; /* do, line 66 */
- z->ket = z->c; /* [, line 66 */
- if (!(eq_s_b(z, 2, s_0))) goto lab0;
- z->bra = z->c; /* ], line 66 */
- if (!(eq_s_b(z, 2, s_1))) goto lab0;
- { int ret;
- ret = slice_del(z); /* delete, line 66 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 66 */
+ z->ket = z->c; /* [, line 66 */
+ if (!(eq_s_b(z, 2, s_0))) goto lab0;
+ z->bra = z->c; /* ], line 66 */
+ if (!(eq_s_b(z, 2, s_1))) goto lab0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 66 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m3; /* setlimit, line 67 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 67 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 67 */
- among_var = find_among_b(z, a_2, 5); /* substring, line 67 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 67 */
- z->lb = m3;
+ { int m3; /* setlimit, line 67 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 67 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 67 */
+ among_var = find_among_b(z, a_2, 5); /* substring, line 67 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 67 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 70 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* do, line 70 */
- { int ret = r_consonant_pair(z);
- if (ret == 0) goto lab1; /* call consonant_pair, line 70 */
- if (ret < 0) return ret;
- }
- lab1:
- z->c = z->l - m;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 4, s_2); /* <-, line 72 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 70 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 70 */
+ { int ret = r_consonant_pair(z);
+ if (ret == 0) goto lab1; /* call consonant_pair, line 70 */
+ if (ret < 0) return ret;
+ }
+ lab1:
+ z->c = z->l - m;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 4, s_2); /* <-, line 72 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
static int r_undouble(struct SN_env * z) {
- { int m3; /* setlimit, line 76 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 76 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 76 */
- if (!(out_grouping_b_U(z, g_v, 97, 248))) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 76 */
- z->S[0] = slice_to(z, z->S[0]); /* -> ch, line 76 */
- if (z->S[0] == 0) return -1; /* -> ch, line 76 */
- z->lb = m3;
+ { int m3; /* setlimit, line 76 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 76 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 76 */
+ if (!(out_grouping_b_U(z, g_v, 97, 248))) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 76 */
+ z->S[0] = slice_to(z, z->S[0]); /* -> ch, line 76 */
+ if (z->S[0] == 0) return -1; /* -> ch, line 76 */
+ z->lb = m3;
}
if (!(eq_v_b(z, z->S[0]))) return 0; /* name ch, line 77 */
- { int ret;
- ret = slice_del(z); /* delete, line 78 */
- if (ret < 0) return ret;
+ { int ret;
+ ret = slice_del(z); /* delete, line 78 */
+ if (ret < 0) return ret;
}
return 1;
}
extern int danish_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 84 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab0; /* call mark_regions, line 84 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 84 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab0; /* call mark_regions, line 84 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 85 */
- { int m = z->l - z->c; (void) m; /* do, line 86 */
- { int ret = r_main_suffix(z);
- if (ret == 0) goto lab1; /* call main_suffix, line 86 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 86 */
+ { int ret = r_main_suffix(z);
+ if (ret == 0) goto lab1; /* call main_suffix, line 86 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 87 */
- { int ret = r_consonant_pair(z);
- if (ret == 0) goto lab2; /* call consonant_pair, line 87 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 87 */
+ { int ret = r_consonant_pair(z);
+ if (ret == 0) goto lab2; /* call consonant_pair, line 87 */
+ if (ret < 0) return ret;
+ }
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 88 */
- { int ret = r_other_suffix(z);
- if (ret == 0) goto lab3; /* call other_suffix, line 88 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 88 */
+ { int ret = r_other_suffix(z);
+ if (ret == 0) goto lab3; /* call other_suffix, line 88 */
+ if (ret < 0) return ret;
+ }
lab3:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 89 */
- { int ret = r_undouble(z);
- if (ret == 0) goto lab4; /* call undouble, line 89 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 89 */
+ { int ret = r_undouble(z);
+ if (ret == 0) goto lab4; /* call undouble, line 89 */
+ if (ret < 0) return ret;
+ }
lab4:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
return 1;
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 15:12:19 2008
@@ -153,108 +153,108 @@
static int r_prelude(struct SN_env * z) {
int among_var;
- { int c_test = z->c; /* test, line 42 */
- while(1) { /* repeat, line 42 */
- int c = z->c;
- z->bra = z->c; /* [, line 43 */
- among_var = find_among(z, a_0, 11); /* substring, line 43 */
- if (!(among_var)) goto lab0;
- z->ket = z->c; /* ], line 43 */
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 1, s_0); /* <-, line 45 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 1, s_1); /* <-, line 47 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 1, s_2); /* <-, line 49 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret;
- ret = slice_from_s(z, 1, s_3); /* <-, line 51 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret;
- ret = slice_from_s(z, 1, s_4); /* <-, line 53 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 54 */
- }
- break;
- }
- continue;
- lab0:
- z->c = c;
- break;
- }
- z->c = c_test;
- }
- { int c = z->c; /* try, line 57 */
- z->bra = z->c; /* [, line 57 */
- if (!(eq_s(z, 1, s_5))) { z->c = c; goto lab1; }
- z->ket = z->c; /* ], line 57 */
- { int ret;
- ret = slice_from_s(z, 1, s_6); /* <-, line 57 */
- if (ret < 0) return ret;
- }
+ { int c_test = z->c; /* test, line 42 */
+ while(1) { /* repeat, line 42 */
+ int c = z->c;
+ z->bra = z->c; /* [, line 43 */
+ among_var = find_among(z, a_0, 11); /* substring, line 43 */
+ if (!(among_var)) goto lab0;
+ z->ket = z->c; /* ], line 43 */
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 1, s_0); /* <-, line 45 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 1, s_1); /* <-, line 47 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 1, s_2); /* <-, line 49 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret;
+ ret = slice_from_s(z, 1, s_3); /* <-, line 51 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret;
+ ret = slice_from_s(z, 1, s_4); /* <-, line 53 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 54 */
+ }
+ break;
+ }
+ continue;
+ lab0:
+ z->c = c;
+ break;
+ }
+ z->c = c_test;
+ }
+ { int c = z->c; /* try, line 57 */
+ z->bra = z->c; /* [, line 57 */
+ if (!(eq_s(z, 1, s_5))) { z->c = c; goto lab1; }
+ z->ket = z->c; /* ], line 57 */
+ { int ret;
+ ret = slice_from_s(z, 1, s_6); /* <-, line 57 */
+ if (ret < 0) return ret;
+ }
lab1:
- ;
+ ;
}
while(1) { /* repeat, line 58 */
- int c = z->c;
- while(1) { /* goto, line 58 */
- int c = z->c;
- if (!(in_grouping_U(z, g_v, 97, 232))) goto lab3;
- z->bra = z->c; /* [, line 59 */
- { int c = z->c; /* or, line 59 */
- if (!(eq_s(z, 1, s_7))) goto lab5;
- z->ket = z->c; /* ], line 59 */
- if (!(in_grouping_U(z, g_v, 97, 232))) goto lab5;
- { int ret;
- ret = slice_from_s(z, 1, s_8); /* <-, line 59 */
- if (ret < 0) return ret;
- }
- goto lab4;
- lab5:
- z->c = c;
- if (!(eq_s(z, 1, s_9))) goto lab3;
- z->ket = z->c; /* ], line 60 */
- { int ret;
- ret = slice_from_s(z, 1, s_10); /* <-, line 60 */
- if (ret < 0) return ret;
- }
- }
- lab4:
- z->c = c;
- break;
- lab3:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab2;
- z->c = c; /* goto, line 58 */
- }
- }
- continue;
+ int c = z->c;
+ while(1) { /* goto, line 58 */
+ int c = z->c;
+ if (!(in_grouping_U(z, g_v, 97, 232))) goto lab3;
+ z->bra = z->c; /* [, line 59 */
+ { int c = z->c; /* or, line 59 */
+ if (!(eq_s(z, 1, s_7))) goto lab5;
+ z->ket = z->c; /* ], line 59 */
+ if (!(in_grouping_U(z, g_v, 97, 232))) goto lab5;
+ { int ret;
+ ret = slice_from_s(z, 1, s_8); /* <-, line 59 */
+ if (ret < 0) return ret;
+ }
+ goto lab4;
+ lab5:
+ z->c = c;
+ if (!(eq_s(z, 1, s_9))) goto lab3;
+ z->ket = z->c; /* ], line 60 */
+ { int ret;
+ ret = slice_from_s(z, 1, s_10); /* <-, line 60 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab4:
+ z->c = c;
+ break;
+ lab3:
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab2;
+ z->c = c; /* goto, line 58 */
+ }
+ }
+ continue;
lab2:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -263,22 +263,22 @@
z->I[0] = z->l;
z->I[1] = z->l;
while(1) { /* gopast, line 69 */
- if (!(in_grouping_U(z, g_v, 97, 232))) goto lab0;
- break;
+ if (!(in_grouping_U(z, g_v, 97, 232))) goto lab0;
+ break;
lab0:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 69 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 69 */
+ }
}
while(1) { /* gopast, line 69 */
- if (!(out_grouping_U(z, g_v, 97, 232))) goto lab1;
- break;
+ if (!(out_grouping_U(z, g_v, 97, 232))) goto lab1;
+ break;
lab1:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 69 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 69 */
+ }
}
z->I[0] = z->c; /* setmark p1, line 69 */
/* try, line 70 */
@@ -286,22 +286,22 @@
z->I[0] = 3;
lab2:
while(1) { /* gopast, line 71 */
- if (!(in_grouping_U(z, g_v, 97, 232))) goto lab3;
- break;
+ if (!(in_grouping_U(z, g_v, 97, 232))) goto lab3;
+ break;
lab3:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 71 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 71 */
+ }
}
while(1) { /* gopast, line 71 */
- if (!(out_grouping_U(z, g_v, 97, 232))) goto lab4;
- break;
+ if (!(out_grouping_U(z, g_v, 97, 232))) goto lab4;
+ break;
lab4:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 71 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 71 */
+ }
}
z->I[1] = z->c; /* setmark p2, line 71 */
return 1;
@@ -310,36 +310,36 @@
static int r_postlude(struct SN_env * z) {
int among_var;
while(1) { /* repeat, line 75 */
- int c = z->c;
- z->bra = z->c; /* [, line 77 */
- among_var = find_among(z, a_1, 3); /* substring, line 77 */
- if (!(among_var)) goto lab0;
- z->ket = z->c; /* ], line 77 */
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 1, s_11); /* <-, line 78 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 1, s_12); /* <-, line 79 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 80 */
- }
- break;
- }
- continue;
+ int c = z->c;
+ z->bra = z->c; /* [, line 77 */
+ among_var = find_among(z, a_1, 3); /* substring, line 77 */
+ if (!(among_var)) goto lab0;
+ z->ket = z->c; /* ], line 77 */
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 1, s_11); /* <-, line 78 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 1, s_12); /* <-, line 79 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 80 */
+ }
+ break;
+ }
+ continue;
lab0:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -355,19 +355,19 @@
}
static int r_undouble(struct SN_env * z) {
- { int m_test = z->l - z->c; /* test, line 91 */
- if (!(find_among_b(z, a_2, 3))) return 0; /* among, line 91 */
- z->c = z->l - m_test;
+ { int m_test = z->l - z->c; /* test, line 91 */
+ if (!(find_among_b(z, a_2, 3))) return 0; /* among, line 91 */
+ z->c = z->l - m_test;
}
z->ket = z->c; /* [, line 91 */
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* next, line 91 */
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* next, line 91 */
}
z->bra = z->c; /* ], line 91 */
- { int ret;
- ret = slice_del(z); /* delete, line 91 */
- if (ret < 0) return ret;
+ { int ret;
+ ret = slice_del(z); /* delete, line 91 */
+ if (ret < 0) return ret;
}
return 1;
}
@@ -377,285 +377,285 @@
z->ket = z->c; /* [, line 96 */
if (!(eq_s_b(z, 1, s_13))) return 0;
z->bra = z->c; /* ], line 96 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 96 */
- if (ret < 0) return ret;
- }
- { int m_test = z->l - z->c; /* test, line 96 */
- if (!(out_grouping_b_U(z, g_v, 97, 232))) return 0;
- z->c = z->l - m_test;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 96 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 96 */
+ if (ret < 0) return ret;
+ }
+ { int m_test = z->l - z->c; /* test, line 96 */
+ if (!(out_grouping_b_U(z, g_v, 97, 232))) return 0;
+ z->c = z->l - m_test;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 96 */
+ if (ret < 0) return ret;
}
z->B[0] = 1; /* set e_found, line 97 */
- { int ret = r_undouble(z);
- if (ret == 0) return 0; /* call undouble, line 98 */
- if (ret < 0) return ret;
+ { int ret = r_undouble(z);
+ if (ret == 0) return 0; /* call undouble, line 98 */
+ if (ret < 0) return ret;
}
return 1;
}
static int r_en_ending(struct SN_env * z) {
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 102 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* and, line 102 */
- if (!(out_grouping_b_U(z, g_v, 97, 232))) return 0;
- z->c = z->l - m;
- { int m = z->l - z->c; (void) m; /* not, line 102 */
- if (!(eq_s_b(z, 3, s_14))) goto lab0;
- return 0;
- lab0:
- z->c = z->l - m;
- }
- }
- { int ret;
- ret = slice_del(z); /* delete, line 102 */
- if (ret < 0) return ret;
- }
- { int ret = r_undouble(z);
- if (ret == 0) return 0; /* call undouble, line 103 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 102 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* and, line 102 */
+ if (!(out_grouping_b_U(z, g_v, 97, 232))) return 0;
+ z->c = z->l - m;
+ { int m = z->l - z->c; (void) m; /* not, line 102 */
+ if (!(eq_s_b(z, 3, s_14))) goto lab0;
+ return 0;
+ lab0:
+ z->c = z->l - m;
+ }
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 102 */
+ if (ret < 0) return ret;
+ }
+ { int ret = r_undouble(z);
+ if (ret == 0) return 0; /* call undouble, line 103 */
+ if (ret < 0) return ret;
}
return 1;
}
static int r_standard_suffix(struct SN_env * z) {
int among_var;
- { int m = z->l - z->c; (void) m; /* do, line 107 */
- z->ket = z->c; /* [, line 108 */
- among_var = find_among_b(z, a_3, 5); /* substring, line 108 */
- if (!(among_var)) goto lab0;
- z->bra = z->c; /* ], line 108 */
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret = r_R1(z);
- if (ret == 0) goto lab0; /* call R1, line 110 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 4, s_15); /* <-, line 110 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = r_en_ending(z);
- if (ret == 0) goto lab0; /* call en_ending, line 113 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret = r_R1(z);
- if (ret == 0) goto lab0; /* call R1, line 116 */
- if (ret < 0) return ret;
- }
- if (!(out_grouping_b_U(z, g_v_j, 97, 232))) goto lab0;
- { int ret;
- ret = slice_del(z); /* delete, line 116 */
- if (ret < 0) return ret;
- }
- break;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 107 */
+ z->ket = z->c; /* [, line 108 */
+ among_var = find_among_b(z, a_3, 5); /* substring, line 108 */
+ if (!(among_var)) goto lab0;
+ z->bra = z->c; /* ], line 108 */
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret = r_R1(z);
+ if (ret == 0) goto lab0; /* call R1, line 110 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 4, s_15); /* <-, line 110 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = r_en_ending(z);
+ if (ret == 0) goto lab0; /* call en_ending, line 113 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret = r_R1(z);
+ if (ret == 0) goto lab0; /* call R1, line 116 */
+ if (ret < 0) return ret;
+ }
+ if (!(out_grouping_b_U(z, g_v_j, 97, 232))) goto lab0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 116 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
lab0:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 120 */
- { int ret = r_e_ending(z);
- if (ret == 0) goto lab1; /* call e_ending, line 120 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 120 */
+ { int ret = r_e_ending(z);
+ if (ret == 0) goto lab1; /* call e_ending, line 120 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 122 */
- z->ket = z->c; /* [, line 122 */
- if (!(eq_s_b(z, 4, s_16))) goto lab2;
- z->bra = z->c; /* ], line 122 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab2; /* call R2, line 122 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* not, line 122 */
- if (!(eq_s_b(z, 1, s_17))) goto lab3;
- goto lab2;
- lab3:
- z->c = z->l - m;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 122 */
- if (ret < 0) return ret;
- }
- z->ket = z->c; /* [, line 123 */
- if (!(eq_s_b(z, 2, s_18))) goto lab2;
- z->bra = z->c; /* ], line 123 */
- { int ret = r_en_ending(z);
- if (ret == 0) goto lab2; /* call en_ending, line 123 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 122 */
+ z->ket = z->c; /* [, line 122 */
+ if (!(eq_s_b(z, 4, s_16))) goto lab2;
+ z->bra = z->c; /* ], line 122 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab2; /* call R2, line 122 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* not, line 122 */
+ if (!(eq_s_b(z, 1, s_17))) goto lab3;
+ goto lab2;
+ lab3:
+ z->c = z->l - m;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 122 */
+ if (ret < 0) return ret;
+ }
+ z->ket = z->c; /* [, line 123 */
+ if (!(eq_s_b(z, 2, s_18))) goto lab2;
+ z->bra = z->c; /* ], line 123 */
+ { int ret = r_en_ending(z);
+ if (ret == 0) goto lab2; /* call en_ending, line 123 */
+ if (ret < 0) return ret;
+ }
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 126 */
- z->ket = z->c; /* [, line 127 */
- among_var = find_among_b(z, a_4, 6); /* substring, line 127 */
- if (!(among_var)) goto lab4;
- z->bra = z->c; /* ], line 127 */
- switch(among_var) {
- case 0: goto lab4;
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) goto lab4; /* call R2, line 129 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 129 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* or, line 130 */
- z->ket = z->c; /* [, line 130 */
- if (!(eq_s_b(z, 2, s_19))) goto lab6;
- z->bra = z->c; /* ], line 130 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab6; /* call R2, line 130 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* not, line 130 */
- if (!(eq_s_b(z, 1, s_20))) goto lab7;
- goto lab6;
- lab7:
- z->c = z->l - m;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 130 */
- if (ret < 0) return ret;
- }
- goto lab5;
- lab6:
- z->c = z->l - m;
- { int ret = r_undouble(z);
- if (ret == 0) goto lab4; /* call undouble, line 130 */
- if (ret < 0) return ret;
- }
- }
- lab5:
- break;
- case 2:
- { int ret = r_R2(z);
- if (ret == 0) goto lab4; /* call R2, line 133 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* not, line 133 */
- if (!(eq_s_b(z, 1, s_21))) goto lab8;
- goto lab4;
- lab8:
- z->c = z->l - m;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 133 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret = r_R2(z);
- if (ret == 0) goto lab4; /* call R2, line 136 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 136 */
- if (ret < 0) return ret;
- }
- { int ret = r_e_ending(z);
- if (ret == 0) goto lab4; /* call e_ending, line 136 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = r_R2(z);
- if (ret == 0) goto lab4; /* call R2, line 139 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 139 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret = r_R2(z);
- if (ret == 0) goto lab4; /* call R2, line 142 */
- if (ret < 0) return ret;
- }
- if (!(z->B[0])) goto lab4; /* Boolean test e_found, line 142 */
- { int ret;
- ret = slice_del(z); /* delete, line 142 */
- if (ret < 0) return ret;
- }
- break;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 126 */
+ z->ket = z->c; /* [, line 127 */
+ among_var = find_among_b(z, a_4, 6); /* substring, line 127 */
+ if (!(among_var)) goto lab4;
+ z->bra = z->c; /* ], line 127 */
+ switch(among_var) {
+ case 0: goto lab4;
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab4; /* call R2, line 129 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 129 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* or, line 130 */
+ z->ket = z->c; /* [, line 130 */
+ if (!(eq_s_b(z, 2, s_19))) goto lab6;
+ z->bra = z->c; /* ], line 130 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab6; /* call R2, line 130 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* not, line 130 */
+ if (!(eq_s_b(z, 1, s_20))) goto lab7;
+ goto lab6;
+ lab7:
+ z->c = z->l - m;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 130 */
+ if (ret < 0) return ret;
+ }
+ goto lab5;
+ lab6:
+ z->c = z->l - m;
+ { int ret = r_undouble(z);
+ if (ret == 0) goto lab4; /* call undouble, line 130 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab5:
+ break;
+ case 2:
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab4; /* call R2, line 133 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* not, line 133 */
+ if (!(eq_s_b(z, 1, s_21))) goto lab8;
+ goto lab4;
+ lab8:
+ z->c = z->l - m;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 133 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab4; /* call R2, line 136 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 136 */
+ if (ret < 0) return ret;
+ }
+ { int ret = r_e_ending(z);
+ if (ret == 0) goto lab4; /* call e_ending, line 136 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab4; /* call R2, line 139 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 139 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab4; /* call R2, line 142 */
+ if (ret < 0) return ret;
+ }
+ if (!(z->B[0])) goto lab4; /* Boolean test e_found, line 142 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 142 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
lab4:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 146 */
- if (!(out_grouping_b_U(z, g_v_I, 73, 232))) goto lab9;
- { int m_test = z->l - z->c; /* test, line 148 */
- if (!(find_among_b(z, a_5, 4))) goto lab9; /* among, line 149 */
- if (!(out_grouping_b_U(z, g_v, 97, 232))) goto lab9;
- z->c = z->l - m_test;
- }
- z->ket = z->c; /* [, line 152 */
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) goto lab9;
- z->c = c; /* next, line 152 */
- }
- z->bra = z->c; /* ], line 152 */
- { int ret;
- ret = slice_del(z); /* delete, line 152 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 146 */
+ if (!(out_grouping_b_U(z, g_v_I, 73, 232))) goto lab9;
+ { int m_test = z->l - z->c; /* test, line 148 */
+ if (!(find_among_b(z, a_5, 4))) goto lab9; /* among, line 149 */
+ if (!(out_grouping_b_U(z, g_v, 97, 232))) goto lab9;
+ z->c = z->l - m_test;
+ }
+ z->ket = z->c; /* [, line 152 */
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) goto lab9;
+ z->c = c; /* next, line 152 */
+ }
+ z->bra = z->c; /* ], line 152 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 152 */
+ if (ret < 0) return ret;
+ }
lab9:
- z->c = z->l - m;
+ z->c = z->l - m;
}
return 1;
}
extern int dutch_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 159 */
- { int ret = r_prelude(z);
- if (ret == 0) goto lab0; /* call prelude, line 159 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 159 */
+ { int ret = r_prelude(z);
+ if (ret == 0) goto lab0; /* call prelude, line 159 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 160 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab1; /* call mark_regions, line 160 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 160 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab1; /* call mark_regions, line 160 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 161 */
- { int m = z->l - z->c; (void) m; /* do, line 162 */
- { int ret = r_standard_suffix(z);
- if (ret == 0) goto lab2; /* call standard_suffix, line 162 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 162 */
+ { int ret = r_standard_suffix(z);
+ if (ret == 0) goto lab2; /* call standard_suffix, line 162 */
+ if (ret < 0) return ret;
+ }
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
- { int c = z->c; /* do, line 163 */
- { int ret = r_postlude(z);
- if (ret == 0) goto lab3; /* call postlude, line 163 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 163 */
+ { int ret = r_postlude(z);
+ if (ret == 0) goto lab3; /* call postlude, line 163 */
+ if (ret < 0) return ret;
+ }
lab3:
- z->c = c;
+ z->c = c;
}
return 1;
}
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 15:12:19 2008
@@ -367,58 +367,58 @@
static int r_prelude(struct SN_env * z) {
z->B[0] = 0; /* unset Y_found, line 26 */
- { int c = z->c; /* do, line 27 */
- z->bra = z->c; /* [, line 27 */
- if (!(eq_s(z, 1, s_0))) goto lab0;
- z->ket = z->c; /* ], line 27 */
- { int ret;
- ret = slice_del(z); /* delete, line 27 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 27 */
+ z->bra = z->c; /* [, line 27 */
+ if (!(eq_s(z, 1, s_0))) goto lab0;
+ z->ket = z->c; /* ], line 27 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 27 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 28 */
- z->bra = z->c; /* [, line 28 */
- if (!(eq_s(z, 1, s_1))) goto lab1;
- z->ket = z->c; /* ], line 28 */
- { int ret;
- ret = slice_from_s(z, 1, s_2); /* <-, line 28 */
- if (ret < 0) return ret;
- }
- z->B[0] = 1; /* set Y_found, line 28 */
+ { int c = z->c; /* do, line 28 */
+ z->bra = z->c; /* [, line 28 */
+ if (!(eq_s(z, 1, s_1))) goto lab1;
+ z->ket = z->c; /* ], line 28 */
+ { int ret;
+ ret = slice_from_s(z, 1, s_2); /* <-, line 28 */
+ if (ret < 0) return ret;
+ }
+ z->B[0] = 1; /* set Y_found, line 28 */
lab1:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 29 */
- while(1) { /* repeat, line 29 */
- int c = z->c;
- while(1) { /* goto, line 29 */
- int c = z->c;
- if (!(in_grouping_U(z, g_v, 97, 121))) goto lab4;
- z->bra = z->c; /* [, line 29 */
- if (!(eq_s(z, 1, s_3))) goto lab4;
- z->ket = z->c; /* ], line 29 */
- z->c = c;
- break;
- lab4:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab3;
- z->c = c; /* goto, line 29 */
- }
- }
- { int ret;
- ret = slice_from_s(z, 1, s_4); /* <-, line 29 */
- if (ret < 0) return ret;
- }
- z->B[0] = 1; /* set Y_found, line 29 */
- continue;
- lab3:
- z->c = c;
- break;
- }
- z->c = c;
+ { int c = z->c; /* do, line 29 */
+ while(1) { /* repeat, line 29 */
+ int c = z->c;
+ while(1) { /* goto, line 29 */
+ int c = z->c;
+ if (!(in_grouping_U(z, g_v, 97, 121))) goto lab4;
+ z->bra = z->c; /* [, line 29 */
+ if (!(eq_s(z, 1, s_3))) goto lab4;
+ z->ket = z->c; /* ], line 29 */
+ z->c = c;
+ break;
+ lab4:
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab3;
+ z->c = c; /* goto, line 29 */
+ }
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_4); /* <-, line 29 */
+ if (ret < 0) return ret;
+ }
+ z->B[0] = 1; /* set Y_found, line 29 */
+ continue;
+ lab3:
+ z->c = c;
+ break;
+ }
+ z->c = c;
}
return 1;
}
@@ -426,69 +426,69 @@
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
z->I[1] = z->l;
- { int c = z->c; /* do, line 35 */
- { int c = z->c; /* or, line 40 */
- if (!(find_among(z, a_0, 2))) goto lab2; /* among, line 36 */
- goto lab1;
- lab2:
- z->c = c;
- while(1) { /* gopast, line 40 */
- if (!(in_grouping_U(z, g_v, 97, 121))) goto lab3;
- break;
- lab3:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* gopast, line 40 */
- }
- }
- while(1) { /* gopast, line 40 */
- if (!(out_grouping_U(z, g_v, 97, 121))) goto lab4;
- break;
- lab4:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* gopast, line 40 */
- }
- }
- }
+ { int c = z->c; /* do, line 35 */
+ { int c = z->c; /* or, line 40 */
+ if (!(find_among(z, a_0, 2))) goto lab2; /* among, line 36 */
+ goto lab1;
+ lab2:
+ z->c = c;
+ while(1) { /* gopast, line 40 */
+ if (!(in_grouping_U(z, g_v, 97, 121))) goto lab3;
+ break;
+ lab3:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* gopast, line 40 */
+ }
+ }
+ while(1) { /* gopast, line 40 */
+ if (!(out_grouping_U(z, g_v, 97, 121))) goto lab4;
+ break;
+ lab4:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* gopast, line 40 */
+ }
+ }
+ }
lab1:
- z->I[0] = z->c; /* setmark p1, line 41 */
- while(1) { /* gopast, line 42 */
- if (!(in_grouping_U(z, g_v, 97, 121))) goto lab5;
- break;
- lab5:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* gopast, line 42 */
- }
- }
- while(1) { /* gopast, line 42 */
- if (!(out_grouping_U(z, g_v, 97, 121))) goto lab6;
- break;
- lab6:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* gopast, line 42 */
- }
- }
- z->I[1] = z->c; /* setmark p2, line 42 */
+ z->I[0] = z->c; /* setmark p1, line 41 */
+ while(1) { /* gopast, line 42 */
+ if (!(in_grouping_U(z, g_v, 97, 121))) goto lab5;
+ break;
+ lab5:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* gopast, line 42 */
+ }
+ }
+ while(1) { /* gopast, line 42 */
+ if (!(out_grouping_U(z, g_v, 97, 121))) goto lab6;
+ break;
+ lab6:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* gopast, line 42 */
+ }
+ }
+ z->I[1] = z->c; /* setmark p2, line 42 */
lab0:
- z->c = c;
+ z->c = c;
}
return 1;
}
static int r_shortv(struct SN_env * z) {
- { int m = z->l - z->c; (void) m; /* or, line 50 */
- if (!(out_grouping_b_U(z, g_v_WXY, 89, 121))) goto lab1;
- if (!(in_grouping_b_U(z, g_v, 97, 121))) goto lab1;
- if (!(out_grouping_b_U(z, g_v, 97, 121))) goto lab1;
- goto lab0;
+ { int m = z->l - z->c; (void) m; /* or, line 50 */
+ if (!(out_grouping_b_U(z, g_v_WXY, 89, 121))) goto lab1;
+ if (!(in_grouping_b_U(z, g_v, 97, 121))) goto lab1;
+ if (!(out_grouping_b_U(z, g_v, 97, 121))) goto lab1;
+ goto lab0;
lab1:
- z->c = z->l - m;
- if (!(out_grouping_b_U(z, g_v, 97, 121))) return 0;
- if (!(in_grouping_b_U(z, g_v, 97, 121))) return 0;
- if (z->c > z->lb) return 0; /* atlimit, line 51 */
+ z->c = z->l - m;
+ if (!(out_grouping_b_U(z, g_v, 97, 121))) return 0;
+ if (!(in_grouping_b_U(z, g_v, 97, 121))) return 0;
+ if (z->c > z->lb) return 0; /* atlimit, line 51 */
}
lab0:
return 1;
@@ -506,74 +506,74 @@
static int r_Step_1a(struct SN_env * z) {
int among_var;
- { int m = z->l - z->c; (void) m; /* try, line 58 */
- z->ket = z->c; /* [, line 59 */
- among_var = find_among_b(z, a_1, 3); /* substring, line 59 */
- if (!(among_var)) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 59 */
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab0; }
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 61 */
- if (ret < 0) return ret;
- }
- break;
- }
+ { int m = z->l - z->c; (void) m; /* try, line 58 */
+ z->ket = z->c; /* [, line 59 */
+ among_var = find_among_b(z, a_1, 3); /* substring, line 59 */
+ if (!(among_var)) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 59 */
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab0; }
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 61 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
lab0:
- ;
+ ;
}
z->ket = z->c; /* [, line 64 */
among_var = find_among_b(z, a_2, 6); /* substring, line 64 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 64 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 2, s_5); /* <-, line 65 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int m = z->l - z->c; (void) m; /* or, line 67 */
- { int c = skip_utf8(z->p, z->c, z->lb, z->l, - 2);
- if (c < 0) goto lab2;
- z->c = c; /* hop, line 67 */
- }
- { int ret;
- ret = slice_from_s(z, 1, s_6); /* <-, line 67 */
- if (ret < 0) return ret;
- }
- goto lab1;
- lab2:
- z->c = z->l - m;
- { int ret;
- ret = slice_from_s(z, 2, s_7); /* <-, line 67 */
- if (ret < 0) return ret;
- }
- }
- lab1:
- break;
- case 3:
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* next, line 68 */
- }
- while(1) { /* gopast, line 68 */
- if (!(in_grouping_b_U(z, g_v, 97, 121))) goto lab3;
- break;
- lab3:
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 68 */
- }
- }
- { int ret;
- ret = slice_del(z); /* delete, line 68 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 2, s_5); /* <-, line 65 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int m = z->l - z->c; (void) m; /* or, line 67 */
+ { int c = skip_utf8(z->p, z->c, z->lb, z->l, - 2);
+ if (c < 0) goto lab2;
+ z->c = c; /* hop, line 67 */
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_6); /* <-, line 67 */
+ if (ret < 0) return ret;
+ }
+ goto lab1;
+ lab2:
+ z->c = z->l - m;
+ { int ret;
+ ret = slice_from_s(z, 2, s_7); /* <-, line 67 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab1:
+ break;
+ case 3:
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* next, line 68 */
+ }
+ while(1) { /* gopast, line 68 */
+ if (!(in_grouping_b_U(z, g_v, 97, 121))) goto lab3;
+ break;
+ lab3:
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 68 */
+ }
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 68 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -585,106 +585,106 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 74 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 76 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 2, s_8); /* <-, line 76 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int m_test = z->l - z->c; /* test, line 79 */
- while(1) { /* gopast, line 79 */
- if (!(in_grouping_b_U(z, g_v, 97, 121))) goto lab0;
- break;
- lab0:
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 79 */
- }
- }
- z->c = z->l - m_test;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 79 */
- if (ret < 0) return ret;
- }
- { int m_test = z->l - z->c; /* test, line 80 */
- among_var = find_among_b(z, a_3, 13); /* substring, line 80 */
- if (!(among_var)) return 0;
- z->c = z->l - m_test;
- }
- switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- { int c = z->c;
- ret = insert_s(z, z->c, z->c, 1, s_9); /* <+, line 82 */
- z->c = c;
- }
- if (ret < 0) return ret;
- }
- break;
- case 2:
- z->ket = z->c; /* [, line 85 */
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* next, line 85 */
- }
- z->bra = z->c; /* ], line 85 */
- { int ret;
- ret = slice_del(z); /* delete, line 85 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- if (z->c != z->I[0]) return 0; /* atmark, line 86 */
- { int m_test = z->l - z->c; /* test, line 86 */
- { int ret = r_shortv(z);
- if (ret == 0) return 0; /* call shortv, line 86 */
- if (ret < 0) return ret;
- }
- z->c = z->l - m_test;
- }
- { int ret;
- { int c = z->c;
- ret = insert_s(z, z->c, z->c, 1, s_10); /* <+, line 86 */
- z->c = c;
- }
- if (ret < 0) return ret;
- }
- break;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 76 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 2, s_8); /* <-, line 76 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int m_test = z->l - z->c; /* test, line 79 */
+ while(1) { /* gopast, line 79 */
+ if (!(in_grouping_b_U(z, g_v, 97, 121))) goto lab0;
+ break;
+ lab0:
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 79 */
+ }
+ }
+ z->c = z->l - m_test;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 79 */
+ if (ret < 0) return ret;
+ }
+ { int m_test = z->l - z->c; /* test, line 80 */
+ among_var = find_among_b(z, a_3, 13); /* substring, line 80 */
+ if (!(among_var)) return 0;
+ z->c = z->l - m_test;
+ }
+ switch(among_var) {
+ case 0: return 0;
+ case 1:
+ { int ret;
+ { int c = z->c;
+ ret = insert_s(z, z->c, z->c, 1, s_9); /* <+, line 82 */
+ z->c = c;
+ }
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ z->ket = z->c; /* [, line 85 */
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* next, line 85 */
+ }
+ z->bra = z->c; /* ], line 85 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 85 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ if (z->c != z->I[0]) return 0; /* atmark, line 86 */
+ { int m_test = z->l - z->c; /* test, line 86 */
+ { int ret = r_shortv(z);
+ if (ret == 0) return 0; /* call shortv, line 86 */
+ if (ret < 0) return ret;
+ }
+ z->c = z->l - m_test;
+ }
+ { int ret;
+ { int c = z->c;
+ ret = insert_s(z, z->c, z->c, 1, s_10); /* <+, line 86 */
+ z->c = c;
+ }
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ break;
}
return 1;
}
static int r_Step_1c(struct SN_env * z) {
z->ket = z->c; /* [, line 93 */
- { int m = z->l - z->c; (void) m; /* or, line 93 */
- if (!(eq_s_b(z, 1, s_11))) goto lab1;
- goto lab0;
+ { int m = z->l - z->c; (void) m; /* or, line 93 */
+ if (!(eq_s_b(z, 1, s_11))) goto lab1;
+ goto lab0;
lab1:
- z->c = z->l - m;
- if (!(eq_s_b(z, 1, s_12))) return 0;
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 1, s_12))) return 0;
}
lab0:
z->bra = z->c; /* ], line 93 */
if (!(out_grouping_b_U(z, g_v, 97, 121))) return 0;
- { int m = z->l - z->c; (void) m; /* not, line 94 */
- if (z->c > z->lb) goto lab2; /* atlimit, line 94 */
- return 0;
+ { int m = z->l - z->c; (void) m; /* not, line 94 */
+ if (z->c > z->lb) goto lab2; /* atlimit, line 94 */
+ return 0;
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int ret;
- ret = slice_from_s(z, 1, s_13); /* <-, line 95 */
- if (ret < 0) return ret;
+ { int ret;
+ ret = slice_from_s(z, 1, s_13); /* <-, line 95 */
+ if (ret < 0) return ret;
}
return 1;
}
@@ -695,110 +695,110 @@
among_var = find_among_b(z, a_5, 24); /* substring, line 99 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 99 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 99 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 99 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 4, s_14); /* <-, line 100 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 4, s_15); /* <-, line 101 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 4, s_16); /* <-, line 102 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret;
- ret = slice_from_s(z, 4, s_17); /* <-, line 103 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret;
- ret = slice_from_s(z, 3, s_18); /* <-, line 104 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret;
- ret = slice_from_s(z, 3, s_19); /* <-, line 106 */
- if (ret < 0) return ret;
- }
- break;
- case 7:
- { int ret;
- ret = slice_from_s(z, 3, s_20); /* <-, line 108 */
- if (ret < 0) return ret;
- }
- break;
- case 8:
- { int ret;
- ret = slice_from_s(z, 2, s_21); /* <-, line 110 */
- if (ret < 0) return ret;
- }
- break;
- case 9:
- { int ret;
- ret = slice_from_s(z, 3, s_22); /* <-, line 111 */
- if (ret < 0) return ret;
- }
- break;
- case 10:
- { int ret;
- ret = slice_from_s(z, 3, s_23); /* <-, line 113 */
- if (ret < 0) return ret;
- }
- break;
- case 11:
- { int ret;
- ret = slice_from_s(z, 3, s_24); /* <-, line 115 */
- if (ret < 0) return ret;
- }
- break;
- case 12:
- { int ret;
- ret = slice_from_s(z, 3, s_25); /* <-, line 117 */
- if (ret < 0) return ret;
- }
- break;
- case 13:
- if (!(eq_s_b(z, 1, s_26))) return 0;
- { int ret;
- ret = slice_from_s(z, 2, s_27); /* <-, line 118 */
- if (ret < 0) return ret;
- }
- break;
- case 14:
- { int ret;
- ret = slice_from_s(z, 3, s_28); /* <-, line 119 */
- if (ret < 0) return ret;
- }
- break;
- case 15:
- { int ret;
- ret = slice_from_s(z, 4, s_29); /* <-, line 120 */
- if (ret < 0) return ret;
- }
- break;
- case 16:
- if (!(in_grouping_b_U(z, g_valid_LI, 99, 116))) return 0;
- { int ret;
- ret = slice_del(z); /* delete, line 121 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 4, s_14); /* <-, line 100 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 4, s_15); /* <-, line 101 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 4, s_16); /* <-, line 102 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret;
+ ret = slice_from_s(z, 4, s_17); /* <-, line 103 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret;
+ ret = slice_from_s(z, 3, s_18); /* <-, line 104 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret;
+ ret = slice_from_s(z, 3, s_19); /* <-, line 106 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 7:
+ { int ret;
+ ret = slice_from_s(z, 3, s_20); /* <-, line 108 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 8:
+ { int ret;
+ ret = slice_from_s(z, 2, s_21); /* <-, line 110 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 9:
+ { int ret;
+ ret = slice_from_s(z, 3, s_22); /* <-, line 111 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 10:
+ { int ret;
+ ret = slice_from_s(z, 3, s_23); /* <-, line 113 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 11:
+ { int ret;
+ ret = slice_from_s(z, 3, s_24); /* <-, line 115 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 12:
+ { int ret;
+ ret = slice_from_s(z, 3, s_25); /* <-, line 117 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 13:
+ if (!(eq_s_b(z, 1, s_26))) return 0;
+ { int ret;
+ ret = slice_from_s(z, 2, s_27); /* <-, line 118 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 14:
+ { int ret;
+ ret = slice_from_s(z, 3, s_28); /* <-, line 119 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 15:
+ { int ret;
+ ret = slice_from_s(z, 4, s_29); /* <-, line 120 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 16:
+ if (!(in_grouping_b_U(z, g_valid_LI, 99, 116))) return 0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 121 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -809,52 +809,52 @@
among_var = find_among_b(z, a_6, 9); /* substring, line 126 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 126 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 126 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 126 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 4, s_30); /* <-, line 127 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 3, s_31); /* <-, line 128 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 2, s_32); /* <-, line 129 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret;
- ret = slice_from_s(z, 2, s_33); /* <-, line 131 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret;
- ret = slice_del(z); /* delete, line 133 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 135 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 135 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 4, s_30); /* <-, line 127 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 3, s_31); /* <-, line 128 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 2, s_32); /* <-, line 129 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret;
+ ret = slice_from_s(z, 2, s_33); /* <-, line 131 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret;
+ ret = slice_del(z); /* delete, line 133 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 135 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 135 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -865,32 +865,32 @@
among_var = find_among_b(z, a_7, 18); /* substring, line 140 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 140 */
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 140 */
- if (ret < 0) return ret;
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 140 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 143 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int m = z->l - z->c; (void) m; /* or, line 144 */
- if (!(eq_s_b(z, 1, s_34))) goto lab1;
- goto lab0;
- lab1:
- z->c = z->l - m;
- if (!(eq_s_b(z, 1, s_35))) return 0;
- }
- lab0:
- { int ret;
- ret = slice_del(z); /* delete, line 144 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 143 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int m = z->l - z->c; (void) m; /* or, line 144 */
+ if (!(eq_s_b(z, 1, s_34))) goto lab1;
+ goto lab0;
+ lab1:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 1, s_35))) return 0;
+ }
+ lab0:
+ { int ret;
+ ret = slice_del(z); /* delete, line 144 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -902,47 +902,47 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 149 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int m = z->l - z->c; (void) m; /* or, line 150 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab1; /* call R2, line 150 */
- if (ret < 0) return ret;
- }
- goto lab0;
- lab1:
- z->c = z->l - m;
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 150 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* not, line 150 */
- { int ret = r_shortv(z);
- if (ret == 0) goto lab2; /* call shortv, line 150 */
- if (ret < 0) return ret;
- }
- return 0;
- lab2:
- z->c = z->l - m;
- }
- }
- lab0:
- { int ret;
- ret = slice_del(z); /* delete, line 150 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 151 */
- if (ret < 0) return ret;
- }
- if (!(eq_s_b(z, 1, s_36))) return 0;
- { int ret;
- ret = slice_del(z); /* delete, line 151 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int m = z->l - z->c; (void) m; /* or, line 150 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab1; /* call R2, line 150 */
+ if (ret < 0) return ret;
+ }
+ goto lab0;
+ lab1:
+ z->c = z->l - m;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 150 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* not, line 150 */
+ { int ret = r_shortv(z);
+ if (ret == 0) goto lab2; /* call shortv, line 150 */
+ if (ret < 0) return ret;
+ }
+ return 0;
+ lab2:
+ z->c = z->l - m;
+ }
+ }
+ lab0:
+ { int ret;
+ ret = slice_del(z); /* delete, line 150 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 151 */
+ if (ret < 0) return ret;
+ }
+ if (!(eq_s_b(z, 1, s_36))) return 0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 151 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -963,73 +963,73 @@
z->ket = z->c; /* ], line 169 */
if (z->c < z->l) return 0; /* atlimit, line 169 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 3, s_37); /* <-, line 173 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 3, s_38); /* <-, line 174 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 3, s_39); /* <-, line 175 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret;
- ret = slice_from_s(z, 3, s_40); /* <-, line 176 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret;
- ret = slice_from_s(z, 3, s_41); /* <-, line 177 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret;
- ret = slice_from_s(z, 3, s_42); /* <-, line 181 */
- if (ret < 0) return ret;
- }
- break;
- case 7:
- { int ret;
- ret = slice_from_s(z, 5, s_43); /* <-, line 182 */
- if (ret < 0) return ret;
- }
- break;
- case 8:
- { int ret;
- ret = slice_from_s(z, 4, s_44); /* <-, line 183 */
- if (ret < 0) return ret;
- }
- break;
- case 9:
- { int ret;
- ret = slice_from_s(z, 5, s_45); /* <-, line 184 */
- if (ret < 0) return ret;
- }
- break;
- case 10:
- { int ret;
- ret = slice_from_s(z, 4, s_46); /* <-, line 185 */
- if (ret < 0) return ret;
- }
- break;
- case 11:
- { int ret;
- ret = slice_from_s(z, 5, s_47); /* <-, line 186 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 3, s_37); /* <-, line 173 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 3, s_38); /* <-, line 174 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 3, s_39); /* <-, line 175 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret;
+ ret = slice_from_s(z, 3, s_40); /* <-, line 176 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret;
+ ret = slice_from_s(z, 3, s_41); /* <-, line 177 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret;
+ ret = slice_from_s(z, 3, s_42); /* <-, line 181 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 7:
+ { int ret;
+ ret = slice_from_s(z, 5, s_43); /* <-, line 182 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 8:
+ { int ret;
+ ret = slice_from_s(z, 4, s_44); /* <-, line 183 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 9:
+ { int ret;
+ ret = slice_from_s(z, 5, s_45); /* <-, line 184 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 10:
+ { int ret;
+ ret = slice_from_s(z, 4, s_46); /* <-, line 185 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 11:
+ { int ret;
+ ret = slice_from_s(z, 5, s_47); /* <-, line 186 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -1037,147 +1037,147 @@
static int r_postlude(struct SN_env * z) {
if (!(z->B[0])) return 0; /* Boolean test Y_found, line 202 */
while(1) { /* repeat, line 202 */
- int c = z->c;
- while(1) { /* goto, line 202 */
- int c = z->c;
- z->bra = z->c; /* [, line 202 */
- if (!(eq_s(z, 1, s_48))) goto lab1;
- z->ket = z->c; /* ], line 202 */
- z->c = c;
- break;
- lab1:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* goto, line 202 */
- }
- }
- { int ret;
- ret = slice_from_s(z, 1, s_49); /* <-, line 202 */
- if (ret < 0) return ret;
- }
- continue;
+ int c = z->c;
+ while(1) { /* goto, line 202 */
+ int c = z->c;
+ z->bra = z->c; /* [, line 202 */
+ if (!(eq_s(z, 1, s_48))) goto lab1;
+ z->ket = z->c; /* ], line 202 */
+ z->c = c;
+ break;
+ lab1:
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* goto, line 202 */
+ }
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_49); /* <-, line 202 */
+ if (ret < 0) return ret;
+ }
+ continue;
lab0:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
extern int english_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* or, line 206 */
- { int ret = r_exception1(z);
- if (ret == 0) goto lab1; /* call exception1, line 206 */
- if (ret < 0) return ret;
- }
- goto lab0;
+ { int c = z->c; /* or, line 206 */
+ { int ret = r_exception1(z);
+ if (ret == 0) goto lab1; /* call exception1, line 206 */
+ if (ret < 0) return ret;
+ }
+ goto lab0;
lab1:
- z->c = c;
- { int c = z->c; /* not, line 207 */
- { int c = skip_utf8(z->p, z->c, 0, z->l, + 3);
- if (c < 0) goto lab3;
- z->c = c; /* hop, line 207 */
- }
- goto lab2;
- lab3:
- z->c = c;
- }
- goto lab0;
+ z->c = c;
+ { int c = z->c; /* not, line 207 */
+ { int c = skip_utf8(z->p, z->c, 0, z->l, + 3);
+ if (c < 0) goto lab3;
+ z->c = c; /* hop, line 207 */
+ }
+ goto lab2;
+ lab3:
+ z->c = c;
+ }
+ goto lab0;
lab2:
- z->c = c;
- { int c = z->c; /* do, line 208 */
- { int ret = r_prelude(z);
- if (ret == 0) goto lab4; /* call prelude, line 208 */
- if (ret < 0) return ret;
- }
- lab4:
- z->c = c;
- }
- { int c = z->c; /* do, line 209 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab5; /* call mark_regions, line 209 */
- if (ret < 0) return ret;
- }
- lab5:
- z->c = c;
- }
- z->lb = z->c; z->c = z->l; /* backwards, line 210 */
-
- { int m = z->l - z->c; (void) m; /* do, line 212 */
- { int ret = r_Step_1a(z);
- if (ret == 0) goto lab6; /* call Step_1a, line 212 */
- if (ret < 0) return ret;
- }
- lab6:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* or, line 214 */
- { int ret = r_exception2(z);
- if (ret == 0) goto lab8; /* call exception2, line 214 */
- if (ret < 0) return ret;
- }
- goto lab7;
- lab8:
- z->c = z->l - m;
- { int m = z->l - z->c; (void) m; /* do, line 216 */
- { int ret = r_Step_1b(z);
- if (ret == 0) goto lab9; /* call Step_1b, line 216 */
- if (ret < 0) return ret;
- }
- lab9:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* do, line 217 */
- { int ret = r_Step_1c(z);
- if (ret == 0) goto lab10; /* call Step_1c, line 217 */
- if (ret < 0) return ret;
- }
- lab10:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* do, line 219 */
- { int ret = r_Step_2(z);
- if (ret == 0) goto lab11; /* call Step_2, line 219 */
- if (ret < 0) return ret;
- }
- lab11:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* do, line 220 */
- { int ret = r_Step_3(z);
- if (ret == 0) goto lab12; /* call Step_3, line 220 */
- if (ret < 0) return ret;
- }
- lab12:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* do, line 221 */
- { int ret = r_Step_4(z);
- if (ret == 0) goto lab13; /* call Step_4, line 221 */
- if (ret < 0) return ret;
- }
- lab13:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* do, line 223 */
- { int ret = r_Step_5(z);
- if (ret == 0) goto lab14; /* call Step_5, line 223 */
- if (ret < 0) return ret;
- }
- lab14:
- z->c = z->l - m;
- }
- }
+ z->c = c;
+ { int c = z->c; /* do, line 208 */
+ { int ret = r_prelude(z);
+ if (ret == 0) goto lab4; /* call prelude, line 208 */
+ if (ret < 0) return ret;
+ }
+ lab4:
+ z->c = c;
+ }
+ { int c = z->c; /* do, line 209 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab5; /* call mark_regions, line 209 */
+ if (ret < 0) return ret;
+ }
+ lab5:
+ z->c = c;
+ }
+ z->lb = z->c; z->c = z->l; /* backwards, line 210 */
+
+ { int m = z->l - z->c; (void) m; /* do, line 212 */
+ { int ret = r_Step_1a(z);
+ if (ret == 0) goto lab6; /* call Step_1a, line 212 */
+ if (ret < 0) return ret;
+ }
+ lab6:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* or, line 214 */
+ { int ret = r_exception2(z);
+ if (ret == 0) goto lab8; /* call exception2, line 214 */
+ if (ret < 0) return ret;
+ }
+ goto lab7;
+ lab8:
+ z->c = z->l - m;
+ { int m = z->l - z->c; (void) m; /* do, line 216 */
+ { int ret = r_Step_1b(z);
+ if (ret == 0) goto lab9; /* call Step_1b, line 216 */
+ if (ret < 0) return ret;
+ }
+ lab9:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 217 */
+ { int ret = r_Step_1c(z);
+ if (ret == 0) goto lab10; /* call Step_1c, line 217 */
+ if (ret < 0) return ret;
+ }
+ lab10:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 219 */
+ { int ret = r_Step_2(z);
+ if (ret == 0) goto lab11; /* call Step_2, line 219 */
+ if (ret < 0) return ret;
+ }
+ lab11:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 220 */
+ { int ret = r_Step_3(z);
+ if (ret == 0) goto lab12; /* call Step_3, line 220 */
+ if (ret < 0) return ret;
+ }
+ lab12:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 221 */
+ { int ret = r_Step_4(z);
+ if (ret == 0) goto lab13; /* call Step_4, line 221 */
+ if (ret < 0) return ret;
+ }
+ lab13:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 223 */
+ { int ret = r_Step_5(z);
+ if (ret == 0) goto lab14; /* call Step_5, line 223 */
+ if (ret < 0) return ret;
+ }
+ lab14:
+ z->c = z->l - m;
+ }
+ }
lab7:
- z->c = z->lb;
- { int c = z->c; /* do, line 226 */
- { int ret = r_postlude(z);
- if (ret == 0) goto lab15; /* call postlude, line 226 */
- if (ret < 0) return ret;
- }
- lab15:
- z->c = c;
- }
+ z->c = z->lb;
+ { int c = z->c; /* do, line 226 */
+ { int ret = r_postlude(z);
+ if (ret == 0) goto lab15; /* call postlude, line 226 */
+ if (ret < 0) return ret;
+ }
+ lab15:
+ z->c = c;
+ }
}
lab0:
return 1;
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 15:12:19 2008
@@ -291,47 +291,47 @@
z->I[0] = z->l;
z->I[1] = z->l;
while(1) { /* goto, line 46 */
- int c = z->c;
- if (!(in_grouping_U(z, g_V1, 97, 246))) goto lab0;
- z->c = c;
- break;
+ int c = z->c;
+ if (!(in_grouping_U(z, g_V1, 97, 246))) goto lab0;
+ z->c = c;
+ break;
lab0:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* goto, line 46 */
- }
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* goto, line 46 */
+ }
}
while(1) { /* gopast, line 46 */
- if (!(out_grouping_U(z, g_V1, 97, 246))) goto lab1;
- break;
+ if (!(out_grouping_U(z, g_V1, 97, 246))) goto lab1;
+ break;
lab1:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 46 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 46 */
+ }
}
z->I[0] = z->c; /* setmark p1, line 46 */
while(1) { /* goto, line 47 */
- int c = z->c;
- if (!(in_grouping_U(z, g_V1, 97, 246))) goto lab2;
- z->c = c;
- break;
+ int c = z->c;
+ if (!(in_grouping_U(z, g_V1, 97, 246))) goto lab2;
+ z->c = c;
+ break;
lab2:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* goto, line 47 */
- }
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* goto, line 47 */
+ }
}
while(1) { /* gopast, line 47 */
- if (!(out_grouping_U(z, g_V1, 97, 246))) goto lab3;
- break;
+ if (!(out_grouping_U(z, g_V1, 97, 246))) goto lab3;
+ break;
lab3:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 47 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 47 */
+ }
}
z->I[1] = z->c; /* setmark p2, line 47 */
return 1;
@@ -344,105 +344,105 @@
static int r_particle_etc(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 55 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 55 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 55 */
- among_var = find_among_b(z, a_0, 10); /* substring, line 55 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 55 */
- z->lb = m3;
+ { int m3; /* setlimit, line 55 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 55 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 55 */
+ among_var = find_among_b(z, a_0, 10); /* substring, line 55 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 55 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- if (!(in_grouping_b_U(z, g_particle_end, 97, 246))) return 0;
- break;
- case 2:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 64 */
- if (ret < 0) return ret;
- }
- break;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 66 */
- if (ret < 0) return ret;
+ case 0: return 0;
+ case 1:
+ if (!(in_grouping_b_U(z, g_particle_end, 97, 246))) return 0;
+ break;
+ case 2:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 64 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 66 */
+ if (ret < 0) return ret;
}
return 1;
}
static int r_possessive(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 69 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 69 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 69 */
- among_var = find_among_b(z, a_4, 9); /* substring, line 69 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 69 */
- z->lb = m3;
+ { int m3; /* setlimit, line 69 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 69 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 69 */
+ among_var = find_among_b(z, a_4, 9); /* substring, line 69 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 69 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int m = z->l - z->c; (void) m; /* not, line 72 */
- if (!(eq_s_b(z, 1, s_0))) goto lab0;
- return 0;
- lab0:
- z->c = z->l - m;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 72 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_del(z); /* delete, line 74 */
- if (ret < 0) return ret;
- }
- z->ket = z->c; /* [, line 74 */
- if (!(eq_s_b(z, 3, s_1))) return 0;
- z->bra = z->c; /* ], line 74 */
- { int ret;
- ret = slice_from_s(z, 3, s_2); /* <-, line 74 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_del(z); /* delete, line 78 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- if (!(find_among_b(z, a_1, 6))) return 0; /* among, line 81 */
- { int ret;
- ret = slice_del(z); /* delete, line 81 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- if (!(find_among_b(z, a_2, 6))) return 0; /* among, line 83 */
- { int ret;
- ret = slice_del(z); /* delete, line 84 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- if (!(find_among_b(z, a_3, 2))) return 0; /* among, line 86 */
- { int ret;
- ret = slice_del(z); /* delete, line 86 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int m = z->l - z->c; (void) m; /* not, line 72 */
+ if (!(eq_s_b(z, 1, s_0))) goto lab0;
+ return 0;
+ lab0:
+ z->c = z->l - m;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 72 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_del(z); /* delete, line 74 */
+ if (ret < 0) return ret;
+ }
+ z->ket = z->c; /* [, line 74 */
+ if (!(eq_s_b(z, 3, s_1))) return 0;
+ z->bra = z->c; /* ], line 74 */
+ { int ret;
+ ret = slice_from_s(z, 3, s_2); /* <-, line 74 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_del(z); /* delete, line 78 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ if (!(find_among_b(z, a_1, 6))) return 0; /* among, line 81 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 81 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ if (!(find_among_b(z, a_2, 6))) return 0; /* among, line 83 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 84 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ if (!(find_among_b(z, a_3, 2))) return 0; /* among, line 86 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 86 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -460,74 +460,74 @@
static int r_case_ending(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 96 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 96 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 96 */
- among_var = find_among_b(z, a_6, 30); /* substring, line 96 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 96 */
- z->lb = m3;
+ { int m3; /* setlimit, line 96 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 96 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 96 */
+ among_var = find_among_b(z, a_6, 30); /* substring, line 96 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 96 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- if (!(eq_s_b(z, 1, s_4))) return 0;
- break;
- case 2:
- if (!(eq_s_b(z, 1, s_5))) return 0;
- break;
- case 3:
- if (!(eq_s_b(z, 1, s_6))) return 0;
- break;
- case 4:
- if (!(eq_s_b(z, 1, s_7))) return 0;
- break;
- case 5:
- if (!(eq_s_b(z, 2, s_8))) return 0;
- break;
- case 6:
- if (!(eq_s_b(z, 2, s_9))) return 0;
- break;
- case 7:
- { int m = z->l - z->c; (void) m; /* try, line 111 */
- { int m = z->l - z->c; (void) m; /* and, line 113 */
- { int m = z->l - z->c; (void) m; /* or, line 112 */
- { int ret = r_LONG(z);
- if (ret == 0) goto lab2; /* call LONG, line 111 */
- if (ret < 0) return ret;
- }
- goto lab1;
- lab2:
- z->c = z->l - m;
- if (!(eq_s_b(z, 2, s_10))) { z->c = z->l - m; goto lab0; }
- }
- lab1:
- z->c = z->l - m;
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) { z->c = z->l - m; goto lab0; }
- z->c = c; /* next, line 113 */
- }
- }
- z->bra = z->c; /* ], line 113 */
- lab0:
- ;
- }
- break;
- case 8:
- if (!(in_grouping_b_U(z, g_V1, 97, 246))) return 0;
- if (!(out_grouping_b_U(z, g_V1, 97, 246))) return 0;
- break;
- case 9:
- if (!(eq_s_b(z, 1, s_11))) return 0;
- break;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 138 */
- if (ret < 0) return ret;
+ case 0: return 0;
+ case 1:
+ if (!(eq_s_b(z, 1, s_4))) return 0;
+ break;
+ case 2:
+ if (!(eq_s_b(z, 1, s_5))) return 0;
+ break;
+ case 3:
+ if (!(eq_s_b(z, 1, s_6))) return 0;
+ break;
+ case 4:
+ if (!(eq_s_b(z, 1, s_7))) return 0;
+ break;
+ case 5:
+ if (!(eq_s_b(z, 2, s_8))) return 0;
+ break;
+ case 6:
+ if (!(eq_s_b(z, 2, s_9))) return 0;
+ break;
+ case 7:
+ { int m = z->l - z->c; (void) m; /* try, line 111 */
+ { int m = z->l - z->c; (void) m; /* and, line 113 */
+ { int m = z->l - z->c; (void) m; /* or, line 112 */
+ { int ret = r_LONG(z);
+ if (ret == 0) goto lab2; /* call LONG, line 111 */
+ if (ret < 0) return ret;
+ }
+ goto lab1;
+ lab2:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 2, s_10))) { z->c = z->l - m; goto lab0; }
+ }
+ lab1:
+ z->c = z->l - m;
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) { z->c = z->l - m; goto lab0; }
+ z->c = c; /* next, line 113 */
+ }
+ }
+ z->bra = z->c; /* ], line 113 */
+ lab0:
+ ;
+ }
+ break;
+ case 8:
+ if (!(in_grouping_b_U(z, g_V1, 97, 246))) return 0;
+ if (!(out_grouping_b_U(z, g_V1, 97, 246))) return 0;
+ break;
+ case 9:
+ if (!(eq_s_b(z, 1, s_11))) return 0;
+ break;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 138 */
+ if (ret < 0) return ret;
}
z->B[0] = 1; /* set ending_removed, line 139 */
return 1;
@@ -535,281 +535,281 @@
static int r_other_endings(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 142 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[1]) return 0;
- z->c = z->I[1]; /* tomark, line 142 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 142 */
- among_var = find_among_b(z, a_7, 14); /* substring, line 142 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 142 */
- z->lb = m3;
+ { int m3; /* setlimit, line 142 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[1]) return 0;
+ z->c = z->I[1]; /* tomark, line 142 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 142 */
+ among_var = find_among_b(z, a_7, 14); /* substring, line 142 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 142 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int m = z->l - z->c; (void) m; /* not, line 146 */
- if (!(eq_s_b(z, 2, s_12))) goto lab0;
- return 0;
- lab0:
- z->c = z->l - m;
- }
- break;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 151 */
- if (ret < 0) return ret;
+ case 0: return 0;
+ case 1:
+ { int m = z->l - z->c; (void) m; /* not, line 146 */
+ if (!(eq_s_b(z, 2, s_12))) goto lab0;
+ return 0;
+ lab0:
+ z->c = z->l - m;
+ }
+ break;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 151 */
+ if (ret < 0) return ret;
}
return 1;
}
static int r_i_plural(struct SN_env * z) {
- { int m3; /* setlimit, line 154 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 154 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 154 */
- if (!(find_among_b(z, a_8, 2))) { z->lb = m3; return 0; } /* substring, line 154 */
- z->bra = z->c; /* ], line 154 */
- z->lb = m3;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 158 */
- if (ret < 0) return ret;
+ { int m3; /* setlimit, line 154 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 154 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 154 */
+ if (!(find_among_b(z, a_8, 2))) { z->lb = m3; return 0; } /* substring, line 154 */
+ z->bra = z->c; /* ], line 154 */
+ z->lb = m3;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 158 */
+ if (ret < 0) return ret;
}
return 1;
}
static int r_t_plural(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 161 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 161 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 162 */
- if (!(eq_s_b(z, 1, s_13))) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 162 */
- { int m_test = z->l - z->c; /* test, line 162 */
- if (!(in_grouping_b_U(z, g_V1, 97, 246))) { z->lb = m3; return 0; }
- z->c = z->l - m_test;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 163 */
- if (ret < 0) return ret;
- }
- z->lb = m3;
- }
- { int m3; /* setlimit, line 165 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[1]) return 0;
- z->c = z->I[1]; /* tomark, line 165 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 165 */
- among_var = find_among_b(z, a_9, 2); /* substring, line 165 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 165 */
- z->lb = m3;
+ { int m3; /* setlimit, line 161 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 161 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 162 */
+ if (!(eq_s_b(z, 1, s_13))) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 162 */
+ { int m_test = z->l - z->c; /* test, line 162 */
+ if (!(in_grouping_b_U(z, g_V1, 97, 246))) { z->lb = m3; return 0; }
+ z->c = z->l - m_test;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 163 */
+ if (ret < 0) return ret;
+ }
+ z->lb = m3;
+ }
+ { int m3; /* setlimit, line 165 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[1]) return 0;
+ z->c = z->I[1]; /* tomark, line 165 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 165 */
+ among_var = find_among_b(z, a_9, 2); /* substring, line 165 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 165 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int m = z->l - z->c; (void) m; /* not, line 167 */
- if (!(eq_s_b(z, 2, s_14))) goto lab0;
- return 0;
- lab0:
- z->c = z->l - m;
- }
- break;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 170 */
- if (ret < 0) return ret;
+ case 0: return 0;
+ case 1:
+ { int m = z->l - z->c; (void) m; /* not, line 167 */
+ if (!(eq_s_b(z, 2, s_14))) goto lab0;
+ return 0;
+ lab0:
+ z->c = z->l - m;
+ }
+ break;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 170 */
+ if (ret < 0) return ret;
}
return 1;
}
static int r_tidy(struct SN_env * z) {
- { int m3; /* setlimit, line 173 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 173 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- { int m = z->l - z->c; (void) m; /* do, line 174 */
- { int m = z->l - z->c; (void) m; /* and, line 174 */
- { int ret = r_LONG(z);
- if (ret == 0) goto lab0; /* call LONG, line 174 */
- if (ret < 0) return ret;
- }
- z->c = z->l - m;
- z->ket = z->c; /* [, line 174 */
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 174 */
- }
- z->bra = z->c; /* ], line 174 */
- { int ret;
- ret = slice_del(z); /* delete, line 174 */
- if (ret < 0) return ret;
- }
- }
- lab0:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* do, line 175 */
- z->ket = z->c; /* [, line 175 */
- if (!(in_grouping_b_U(z, g_AEI, 97, 228))) goto lab1;
- z->bra = z->c; /* ], line 175 */
- if (!(out_grouping_b_U(z, g_V1, 97, 246))) goto lab1;
- { int ret;
- ret = slice_del(z); /* delete, line 175 */
- if (ret < 0) return ret;
- }
- lab1:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* do, line 176 */
- z->ket = z->c; /* [, line 176 */
- if (!(eq_s_b(z, 1, s_15))) goto lab2;
- z->bra = z->c; /* ], line 176 */
- { int m = z->l - z->c; (void) m; /* or, line 176 */
- if (!(eq_s_b(z, 1, s_16))) goto lab4;
- goto lab3;
- lab4:
- z->c = z->l - m;
- if (!(eq_s_b(z, 1, s_17))) goto lab2;
- }
- lab3:
- { int ret;
- ret = slice_del(z); /* delete, line 176 */
- if (ret < 0) return ret;
- }
- lab2:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* do, line 177 */
- z->ket = z->c; /* [, line 177 */
- if (!(eq_s_b(z, 1, s_18))) goto lab5;
- z->bra = z->c; /* ], line 177 */
- if (!(eq_s_b(z, 1, s_19))) goto lab5;
- { int ret;
- ret = slice_del(z); /* delete, line 177 */
- if (ret < 0) return ret;
- }
- lab5:
- z->c = z->l - m;
- }
- z->lb = m3;
+ { int m3; /* setlimit, line 173 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 173 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ { int m = z->l - z->c; (void) m; /* do, line 174 */
+ { int m = z->l - z->c; (void) m; /* and, line 174 */
+ { int ret = r_LONG(z);
+ if (ret == 0) goto lab0; /* call LONG, line 174 */
+ if (ret < 0) return ret;
+ }
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 174 */
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 174 */
+ }
+ z->bra = z->c; /* ], line 174 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 174 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab0:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 175 */
+ z->ket = z->c; /* [, line 175 */
+ if (!(in_grouping_b_U(z, g_AEI, 97, 228))) goto lab1;
+ z->bra = z->c; /* ], line 175 */
+ if (!(out_grouping_b_U(z, g_V1, 97, 246))) goto lab1;
+ { int ret;
+ ret = slice_del(z); /* delete, line 175 */
+ if (ret < 0) return ret;
+ }
+ lab1:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 176 */
+ z->ket = z->c; /* [, line 176 */
+ if (!(eq_s_b(z, 1, s_15))) goto lab2;
+ z->bra = z->c; /* ], line 176 */
+ { int m = z->l - z->c; (void) m; /* or, line 176 */
+ if (!(eq_s_b(z, 1, s_16))) goto lab4;
+ goto lab3;
+ lab4:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 1, s_17))) goto lab2;
+ }
+ lab3:
+ { int ret;
+ ret = slice_del(z); /* delete, line 176 */
+ if (ret < 0) return ret;
+ }
+ lab2:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 177 */
+ z->ket = z->c; /* [, line 177 */
+ if (!(eq_s_b(z, 1, s_18))) goto lab5;
+ z->bra = z->c; /* ], line 177 */
+ if (!(eq_s_b(z, 1, s_19))) goto lab5;
+ { int ret;
+ ret = slice_del(z); /* delete, line 177 */
+ if (ret < 0) return ret;
+ }
+ lab5:
+ z->c = z->l - m;
+ }
+ z->lb = m3;
}
while(1) { /* goto, line 179 */
- int m = z->l - z->c; (void) m;
- if (!(out_grouping_b_U(z, g_V1, 97, 246))) goto lab6;
- z->c = z->l - m;
- break;
+ int m = z->l - z->c; (void) m;
+ if (!(out_grouping_b_U(z, g_V1, 97, 246))) goto lab6;
+ z->c = z->l - m;
+ break;
lab6:
- z->c = z->l - m;
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* goto, line 179 */
- }
+ z->c = z->l - m;
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* goto, line 179 */
+ }
}
z->ket = z->c; /* [, line 179 */
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* next, line 179 */
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* next, line 179 */
}
z->bra = z->c; /* ], line 179 */
z->S[0] = slice_to(z, z->S[0]); /* -> x, line 179 */
if (z->S[0] == 0) return -1; /* -> x, line 179 */
if (!(eq_v_b(z, z->S[0]))) return 0; /* name x, line 179 */
- { int ret;
- ret = slice_del(z); /* delete, line 179 */
- if (ret < 0) return ret;
+ { int ret;
+ ret = slice_del(z); /* delete, line 179 */
+ if (ret < 0) return ret;
}
return 1;
}
extern int finnish_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 185 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab0; /* call mark_regions, line 185 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 185 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab0; /* call mark_regions, line 185 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
z->B[0] = 0; /* unset ending_removed, line 186 */
z->lb = z->c; z->c = z->l; /* backwards, line 187 */
- { int m = z->l - z->c; (void) m; /* do, line 188 */
- { int ret = r_particle_etc(z);
- if (ret == 0) goto lab1; /* call particle_etc, line 188 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 188 */
+ { int ret = r_particle_etc(z);
+ if (ret == 0) goto lab1; /* call particle_etc, line 188 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 189 */
- { int ret = r_possessive(z);
- if (ret == 0) goto lab2; /* call possessive, line 189 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 189 */
+ { int ret = r_possessive(z);
+ if (ret == 0) goto lab2; /* call possessive, line 189 */
+ if (ret < 0) return ret;
+ }
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 190 */
- { int ret = r_case_ending(z);
- if (ret == 0) goto lab3; /* call case_ending, line 190 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 190 */
+ { int ret = r_case_ending(z);
+ if (ret == 0) goto lab3; /* call case_ending, line 190 */
+ if (ret < 0) return ret;
+ }
lab3:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 191 */
- { int ret = r_other_endings(z);
- if (ret == 0) goto lab4; /* call other_endings, line 191 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 191 */
+ { int ret = r_other_endings(z);
+ if (ret == 0) goto lab4; /* call other_endings, line 191 */
+ if (ret < 0) return ret;
+ }
lab4:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* or, line 192 */
- if (!(z->B[0])) goto lab6; /* Boolean test ending_removed, line 192 */
- { int m = z->l - z->c; (void) m; /* do, line 192 */
- { int ret = r_i_plural(z);
- if (ret == 0) goto lab7; /* call i_plural, line 192 */
- if (ret < 0) return ret;
- }
- lab7:
- z->c = z->l - m;
- }
- goto lab5;
+ { int m = z->l - z->c; (void) m; /* or, line 192 */
+ if (!(z->B[0])) goto lab6; /* Boolean test ending_removed, line 192 */
+ { int m = z->l - z->c; (void) m; /* do, line 192 */
+ { int ret = r_i_plural(z);
+ if (ret == 0) goto lab7; /* call i_plural, line 192 */
+ if (ret < 0) return ret;
+ }
+ lab7:
+ z->c = z->l - m;
+ }
+ goto lab5;
lab6:
- z->c = z->l - m;
- { int m = z->l - z->c; (void) m; /* do, line 192 */
- { int ret = r_t_plural(z);
- if (ret == 0) goto lab8; /* call t_plural, line 192 */
- if (ret < 0) return ret;
- }
- lab8:
- z->c = z->l - m;
- }
+ z->c = z->l - m;
+ { int m = z->l - z->c; (void) m; /* do, line 192 */
+ { int ret = r_t_plural(z);
+ if (ret == 0) goto lab8; /* call t_plural, line 192 */
+ if (ret < 0) return ret;
+ }
+ lab8:
+ z->c = z->l - m;
+ }
}
lab5:
- { int m = z->l - z->c; (void) m; /* do, line 193 */
- { int ret = r_tidy(z);
- if (ret == 0) goto lab9; /* call tidy, line 193 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 193 */
+ { int ret = r_tidy(z);
+ if (ret == 0) goto lab9; /* call tidy, line 193 */
+ if (ret < 0) return ret;
+ }
lab9:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
return 1;
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 15:12:19 2008
@@ -406,78 +406,78 @@
static int r_prelude(struct SN_env * z) {
while(1) { /* repeat, line 38 */
- int c = z->c;
- while(1) { /* goto, line 38 */
- int c = z->c;
- { int c = z->c; /* or, line 44 */
- if (!(in_grouping_U(z, g_v, 97, 251))) goto lab3;
- z->bra = z->c; /* [, line 40 */
- { int c = z->c; /* or, line 40 */
- if (!(eq_s(z, 1, s_0))) goto lab5;
- z->ket = z->c; /* ], line 40 */
- if (!(in_grouping_U(z, g_v, 97, 251))) goto lab5;
- { int ret;
- ret = slice_from_s(z, 1, s_1); /* <-, line 40 */
- if (ret < 0) return ret;
- }
- goto lab4;
- lab5:
- z->c = c;
- if (!(eq_s(z, 1, s_2))) goto lab6;
- z->ket = z->c; /* ], line 41 */
- if (!(in_grouping_U(z, g_v, 97, 251))) goto lab6;
- { int ret;
- ret = slice_from_s(z, 1, s_3); /* <-, line 41 */
- if (ret < 0) return ret;
- }
- goto lab4;
- lab6:
- z->c = c;
- if (!(eq_s(z, 1, s_4))) goto lab3;
- z->ket = z->c; /* ], line 42 */
- { int ret;
- ret = slice_from_s(z, 1, s_5); /* <-, line 42 */
- if (ret < 0) return ret;
- }
- }
- lab4:
- goto lab2;
- lab3:
- z->c = c;
- z->bra = z->c; /* [, line 45 */
- if (!(eq_s(z, 1, s_6))) goto lab7;
- z->ket = z->c; /* ], line 45 */
- if (!(in_grouping_U(z, g_v, 97, 251))) goto lab7;
- { int ret;
- ret = slice_from_s(z, 1, s_7); /* <-, line 45 */
- if (ret < 0) return ret;
- }
- goto lab2;
- lab7:
- z->c = c;
- if (!(eq_s(z, 1, s_8))) goto lab1;
- z->bra = z->c; /* [, line 47 */
- if (!(eq_s(z, 1, s_9))) goto lab1;
- z->ket = z->c; /* ], line 47 */
- { int ret;
- ret = slice_from_s(z, 1, s_10); /* <-, line 47 */
- if (ret < 0) return ret;
- }
- }
- lab2:
- z->c = c;
- break;
- lab1:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* goto, line 38 */
- }
- }
- continue;
+ int c = z->c;
+ while(1) { /* goto, line 38 */
+ int c = z->c;
+ { int c = z->c; /* or, line 44 */
+ if (!(in_grouping_U(z, g_v, 97, 251))) goto lab3;
+ z->bra = z->c; /* [, line 40 */
+ { int c = z->c; /* or, line 40 */
+ if (!(eq_s(z, 1, s_0))) goto lab5;
+ z->ket = z->c; /* ], line 40 */
+ if (!(in_grouping_U(z, g_v, 97, 251))) goto lab5;
+ { int ret;
+ ret = slice_from_s(z, 1, s_1); /* <-, line 40 */
+ if (ret < 0) return ret;
+ }
+ goto lab4;
+ lab5:
+ z->c = c;
+ if (!(eq_s(z, 1, s_2))) goto lab6;
+ z->ket = z->c; /* ], line 41 */
+ if (!(in_grouping_U(z, g_v, 97, 251))) goto lab6;
+ { int ret;
+ ret = slice_from_s(z, 1, s_3); /* <-, line 41 */
+ if (ret < 0) return ret;
+ }
+ goto lab4;
+ lab6:
+ z->c = c;
+ if (!(eq_s(z, 1, s_4))) goto lab3;
+ z->ket = z->c; /* ], line 42 */
+ { int ret;
+ ret = slice_from_s(z, 1, s_5); /* <-, line 42 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab4:
+ goto lab2;
+ lab3:
+ z->c = c;
+ z->bra = z->c; /* [, line 45 */
+ if (!(eq_s(z, 1, s_6))) goto lab7;
+ z->ket = z->c; /* ], line 45 */
+ if (!(in_grouping_U(z, g_v, 97, 251))) goto lab7;
+ { int ret;
+ ret = slice_from_s(z, 1, s_7); /* <-, line 45 */
+ if (ret < 0) return ret;
+ }
+ goto lab2;
+ lab7:
+ z->c = c;
+ if (!(eq_s(z, 1, s_8))) goto lab1;
+ z->bra = z->c; /* [, line 47 */
+ if (!(eq_s(z, 1, s_9))) goto lab1;
+ z->ket = z->c; /* ], line 47 */
+ { int ret;
+ ret = slice_from_s(z, 1, s_10); /* <-, line 47 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab2:
+ z->c = c;
+ break;
+ lab1:
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* goto, line 38 */
+ }
+ }
+ continue;
lab0:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -486,77 +486,77 @@
z->I[0] = z->l;
z->I[1] = z->l;
z->I[2] = z->l;
- { int c = z->c; /* do, line 56 */
- { int c = z->c; /* or, line 57 */
- if (!(in_grouping_U(z, g_v, 97, 251))) goto lab2;
- if (!(in_grouping_U(z, g_v, 97, 251))) goto lab2;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab2;
- z->c = c; /* next, line 57 */
- }
- goto lab1;
- lab2:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 57 */
- }
- while(1) { /* gopast, line 57 */
- if (!(in_grouping_U(z, g_v, 97, 251))) goto lab3;
- break;
- lab3:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* gopast, line 57 */
- }
- }
- }
+ { int c = z->c; /* do, line 56 */
+ { int c = z->c; /* or, line 57 */
+ if (!(in_grouping_U(z, g_v, 97, 251))) goto lab2;
+ if (!(in_grouping_U(z, g_v, 97, 251))) goto lab2;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab2;
+ z->c = c; /* next, line 57 */
+ }
+ goto lab1;
+ lab2:
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 57 */
+ }
+ while(1) { /* gopast, line 57 */
+ if (!(in_grouping_U(z, g_v, 97, 251))) goto lab3;
+ break;
+ lab3:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* gopast, line 57 */
+ }
+ }
+ }
lab1:
- z->I[0] = z->c; /* setmark pV, line 58 */
+ z->I[0] = z->c; /* setmark pV, line 58 */
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 60 */
- while(1) { /* gopast, line 61 */
- if (!(in_grouping_U(z, g_v, 97, 251))) goto lab5;
- break;
- lab5:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 61 */
- }
- }
- while(1) { /* gopast, line 61 */
- if (!(out_grouping_U(z, g_v, 97, 251))) goto lab6;
- break;
- lab6:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 61 */
- }
- }
- z->I[1] = z->c; /* setmark p1, line 61 */
- while(1) { /* gopast, line 62 */
- if (!(in_grouping_U(z, g_v, 97, 251))) goto lab7;
- break;
- lab7:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 62 */
- }
- }
- while(1) { /* gopast, line 62 */
- if (!(out_grouping_U(z, g_v, 97, 251))) goto lab8;
- break;
- lab8:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 62 */
- }
- }
- z->I[2] = z->c; /* setmark p2, line 62 */
+ { int c = z->c; /* do, line 60 */
+ while(1) { /* gopast, line 61 */
+ if (!(in_grouping_U(z, g_v, 97, 251))) goto lab5;
+ break;
+ lab5:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 61 */
+ }
+ }
+ while(1) { /* gopast, line 61 */
+ if (!(out_grouping_U(z, g_v, 97, 251))) goto lab6;
+ break;
+ lab6:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 61 */
+ }
+ }
+ z->I[1] = z->c; /* setmark p1, line 61 */
+ while(1) { /* gopast, line 62 */
+ if (!(in_grouping_U(z, g_v, 97, 251))) goto lab7;
+ break;
+ lab7:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 62 */
+ }
+ }
+ while(1) { /* gopast, line 62 */
+ if (!(out_grouping_U(z, g_v, 97, 251))) goto lab8;
+ break;
+ lab8:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 62 */
+ }
+ }
+ z->I[2] = z->c; /* setmark p2, line 62 */
lab4:
- z->c = c;
+ z->c = c;
}
return 1;
}
@@ -564,42 +564,42 @@
static int r_postlude(struct SN_env * z) {
int among_var;
while(1) { /* repeat, line 66 */
- int c = z->c;
- z->bra = z->c; /* [, line 68 */
- among_var = find_among(z, a_0, 4); /* substring, line 68 */
- if (!(among_var)) goto lab0;
- z->ket = z->c; /* ], line 68 */
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 1, s_11); /* <-, line 69 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 1, s_12); /* <-, line 70 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 1, s_13); /* <-, line 71 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 72 */
- }
- break;
- }
- continue;
+ int c = z->c;
+ z->bra = z->c; /* [, line 68 */
+ among_var = find_among(z, a_0, 4); /* substring, line 68 */
+ if (!(among_var)) goto lab0;
+ z->ket = z->c; /* ], line 68 */
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 1, s_11); /* <-, line 69 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 1, s_12); /* <-, line 70 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 1, s_13); /* <-, line 71 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 72 */
+ }
+ break;
+ }
+ continue;
lab0:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -626,679 +626,679 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 83 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 87 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 87 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 90 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 90 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 91 */
- z->ket = z->c; /* [, line 91 */
- if (!(eq_s_b(z, 2, s_14))) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 91 */
- { int m = z->l - z->c; (void) m; /* or, line 91 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab2; /* call R2, line 91 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 91 */
- if (ret < 0) return ret;
- }
- goto lab1;
- lab2:
- z->c = z->l - m;
- { int ret;
- ret = slice_from_s(z, 3, s_15); /* <-, line 91 */
- if (ret < 0) return ret;
- }
- }
- lab1:
- lab0:
- ;
- }
- break;
- case 3:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 95 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 3, s_16); /* <-, line 95 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 98 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 1, s_17); /* <-, line 98 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 101 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 3, s_18); /* <-, line 101 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 105 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 105 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 106 */
- z->ket = z->c; /* [, line 107 */
- among_var = find_among_b(z, a_1, 6); /* substring, line 107 */
- if (!(among_var)) { z->c = z->l - m; goto lab3; }
- z->bra = z->c; /* ], line 107 */
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab3; }
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 108 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 108 */
- if (ret < 0) return ret;
- }
- z->ket = z->c; /* [, line 108 */
- if (!(eq_s_b(z, 2, s_19))) { z->c = z->l - m; goto lab3; }
- z->bra = z->c; /* ], line 108 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 108 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 108 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int m = z->l - z->c; (void) m; /* or, line 109 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab5; /* call R2, line 109 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 109 */
- if (ret < 0) return ret;
- }
- goto lab4;
- lab5:
- z->c = z->l - m;
- { int ret = r_R1(z);
- if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R1, line 109 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 3, s_20); /* <-, line 109 */
- if (ret < 0) return ret;
- }
- }
- lab4:
- break;
- case 3:
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 111 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 111 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = r_RV(z);
- if (ret == 0) { z->c = z->l - m; goto lab3; } /* call RV, line 113 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 1, s_21); /* <-, line 113 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab3:
- ;
- }
- break;
- case 7:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 120 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 120 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 121 */
- z->ket = z->c; /* [, line 122 */
- among_var = find_among_b(z, a_2, 3); /* substring, line 122 */
- if (!(among_var)) { z->c = z->l - m; goto lab6; }
- z->bra = z->c; /* ], line 122 */
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab6; }
- case 1:
- { int m = z->l - z->c; (void) m; /* or, line 123 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab8; /* call R2, line 123 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 123 */
- if (ret < 0) return ret;
- }
- goto lab7;
- lab8:
- z->c = z->l - m;
- { int ret;
- ret = slice_from_s(z, 3, s_22); /* <-, line 123 */
- if (ret < 0) return ret;
- }
- }
- lab7:
- break;
- case 2:
- { int m = z->l - z->c; (void) m; /* or, line 124 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab10; /* call R2, line 124 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 124 */
- if (ret < 0) return ret;
- }
- goto lab9;
- lab10:
- z->c = z->l - m;
- { int ret;
- ret = slice_from_s(z, 3, s_23); /* <-, line 124 */
- if (ret < 0) return ret;
- }
- }
- lab9:
- break;
- case 3:
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab6; } /* call R2, line 125 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 125 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab6:
- ;
- }
- break;
- case 8:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 132 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 132 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 133 */
- z->ket = z->c; /* [, line 133 */
- if (!(eq_s_b(z, 2, s_24))) { z->c = z->l - m; goto lab11; }
- z->bra = z->c; /* ], line 133 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab11; } /* call R2, line 133 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 133 */
- if (ret < 0) return ret;
- }
- z->ket = z->c; /* [, line 133 */
- if (!(eq_s_b(z, 2, s_25))) { z->c = z->l - m; goto lab11; }
- z->bra = z->c; /* ], line 133 */
- { int m = z->l - z->c; (void) m; /* or, line 133 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab13; /* call R2, line 133 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 133 */
- if (ret < 0) return ret;
- }
- goto lab12;
- lab13:
- z->c = z->l - m;
- { int ret;
- ret = slice_from_s(z, 3, s_26); /* <-, line 133 */
- if (ret < 0) return ret;
- }
- }
- lab12:
- lab11:
- ;
- }
- break;
- case 9:
- { int ret;
- ret = slice_from_s(z, 3, s_27); /* <-, line 135 */
- if (ret < 0) return ret;
- }
- break;
- case 10:
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 136 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 2, s_28); /* <-, line 136 */
- if (ret < 0) return ret;
- }
- break;
- case 11:
- { int m = z->l - z->c; (void) m; /* or, line 138 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab15; /* call R2, line 138 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 138 */
- if (ret < 0) return ret;
- }
- goto lab14;
- lab15:
- z->c = z->l - m;
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 138 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 3, s_29); /* <-, line 138 */
- if (ret < 0) return ret;
- }
- }
- lab14:
- break;
- case 12:
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 141 */
- if (ret < 0) return ret;
- }
- if (!(out_grouping_b_U(z, g_v, 97, 251))) return 0;
- { int ret;
- ret = slice_del(z); /* delete, line 141 */
- if (ret < 0) return ret;
- }
- break;
- case 13:
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 146 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 3, s_30); /* <-, line 146 */
- if (ret < 0) return ret;
- }
- return 0; /* fail, line 146 */
- break;
- case 14:
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 147 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 3, s_31); /* <-, line 147 */
- if (ret < 0) return ret;
- }
- return 0; /* fail, line 147 */
- break;
- case 15:
- { int m_test = z->l - z->c; /* test, line 149 */
- if (!(in_grouping_b_U(z, g_v, 97, 251))) return 0;
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 149 */
- if (ret < 0) return ret;
- }
- z->c = z->l - m_test;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 149 */
- if (ret < 0) return ret;
- }
- return 0; /* fail, line 149 */
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 87 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 87 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 90 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 90 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 91 */
+ z->ket = z->c; /* [, line 91 */
+ if (!(eq_s_b(z, 2, s_14))) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 91 */
+ { int m = z->l - z->c; (void) m; /* or, line 91 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab2; /* call R2, line 91 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 91 */
+ if (ret < 0) return ret;
+ }
+ goto lab1;
+ lab2:
+ z->c = z->l - m;
+ { int ret;
+ ret = slice_from_s(z, 3, s_15); /* <-, line 91 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab1:
+ lab0:
+ ;
+ }
+ break;
+ case 3:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 95 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 3, s_16); /* <-, line 95 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 98 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_17); /* <-, line 98 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 101 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 3, s_18); /* <-, line 101 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 105 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 105 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 106 */
+ z->ket = z->c; /* [, line 107 */
+ among_var = find_among_b(z, a_1, 6); /* substring, line 107 */
+ if (!(among_var)) { z->c = z->l - m; goto lab3; }
+ z->bra = z->c; /* ], line 107 */
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab3; }
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 108 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 108 */
+ if (ret < 0) return ret;
+ }
+ z->ket = z->c; /* [, line 108 */
+ if (!(eq_s_b(z, 2, s_19))) { z->c = z->l - m; goto lab3; }
+ z->bra = z->c; /* ], line 108 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 108 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 108 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int m = z->l - z->c; (void) m; /* or, line 109 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab5; /* call R2, line 109 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 109 */
+ if (ret < 0) return ret;
+ }
+ goto lab4;
+ lab5:
+ z->c = z->l - m;
+ { int ret = r_R1(z);
+ if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R1, line 109 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 3, s_20); /* <-, line 109 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab4:
+ break;
+ case 3:
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 111 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 111 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = r_RV(z);
+ if (ret == 0) { z->c = z->l - m; goto lab3; } /* call RV, line 113 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_21); /* <-, line 113 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab3:
+ ;
+ }
+ break;
+ case 7:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 120 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 120 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 121 */
+ z->ket = z->c; /* [, line 122 */
+ among_var = find_among_b(z, a_2, 3); /* substring, line 122 */
+ if (!(among_var)) { z->c = z->l - m; goto lab6; }
+ z->bra = z->c; /* ], line 122 */
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab6; }
+ case 1:
+ { int m = z->l - z->c; (void) m; /* or, line 123 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab8; /* call R2, line 123 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 123 */
+ if (ret < 0) return ret;
+ }
+ goto lab7;
+ lab8:
+ z->c = z->l - m;
+ { int ret;
+ ret = slice_from_s(z, 3, s_22); /* <-, line 123 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab7:
+ break;
+ case 2:
+ { int m = z->l - z->c; (void) m; /* or, line 124 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab10; /* call R2, line 124 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 124 */
+ if (ret < 0) return ret;
+ }
+ goto lab9;
+ lab10:
+ z->c = z->l - m;
+ { int ret;
+ ret = slice_from_s(z, 3, s_23); /* <-, line 124 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab9:
+ break;
+ case 3:
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab6; } /* call R2, line 125 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 125 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab6:
+ ;
+ }
+ break;
+ case 8:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 132 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 132 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 133 */
+ z->ket = z->c; /* [, line 133 */
+ if (!(eq_s_b(z, 2, s_24))) { z->c = z->l - m; goto lab11; }
+ z->bra = z->c; /* ], line 133 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab11; } /* call R2, line 133 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 133 */
+ if (ret < 0) return ret;
+ }
+ z->ket = z->c; /* [, line 133 */
+ if (!(eq_s_b(z, 2, s_25))) { z->c = z->l - m; goto lab11; }
+ z->bra = z->c; /* ], line 133 */
+ { int m = z->l - z->c; (void) m; /* or, line 133 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab13; /* call R2, line 133 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 133 */
+ if (ret < 0) return ret;
+ }
+ goto lab12;
+ lab13:
+ z->c = z->l - m;
+ { int ret;
+ ret = slice_from_s(z, 3, s_26); /* <-, line 133 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab12:
+ lab11:
+ ;
+ }
+ break;
+ case 9:
+ { int ret;
+ ret = slice_from_s(z, 3, s_27); /* <-, line 135 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 10:
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 136 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 2, s_28); /* <-, line 136 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 11:
+ { int m = z->l - z->c; (void) m; /* or, line 138 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab15; /* call R2, line 138 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 138 */
+ if (ret < 0) return ret;
+ }
+ goto lab14;
+ lab15:
+ z->c = z->l - m;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 138 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 3, s_29); /* <-, line 138 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab14:
+ break;
+ case 12:
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 141 */
+ if (ret < 0) return ret;
+ }
+ if (!(out_grouping_b_U(z, g_v, 97, 251))) return 0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 141 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 13:
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 146 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 3, s_30); /* <-, line 146 */
+ if (ret < 0) return ret;
+ }
+ return 0; /* fail, line 146 */
+ break;
+ case 14:
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 147 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 3, s_31); /* <-, line 147 */
+ if (ret < 0) return ret;
+ }
+ return 0; /* fail, line 147 */
+ break;
+ case 15:
+ { int m_test = z->l - z->c; /* test, line 149 */
+ if (!(in_grouping_b_U(z, g_v, 97, 251))) return 0;
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 149 */
+ if (ret < 0) return ret;
+ }
+ z->c = z->l - m_test;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 149 */
+ if (ret < 0) return ret;
+ }
+ return 0; /* fail, line 149 */
+ break;
}
return 1;
}
static int r_i_verb_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 154 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 154 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 155 */
- among_var = find_among_b(z, a_4, 35); /* substring, line 155 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 155 */
- switch(among_var) {
- case 0: { z->lb = m3; return 0; }
- case 1:
- if (!(out_grouping_b_U(z, g_v, 97, 251))) { z->lb = m3; return 0; }
- { int ret;
- ret = slice_del(z); /* delete, line 161 */
- if (ret < 0) return ret;
- }
- break;
- }
- z->lb = m3;
+ { int m3; /* setlimit, line 154 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 154 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 155 */
+ among_var = find_among_b(z, a_4, 35); /* substring, line 155 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 155 */
+ switch(among_var) {
+ case 0: { z->lb = m3; return 0; }
+ case 1:
+ if (!(out_grouping_b_U(z, g_v, 97, 251))) { z->lb = m3; return 0; }
+ { int ret;
+ ret = slice_del(z); /* delete, line 161 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ z->lb = m3;
}
return 1;
}
static int r_verb_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 165 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 165 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 166 */
- among_var = find_among_b(z, a_5, 38); /* substring, line 166 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 166 */
- switch(among_var) {
- case 0: { z->lb = m3; return 0; }
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) { z->lb = m3; return 0; } /* call R2, line 168 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 168 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_del(z); /* delete, line 176 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_del(z); /* delete, line 181 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 182 */
- z->ket = z->c; /* [, line 182 */
- if (!(eq_s_b(z, 1, s_32))) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 182 */
- { int ret;
- ret = slice_del(z); /* delete, line 182 */
- if (ret < 0) return ret;
- }
- lab0:
- ;
- }
- break;
- }
- z->lb = m3;
+ { int m3; /* setlimit, line 165 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 165 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 166 */
+ among_var = find_among_b(z, a_5, 38); /* substring, line 166 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 166 */
+ switch(among_var) {
+ case 0: { z->lb = m3; return 0; }
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) { z->lb = m3; return 0; } /* call R2, line 168 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 168 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_del(z); /* delete, line 176 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_del(z); /* delete, line 181 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 182 */
+ z->ket = z->c; /* [, line 182 */
+ if (!(eq_s_b(z, 1, s_32))) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 182 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 182 */
+ if (ret < 0) return ret;
+ }
+ lab0:
+ ;
+ }
+ break;
+ }
+ z->lb = m3;
}
return 1;
}
static int r_residual_suffix(struct SN_env * z) {
int among_var;
- { int m = z->l - z->c; (void) m; /* try, line 190 */
- z->ket = z->c; /* [, line 190 */
- if (!(eq_s_b(z, 1, s_33))) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 190 */
- { int m_test = z->l - z->c; /* test, line 190 */
- if (!(out_grouping_b_U(z, g_keep_with_s, 97, 232))) { z->c = z->l - m; goto lab0; }
- z->c = z->l - m_test;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 190 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* try, line 190 */
+ z->ket = z->c; /* [, line 190 */
+ if (!(eq_s_b(z, 1, s_33))) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 190 */
+ { int m_test = z->l - z->c; /* test, line 190 */
+ if (!(out_grouping_b_U(z, g_keep_with_s, 97, 232))) { z->c = z->l - m; goto lab0; }
+ z->c = z->l - m_test;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 190 */
+ if (ret < 0) return ret;
+ }
lab0:
- ;
+ ;
}
- { int m3; /* setlimit, line 191 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 191 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 192 */
- among_var = find_among_b(z, a_6, 7); /* substring, line 192 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 192 */
- switch(among_var) {
- case 0: { z->lb = m3; return 0; }
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) { z->lb = m3; return 0; } /* call R2, line 193 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* or, line 193 */
- if (!(eq_s_b(z, 1, s_34))) goto lab2;
- goto lab1;
- lab2:
- z->c = z->l - m;
- if (!(eq_s_b(z, 1, s_35))) { z->lb = m3; return 0; }
- }
- lab1:
- { int ret;
- ret = slice_del(z); /* delete, line 193 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 1, s_36); /* <-, line 195 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_del(z); /* delete, line 196 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- if (!(eq_s_b(z, 2, s_37))) { z->lb = m3; return 0; }
- { int ret;
- ret = slice_del(z); /* delete, line 197 */
- if (ret < 0) return ret;
- }
- break;
- }
- z->lb = m3;
+ { int m3; /* setlimit, line 191 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 191 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 192 */
+ among_var = find_among_b(z, a_6, 7); /* substring, line 192 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 192 */
+ switch(among_var) {
+ case 0: { z->lb = m3; return 0; }
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) { z->lb = m3; return 0; } /* call R2, line 193 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* or, line 193 */
+ if (!(eq_s_b(z, 1, s_34))) goto lab2;
+ goto lab1;
+ lab2:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 1, s_35))) { z->lb = m3; return 0; }
+ }
+ lab1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 193 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 1, s_36); /* <-, line 195 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_del(z); /* delete, line 196 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ if (!(eq_s_b(z, 2, s_37))) { z->lb = m3; return 0; }
+ { int ret;
+ ret = slice_del(z); /* delete, line 197 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ z->lb = m3;
}
return 1;
}
static int r_un_double(struct SN_env * z) {
- { int m_test = z->l - z->c; /* test, line 203 */
- if (!(find_among_b(z, a_7, 5))) return 0; /* among, line 203 */
- z->c = z->l - m_test;
+ { int m_test = z->l - z->c; /* test, line 203 */
+ if (!(find_among_b(z, a_7, 5))) return 0; /* among, line 203 */
+ z->c = z->l - m_test;
}
z->ket = z->c; /* [, line 203 */
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* next, line 203 */
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* next, line 203 */
}
z->bra = z->c; /* ], line 203 */
- { int ret;
- ret = slice_del(z); /* delete, line 203 */
- if (ret < 0) return ret;
+ { int ret;
+ ret = slice_del(z); /* delete, line 203 */
+ if (ret < 0) return ret;
}
return 1;
}
static int r_un_accent(struct SN_env * z) {
- { int i = 1;
- while(1) { /* atleast, line 207 */
- if (!(out_grouping_b_U(z, g_v, 97, 251))) goto lab0;
- i--;
- continue;
- lab0:
- break;
- }
- if (i > 0) return 0;
+ { int i = 1;
+ while(1) { /* atleast, line 207 */
+ if (!(out_grouping_b_U(z, g_v, 97, 251))) goto lab0;
+ i--;
+ continue;
+ lab0:
+ break;
+ }
+ if (i > 0) return 0;
}
z->ket = z->c; /* [, line 208 */
- { int m = z->l - z->c; (void) m; /* or, line 208 */
- if (!(eq_s_b(z, 2, s_38))) goto lab2;
- goto lab1;
+ { int m = z->l - z->c; (void) m; /* or, line 208 */
+ if (!(eq_s_b(z, 2, s_38))) goto lab2;
+ goto lab1;
lab2:
- z->c = z->l - m;
- if (!(eq_s_b(z, 2, s_39))) return 0;
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 2, s_39))) return 0;
}
lab1:
z->bra = z->c; /* ], line 208 */
- { int ret;
- ret = slice_from_s(z, 1, s_40); /* <-, line 208 */
- if (ret < 0) return ret;
+ { int ret;
+ ret = slice_from_s(z, 1, s_40); /* <-, line 208 */
+ if (ret < 0) return ret;
}
return 1;
}
extern int french_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 214 */
- { int ret = r_prelude(z);
- if (ret == 0) goto lab0; /* call prelude, line 214 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 214 */
+ { int ret = r_prelude(z);
+ if (ret == 0) goto lab0; /* call prelude, line 214 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 215 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab1; /* call mark_regions, line 215 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 215 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab1; /* call mark_regions, line 215 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 216 */
- { int m = z->l - z->c; (void) m; /* do, line 218 */
- { int m = z->l - z->c; (void) m; /* or, line 228 */
- { int m = z->l - z->c; (void) m; /* and, line 224 */
- { int m = z->l - z->c; (void) m; /* or, line 220 */
- { int ret = r_standard_suffix(z);
- if (ret == 0) goto lab6; /* call standard_suffix, line 220 */
- if (ret < 0) return ret;
- }
- goto lab5;
- lab6:
- z->c = z->l - m;
- { int ret = r_i_verb_suffix(z);
- if (ret == 0) goto lab7; /* call i_verb_suffix, line 221 */
- if (ret < 0) return ret;
- }
- goto lab5;
- lab7:
- z->c = z->l - m;
- { int ret = r_verb_suffix(z);
- if (ret == 0) goto lab4; /* call verb_suffix, line 222 */
- if (ret < 0) return ret;
- }
- }
- lab5:
- z->c = z->l - m;
- { int m = z->l - z->c; (void) m; /* try, line 225 */
- z->ket = z->c; /* [, line 225 */
- { int m = z->l - z->c; (void) m; /* or, line 225 */
- if (!(eq_s_b(z, 1, s_41))) goto lab10;
- z->bra = z->c; /* ], line 225 */
- { int ret;
- ret = slice_from_s(z, 1, s_42); /* <-, line 225 */
- if (ret < 0) return ret;
- }
- goto lab9;
- lab10:
- z->c = z->l - m;
- if (!(eq_s_b(z, 2, s_43))) { z->c = z->l - m; goto lab8; }
- z->bra = z->c; /* ], line 226 */
- { int ret;
- ret = slice_from_s(z, 1, s_44); /* <-, line 226 */
- if (ret < 0) return ret;
- }
- }
- lab9:
- lab8:
- ;
- }
- }
- goto lab3;
- lab4:
- z->c = z->l - m;
- { int ret = r_residual_suffix(z);
- if (ret == 0) goto lab2; /* call residual_suffix, line 229 */
- if (ret < 0) return ret;
- }
- }
+ { int m = z->l - z->c; (void) m; /* do, line 218 */
+ { int m = z->l - z->c; (void) m; /* or, line 228 */
+ { int m = z->l - z->c; (void) m; /* and, line 224 */
+ { int m = z->l - z->c; (void) m; /* or, line 220 */
+ { int ret = r_standard_suffix(z);
+ if (ret == 0) goto lab6; /* call standard_suffix, line 220 */
+ if (ret < 0) return ret;
+ }
+ goto lab5;
+ lab6:
+ z->c = z->l - m;
+ { int ret = r_i_verb_suffix(z);
+ if (ret == 0) goto lab7; /* call i_verb_suffix, line 221 */
+ if (ret < 0) return ret;
+ }
+ goto lab5;
+ lab7:
+ z->c = z->l - m;
+ { int ret = r_verb_suffix(z);
+ if (ret == 0) goto lab4; /* call verb_suffix, line 222 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab5:
+ z->c = z->l - m;
+ { int m = z->l - z->c; (void) m; /* try, line 225 */
+ z->ket = z->c; /* [, line 225 */
+ { int m = z->l - z->c; (void) m; /* or, line 225 */
+ if (!(eq_s_b(z, 1, s_41))) goto lab10;
+ z->bra = z->c; /* ], line 225 */
+ { int ret;
+ ret = slice_from_s(z, 1, s_42); /* <-, line 225 */
+ if (ret < 0) return ret;
+ }
+ goto lab9;
+ lab10:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 2, s_43))) { z->c = z->l - m; goto lab8; }
+ z->bra = z->c; /* ], line 226 */
+ { int ret;
+ ret = slice_from_s(z, 1, s_44); /* <-, line 226 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab9:
+ lab8:
+ ;
+ }
+ }
+ goto lab3;
+ lab4:
+ z->c = z->l - m;
+ { int ret = r_residual_suffix(z);
+ if (ret == 0) goto lab2; /* call residual_suffix, line 229 */
+ if (ret < 0) return ret;
+ }
+ }
lab3:
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 234 */
- { int ret = r_un_double(z);
- if (ret == 0) goto lab11; /* call un_double, line 234 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 234 */
+ { int ret = r_un_double(z);
+ if (ret == 0) goto lab11; /* call un_double, line 234 */
+ if (ret < 0) return ret;
+ }
lab11:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 235 */
- { int ret = r_un_accent(z);
- if (ret == 0) goto lab12; /* call un_accent, line 235 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 235 */
+ { int ret = r_un_accent(z);
+ if (ret == 0) goto lab12; /* call un_accent, line 235 */
+ if (ret < 0) return ret;
+ }
lab12:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
- { int c = z->c; /* do, line 237 */
- { int ret = r_postlude(z);
- if (ret == 0) goto lab13; /* call postlude, line 237 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 237 */
+ { int ret = r_postlude(z);
+ if (ret == 0) goto lab13; /* call postlude, line 237 */
+ if (ret < 0) return ret;
+ }
lab13:
- z->c = c;
+ z->c = c;
}
return 1;
}
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 15:12:19 2008
@@ -129,72 +129,72 @@
static symbol s_15[] = { 'e', 'n' };
static int r_prelude(struct SN_env * z) {
- { int c_test = z->c; /* test, line 30 */
- while(1) { /* repeat, line 30 */
- int c = z->c;
- { int c = z->c; /* or, line 33 */
- z->bra = z->c; /* [, line 32 */
- if (!(eq_s(z, 2, s_0))) goto lab2;
- z->ket = z->c; /* ], line 32 */
- { int ret;
- ret = slice_from_s(z, 2, s_1); /* <-, line 32 */
- if (ret < 0) return ret;
- }
- goto lab1;
- lab2:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 33 */
- }
- }
- lab1:
- continue;
- lab0:
- z->c = c;
- break;
- }
- z->c = c_test;
+ { int c_test = z->c; /* test, line 30 */
+ while(1) { /* repeat, line 30 */
+ int c = z->c;
+ { int c = z->c; /* or, line 33 */
+ z->bra = z->c; /* [, line 32 */
+ if (!(eq_s(z, 2, s_0))) goto lab2;
+ z->ket = z->c; /* ], line 32 */
+ { int ret;
+ ret = slice_from_s(z, 2, s_1); /* <-, line 32 */
+ if (ret < 0) return ret;
+ }
+ goto lab1;
+ lab2:
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 33 */
+ }
+ }
+ lab1:
+ continue;
+ lab0:
+ z->c = c;
+ break;
+ }
+ z->c = c_test;
}
while(1) { /* repeat, line 36 */
- int c = z->c;
- while(1) { /* goto, line 36 */
- int c = z->c;
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab4;
- z->bra = z->c; /* [, line 37 */
- { int c = z->c; /* or, line 37 */
- if (!(eq_s(z, 1, s_2))) goto lab6;
- z->ket = z->c; /* ], line 37 */
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab6;
- { int ret;
- ret = slice_from_s(z, 1, s_3); /* <-, line 37 */
- if (ret < 0) return ret;
- }
- goto lab5;
- lab6:
- z->c = c;
- if (!(eq_s(z, 1, s_4))) goto lab4;
- z->ket = z->c; /* ], line 38 */
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab4;
- { int ret;
- ret = slice_from_s(z, 1, s_5); /* <-, line 38 */
- if (ret < 0) return ret;
- }
- }
- lab5:
- z->c = c;
- break;
- lab4:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab3;
- z->c = c; /* goto, line 36 */
- }
- }
- continue;
+ int c = z->c;
+ while(1) { /* goto, line 36 */
+ int c = z->c;
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab4;
+ z->bra = z->c; /* [, line 37 */
+ { int c = z->c; /* or, line 37 */
+ if (!(eq_s(z, 1, s_2))) goto lab6;
+ z->ket = z->c; /* ], line 37 */
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab6;
+ { int ret;
+ ret = slice_from_s(z, 1, s_3); /* <-, line 37 */
+ if (ret < 0) return ret;
+ }
+ goto lab5;
+ lab6:
+ z->c = c;
+ if (!(eq_s(z, 1, s_4))) goto lab4;
+ z->ket = z->c; /* ], line 38 */
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab4;
+ { int ret;
+ ret = slice_from_s(z, 1, s_5); /* <-, line 38 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab5:
+ z->c = c;
+ break;
+ lab4:
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab3;
+ z->c = c; /* goto, line 36 */
+ }
+ }
+ continue;
lab3:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -202,31 +202,31 @@
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
z->I[1] = z->l;
- { int c_test = z->c; /* test, line 47 */
- { int c = skip_utf8(z->p, z->c, 0, z->l, + 3);
- if (c < 0) return 0;
- z->c = c; /* hop, line 47 */
- }
- z->I[2] = z->c; /* setmark x, line 47 */
- z->c = c_test;
+ { int c_test = z->c; /* test, line 47 */
+ { int c = skip_utf8(z->p, z->c, 0, z->l, + 3);
+ if (c < 0) return 0;
+ z->c = c; /* hop, line 47 */
+ }
+ z->I[2] = z->c; /* setmark x, line 47 */
+ z->c = c_test;
}
while(1) { /* gopast, line 49 */
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab0;
- break;
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab0;
+ break;
lab0:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 49 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 49 */
+ }
}
while(1) { /* gopast, line 49 */
- if (!(out_grouping_U(z, g_v, 97, 252))) goto lab1;
- break;
+ if (!(out_grouping_U(z, g_v, 97, 252))) goto lab1;
+ break;
lab1:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 49 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 49 */
+ }
}
z->I[0] = z->c; /* setmark p1, line 49 */
/* try, line 50 */
@@ -234,22 +234,22 @@
z->I[0] = z->I[2];
lab2:
while(1) { /* gopast, line 51 */
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab3;
- break;
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab3;
+ break;
lab3:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 51 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 51 */
+ }
}
while(1) { /* gopast, line 51 */
- if (!(out_grouping_U(z, g_v, 97, 252))) goto lab4;
- break;
+ if (!(out_grouping_U(z, g_v, 97, 252))) goto lab4;
+ break;
lab4:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 51 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 51 */
+ }
}
z->I[1] = z->c; /* setmark p2, line 51 */
return 1;
@@ -258,54 +258,54 @@
static int r_postlude(struct SN_env * z) {
int among_var;
while(1) { /* repeat, line 55 */
- int c = z->c;
- z->bra = z->c; /* [, line 57 */
- among_var = find_among(z, a_0, 6); /* substring, line 57 */
- if (!(among_var)) goto lab0;
- z->ket = z->c; /* ], line 57 */
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 1, s_6); /* <-, line 58 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 1, s_7); /* <-, line 59 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 1, s_8); /* <-, line 60 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret;
- ret = slice_from_s(z, 1, s_9); /* <-, line 61 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret;
- ret = slice_from_s(z, 1, s_10); /* <-, line 62 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 63 */
- }
- break;
- }
- continue;
+ int c = z->c;
+ z->bra = z->c; /* [, line 57 */
+ among_var = find_among(z, a_0, 6); /* substring, line 57 */
+ if (!(among_var)) goto lab0;
+ z->ket = z->c; /* ], line 57 */
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 1, s_6); /* <-, line 58 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 1, s_7); /* <-, line 59 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 1, s_8); /* <-, line 60 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret;
+ ret = slice_from_s(z, 1, s_9); /* <-, line 61 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret;
+ ret = slice_from_s(z, 1, s_10); /* <-, line 62 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 63 */
+ }
+ break;
+ }
+ continue;
lab0:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -322,213 +322,213 @@
static int r_standard_suffix(struct SN_env * z) {
int among_var;
- { int m = z->l - z->c; (void) m; /* do, line 74 */
- z->ket = z->c; /* [, line 75 */
- among_var = find_among_b(z, a_1, 7); /* substring, line 75 */
- if (!(among_var)) goto lab0;
- z->bra = z->c; /* ], line 75 */
- { int ret = r_R1(z);
- if (ret == 0) goto lab0; /* call R1, line 75 */
- if (ret < 0) return ret;
- }
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 77 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- if (!(in_grouping_b_U(z, g_s_ending, 98, 116))) goto lab0;
- { int ret;
- ret = slice_del(z); /* delete, line 80 */
- if (ret < 0) return ret;
- }
- break;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 74 */
+ z->ket = z->c; /* [, line 75 */
+ among_var = find_among_b(z, a_1, 7); /* substring, line 75 */
+ if (!(among_var)) goto lab0;
+ z->bra = z->c; /* ], line 75 */
+ { int ret = r_R1(z);
+ if (ret == 0) goto lab0; /* call R1, line 75 */
+ if (ret < 0) return ret;
+ }
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 77 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ if (!(in_grouping_b_U(z, g_s_ending, 98, 116))) goto lab0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 80 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
lab0:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 84 */
- z->ket = z->c; /* [, line 85 */
- among_var = find_among_b(z, a_2, 4); /* substring, line 85 */
- if (!(among_var)) goto lab1;
- z->bra = z->c; /* ], line 85 */
- { int ret = r_R1(z);
- if (ret == 0) goto lab1; /* call R1, line 85 */
- if (ret < 0) return ret;
- }
- switch(among_var) {
- case 0: goto lab1;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 87 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- if (!(in_grouping_b_U(z, g_st_ending, 98, 116))) goto lab1;
- { int c = skip_utf8(z->p, z->c, z->lb, z->l, - 3);
- if (c < 0) goto lab1;
- z->c = c; /* hop, line 90 */
- }
- { int ret;
- ret = slice_del(z); /* delete, line 90 */
- if (ret < 0) return ret;
- }
- break;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 84 */
+ z->ket = z->c; /* [, line 85 */
+ among_var = find_among_b(z, a_2, 4); /* substring, line 85 */
+ if (!(among_var)) goto lab1;
+ z->bra = z->c; /* ], line 85 */
+ { int ret = r_R1(z);
+ if (ret == 0) goto lab1; /* call R1, line 85 */
+ if (ret < 0) return ret;
+ }
+ switch(among_var) {
+ case 0: goto lab1;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 87 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ if (!(in_grouping_b_U(z, g_st_ending, 98, 116))) goto lab1;
+ { int c = skip_utf8(z->p, z->c, z->lb, z->l, - 3);
+ if (c < 0) goto lab1;
+ z->c = c; /* hop, line 90 */
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 90 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
lab1:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 94 */
- z->ket = z->c; /* [, line 95 */
- among_var = find_among_b(z, a_4, 8); /* substring, line 95 */
- if (!(among_var)) goto lab2;
- z->bra = z->c; /* ], line 95 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab2; /* call R2, line 95 */
- if (ret < 0) return ret;
- }
- switch(among_var) {
- case 0: goto lab2;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 97 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 98 */
- z->ket = z->c; /* [, line 98 */
- if (!(eq_s_b(z, 2, s_11))) { z->c = z->l - m; goto lab3; }
- z->bra = z->c; /* ], line 98 */
- { int m = z->l - z->c; (void) m; /* not, line 98 */
- if (!(eq_s_b(z, 1, s_12))) goto lab4;
- { z->c = z->l - m; goto lab3; }
- lab4:
- z->c = z->l - m;
- }
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 98 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 98 */
- if (ret < 0) return ret;
- }
- lab3:
- ;
- }
- break;
- case 2:
- { int m = z->l - z->c; (void) m; /* not, line 101 */
- if (!(eq_s_b(z, 1, s_13))) goto lab5;
- goto lab2;
- lab5:
- z->c = z->l - m;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 101 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_del(z); /* delete, line 104 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 105 */
- z->ket = z->c; /* [, line 106 */
- { int m = z->l - z->c; (void) m; /* or, line 106 */
- if (!(eq_s_b(z, 2, s_14))) goto lab8;
- goto lab7;
- lab8:
- z->c = z->l - m;
- if (!(eq_s_b(z, 2, s_15))) { z->c = z->l - m; goto lab6; }
- }
- lab7:
- z->bra = z->c; /* ], line 106 */
- { int ret = r_R1(z);
- if (ret == 0) { z->c = z->l - m; goto lab6; } /* call R1, line 106 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 106 */
- if (ret < 0) return ret;
- }
- lab6:
- ;
- }
- break;
- case 4:
- { int ret;
- ret = slice_del(z); /* delete, line 110 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 111 */
- z->ket = z->c; /* [, line 112 */
- among_var = find_among_b(z, a_3, 2); /* substring, line 112 */
- if (!(among_var)) { z->c = z->l - m; goto lab9; }
- z->bra = z->c; /* ], line 112 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab9; } /* call R2, line 112 */
- if (ret < 0) return ret;
- }
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab9; }
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 114 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab9:
- ;
- }
- break;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 94 */
+ z->ket = z->c; /* [, line 95 */
+ among_var = find_among_b(z, a_4, 8); /* substring, line 95 */
+ if (!(among_var)) goto lab2;
+ z->bra = z->c; /* ], line 95 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab2; /* call R2, line 95 */
+ if (ret < 0) return ret;
+ }
+ switch(among_var) {
+ case 0: goto lab2;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 97 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 98 */
+ z->ket = z->c; /* [, line 98 */
+ if (!(eq_s_b(z, 2, s_11))) { z->c = z->l - m; goto lab3; }
+ z->bra = z->c; /* ], line 98 */
+ { int m = z->l - z->c; (void) m; /* not, line 98 */
+ if (!(eq_s_b(z, 1, s_12))) goto lab4;
+ { z->c = z->l - m; goto lab3; }
+ lab4:
+ z->c = z->l - m;
+ }
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 98 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 98 */
+ if (ret < 0) return ret;
+ }
+ lab3:
+ ;
+ }
+ break;
+ case 2:
+ { int m = z->l - z->c; (void) m; /* not, line 101 */
+ if (!(eq_s_b(z, 1, s_13))) goto lab5;
+ goto lab2;
+ lab5:
+ z->c = z->l - m;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 101 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_del(z); /* delete, line 104 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 105 */
+ z->ket = z->c; /* [, line 106 */
+ { int m = z->l - z->c; (void) m; /* or, line 106 */
+ if (!(eq_s_b(z, 2, s_14))) goto lab8;
+ goto lab7;
+ lab8:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 2, s_15))) { z->c = z->l - m; goto lab6; }
+ }
+ lab7:
+ z->bra = z->c; /* ], line 106 */
+ { int ret = r_R1(z);
+ if (ret == 0) { z->c = z->l - m; goto lab6; } /* call R1, line 106 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 106 */
+ if (ret < 0) return ret;
+ }
+ lab6:
+ ;
+ }
+ break;
+ case 4:
+ { int ret;
+ ret = slice_del(z); /* delete, line 110 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 111 */
+ z->ket = z->c; /* [, line 112 */
+ among_var = find_among_b(z, a_3, 2); /* substring, line 112 */
+ if (!(among_var)) { z->c = z->l - m; goto lab9; }
+ z->bra = z->c; /* ], line 112 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab9; } /* call R2, line 112 */
+ if (ret < 0) return ret;
+ }
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab9; }
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 114 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab9:
+ ;
+ }
+ break;
+ }
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
return 1;
}
extern int german_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 125 */
- { int ret = r_prelude(z);
- if (ret == 0) goto lab0; /* call prelude, line 125 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 125 */
+ { int ret = r_prelude(z);
+ if (ret == 0) goto lab0; /* call prelude, line 125 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 126 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab1; /* call mark_regions, line 126 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 126 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab1; /* call mark_regions, line 126 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 127 */
- { int m = z->l - z->c; (void) m; /* do, line 128 */
- { int ret = r_standard_suffix(z);
- if (ret == 0) goto lab2; /* call standard_suffix, line 128 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 128 */
+ { int ret = r_standard_suffix(z);
+ if (ret == 0) goto lab2; /* call standard_suffix, line 128 */
+ if (ret < 0) return ret;
+ }
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
- { int c = z->c; /* do, line 129 */
- { int ret = r_postlude(z);
- if (ret == 0) goto lab3; /* call postlude, line 129 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 129 */
+ { int ret = r_postlude(z);
+ if (ret == 0) goto lab3; /* call postlude, line 129 */
+ if (ret < 0) return ret;
+ }
lab3:
- z->c = c;
+ z->c = c;
}
return 1;
}
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 15:12:19 2008
@@ -501,36 +501,36 @@
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
- { int c1 = z->c; /* or, line 51 */
- //if (in_grouping_U(z, g_v, 97, 369, 0)) goto lab1;
- if (in_grouping_U(z, g_v, 97, 369)) goto lab1;
- //if (in_grouping_U(z, g_v, 97, 369, 1) < 0) goto lab1; /* goto */ /* non v, line 48 */
- if (in_grouping_U(z, g_v, 97, 369) < 0) goto lab1; /* goto */ /* non v, line 48 */
- { int c2 = z->c; /* or, line 49 */
- if (z->c + 1 >= z->l || z->p[z->c + 1] >> 5 != 3 || !((101187584 >> (z->p[z->c + 1] & 0x1f)) & 1)) goto lab3;
- if (!(find_among(z, a_0, 8))) goto lab3; /* among, line 49 */
- goto lab2;
- lab3:
- z->c = c2;
- { int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (ret < 0) goto lab1;
- z->c = ret; /* next, line 49 */
- }
- }
+ { int c1 = z->c; /* or, line 51 */
+ //if (in_grouping_U(z, g_v, 97, 369, 0)) goto lab1;
+ if (in_grouping_U(z, g_v, 97, 369)) goto lab1;
+ //if (in_grouping_U(z, g_v, 97, 369, 1) < 0) goto lab1; /* goto */ /* non v, line 48 */
+ if (in_grouping_U(z, g_v, 97, 369) < 0) goto lab1; /* goto */ /* non v, line 48 */
+ { int c2 = z->c; /* or, line 49 */
+ if (z->c + 1 >= z->l || z->p[z->c + 1] >> 5 != 3 || !((101187584 >> (z->p[z->c + 1] & 0x1f)) & 1)) goto lab3;
+ if (!(find_among(z, a_0, 8))) goto lab3; /* among, line 49 */
+ goto lab2;
+ lab3:
+ z->c = c2;
+ { int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (ret < 0) goto lab1;
+ z->c = ret; /* next, line 49 */
+ }
+ }
lab2:
- z->I[0] = z->c; /* setmark p1, line 50 */
- goto lab0;
+ z->I[0] = z->c; /* setmark p1, line 50 */
+ goto lab0;
lab1:
- z->c = c1;
- //if (out_grouping_U(z, g_v, 97, 369, 0)) return 0;
- if (out_grouping_U(z, g_v, 97, 369)) return 0;
- { /* gopast */ /* grouping v, line 53 */
- //int ret = out_grouping_U(z, g_v, 97, 369, 1);
- int ret = out_grouping_U(z, g_v, 97, 369);
- if (ret < 0) return 0;
- z->c += ret;
- }
- z->I[0] = z->c; /* setmark p1, line 53 */
+ z->c = c1;
+ //if (out_grouping_U(z, g_v, 97, 369, 0)) return 0;
+ if (out_grouping_U(z, g_v, 97, 369)) return 0;
+ { /* gopast */ /* grouping v, line 53 */
+ //int ret = out_grouping_U(z, g_v, 97, 369, 1);
+ int ret = out_grouping_U(z, g_v, 97, 369);
+ if (ret < 0) return 0;
+ z->c += ret;
+ }
+ z->I[0] = z->c; /* setmark p1, line 53 */
}
lab0:
return 1;
@@ -548,48 +548,48 @@
among_var = find_among_b(z, a_1, 2); /* substring, line 61 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 61 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 61 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 61 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = slice_from_s(z, 1, s_0); /* <-, line 62 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = slice_from_s(z, 1, s_1); /* <-, line 63 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = slice_from_s(z, 1, s_0); /* <-, line 62 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = slice_from_s(z, 1, s_1); /* <-, line 63 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
static int r_double(struct SN_env * z) {
- { int m_test = z->l - z->c; /* test, line 68 */
- if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((106790108 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
- if (!(find_among_b(z, a_2, 23))) return 0; /* among, line 68 */
- z->c = z->l - m_test;
+ { int m_test = z->l - z->c; /* test, line 68 */
+ if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((106790108 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+ if (!(find_among_b(z, a_2, 23))) return 0; /* among, line 68 */
+ z->c = z->l - m_test;
}
return 1;
}
static int r_undouble(struct SN_env * z) {
- { int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (ret < 0) return 0;
- z->c = ret; /* next, line 73 */
+ { int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (ret < 0) return 0;
+ z->c = ret; /* next, line 73 */
}
z->ket = z->c; /* [, line 73 */
- { int ret = skip_utf8(z->p, z->c, z->lb, z->l, - 1);
- if (ret < 0) return 0;
- z->c = ret; /* hop, line 73 */
+ { int ret = skip_utf8(z->p, z->c, z->lb, z->l, - 1);
+ if (ret < 0) return 0;
+ z->c = ret; /* hop, line 73 */
}
z->bra = z->c; /* ], line 73 */
- { int ret = slice_del(z); /* delete, line 73 */
- if (ret < 0) return ret;
+ { int ret = slice_del(z); /* delete, line 73 */
+ if (ret < 0) return ret;
}
return 1;
}
@@ -601,31 +601,31 @@
among_var = find_among_b(z, a_3, 2); /* substring, line 77 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 77 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 77 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 77 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_double(z);
- if (ret == 0) return 0; /* call double, line 78 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = r_double(z);
- if (ret == 0) return 0; /* call double, line 79 */
- if (ret < 0) return ret;
- }
- break;
- }
- { int ret = slice_del(z); /* delete, line 81 */
- if (ret < 0) return ret;
- }
- { int ret = r_undouble(z);
- if (ret == 0) return 0; /* call undouble, line 82 */
- if (ret < 0) return ret;
+ case 0: return 0;
+ case 1:
+ { int ret = r_double(z);
+ if (ret == 0) return 0; /* call double, line 78 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = r_double(z);
+ if (ret == 0) return 0; /* call double, line 79 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ { int ret = slice_del(z); /* delete, line 81 */
+ if (ret < 0) return ret;
+ }
+ { int ret = r_undouble(z);
+ if (ret == 0) return 0; /* call undouble, line 82 */
+ if (ret < 0) return ret;
}
return 1;
}
@@ -634,16 +634,16 @@
z->ket = z->c; /* [, line 87 */
if (!(find_among_b(z, a_4, 44))) return 0; /* substring, line 87 */
z->bra = z->c; /* ], line 87 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 87 */
- if (ret < 0) return ret;
- }
- { int ret = slice_del(z); /* delete, line 111 */
- if (ret < 0) return ret;
- }
- { int ret = r_v_ending(z);
- if (ret == 0) return 0; /* call v_ending, line 112 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 87 */
+ if (ret < 0) return ret;
+ }
+ { int ret = slice_del(z); /* delete, line 111 */
+ if (ret < 0) return ret;
+ }
+ { int ret = r_v_ending(z);
+ if (ret == 0) return 0; /* call v_ending, line 112 */
+ if (ret < 0) return ret;
}
return 1;
}
@@ -655,27 +655,27 @@
among_var = find_among_b(z, a_5, 3); /* substring, line 116 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 116 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 116 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 116 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = slice_from_s(z, 1, s_2); /* <-, line 117 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = slice_from_s(z, 1, s_3); /* <-, line 118 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret = slice_from_s(z, 1, s_4); /* <-, line 119 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = slice_from_s(z, 1, s_2); /* <-, line 117 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = slice_from_s(z, 1, s_3); /* <-, line 118 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret = slice_from_s(z, 1, s_4); /* <-, line 119 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -687,32 +687,32 @@
among_var = find_among_b(z, a_6, 6); /* substring, line 124 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 124 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 124 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 124 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = slice_del(z); /* delete, line 125 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = slice_del(z); /* delete, line 126 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret = slice_from_s(z, 1, s_5); /* <-, line 127 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = slice_from_s(z, 1, s_6); /* <-, line 128 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = slice_del(z); /* delete, line 125 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = slice_del(z); /* delete, line 126 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret = slice_from_s(z, 1, s_5); /* <-, line 127 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = slice_from_s(z, 1, s_6); /* <-, line 128 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -724,31 +724,31 @@
among_var = find_among_b(z, a_7, 2); /* substring, line 133 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 133 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 133 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 133 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_double(z);
- if (ret == 0) return 0; /* call double, line 134 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = r_double(z);
- if (ret == 0) return 0; /* call double, line 135 */
- if (ret < 0) return ret;
- }
- break;
- }
- { int ret = slice_del(z); /* delete, line 137 */
- if (ret < 0) return ret;
- }
- { int ret = r_undouble(z);
- if (ret == 0) return 0; /* call undouble, line 138 */
- if (ret < 0) return ret;
+ case 0: return 0;
+ case 1:
+ { int ret = r_double(z);
+ if (ret == 0) return 0; /* call double, line 134 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = r_double(z);
+ if (ret == 0) return 0; /* call double, line 135 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ { int ret = slice_del(z); /* delete, line 137 */
+ if (ret < 0) return ret;
+ }
+ { int ret = r_undouble(z);
+ if (ret == 0) return 0; /* call undouble, line 138 */
+ if (ret < 0) return ret;
}
return 1;
}
@@ -760,47 +760,47 @@
among_var = find_among_b(z, a_8, 7); /* substring, line 142 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 142 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 142 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 142 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = slice_from_s(z, 1, s_7); /* <-, line 143 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = slice_from_s(z, 1, s_8); /* <-, line 144 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret = slice_del(z); /* delete, line 145 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = slice_del(z); /* delete, line 146 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret = slice_del(z); /* delete, line 147 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret = slice_del(z); /* delete, line 148 */
- if (ret < 0) return ret;
- }
- break;
- case 7:
- { int ret = slice_del(z); /* delete, line 149 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = slice_from_s(z, 1, s_7); /* <-, line 143 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = slice_from_s(z, 1, s_8); /* <-, line 144 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret = slice_del(z); /* delete, line 145 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = slice_del(z); /* delete, line 146 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret = slice_del(z); /* delete, line 147 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret = slice_del(z); /* delete, line 148 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 7:
+ { int ret = slice_del(z); /* delete, line 149 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -812,57 +812,57 @@
among_var = find_among_b(z, a_9, 12); /* substring, line 154 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 154 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 154 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 154 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = slice_del(z); /* delete, line 155 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = slice_from_s(z, 1, s_9); /* <-, line 156 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret = slice_from_s(z, 1, s_10); /* <-, line 157 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = slice_del(z); /* delete, line 158 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret = slice_from_s(z, 1, s_11); /* <-, line 159 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret = slice_from_s(z, 1, s_12); /* <-, line 160 */
- if (ret < 0) return ret;
- }
- break;
- case 7:
- { int ret = slice_del(z); /* delete, line 161 */
- if (ret < 0) return ret;
- }
- break;
- case 8:
- { int ret = slice_from_s(z, 1, s_13); /* <-, line 162 */
- if (ret < 0) return ret;
- }
- break;
- case 9:
- { int ret = slice_del(z); /* delete, line 163 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = slice_del(z); /* delete, line 155 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = slice_from_s(z, 1, s_9); /* <-, line 156 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret = slice_from_s(z, 1, s_10); /* <-, line 157 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = slice_del(z); /* delete, line 158 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret = slice_from_s(z, 1, s_11); /* <-, line 159 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret = slice_from_s(z, 1, s_12); /* <-, line 160 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 7:
+ { int ret = slice_del(z); /* delete, line 161 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 8:
+ { int ret = slice_from_s(z, 1, s_13); /* <-, line 162 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 9:
+ { int ret = slice_del(z); /* delete, line 163 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -873,112 +873,112 @@
among_var = find_among_b(z, a_10, 31); /* substring, line 168 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 168 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 168 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 168 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = slice_del(z); /* delete, line 169 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = slice_from_s(z, 1, s_14); /* <-, line 170 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret = slice_from_s(z, 1, s_15); /* <-, line 171 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = slice_del(z); /* delete, line 172 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret = slice_from_s(z, 1, s_16); /* <-, line 173 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret = slice_from_s(z, 1, s_17); /* <-, line 174 */
- if (ret < 0) return ret;
- }
- break;
- case 7:
- { int ret = slice_del(z); /* delete, line 175 */
- if (ret < 0) return ret;
- }
- break;
- case 8:
- { int ret = slice_del(z); /* delete, line 176 */
- if (ret < 0) return ret;
- }
- break;
- case 9:
- { int ret = slice_del(z); /* delete, line 177 */
- if (ret < 0) return ret;
- }
- break;
- case 10:
- { int ret = slice_from_s(z, 1, s_18); /* <-, line 178 */
- if (ret < 0) return ret;
- }
- break;
- case 11:
- { int ret = slice_from_s(z, 1, s_19); /* <-, line 179 */
- if (ret < 0) return ret;
- }
- break;
- case 12:
- { int ret = slice_del(z); /* delete, line 180 */
- if (ret < 0) return ret;
- }
- break;
- case 13:
- { int ret = slice_del(z); /* delete, line 181 */
- if (ret < 0) return ret;
- }
- break;
- case 14:
- { int ret = slice_from_s(z, 1, s_20); /* <-, line 182 */
- if (ret < 0) return ret;
- }
- break;
- case 15:
- { int ret = slice_from_s(z, 1, s_21); /* <-, line 183 */
- if (ret < 0) return ret;
- }
- break;
- case 16:
- { int ret = slice_del(z); /* delete, line 184 */
- if (ret < 0) return ret;
- }
- break;
- case 17:
- { int ret = slice_del(z); /* delete, line 185 */
- if (ret < 0) return ret;
- }
- break;
- case 18:
- { int ret = slice_del(z); /* delete, line 186 */
- if (ret < 0) return ret;
- }
- break;
- case 19:
- { int ret = slice_from_s(z, 1, s_22); /* <-, line 187 */
- if (ret < 0) return ret;
- }
- break;
- case 20:
- { int ret = slice_from_s(z, 1, s_23); /* <-, line 188 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = slice_del(z); /* delete, line 169 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = slice_from_s(z, 1, s_14); /* <-, line 170 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret = slice_from_s(z, 1, s_15); /* <-, line 171 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = slice_del(z); /* delete, line 172 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret = slice_from_s(z, 1, s_16); /* <-, line 173 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret = slice_from_s(z, 1, s_17); /* <-, line 174 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 7:
+ { int ret = slice_del(z); /* delete, line 175 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 8:
+ { int ret = slice_del(z); /* delete, line 176 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 9:
+ { int ret = slice_del(z); /* delete, line 177 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 10:
+ { int ret = slice_from_s(z, 1, s_18); /* <-, line 178 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 11:
+ { int ret = slice_from_s(z, 1, s_19); /* <-, line 179 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 12:
+ { int ret = slice_del(z); /* delete, line 180 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 13:
+ { int ret = slice_del(z); /* delete, line 181 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 14:
+ { int ret = slice_from_s(z, 1, s_20); /* <-, line 182 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 15:
+ { int ret = slice_from_s(z, 1, s_21); /* <-, line 183 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 16:
+ { int ret = slice_del(z); /* delete, line 184 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 17:
+ { int ret = slice_del(z); /* delete, line 185 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 18:
+ { int ret = slice_del(z); /* delete, line 186 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 19:
+ { int ret = slice_from_s(z, 1, s_22); /* <-, line 187 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 20:
+ { int ret = slice_from_s(z, 1, s_23); /* <-, line 188 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -990,243 +990,243 @@
among_var = find_among_b(z, a_11, 42); /* substring, line 193 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 193 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 193 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 193 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = slice_del(z); /* delete, line 194 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = slice_from_s(z, 1, s_24); /* <-, line 195 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret = slice_from_s(z, 1, s_25); /* <-, line 196 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = slice_del(z); /* delete, line 197 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret = slice_del(z); /* delete, line 198 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret = slice_del(z); /* delete, line 199 */
- if (ret < 0) return ret;
- }
- break;
- case 7:
- { int ret = slice_from_s(z, 1, s_26); /* <-, line 200 */
- if (ret < 0) return ret;
- }
- break;
- case 8:
- { int ret = slice_from_s(z, 1, s_27); /* <-, line 201 */
- if (ret < 0) return ret;
- }
- break;
- case 9:
- { int ret = slice_del(z); /* delete, line 202 */
- if (ret < 0) return ret;
- }
- break;
- case 10:
- { int ret = slice_del(z); /* delete, line 203 */
- if (ret < 0) return ret;
- }
- break;
- case 11:
- { int ret = slice_del(z); /* delete, line 204 */
- if (ret < 0) return ret;
- }
- break;
- case 12:
- { int ret = slice_from_s(z, 1, s_28); /* <-, line 205 */
- if (ret < 0) return ret;
- }
- break;
- case 13:
- { int ret = slice_from_s(z, 1, s_29); /* <-, line 206 */
- if (ret < 0) return ret;
- }
- break;
- case 14:
- { int ret = slice_del(z); /* delete, line 207 */
- if (ret < 0) return ret;
- }
- break;
- case 15:
- { int ret = slice_del(z); /* delete, line 208 */
- if (ret < 0) return ret;
- }
- break;
- case 16:
- { int ret = slice_del(z); /* delete, line 209 */
- if (ret < 0) return ret;
- }
- break;
- case 17:
- { int ret = slice_del(z); /* delete, line 210 */
- if (ret < 0) return ret;
- }
- break;
- case 18:
- { int ret = slice_from_s(z, 1, s_30); /* <-, line 211 */
- if (ret < 0) return ret;
- }
- break;
- case 19:
- { int ret = slice_from_s(z, 1, s_31); /* <-, line 212 */
- if (ret < 0) return ret;
- }
- break;
- case 20:
- { int ret = slice_del(z); /* delete, line 214 */
- if (ret < 0) return ret;
- }
- break;
- case 21:
- { int ret = slice_del(z); /* delete, line 215 */
- if (ret < 0) return ret;
- }
- break;
- case 22:
- { int ret = slice_from_s(z, 1, s_32); /* <-, line 216 */
- if (ret < 0) return ret;
- }
- break;
- case 23:
- { int ret = slice_from_s(z, 1, s_33); /* <-, line 217 */
- if (ret < 0) return ret;
- }
- break;
- case 24:
- { int ret = slice_del(z); /* delete, line 218 */
- if (ret < 0) return ret;
- }
- break;
- case 25:
- { int ret = slice_del(z); /* delete, line 219 */
- if (ret < 0) return ret;
- }
- break;
- case 26:
- { int ret = slice_del(z); /* delete, line 220 */
- if (ret < 0) return ret;
- }
- break;
- case 27:
- { int ret = slice_from_s(z, 1, s_34); /* <-, line 221 */
- if (ret < 0) return ret;
- }
- break;
- case 28:
- { int ret = slice_from_s(z, 1, s_35); /* <-, line 222 */
- if (ret < 0) return ret;
- }
- break;
- case 29:
- { int ret = slice_del(z); /* delete, line 223 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = slice_del(z); /* delete, line 194 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = slice_from_s(z, 1, s_24); /* <-, line 195 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret = slice_from_s(z, 1, s_25); /* <-, line 196 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = slice_del(z); /* delete, line 197 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret = slice_del(z); /* delete, line 198 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret = slice_del(z); /* delete, line 199 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 7:
+ { int ret = slice_from_s(z, 1, s_26); /* <-, line 200 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 8:
+ { int ret = slice_from_s(z, 1, s_27); /* <-, line 201 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 9:
+ { int ret = slice_del(z); /* delete, line 202 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 10:
+ { int ret = slice_del(z); /* delete, line 203 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 11:
+ { int ret = slice_del(z); /* delete, line 204 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 12:
+ { int ret = slice_from_s(z, 1, s_28); /* <-, line 205 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 13:
+ { int ret = slice_from_s(z, 1, s_29); /* <-, line 206 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 14:
+ { int ret = slice_del(z); /* delete, line 207 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 15:
+ { int ret = slice_del(z); /* delete, line 208 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 16:
+ { int ret = slice_del(z); /* delete, line 209 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 17:
+ { int ret = slice_del(z); /* delete, line 210 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 18:
+ { int ret = slice_from_s(z, 1, s_30); /* <-, line 211 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 19:
+ { int ret = slice_from_s(z, 1, s_31); /* <-, line 212 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 20:
+ { int ret = slice_del(z); /* delete, line 214 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 21:
+ { int ret = slice_del(z); /* delete, line 215 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 22:
+ { int ret = slice_from_s(z, 1, s_32); /* <-, line 216 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 23:
+ { int ret = slice_from_s(z, 1, s_33); /* <-, line 217 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 24:
+ { int ret = slice_del(z); /* delete, line 218 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 25:
+ { int ret = slice_del(z); /* delete, line 219 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 26:
+ { int ret = slice_del(z); /* delete, line 220 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 27:
+ { int ret = slice_from_s(z, 1, s_34); /* <-, line 221 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 28:
+ { int ret = slice_from_s(z, 1, s_35); /* <-, line 222 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 29:
+ { int ret = slice_del(z); /* delete, line 223 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
extern int hungarian_UTF_8_stem(struct SN_env * z) {
- { int c1 = z->c; /* do, line 229 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab0; /* call mark_regions, line 229 */
- if (ret < 0) return ret;
- }
+ { int c1 = z->c; /* do, line 229 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab0; /* call mark_regions, line 229 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c1;
+ z->c = c1;
}
z->lb = z->c; z->c = z->l; /* backwards, line 230 */
- { int m2 = z->l - z->c; (void)m2; /* do, line 231 */
- { int ret = r_instrum(z);
- if (ret == 0) goto lab1; /* call instrum, line 231 */
- if (ret < 0) return ret;
- }
+ { int m2 = z->l - z->c; (void)m2; /* do, line 231 */
+ { int ret = r_instrum(z);
+ if (ret == 0) goto lab1; /* call instrum, line 231 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = z->l - m2;
+ z->c = z->l - m2;
}
- { int m3 = z->l - z->c; (void)m3; /* do, line 232 */
- { int ret = r_case(z);
- if (ret == 0) goto lab2; /* call case, line 232 */
- if (ret < 0) return ret;
- }
+ { int m3 = z->l - z->c; (void)m3; /* do, line 232 */
+ { int ret = r_case(z);
+ if (ret == 0) goto lab2; /* call case, line 232 */
+ if (ret < 0) return ret;
+ }
lab2:
- z->c = z->l - m3;
+ z->c = z->l - m3;
}
- { int m4 = z->l - z->c; (void)m4; /* do, line 233 */
- { int ret = r_case_special(z);
- if (ret == 0) goto lab3; /* call case_special, line 233 */
- if (ret < 0) return ret;
- }
+ { int m4 = z->l - z->c; (void)m4; /* do, line 233 */
+ { int ret = r_case_special(z);
+ if (ret == 0) goto lab3; /* call case_special, line 233 */
+ if (ret < 0) return ret;
+ }
lab3:
- z->c = z->l - m4;
+ z->c = z->l - m4;
}
- { int m5 = z->l - z->c; (void)m5; /* do, line 234 */
- { int ret = r_case_other(z);
- if (ret == 0) goto lab4; /* call case_other, line 234 */
- if (ret < 0) return ret;
- }
+ { int m5 = z->l - z->c; (void)m5; /* do, line 234 */
+ { int ret = r_case_other(z);
+ if (ret == 0) goto lab4; /* call case_other, line 234 */
+ if (ret < 0) return ret;
+ }
lab4:
- z->c = z->l - m5;
+ z->c = z->l - m5;
}
- { int m6 = z->l - z->c; (void)m6; /* do, line 235 */
- { int ret = r_factive(z);
- if (ret == 0) goto lab5; /* call factive, line 235 */
- if (ret < 0) return ret;
- }
+ { int m6 = z->l - z->c; (void)m6; /* do, line 235 */
+ { int ret = r_factive(z);
+ if (ret == 0) goto lab5; /* call factive, line 235 */
+ if (ret < 0) return ret;
+ }
lab5:
- z->c = z->l - m6;
+ z->c = z->l - m6;
}
- { int m7 = z->l - z->c; (void)m7; /* do, line 236 */
- { int ret = r_owned(z);
- if (ret == 0) goto lab6; /* call owned, line 236 */
- if (ret < 0) return ret;
- }
+ { int m7 = z->l - z->c; (void)m7; /* do, line 236 */
+ { int ret = r_owned(z);
+ if (ret == 0) goto lab6; /* call owned, line 236 */
+ if (ret < 0) return ret;
+ }
lab6:
- z->c = z->l - m7;
+ z->c = z->l - m7;
}
- { int m8 = z->l - z->c; (void)m8; /* do, line 237 */
- { int ret = r_sing_owner(z);
- if (ret == 0) goto lab7; /* call sing_owner, line 237 */
- if (ret < 0) return ret;
- }
+ { int m8 = z->l - z->c; (void)m8; /* do, line 237 */
+ { int ret = r_sing_owner(z);
+ if (ret == 0) goto lab7; /* call sing_owner, line 237 */
+ if (ret < 0) return ret;
+ }
lab7:
- z->c = z->l - m8;
+ z->c = z->l - m8;
}
- { int m9 = z->l - z->c; (void)m9; /* do, line 238 */
- { int ret = r_plur_owner(z);
- if (ret == 0) goto lab8; /* call plur_owner, line 238 */
- if (ret < 0) return ret;
- }
+ { int m9 = z->l - z->c; (void)m9; /* do, line 238 */
+ { int ret = r_plur_owner(z);
+ if (ret == 0) goto lab8; /* call plur_owner, line 238 */
+ if (ret < 0) return ret;
+ }
lab8:
- z->c = z->l - m9;
+ z->c = z->l - m9;
}
- { int m10 = z->l - z->c; (void)m10; /* do, line 239 */
- { int ret = r_plural(z);
- if (ret == 0) goto lab9; /* call plural, line 239 */
- if (ret < 0) return ret;
- }
+ { int m10 = z->l - z->c; (void)m10; /* do, line 239 */
+ { int ret = r_plural(z);
+ if (ret == 0) goto lab9; /* call plural, line 239 */
+ if (ret < 0) return ret;
+ }
lab9:
- z->c = z->l - m10;
+ z->c = z->l - m10;
}
z->c = z->lb;
return 1;
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 15:12:19 2008
@@ -494,104 +494,104 @@
static int r_prelude(struct SN_env * z) {
int among_var;
- { int c_test = z->c; /* test, line 35 */
- while(1) { /* repeat, line 35 */
- int c = z->c;
- z->bra = z->c; /* [, line 36 */
- among_var = find_among(z, a_0, 7); /* substring, line 36 */
- if (!(among_var)) goto lab0;
- z->ket = z->c; /* ], line 36 */
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 2, s_0); /* <-, line 37 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 2, s_1); /* <-, line 38 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 2, s_2); /* <-, line 39 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret;
- ret = slice_from_s(z, 2, s_3); /* <-, line 40 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret;
- ret = slice_from_s(z, 2, s_4); /* <-, line 41 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret;
- ret = slice_from_s(z, 2, s_5); /* <-, line 42 */
- if (ret < 0) return ret;
- }
- break;
- case 7:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 43 */
- }
- break;
- }
- continue;
- lab0:
- z->c = c;
- break;
- }
- z->c = c_test;
+ { int c_test = z->c; /* test, line 35 */
+ while(1) { /* repeat, line 35 */
+ int c = z->c;
+ z->bra = z->c; /* [, line 36 */
+ among_var = find_among(z, a_0, 7); /* substring, line 36 */
+ if (!(among_var)) goto lab0;
+ z->ket = z->c; /* ], line 36 */
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 2, s_0); /* <-, line 37 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 2, s_1); /* <-, line 38 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 2, s_2); /* <-, line 39 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret;
+ ret = slice_from_s(z, 2, s_3); /* <-, line 40 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret;
+ ret = slice_from_s(z, 2, s_4); /* <-, line 41 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret;
+ ret = slice_from_s(z, 2, s_5); /* <-, line 42 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 7:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 43 */
+ }
+ break;
+ }
+ continue;
+ lab0:
+ z->c = c;
+ break;
+ }
+ z->c = c_test;
}
while(1) { /* repeat, line 46 */
- int c = z->c;
- while(1) { /* goto, line 46 */
- int c = z->c;
- if (!(in_grouping_U(z, g_v, 97, 249))) goto lab2;
- z->bra = z->c; /* [, line 47 */
- { int c = z->c; /* or, line 47 */
- if (!(eq_s(z, 1, s_6))) goto lab4;
- z->ket = z->c; /* ], line 47 */
- if (!(in_grouping_U(z, g_v, 97, 249))) goto lab4;
- { int ret;
- ret = slice_from_s(z, 1, s_7); /* <-, line 47 */
- if (ret < 0) return ret;
- }
- goto lab3;
- lab4:
- z->c = c;
- if (!(eq_s(z, 1, s_8))) goto lab2;
- z->ket = z->c; /* ], line 48 */
- if (!(in_grouping_U(z, g_v, 97, 249))) goto lab2;
- { int ret;
- ret = slice_from_s(z, 1, s_9); /* <-, line 48 */
- if (ret < 0) return ret;
- }
- }
- lab3:
- z->c = c;
- break;
- lab2:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab1;
- z->c = c; /* goto, line 46 */
- }
- }
- continue;
+ int c = z->c;
+ while(1) { /* goto, line 46 */
+ int c = z->c;
+ if (!(in_grouping_U(z, g_v, 97, 249))) goto lab2;
+ z->bra = z->c; /* [, line 47 */
+ { int c = z->c; /* or, line 47 */
+ if (!(eq_s(z, 1, s_6))) goto lab4;
+ z->ket = z->c; /* ], line 47 */
+ if (!(in_grouping_U(z, g_v, 97, 249))) goto lab4;
+ { int ret;
+ ret = slice_from_s(z, 1, s_7); /* <-, line 47 */
+ if (ret < 0) return ret;
+ }
+ goto lab3;
+ lab4:
+ z->c = c;
+ if (!(eq_s(z, 1, s_8))) goto lab2;
+ z->ket = z->c; /* ], line 48 */
+ if (!(in_grouping_U(z, g_v, 97, 249))) goto lab2;
+ { int ret;
+ ret = slice_from_s(z, 1, s_9); /* <-, line 48 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab3:
+ z->c = c;
+ break;
+ lab2:
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab1;
+ z->c = c; /* goto, line 46 */
+ }
+ }
+ continue;
lab1:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -600,108 +600,108 @@
z->I[0] = z->l;
z->I[1] = z->l;
z->I[2] = z->l;
- { int c = z->c; /* do, line 58 */
- { int c = z->c; /* or, line 60 */
- if (!(in_grouping_U(z, g_v, 97, 249))) goto lab2;
- { int c = z->c; /* or, line 59 */
- if (!(out_grouping_U(z, g_v, 97, 249))) goto lab4;
- while(1) { /* gopast, line 59 */
- if (!(in_grouping_U(z, g_v, 97, 249))) goto lab5;
- break;
- lab5:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 59 */
- }
- }
- goto lab3;
- lab4:
- z->c = c;
- if (!(in_grouping_U(z, g_v, 97, 249))) goto lab2;
- while(1) { /* gopast, line 59 */
- if (!(out_grouping_U(z, g_v, 97, 249))) goto lab6;
- break;
- lab6:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab2;
- z->c = c; /* gopast, line 59 */
- }
- }
- }
- lab3:
- goto lab1;
- lab2:
- z->c = c;
- if (!(out_grouping_U(z, g_v, 97, 249))) goto lab0;
- { int c = z->c; /* or, line 61 */
- if (!(out_grouping_U(z, g_v, 97, 249))) goto lab8;
- while(1) { /* gopast, line 61 */
- if (!(in_grouping_U(z, g_v, 97, 249))) goto lab9;
- break;
- lab9:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab8;
- z->c = c; /* gopast, line 61 */
- }
- }
- goto lab7;
- lab8:
- z->c = c;
- if (!(in_grouping_U(z, g_v, 97, 249))) goto lab0;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 61 */
- }
- }
- lab7:
- ;
- }
+ { int c = z->c; /* do, line 58 */
+ { int c = z->c; /* or, line 60 */
+ if (!(in_grouping_U(z, g_v, 97, 249))) goto lab2;
+ { int c = z->c; /* or, line 59 */
+ if (!(out_grouping_U(z, g_v, 97, 249))) goto lab4;
+ while(1) { /* gopast, line 59 */
+ if (!(in_grouping_U(z, g_v, 97, 249))) goto lab5;
+ break;
+ lab5:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 59 */
+ }
+ }
+ goto lab3;
+ lab4:
+ z->c = c;
+ if (!(in_grouping_U(z, g_v, 97, 249))) goto lab2;
+ while(1) { /* gopast, line 59 */
+ if (!(out_grouping_U(z, g_v, 97, 249))) goto lab6;
+ break;
+ lab6:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab2;
+ z->c = c; /* gopast, line 59 */
+ }
+ }
+ }
+ lab3:
+ goto lab1;
+ lab2:
+ z->c = c;
+ if (!(out_grouping_U(z, g_v, 97, 249))) goto lab0;
+ { int c = z->c; /* or, line 61 */
+ if (!(out_grouping_U(z, g_v, 97, 249))) goto lab8;
+ while(1) { /* gopast, line 61 */
+ if (!(in_grouping_U(z, g_v, 97, 249))) goto lab9;
+ break;
+ lab9:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab8;
+ z->c = c; /* gopast, line 61 */
+ }
+ }
+ goto lab7;
+ lab8:
+ z->c = c;
+ if (!(in_grouping_U(z, g_v, 97, 249))) goto lab0;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 61 */
+ }
+ }
+ lab7:
+ ;
+ }
lab1:
- z->I[0] = z->c; /* setmark pV, line 62 */
+ z->I[0] = z->c; /* setmark pV, line 62 */
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 64 */
- while(1) { /* gopast, line 65 */
- if (!(in_grouping_U(z, g_v, 97, 249))) goto lab11;
- break;
- lab11:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 65 */
- }
- }
- while(1) { /* gopast, line 65 */
- if (!(out_grouping_U(z, g_v, 97, 249))) goto lab12;
- break;
- lab12:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 65 */
- }
- }
- z->I[1] = z->c; /* setmark p1, line 65 */
- while(1) { /* gopast, line 66 */
- if (!(in_grouping_U(z, g_v, 97, 249))) goto lab13;
- break;
- lab13:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 66 */
- }
- }
- while(1) { /* gopast, line 66 */
- if (!(out_grouping_U(z, g_v, 97, 249))) goto lab14;
- break;
- lab14:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 66 */
- }
- }
- z->I[2] = z->c; /* setmark p2, line 66 */
+ { int c = z->c; /* do, line 64 */
+ while(1) { /* gopast, line 65 */
+ if (!(in_grouping_U(z, g_v, 97, 249))) goto lab11;
+ break;
+ lab11:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 65 */
+ }
+ }
+ while(1) { /* gopast, line 65 */
+ if (!(out_grouping_U(z, g_v, 97, 249))) goto lab12;
+ break;
+ lab12:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 65 */
+ }
+ }
+ z->I[1] = z->c; /* setmark p1, line 65 */
+ while(1) { /* gopast, line 66 */
+ if (!(in_grouping_U(z, g_v, 97, 249))) goto lab13;
+ break;
+ lab13:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 66 */
+ }
+ }
+ while(1) { /* gopast, line 66 */
+ if (!(out_grouping_U(z, g_v, 97, 249))) goto lab14;
+ break;
+ lab14:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 66 */
+ }
+ }
+ z->I[2] = z->c; /* setmark p2, line 66 */
lab10:
- z->c = c;
+ z->c = c;
}
return 1;
}
@@ -709,36 +709,36 @@
static int r_postlude(struct SN_env * z) {
int among_var;
while(1) { /* repeat, line 70 */
- int c = z->c;
- z->bra = z->c; /* [, line 72 */
- among_var = find_among(z, a_1, 3); /* substring, line 72 */
- if (!(among_var)) goto lab0;
- z->ket = z->c; /* ], line 72 */
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 1, s_10); /* <-, line 73 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 1, s_11); /* <-, line 74 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 75 */
- }
- break;
- }
- continue;
+ int c = z->c;
+ z->bra = z->c; /* [, line 72 */
+ among_var = find_among(z, a_1, 3); /* substring, line 72 */
+ if (!(among_var)) goto lab0;
+ z->ket = z->c; /* ], line 72 */
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 1, s_10); /* <-, line 73 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 1, s_11); /* <-, line 74 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 75 */
+ }
+ break;
+ }
+ continue;
lab0:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -765,24 +765,24 @@
z->bra = z->c; /* ], line 87 */
among_var = find_among_b(z, a_3, 5); /* among, line 97 */
if (!(among_var)) return 0;
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 97 */
- if (ret < 0) return ret;
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 97 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 98 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 1, s_12); /* <-, line 99 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 98 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 1, s_12); /* <-, line 99 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -794,328 +794,328 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 104 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 111 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 111 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 113 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 113 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 114 */
- z->ket = z->c; /* [, line 114 */
- if (!(eq_s_b(z, 2, s_13))) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 114 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab0; } /* call R2, line 114 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 114 */
- if (ret < 0) return ret;
- }
- lab0:
- ;
- }
- break;
- case 3:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 117 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 3, s_14); /* <-, line 117 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 119 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 1, s_15); /* <-, line 119 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 121 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 4, s_16); /* <-, line 121 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 123 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 123 */
- if (ret < 0) return ret;
- }
- break;
- case 7:
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 125 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 125 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 126 */
- z->ket = z->c; /* [, line 127 */
- among_var = find_among_b(z, a_4, 4); /* substring, line 127 */
- if (!(among_var)) { z->c = z->l - m; goto lab1; }
- z->bra = z->c; /* ], line 127 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab1; } /* call R2, line 127 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 127 */
- if (ret < 0) return ret;
- }
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab1; }
- case 1:
- z->ket = z->c; /* [, line 128 */
- if (!(eq_s_b(z, 2, s_17))) { z->c = z->l - m; goto lab1; }
- z->bra = z->c; /* ], line 128 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab1; } /* call R2, line 128 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 128 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab1:
- ;
- }
- break;
- case 8:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 134 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 134 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 135 */
- z->ket = z->c; /* [, line 136 */
- among_var = find_among_b(z, a_5, 3); /* substring, line 136 */
- if (!(among_var)) { z->c = z->l - m; goto lab2; }
- z->bra = z->c; /* ], line 136 */
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab2; }
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab2; } /* call R2, line 137 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 137 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab2:
- ;
- }
- break;
- case 9:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 142 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 142 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 143 */
- z->ket = z->c; /* [, line 143 */
- if (!(eq_s_b(z, 2, s_18))) { z->c = z->l - m; goto lab3; }
- z->bra = z->c; /* ], line 143 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 143 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 143 */
- if (ret < 0) return ret;
- }
- z->ket = z->c; /* [, line 143 */
- if (!(eq_s_b(z, 2, s_19))) { z->c = z->l - m; goto lab3; }
- z->bra = z->c; /* ], line 143 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 143 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 143 */
- if (ret < 0) return ret;
- }
- lab3:
- ;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 111 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 111 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 113 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 113 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 114 */
+ z->ket = z->c; /* [, line 114 */
+ if (!(eq_s_b(z, 2, s_13))) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 114 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab0; } /* call R2, line 114 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 114 */
+ if (ret < 0) return ret;
+ }
+ lab0:
+ ;
+ }
+ break;
+ case 3:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 117 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 3, s_14); /* <-, line 117 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 119 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_15); /* <-, line 119 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 121 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 4, s_16); /* <-, line 121 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 123 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 123 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 7:
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 125 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 125 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 126 */
+ z->ket = z->c; /* [, line 127 */
+ among_var = find_among_b(z, a_4, 4); /* substring, line 127 */
+ if (!(among_var)) { z->c = z->l - m; goto lab1; }
+ z->bra = z->c; /* ], line 127 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab1; } /* call R2, line 127 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 127 */
+ if (ret < 0) return ret;
+ }
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab1; }
+ case 1:
+ z->ket = z->c; /* [, line 128 */
+ if (!(eq_s_b(z, 2, s_17))) { z->c = z->l - m; goto lab1; }
+ z->bra = z->c; /* ], line 128 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab1; } /* call R2, line 128 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 128 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab1:
+ ;
+ }
+ break;
+ case 8:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 134 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 134 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 135 */
+ z->ket = z->c; /* [, line 136 */
+ among_var = find_among_b(z, a_5, 3); /* substring, line 136 */
+ if (!(among_var)) { z->c = z->l - m; goto lab2; }
+ z->bra = z->c; /* ], line 136 */
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab2; }
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab2; } /* call R2, line 137 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 137 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab2:
+ ;
+ }
+ break;
+ case 9:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 142 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 142 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 143 */
+ z->ket = z->c; /* [, line 143 */
+ if (!(eq_s_b(z, 2, s_18))) { z->c = z->l - m; goto lab3; }
+ z->bra = z->c; /* ], line 143 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 143 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 143 */
+ if (ret < 0) return ret;
+ }
+ z->ket = z->c; /* [, line 143 */
+ if (!(eq_s_b(z, 2, s_19))) { z->c = z->l - m; goto lab3; }
+ z->bra = z->c; /* ], line 143 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 143 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 143 */
+ if (ret < 0) return ret;
+ }
+ lab3:
+ ;
+ }
+ break;
}
return 1;
}
static int r_verb_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 148 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 148 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 149 */
- among_var = find_among_b(z, a_7, 87); /* substring, line 149 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 149 */
- switch(among_var) {
- case 0: { z->lb = m3; return 0; }
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 163 */
- if (ret < 0) return ret;
- }
- break;
- }
- z->lb = m3;
+ { int m3; /* setlimit, line 148 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 148 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 149 */
+ among_var = find_among_b(z, a_7, 87); /* substring, line 149 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 149 */
+ switch(among_var) {
+ case 0: { z->lb = m3; return 0; }
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 163 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ z->lb = m3;
}
return 1;
}
static int r_vowel_suffix(struct SN_env * z) {
- { int m = z->l - z->c; (void) m; /* try, line 171 */
- z->ket = z->c; /* [, line 172 */
- if (!(in_grouping_b_U(z, g_AEIO, 97, 242))) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 172 */
- { int ret = r_RV(z);
- if (ret == 0) { z->c = z->l - m; goto lab0; } /* call RV, line 172 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 172 */
- if (ret < 0) return ret;
- }
- z->ket = z->c; /* [, line 173 */
- if (!(eq_s_b(z, 1, s_20))) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 173 */
- { int ret = r_RV(z);
- if (ret == 0) { z->c = z->l - m; goto lab0; } /* call RV, line 173 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 173 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* try, line 171 */
+ z->ket = z->c; /* [, line 172 */
+ if (!(in_grouping_b_U(z, g_AEIO, 97, 242))) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 172 */
+ { int ret = r_RV(z);
+ if (ret == 0) { z->c = z->l - m; goto lab0; } /* call RV, line 172 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 172 */
+ if (ret < 0) return ret;
+ }
+ z->ket = z->c; /* [, line 173 */
+ if (!(eq_s_b(z, 1, s_20))) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 173 */
+ { int ret = r_RV(z);
+ if (ret == 0) { z->c = z->l - m; goto lab0; } /* call RV, line 173 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 173 */
+ if (ret < 0) return ret;
+ }
lab0:
- ;
+ ;
}
- { int m = z->l - z->c; (void) m; /* try, line 175 */
- z->ket = z->c; /* [, line 176 */
- if (!(eq_s_b(z, 1, s_21))) { z->c = z->l - m; goto lab1; }
- z->bra = z->c; /* ], line 176 */
- if (!(in_grouping_b_U(z, g_CG, 99, 103))) { z->c = z->l - m; goto lab1; }
- { int ret = r_RV(z);
- if (ret == 0) { z->c = z->l - m; goto lab1; } /* call RV, line 176 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 176 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* try, line 175 */
+ z->ket = z->c; /* [, line 176 */
+ if (!(eq_s_b(z, 1, s_21))) { z->c = z->l - m; goto lab1; }
+ z->bra = z->c; /* ], line 176 */
+ if (!(in_grouping_b_U(z, g_CG, 99, 103))) { z->c = z->l - m; goto lab1; }
+ { int ret = r_RV(z);
+ if (ret == 0) { z->c = z->l - m; goto lab1; } /* call RV, line 176 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 176 */
+ if (ret < 0) return ret;
+ }
lab1:
- ;
+ ;
}
return 1;
}
extern int italian_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 182 */
- { int ret = r_prelude(z);
- if (ret == 0) goto lab0; /* call prelude, line 182 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 182 */
+ { int ret = r_prelude(z);
+ if (ret == 0) goto lab0; /* call prelude, line 182 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 183 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab1; /* call mark_regions, line 183 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 183 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab1; /* call mark_regions, line 183 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 184 */
- { int m = z->l - z->c; (void) m; /* do, line 185 */
- { int ret = r_attached_pronoun(z);
- if (ret == 0) goto lab2; /* call attached_pronoun, line 185 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 185 */
+ { int ret = r_attached_pronoun(z);
+ if (ret == 0) goto lab2; /* call attached_pronoun, line 185 */
+ if (ret < 0) return ret;
+ }
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 186 */
- { int m = z->l - z->c; (void) m; /* or, line 186 */
- { int ret = r_standard_suffix(z);
- if (ret == 0) goto lab5; /* call standard_suffix, line 186 */
- if (ret < 0) return ret;
- }
- goto lab4;
- lab5:
- z->c = z->l - m;
- { int ret = r_verb_suffix(z);
- if (ret == 0) goto lab3; /* call verb_suffix, line 186 */
- if (ret < 0) return ret;
- }
- }
+ { int m = z->l - z->c; (void) m; /* do, line 186 */
+ { int m = z->l - z->c; (void) m; /* or, line 186 */
+ { int ret = r_standard_suffix(z);
+ if (ret == 0) goto lab5; /* call standard_suffix, line 186 */
+ if (ret < 0) return ret;
+ }
+ goto lab4;
+ lab5:
+ z->c = z->l - m;
+ { int ret = r_verb_suffix(z);
+ if (ret == 0) goto lab3; /* call verb_suffix, line 186 */
+ if (ret < 0) return ret;
+ }
+ }
lab4:
lab3:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 187 */
- { int ret = r_vowel_suffix(z);
- if (ret == 0) goto lab6; /* call vowel_suffix, line 187 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 187 */
+ { int ret = r_vowel_suffix(z);
+ if (ret == 0) goto lab6; /* call vowel_suffix, line 187 */
+ if (ret < 0) return ret;
+ }
lab6:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
- { int c = z->c; /* do, line 189 */
- { int ret = r_postlude(z);
- if (ret == 0) goto lab7; /* call postlude, line 189 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 189 */
+ { int ret = r_postlude(z);
+ if (ret == 0) goto lab7; /* call postlude, line 189 */
+ if (ret < 0) return ret;
+ }
lab7:
- z->c = c;
+ z->c = c;
}
return 1;
}
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 15:12:19 2008
@@ -133,34 +133,34 @@
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
- { int c_test = z->c; /* test, line 30 */
- { int c = skip_utf8(z->p, z->c, 0, z->l, + 3);
- if (c < 0) return 0;
- z->c = c; /* hop, line 30 */
- }
- z->I[1] = z->c; /* setmark x, line 30 */
- z->c = c_test;
+ { int c_test = z->c; /* test, line 30 */
+ { int c = skip_utf8(z->p, z->c, 0, z->l, + 3);
+ if (c < 0) return 0;
+ z->c = c; /* hop, line 30 */
+ }
+ z->I[1] = z->c; /* setmark x, line 30 */
+ z->c = c_test;
}
while(1) { /* goto, line 31 */
- int c = z->c;
- if (!(in_grouping_U(z, g_v, 97, 248))) goto lab0;
- z->c = c;
- break;
+ int c = z->c;
+ if (!(in_grouping_U(z, g_v, 97, 248))) goto lab0;
+ z->c = c;
+ break;
lab0:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* goto, line 31 */
- }
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* goto, line 31 */
+ }
}
while(1) { /* gopast, line 31 */
- if (!(out_grouping_U(z, g_v, 97, 248))) goto lab1;
- break;
+ if (!(out_grouping_U(z, g_v, 97, 248))) goto lab1;
+ break;
lab1:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 31 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 31 */
+ }
}
z->I[0] = z->c; /* setmark p1, line 31 */
/* try, line 32 */
@@ -172,138 +172,138 @@
static int r_main_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 38 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 38 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 38 */
- among_var = find_among_b(z, a_0, 29); /* substring, line 38 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 38 */
- z->lb = m3;
+ { int m3; /* setlimit, line 38 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 38 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 38 */
+ among_var = find_among_b(z, a_0, 29); /* substring, line 38 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 38 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 44 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int m = z->l - z->c; (void) m; /* or, line 46 */
- if (!(in_grouping_b_U(z, g_s_ending, 98, 122))) goto lab1;
- goto lab0;
- lab1:
- z->c = z->l - m;
- if (!(eq_s_b(z, 1, s_0))) return 0;
- if (!(out_grouping_b_U(z, g_v, 97, 248))) return 0;
- }
- lab0:
- { int ret;
- ret = slice_del(z); /* delete, line 46 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 2, s_1); /* <-, line 48 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 44 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int m = z->l - z->c; (void) m; /* or, line 46 */
+ if (!(in_grouping_b_U(z, g_s_ending, 98, 122))) goto lab1;
+ goto lab0;
+ lab1:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 1, s_0))) return 0;
+ if (!(out_grouping_b_U(z, g_v, 97, 248))) return 0;
+ }
+ lab0:
+ { int ret;
+ ret = slice_del(z); /* delete, line 46 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 2, s_1); /* <-, line 48 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
static int r_consonant_pair(struct SN_env * z) {
- { int m_test = z->l - z->c; /* test, line 53 */
- { int m3; /* setlimit, line 54 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 54 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 54 */
- if (!(find_among_b(z, a_1, 2))) { z->lb = m3; return 0; } /* substring, line 54 */
- z->bra = z->c; /* ], line 54 */
- z->lb = m3;
- }
- z->c = z->l - m_test;
- }
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* next, line 59 */
+ { int m_test = z->l - z->c; /* test, line 53 */
+ { int m3; /* setlimit, line 54 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 54 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 54 */
+ if (!(find_among_b(z, a_1, 2))) { z->lb = m3; return 0; } /* substring, line 54 */
+ z->bra = z->c; /* ], line 54 */
+ z->lb = m3;
+ }
+ z->c = z->l - m_test;
+ }
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* next, line 59 */
}
z->bra = z->c; /* ], line 59 */
- { int ret;
- ret = slice_del(z); /* delete, line 59 */
- if (ret < 0) return ret;
+ { int ret;
+ ret = slice_del(z); /* delete, line 59 */
+ if (ret < 0) return ret;
}
return 1;
}
static int r_other_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 63 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 63 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 63 */
- among_var = find_among_b(z, a_2, 11); /* substring, line 63 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 63 */
- z->lb = m3;
+ { int m3; /* setlimit, line 63 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 63 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 63 */
+ among_var = find_among_b(z, a_2, 11); /* substring, line 63 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 63 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 67 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 67 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
extern int norwegian_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 74 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab0; /* call mark_regions, line 74 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 74 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab0; /* call mark_regions, line 74 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 75 */
- { int m = z->l - z->c; (void) m; /* do, line 76 */
- { int ret = r_main_suffix(z);
- if (ret == 0) goto lab1; /* call main_suffix, line 76 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 76 */
+ { int ret = r_main_suffix(z);
+ if (ret == 0) goto lab1; /* call main_suffix, line 76 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 77 */
- { int ret = r_consonant_pair(z);
- if (ret == 0) goto lab2; /* call consonant_pair, line 77 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 77 */
+ { int ret = r_consonant_pair(z);
+ if (ret == 0) goto lab2; /* call consonant_pair, line 77 */
+ if (ret < 0) return ret;
+ }
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 78 */
- { int ret = r_other_suffix(z);
- if (ret == 0) goto lab3; /* call other_suffix, line 78 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 78 */
+ { int ret = r_other_suffix(z);
+ if (ret == 0) goto lab3; /* call other_suffix, line 78 */
+ if (ret < 0) return ret;
+ }
lab3:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
return 1;
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 15:12:19 2008
@@ -257,25 +257,25 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 25 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 2, s_0); /* <-, line 26 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 1, s_1); /* <-, line 27 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_del(z); /* delete, line 29 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 2, s_0); /* <-, line 26 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 1, s_1); /* <-, line 27 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_del(z); /* delete, line 29 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -287,108 +287,108 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 34 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 35 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 2, s_2); /* <-, line 35 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int m_test = z->l - z->c; /* test, line 38 */
- while(1) { /* gopast, line 38 */
- if (!(in_grouping_b_U(z, g_v, 97, 121))) goto lab0;
- break;
- lab0:
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 38 */
- }
- }
- z->c = z->l - m_test;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 38 */
- if (ret < 0) return ret;
- }
- { int m_test = z->l - z->c; /* test, line 39 */
- among_var = find_among_b(z, a_1, 13); /* substring, line 39 */
- if (!(among_var)) return 0;
- z->c = z->l - m_test;
- }
- switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- { int c = z->c;
- ret = insert_s(z, z->c, z->c, 1, s_3); /* <+, line 41 */
- z->c = c;
- }
- if (ret < 0) return ret;
- }
- break;
- case 2:
- z->ket = z->c; /* [, line 44 */
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* next, line 44 */
- }
- z->bra = z->c; /* ], line 44 */
- { int ret;
- ret = slice_del(z); /* delete, line 44 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- if (z->c != z->I[0]) return 0; /* atmark, line 45 */
- { int m_test = z->l - z->c; /* test, line 45 */
- { int ret = r_shortv(z);
- if (ret == 0) return 0; /* call shortv, line 45 */
- if (ret < 0) return ret;
- }
- z->c = z->l - m_test;
- }
- { int ret;
- { int c = z->c;
- ret = insert_s(z, z->c, z->c, 1, s_4); /* <+, line 45 */
- z->c = c;
- }
- if (ret < 0) return ret;
- }
- break;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 35 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 2, s_2); /* <-, line 35 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int m_test = z->l - z->c; /* test, line 38 */
+ while(1) { /* gopast, line 38 */
+ if (!(in_grouping_b_U(z, g_v, 97, 121))) goto lab0;
+ break;
+ lab0:
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 38 */
+ }
+ }
+ z->c = z->l - m_test;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 38 */
+ if (ret < 0) return ret;
+ }
+ { int m_test = z->l - z->c; /* test, line 39 */
+ among_var = find_among_b(z, a_1, 13); /* substring, line 39 */
+ if (!(among_var)) return 0;
+ z->c = z->l - m_test;
+ }
+ switch(among_var) {
+ case 0: return 0;
+ case 1:
+ { int ret;
+ { int c = z->c;
+ ret = insert_s(z, z->c, z->c, 1, s_3); /* <+, line 41 */
+ z->c = c;
+ }
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ z->ket = z->c; /* [, line 44 */
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* next, line 44 */
+ }
+ z->bra = z->c; /* ], line 44 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 44 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ if (z->c != z->I[0]) return 0; /* atmark, line 45 */
+ { int m_test = z->l - z->c; /* test, line 45 */
+ { int ret = r_shortv(z);
+ if (ret == 0) return 0; /* call shortv, line 45 */
+ if (ret < 0) return ret;
+ }
+ z->c = z->l - m_test;
+ }
+ { int ret;
+ { int c = z->c;
+ ret = insert_s(z, z->c, z->c, 1, s_4); /* <+, line 45 */
+ z->c = c;
+ }
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ break;
}
return 1;
}
static int r_Step_1c(struct SN_env * z) {
z->ket = z->c; /* [, line 52 */
- { int m = z->l - z->c; (void) m; /* or, line 52 */
- if (!(eq_s_b(z, 1, s_5))) goto lab1;
- goto lab0;
+ { int m = z->l - z->c; (void) m; /* or, line 52 */
+ if (!(eq_s_b(z, 1, s_5))) goto lab1;
+ goto lab0;
lab1:
- z->c = z->l - m;
- if (!(eq_s_b(z, 1, s_6))) return 0;
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 1, s_6))) return 0;
}
lab0:
z->bra = z->c; /* ], line 52 */
while(1) { /* gopast, line 53 */
- if (!(in_grouping_b_U(z, g_v, 97, 121))) goto lab2;
- break;
+ if (!(in_grouping_b_U(z, g_v, 97, 121))) goto lab2;
+ break;
lab2:
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 53 */
- }
- }
- { int ret;
- ret = slice_from_s(z, 1, s_7); /* <-, line 54 */
- if (ret < 0) return ret;
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 53 */
+ }
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_7); /* <-, line 54 */
+ if (ret < 0) return ret;
}
return 1;
}
@@ -399,96 +399,96 @@
among_var = find_among_b(z, a_3, 20); /* substring, line 58 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 58 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 58 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 58 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 4, s_8); /* <-, line 59 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 4, s_9); /* <-, line 60 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 4, s_10); /* <-, line 61 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret;
- ret = slice_from_s(z, 4, s_11); /* <-, line 62 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret;
- ret = slice_from_s(z, 3, s_12); /* <-, line 63 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret;
- ret = slice_from_s(z, 1, s_13); /* <-, line 64 */
- if (ret < 0) return ret;
- }
- break;
- case 7:
- { int ret;
- ret = slice_from_s(z, 3, s_14); /* <-, line 66 */
- if (ret < 0) return ret;
- }
- break;
- case 8:
- { int ret;
- ret = slice_from_s(z, 3, s_15); /* <-, line 68 */
- if (ret < 0) return ret;
- }
- break;
- case 9:
- { int ret;
- ret = slice_from_s(z, 2, s_16); /* <-, line 69 */
- if (ret < 0) return ret;
- }
- break;
- case 10:
- { int ret;
- ret = slice_from_s(z, 2, s_17); /* <-, line 71 */
- if (ret < 0) return ret;
- }
- break;
- case 11:
- { int ret;
- ret = slice_from_s(z, 3, s_18); /* <-, line 72 */
- if (ret < 0) return ret;
- }
- break;
- case 12:
- { int ret;
- ret = slice_from_s(z, 3, s_19); /* <-, line 74 */
- if (ret < 0) return ret;
- }
- break;
- case 13:
- { int ret;
- ret = slice_from_s(z, 3, s_20); /* <-, line 76 */
- if (ret < 0) return ret;
- }
- break;
- case 14:
- { int ret;
- ret = slice_from_s(z, 3, s_21); /* <-, line 77 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 4, s_8); /* <-, line 59 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 4, s_9); /* <-, line 60 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 4, s_10); /* <-, line 61 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret;
+ ret = slice_from_s(z, 4, s_11); /* <-, line 62 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret;
+ ret = slice_from_s(z, 3, s_12); /* <-, line 63 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret;
+ ret = slice_from_s(z, 1, s_13); /* <-, line 64 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 7:
+ { int ret;
+ ret = slice_from_s(z, 3, s_14); /* <-, line 66 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 8:
+ { int ret;
+ ret = slice_from_s(z, 3, s_15); /* <-, line 68 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 9:
+ { int ret;
+ ret = slice_from_s(z, 2, s_16); /* <-, line 69 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 10:
+ { int ret;
+ ret = slice_from_s(z, 2, s_17); /* <-, line 71 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 11:
+ { int ret;
+ ret = slice_from_s(z, 3, s_18); /* <-, line 72 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 12:
+ { int ret;
+ ret = slice_from_s(z, 3, s_19); /* <-, line 74 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 13:
+ { int ret;
+ ret = slice_from_s(z, 3, s_20); /* <-, line 76 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 14:
+ { int ret;
+ ret = slice_from_s(z, 3, s_21); /* <-, line 77 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -499,30 +499,30 @@
among_var = find_among_b(z, a_4, 7); /* substring, line 82 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 82 */
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 82 */
- if (ret < 0) return ret;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 82 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 2, s_22); /* <-, line 83 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 2, s_23); /* <-, line 85 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_del(z); /* delete, line 87 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 2, s_22); /* <-, line 83 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 2, s_23); /* <-, line 85 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_del(z); /* delete, line 87 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -533,32 +533,32 @@
among_var = find_among_b(z, a_5, 19); /* substring, line 92 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 92 */
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 92 */
- if (ret < 0) return ret;
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 92 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 95 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int m = z->l - z->c; (void) m; /* or, line 96 */
- if (!(eq_s_b(z, 1, s_24))) goto lab1;
- goto lab0;
- lab1:
- z->c = z->l - m;
- if (!(eq_s_b(z, 1, s_25))) return 0;
- }
- lab0:
- { int ret;
- ret = slice_del(z); /* delete, line 96 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 95 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int m = z->l - z->c; (void) m; /* or, line 96 */
+ if (!(eq_s_b(z, 1, s_24))) goto lab1;
+ goto lab0;
+ lab1:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 1, s_25))) return 0;
+ }
+ lab0:
+ { int ret;
+ ret = slice_del(z); /* delete, line 96 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -567,32 +567,32 @@
z->ket = z->c; /* [, line 101 */
if (!(eq_s_b(z, 1, s_26))) return 0;
z->bra = z->c; /* ], line 101 */
- { int m = z->l - z->c; (void) m; /* or, line 102 */
- { int ret = r_R2(z);
- if (ret == 0) goto lab1; /* call R2, line 102 */
- if (ret < 0) return ret;
- }
- goto lab0;
+ { int m = z->l - z->c; (void) m; /* or, line 102 */
+ { int ret = r_R2(z);
+ if (ret == 0) goto lab1; /* call R2, line 102 */
+ if (ret < 0) return ret;
+ }
+ goto lab0;
lab1:
- z->c = z->l - m;
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 102 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* not, line 102 */
- { int ret = r_shortv(z);
- if (ret == 0) goto lab2; /* call shortv, line 102 */
- if (ret < 0) return ret;
- }
- return 0;
- lab2:
- z->c = z->l - m;
- }
+ z->c = z->l - m;
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 102 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* not, line 102 */
+ { int ret = r_shortv(z);
+ if (ret == 0) goto lab2; /* call shortv, line 102 */
+ if (ret < 0) return ret;
+ }
+ return 0;
+ lab2:
+ z->c = z->l - m;
+ }
}
lab0:
- { int ret;
- ret = slice_del(z); /* delete, line 103 */
- if (ret < 0) return ret;
+ { int ret;
+ ret = slice_del(z); /* delete, line 103 */
+ if (ret < 0) return ret;
}
return 1;
}
@@ -601,202 +601,202 @@
z->ket = z->c; /* [, line 107 */
if (!(eq_s_b(z, 1, s_27))) return 0;
z->bra = z->c; /* ], line 107 */
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 108 */
- if (ret < 0) return ret;
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 108 */
+ if (ret < 0) return ret;
}
if (!(eq_s_b(z, 1, s_28))) return 0;
- { int ret;
- ret = slice_del(z); /* delete, line 109 */
- if (ret < 0) return ret;
+ { int ret;
+ ret = slice_del(z); /* delete, line 109 */
+ if (ret < 0) return ret;
}
return 1;
}
extern int porter_UTF_8_stem(struct SN_env * z) {
z->B[0] = 0; /* unset Y_found, line 115 */
- { int c = z->c; /* do, line 116 */
- z->bra = z->c; /* [, line 116 */
- if (!(eq_s(z, 1, s_29))) goto lab0;
- z->ket = z->c; /* ], line 116 */
- { int ret;
- ret = slice_from_s(z, 1, s_30); /* <-, line 116 */
- if (ret < 0) return ret;
- }
- z->B[0] = 1; /* set Y_found, line 116 */
+ { int c = z->c; /* do, line 116 */
+ z->bra = z->c; /* [, line 116 */
+ if (!(eq_s(z, 1, s_29))) goto lab0;
+ z->ket = z->c; /* ], line 116 */
+ { int ret;
+ ret = slice_from_s(z, 1, s_30); /* <-, line 116 */
+ if (ret < 0) return ret;
+ }
+ z->B[0] = 1; /* set Y_found, line 116 */
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 117 */
- while(1) { /* repeat, line 117 */
- int c = z->c;
- while(1) { /* goto, line 117 */
- int c = z->c;
- if (!(in_grouping_U(z, g_v, 97, 121))) goto lab3;
- z->bra = z->c; /* [, line 117 */
- if (!(eq_s(z, 1, s_31))) goto lab3;
- z->ket = z->c; /* ], line 117 */
- z->c = c;
- break;
- lab3:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab2;
- z->c = c; /* goto, line 117 */
- }
- }
- { int ret;
- ret = slice_from_s(z, 1, s_32); /* <-, line 117 */
- if (ret < 0) return ret;
- }
- z->B[0] = 1; /* set Y_found, line 117 */
- continue;
- lab2:
- z->c = c;
- break;
- }
- z->c = c;
+ { int c = z->c; /* do, line 117 */
+ while(1) { /* repeat, line 117 */
+ int c = z->c;
+ while(1) { /* goto, line 117 */
+ int c = z->c;
+ if (!(in_grouping_U(z, g_v, 97, 121))) goto lab3;
+ z->bra = z->c; /* [, line 117 */
+ if (!(eq_s(z, 1, s_31))) goto lab3;
+ z->ket = z->c; /* ], line 117 */
+ z->c = c;
+ break;
+ lab3:
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab2;
+ z->c = c; /* goto, line 117 */
+ }
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_32); /* <-, line 117 */
+ if (ret < 0) return ret;
+ }
+ z->B[0] = 1; /* set Y_found, line 117 */
+ continue;
+ lab2:
+ z->c = c;
+ break;
+ }
+ z->c = c;
}
z->I[0] = z->l;
z->I[1] = z->l;
- { int c = z->c; /* do, line 121 */
- while(1) { /* gopast, line 122 */
- if (!(in_grouping_U(z, g_v, 97, 121))) goto lab5;
- break;
- lab5:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 122 */
- }
- }
- while(1) { /* gopast, line 122 */
- if (!(out_grouping_U(z, g_v, 97, 121))) goto lab6;
- break;
- lab6:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 122 */
- }
- }
- z->I[0] = z->c; /* setmark p1, line 122 */
- while(1) { /* gopast, line 123 */
- if (!(in_grouping_U(z, g_v, 97, 121))) goto lab7;
- break;
- lab7:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 123 */
- }
- }
- while(1) { /* gopast, line 123 */
- if (!(out_grouping_U(z, g_v, 97, 121))) goto lab8;
- break;
- lab8:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 123 */
- }
- }
- z->I[1] = z->c; /* setmark p2, line 123 */
+ { int c = z->c; /* do, line 121 */
+ while(1) { /* gopast, line 122 */
+ if (!(in_grouping_U(z, g_v, 97, 121))) goto lab5;
+ break;
+ lab5:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 122 */
+ }
+ }
+ while(1) { /* gopast, line 122 */
+ if (!(out_grouping_U(z, g_v, 97, 121))) goto lab6;
+ break;
+ lab6:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 122 */
+ }
+ }
+ z->I[0] = z->c; /* setmark p1, line 122 */
+ while(1) { /* gopast, line 123 */
+ if (!(in_grouping_U(z, g_v, 97, 121))) goto lab7;
+ break;
+ lab7:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 123 */
+ }
+ }
+ while(1) { /* gopast, line 123 */
+ if (!(out_grouping_U(z, g_v, 97, 121))) goto lab8;
+ break;
+ lab8:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 123 */
+ }
+ }
+ z->I[1] = z->c; /* setmark p2, line 123 */
lab4:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 126 */
- { int m = z->l - z->c; (void) m; /* do, line 127 */
- { int ret = r_Step_1a(z);
- if (ret == 0) goto lab9; /* call Step_1a, line 127 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 127 */
+ { int ret = r_Step_1a(z);
+ if (ret == 0) goto lab9; /* call Step_1a, line 127 */
+ if (ret < 0) return ret;
+ }
lab9:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 128 */
- { int ret = r_Step_1b(z);
- if (ret == 0) goto lab10; /* call Step_1b, line 128 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 128 */
+ { int ret = r_Step_1b(z);
+ if (ret == 0) goto lab10; /* call Step_1b, line 128 */
+ if (ret < 0) return ret;
+ }
lab10:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 129 */
- { int ret = r_Step_1c(z);
- if (ret == 0) goto lab11; /* call Step_1c, line 129 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 129 */
+ { int ret = r_Step_1c(z);
+ if (ret == 0) goto lab11; /* call Step_1c, line 129 */
+ if (ret < 0) return ret;
+ }
lab11:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 130 */
- { int ret = r_Step_2(z);
- if (ret == 0) goto lab12; /* call Step_2, line 130 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 130 */
+ { int ret = r_Step_2(z);
+ if (ret == 0) goto lab12; /* call Step_2, line 130 */
+ if (ret < 0) return ret;
+ }
lab12:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 131 */
- { int ret = r_Step_3(z);
- if (ret == 0) goto lab13; /* call Step_3, line 131 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 131 */
+ { int ret = r_Step_3(z);
+ if (ret == 0) goto lab13; /* call Step_3, line 131 */
+ if (ret < 0) return ret;
+ }
lab13:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 132 */
- { int ret = r_Step_4(z);
- if (ret == 0) goto lab14; /* call Step_4, line 132 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 132 */
+ { int ret = r_Step_4(z);
+ if (ret == 0) goto lab14; /* call Step_4, line 132 */
+ if (ret < 0) return ret;
+ }
lab14:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 133 */
- { int ret = r_Step_5a(z);
- if (ret == 0) goto lab15; /* call Step_5a, line 133 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 133 */
+ { int ret = r_Step_5a(z);
+ if (ret == 0) goto lab15; /* call Step_5a, line 133 */
+ if (ret < 0) return ret;
+ }
lab15:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 134 */
- { int ret = r_Step_5b(z);
- if (ret == 0) goto lab16; /* call Step_5b, line 134 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 134 */
+ { int ret = r_Step_5b(z);
+ if (ret == 0) goto lab16; /* call Step_5b, line 134 */
+ if (ret < 0) return ret;
+ }
lab16:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
- { int c = z->c; /* do, line 137 */
- if (!(z->B[0])) goto lab17; /* Boolean test Y_found, line 137 */
- while(1) { /* repeat, line 137 */
- int c = z->c;
- while(1) { /* goto, line 137 */
- int c = z->c;
- z->bra = z->c; /* [, line 137 */
- if (!(eq_s(z, 1, s_33))) goto lab19;
- z->ket = z->c; /* ], line 137 */
- z->c = c;
- break;
- lab19:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab18;
- z->c = c; /* goto, line 137 */
- }
- }
- { int ret;
- ret = slice_from_s(z, 1, s_34); /* <-, line 137 */
- if (ret < 0) return ret;
- }
- continue;
- lab18:
- z->c = c;
- break;
- }
+ { int c = z->c; /* do, line 137 */
+ if (!(z->B[0])) goto lab17; /* Boolean test Y_found, line 137 */
+ while(1) { /* repeat, line 137 */
+ int c = z->c;
+ while(1) { /* goto, line 137 */
+ int c = z->c;
+ z->bra = z->c; /* [, line 137 */
+ if (!(eq_s(z, 1, s_33))) goto lab19;
+ z->ket = z->c; /* ], line 137 */
+ z->c = c;
+ break;
+ lab19:
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab18;
+ z->c = c; /* goto, line 137 */
+ }
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_34); /* <-, line 137 */
+ if (ret < 0) return ret;
+ }
+ continue;
+ lab18:
+ z->c = c;
+ break;
+ }
lab17:
- z->c = c;
+ z->c = c;
}
return 1;
}
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 15:12:19 2008
@@ -482,36 +482,36 @@
static int r_prelude(struct SN_env * z) {
int among_var;
while(1) { /* repeat, line 36 */
- int c = z->c;
- z->bra = z->c; /* [, line 37 */
- among_var = find_among(z, a_0, 3); /* substring, line 37 */
- if (!(among_var)) goto lab0;
- z->ket = z->c; /* ], line 37 */
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 2, s_0); /* <-, line 38 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 2, s_1); /* <-, line 39 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 40 */
- }
- break;
- }
- continue;
+ int c = z->c;
+ z->bra = z->c; /* [, line 37 */
+ among_var = find_among(z, a_0, 3); /* substring, line 37 */
+ if (!(among_var)) goto lab0;
+ z->ket = z->c; /* ], line 37 */
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 2, s_0); /* <-, line 38 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 2, s_1); /* <-, line 39 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 40 */
+ }
+ break;
+ }
+ continue;
lab0:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -520,108 +520,108 @@
z->I[0] = z->l;
z->I[1] = z->l;
z->I[2] = z->l;
- { int c = z->c; /* do, line 50 */
- { int c = z->c; /* or, line 52 */
- if (!(in_grouping_U(z, g_v, 97, 250))) goto lab2;
- { int c = z->c; /* or, line 51 */
- if (!(out_grouping_U(z, g_v, 97, 250))) goto lab4;
- while(1) { /* gopast, line 51 */
- if (!(in_grouping_U(z, g_v, 97, 250))) goto lab5;
- break;
- lab5:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 51 */
- }
- }
- goto lab3;
- lab4:
- z->c = c;
- if (!(in_grouping_U(z, g_v, 97, 250))) goto lab2;
- while(1) { /* gopast, line 51 */
- if (!(out_grouping_U(z, g_v, 97, 250))) goto lab6;
- break;
- lab6:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab2;
- z->c = c; /* gopast, line 51 */
- }
- }
- }
- lab3:
- goto lab1;
- lab2:
- z->c = c;
- if (!(out_grouping_U(z, g_v, 97, 250))) goto lab0;
- { int c = z->c; /* or, line 53 */
- if (!(out_grouping_U(z, g_v, 97, 250))) goto lab8;
- while(1) { /* gopast, line 53 */
- if (!(in_grouping_U(z, g_v, 97, 250))) goto lab9;
- break;
- lab9:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab8;
- z->c = c; /* gopast, line 53 */
- }
- }
- goto lab7;
- lab8:
- z->c = c;
- if (!(in_grouping_U(z, g_v, 97, 250))) goto lab0;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 53 */
- }
- }
- lab7:
- ;
- }
+ { int c = z->c; /* do, line 50 */
+ { int c = z->c; /* or, line 52 */
+ if (!(in_grouping_U(z, g_v, 97, 250))) goto lab2;
+ { int c = z->c; /* or, line 51 */
+ if (!(out_grouping_U(z, g_v, 97, 250))) goto lab4;
+ while(1) { /* gopast, line 51 */
+ if (!(in_grouping_U(z, g_v, 97, 250))) goto lab5;
+ break;
+ lab5:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 51 */
+ }
+ }
+ goto lab3;
+ lab4:
+ z->c = c;
+ if (!(in_grouping_U(z, g_v, 97, 250))) goto lab2;
+ while(1) { /* gopast, line 51 */
+ if (!(out_grouping_U(z, g_v, 97, 250))) goto lab6;
+ break;
+ lab6:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab2;
+ z->c = c; /* gopast, line 51 */
+ }
+ }
+ }
+ lab3:
+ goto lab1;
+ lab2:
+ z->c = c;
+ if (!(out_grouping_U(z, g_v, 97, 250))) goto lab0;
+ { int c = z->c; /* or, line 53 */
+ if (!(out_grouping_U(z, g_v, 97, 250))) goto lab8;
+ while(1) { /* gopast, line 53 */
+ if (!(in_grouping_U(z, g_v, 97, 250))) goto lab9;
+ break;
+ lab9:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab8;
+ z->c = c; /* gopast, line 53 */
+ }
+ }
+ goto lab7;
+ lab8:
+ z->c = c;
+ if (!(in_grouping_U(z, g_v, 97, 250))) goto lab0;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 53 */
+ }
+ }
+ lab7:
+ ;
+ }
lab1:
- z->I[0] = z->c; /* setmark pV, line 54 */
+ z->I[0] = z->c; /* setmark pV, line 54 */
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 56 */
- while(1) { /* gopast, line 57 */
- if (!(in_grouping_U(z, g_v, 97, 250))) goto lab11;
- break;
- lab11:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 57 */
- }
- }
- while(1) { /* gopast, line 57 */
- if (!(out_grouping_U(z, g_v, 97, 250))) goto lab12;
- break;
- lab12:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 57 */
- }
- }
- z->I[1] = z->c; /* setmark p1, line 57 */
- while(1) { /* gopast, line 58 */
- if (!(in_grouping_U(z, g_v, 97, 250))) goto lab13;
- break;
- lab13:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 58 */
- }
- }
- while(1) { /* gopast, line 58 */
- if (!(out_grouping_U(z, g_v, 97, 250))) goto lab14;
- break;
- lab14:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 58 */
- }
- }
- z->I[2] = z->c; /* setmark p2, line 58 */
+ { int c = z->c; /* do, line 56 */
+ while(1) { /* gopast, line 57 */
+ if (!(in_grouping_U(z, g_v, 97, 250))) goto lab11;
+ break;
+ lab11:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 57 */
+ }
+ }
+ while(1) { /* gopast, line 57 */
+ if (!(out_grouping_U(z, g_v, 97, 250))) goto lab12;
+ break;
+ lab12:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 57 */
+ }
+ }
+ z->I[1] = z->c; /* setmark p1, line 57 */
+ while(1) { /* gopast, line 58 */
+ if (!(in_grouping_U(z, g_v, 97, 250))) goto lab13;
+ break;
+ lab13:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 58 */
+ }
+ }
+ while(1) { /* gopast, line 58 */
+ if (!(out_grouping_U(z, g_v, 97, 250))) goto lab14;
+ break;
+ lab14:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 58 */
+ }
+ }
+ z->I[2] = z->c; /* setmark p2, line 58 */
lab10:
- z->c = c;
+ z->c = c;
}
return 1;
}
@@ -629,36 +629,36 @@
static int r_postlude(struct SN_env * z) {
int among_var;
while(1) { /* repeat, line 62 */
- int c = z->c;
- z->bra = z->c; /* [, line 63 */
- among_var = find_among(z, a_1, 3); /* substring, line 63 */
- if (!(among_var)) goto lab0;
- z->ket = z->c; /* ], line 63 */
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 2, s_2); /* <-, line 64 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 2, s_3); /* <-, line 65 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 66 */
- }
- break;
- }
- continue;
+ int c = z->c;
+ z->bra = z->c; /* [, line 63 */
+ among_var = find_among(z, a_1, 3); /* substring, line 63 */
+ if (!(among_var)) goto lab0;
+ z->ket = z->c; /* ], line 63 */
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 2, s_2); /* <-, line 64 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 2, s_3); /* <-, line 65 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 66 */
+ }
+ break;
+ }
+ continue;
lab0:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -685,213 +685,213 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 77 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 93 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 93 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 98 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 3, s_4); /* <-, line 98 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 102 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 1, s_5); /* <-, line 102 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 106 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 4, s_6); /* <-, line 106 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 110 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 110 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 111 */
- z->ket = z->c; /* [, line 112 */
- among_var = find_among_b(z, a_2, 4); /* substring, line 112 */
- if (!(among_var)) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 112 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab0; } /* call R2, line 112 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 112 */
- if (ret < 0) return ret;
- }
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab0; }
- case 1:
- z->ket = z->c; /* [, line 113 */
- if (!(eq_s_b(z, 2, s_7))) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 113 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab0; } /* call R2, line 113 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 113 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab0:
- ;
- }
- break;
- case 6:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 122 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 122 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 123 */
- z->ket = z->c; /* [, line 124 */
- among_var = find_among_b(z, a_3, 3); /* substring, line 124 */
- if (!(among_var)) { z->c = z->l - m; goto lab1; }
- z->bra = z->c; /* ], line 124 */
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab1; }
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab1; } /* call R2, line 127 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 127 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab1:
- ;
- }
- break;
- case 7:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 134 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 134 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 135 */
- z->ket = z->c; /* [, line 136 */
- among_var = find_among_b(z, a_4, 3); /* substring, line 136 */
- if (!(among_var)) { z->c = z->l - m; goto lab2; }
- z->bra = z->c; /* ], line 136 */
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab2; }
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab2; } /* call R2, line 139 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 139 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab2:
- ;
- }
- break;
- case 8:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 146 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 146 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 147 */
- z->ket = z->c; /* [, line 148 */
- if (!(eq_s_b(z, 2, s_8))) { z->c = z->l - m; goto lab3; }
- z->bra = z->c; /* ], line 148 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 148 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 148 */
- if (ret < 0) return ret;
- }
- lab3:
- ;
- }
- break;
- case 9:
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 153 */
- if (ret < 0) return ret;
- }
- if (!(eq_s_b(z, 1, s_9))) return 0;
- { int ret;
- ret = slice_from_s(z, 2, s_10); /* <-, line 154 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 93 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 93 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 98 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 3, s_4); /* <-, line 98 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 102 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_5); /* <-, line 102 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 106 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 4, s_6); /* <-, line 106 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 110 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 110 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 111 */
+ z->ket = z->c; /* [, line 112 */
+ among_var = find_among_b(z, a_2, 4); /* substring, line 112 */
+ if (!(among_var)) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 112 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab0; } /* call R2, line 112 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 112 */
+ if (ret < 0) return ret;
+ }
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab0; }
+ case 1:
+ z->ket = z->c; /* [, line 113 */
+ if (!(eq_s_b(z, 2, s_7))) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 113 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab0; } /* call R2, line 113 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 113 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab0:
+ ;
+ }
+ break;
+ case 6:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 122 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 122 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 123 */
+ z->ket = z->c; /* [, line 124 */
+ among_var = find_among_b(z, a_3, 3); /* substring, line 124 */
+ if (!(among_var)) { z->c = z->l - m; goto lab1; }
+ z->bra = z->c; /* ], line 124 */
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab1; }
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab1; } /* call R2, line 127 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 127 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab1:
+ ;
+ }
+ break;
+ case 7:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 134 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 134 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 135 */
+ z->ket = z->c; /* [, line 136 */
+ among_var = find_among_b(z, a_4, 3); /* substring, line 136 */
+ if (!(among_var)) { z->c = z->l - m; goto lab2; }
+ z->bra = z->c; /* ], line 136 */
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab2; }
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab2; } /* call R2, line 139 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 139 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab2:
+ ;
+ }
+ break;
+ case 8:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 146 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 146 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 147 */
+ z->ket = z->c; /* [, line 148 */
+ if (!(eq_s_b(z, 2, s_8))) { z->c = z->l - m; goto lab3; }
+ z->bra = z->c; /* ], line 148 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 148 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 148 */
+ if (ret < 0) return ret;
+ }
+ lab3:
+ ;
+ }
+ break;
+ case 9:
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 153 */
+ if (ret < 0) return ret;
+ }
+ if (!(eq_s_b(z, 1, s_9))) return 0;
+ { int ret;
+ ret = slice_from_s(z, 2, s_10); /* <-, line 154 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
static int r_verb_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 159 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 159 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 160 */
- among_var = find_among_b(z, a_6, 120); /* substring, line 160 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 160 */
- switch(among_var) {
- case 0: { z->lb = m3; return 0; }
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 179 */
- if (ret < 0) return ret;
- }
- break;
- }
- z->lb = m3;
+ { int m3; /* setlimit, line 159 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 159 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 160 */
+ among_var = find_among_b(z, a_6, 120); /* substring, line 160 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 160 */
+ switch(among_var) {
+ case 0: { z->lb = m3; return 0; }
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 179 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ z->lb = m3;
}
return 1;
}
@@ -903,17 +903,17 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 184 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 187 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 187 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 187 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 187 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -925,139 +925,139 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 192 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 194 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 194 */
- if (ret < 0) return ret;
- }
- z->ket = z->c; /* [, line 194 */
- { int m = z->l - z->c; (void) m; /* or, line 194 */
- if (!(eq_s_b(z, 1, s_11))) goto lab1;
- z->bra = z->c; /* ], line 194 */
- { int m_test = z->l - z->c; /* test, line 194 */
- if (!(eq_s_b(z, 1, s_12))) goto lab1;
- z->c = z->l - m_test;
- }
- goto lab0;
- lab1:
- z->c = z->l - m;
- if (!(eq_s_b(z, 1, s_13))) return 0;
- z->bra = z->c; /* ], line 195 */
- { int m_test = z->l - z->c; /* test, line 195 */
- if (!(eq_s_b(z, 1, s_14))) return 0;
- z->c = z->l - m_test;
- }
- }
- lab0:
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 195 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 195 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 1, s_15); /* <-, line 196 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 194 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 194 */
+ if (ret < 0) return ret;
+ }
+ z->ket = z->c; /* [, line 194 */
+ { int m = z->l - z->c; (void) m; /* or, line 194 */
+ if (!(eq_s_b(z, 1, s_11))) goto lab1;
+ z->bra = z->c; /* ], line 194 */
+ { int m_test = z->l - z->c; /* test, line 194 */
+ if (!(eq_s_b(z, 1, s_12))) goto lab1;
+ z->c = z->l - m_test;
+ }
+ goto lab0;
+ lab1:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 1, s_13))) return 0;
+ z->bra = z->c; /* ], line 195 */
+ { int m_test = z->l - z->c; /* test, line 195 */
+ if (!(eq_s_b(z, 1, s_14))) return 0;
+ z->c = z->l - m_test;
+ }
+ }
+ lab0:
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 195 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 195 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 1, s_15); /* <-, line 196 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
extern int portuguese_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 202 */
- { int ret = r_prelude(z);
- if (ret == 0) goto lab0; /* call prelude, line 202 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 202 */
+ { int ret = r_prelude(z);
+ if (ret == 0) goto lab0; /* call prelude, line 202 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 203 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab1; /* call mark_regions, line 203 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 203 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab1; /* call mark_regions, line 203 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 204 */
- { int m = z->l - z->c; (void) m; /* do, line 205 */
- { int m = z->l - z->c; (void) m; /* or, line 209 */
- { int m = z->l - z->c; (void) m; /* and, line 207 */
- { int m = z->l - z->c; (void) m; /* or, line 206 */
- { int ret = r_standard_suffix(z);
- if (ret == 0) goto lab6; /* call standard_suffix, line 206 */
- if (ret < 0) return ret;
- }
- goto lab5;
- lab6:
- z->c = z->l - m;
- { int ret = r_verb_suffix(z);
- if (ret == 0) goto lab4; /* call verb_suffix, line 206 */
- if (ret < 0) return ret;
- }
- }
- lab5:
- z->c = z->l - m;
- { int m = z->l - z->c; (void) m; /* do, line 207 */
- z->ket = z->c; /* [, line 207 */
- if (!(eq_s_b(z, 1, s_16))) goto lab7;
- z->bra = z->c; /* ], line 207 */
- { int m_test = z->l - z->c; /* test, line 207 */
- if (!(eq_s_b(z, 1, s_17))) goto lab7;
- z->c = z->l - m_test;
- }
- { int ret = r_RV(z);
- if (ret == 0) goto lab7; /* call RV, line 207 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 207 */
- if (ret < 0) return ret;
- }
- lab7:
- z->c = z->l - m;
- }
- }
- goto lab3;
- lab4:
- z->c = z->l - m;
- { int ret = r_residual_suffix(z);
- if (ret == 0) goto lab2; /* call residual_suffix, line 209 */
- if (ret < 0) return ret;
- }
- }
+ { int m = z->l - z->c; (void) m; /* do, line 205 */
+ { int m = z->l - z->c; (void) m; /* or, line 209 */
+ { int m = z->l - z->c; (void) m; /* and, line 207 */
+ { int m = z->l - z->c; (void) m; /* or, line 206 */
+ { int ret = r_standard_suffix(z);
+ if (ret == 0) goto lab6; /* call standard_suffix, line 206 */
+ if (ret < 0) return ret;
+ }
+ goto lab5;
+ lab6:
+ z->c = z->l - m;
+ { int ret = r_verb_suffix(z);
+ if (ret == 0) goto lab4; /* call verb_suffix, line 206 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab5:
+ z->c = z->l - m;
+ { int m = z->l - z->c; (void) m; /* do, line 207 */
+ z->ket = z->c; /* [, line 207 */
+ if (!(eq_s_b(z, 1, s_16))) goto lab7;
+ z->bra = z->c; /* ], line 207 */
+ { int m_test = z->l - z->c; /* test, line 207 */
+ if (!(eq_s_b(z, 1, s_17))) goto lab7;
+ z->c = z->l - m_test;
+ }
+ { int ret = r_RV(z);
+ if (ret == 0) goto lab7; /* call RV, line 207 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 207 */
+ if (ret < 0) return ret;
+ }
+ lab7:
+ z->c = z->l - m;
+ }
+ }
+ goto lab3;
+ lab4:
+ z->c = z->l - m;
+ { int ret = r_residual_suffix(z);
+ if (ret == 0) goto lab2; /* call residual_suffix, line 209 */
+ if (ret < 0) return ret;
+ }
+ }
lab3:
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 211 */
- { int ret = r_residual_form(z);
- if (ret == 0) goto lab8; /* call residual_form, line 211 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 211 */
+ { int ret = r_residual_form(z);
+ if (ret == 0) goto lab8; /* call residual_form, line 211 */
+ if (ret < 0) return ret;
+ }
lab8:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
- { int c = z->c; /* do, line 213 */
- { int ret = r_postlude(z);
- if (ret == 0) goto lab9; /* call postlude, line 213 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 213 */
+ { int ret = r_postlude(z);
+ if (ret == 0) goto lab9; /* call postlude, line 213 */
+ if (ret < 0) return ret;
+ }
lab9:
- z->c = c;
+ z->c = c;
}
return 1;
}
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 15:12:19 2008
@@ -353,47 +353,47 @@
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
z->I[1] = z->l;
- { int c = z->c; /* do, line 61 */
- while(1) { /* gopast, line 62 */
- if (!(in_grouping_U(z, g_v, 1072, 1103))) goto lab1;
- break;
- lab1:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* gopast, line 62 */
- }
- }
- z->I[0] = z->c; /* setmark pV, line 62 */
- while(1) { /* gopast, line 62 */
- if (!(out_grouping_U(z, g_v, 1072, 1103))) goto lab2;
- break;
- lab2:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* gopast, line 62 */
- }
- }
- while(1) { /* gopast, line 63 */
- if (!(in_grouping_U(z, g_v, 1072, 1103))) goto lab3;
- break;
- lab3:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* gopast, line 63 */
- }
- }
- while(1) { /* gopast, line 63 */
- if (!(out_grouping_U(z, g_v, 1072, 1103))) goto lab4;
- break;
- lab4:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* gopast, line 63 */
- }
- }
- z->I[1] = z->c; /* setmark p2, line 63 */
+ { int c = z->c; /* do, line 61 */
+ while(1) { /* gopast, line 62 */
+ if (!(in_grouping_U(z, g_v, 1072, 1103))) goto lab1;
+ break;
+ lab1:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* gopast, line 62 */
+ }
+ }
+ z->I[0] = z->c; /* setmark pV, line 62 */
+ while(1) { /* gopast, line 62 */
+ if (!(out_grouping_U(z, g_v, 1072, 1103))) goto lab2;
+ break;
+ lab2:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* gopast, line 62 */
+ }
+ }
+ while(1) { /* gopast, line 63 */
+ if (!(in_grouping_U(z, g_v, 1072, 1103))) goto lab3;
+ break;
+ lab3:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* gopast, line 63 */
+ }
+ }
+ while(1) { /* gopast, line 63 */
+ if (!(out_grouping_U(z, g_v, 1072, 1103))) goto lab4;
+ break;
+ lab4:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* gopast, line 63 */
+ }
+ }
+ z->I[1] = z->c; /* setmark p2, line 63 */
lab0:
- z->c = c;
+ z->c = c;
}
return 1;
}
@@ -410,27 +410,27 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 72 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int m = z->l - z->c; (void) m; /* or, line 76 */
- if (!(eq_s_b(z, 2, s_0))) goto lab1;
- goto lab0;
- lab1:
- z->c = z->l - m;
- if (!(eq_s_b(z, 2, s_1))) return 0;
- }
- lab0:
- { int ret;
- ret = slice_del(z); /* delete, line 76 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_del(z); /* delete, line 83 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int m = z->l - z->c; (void) m; /* or, line 76 */
+ if (!(eq_s_b(z, 2, s_0))) goto lab1;
+ goto lab0;
+ lab1:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 2, s_1))) return 0;
+ }
+ lab0:
+ { int ret;
+ ret = slice_del(z); /* delete, line 76 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_del(z); /* delete, line 83 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -442,53 +442,53 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 88 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 97 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 97 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
static int r_adjectival(struct SN_env * z) {
int among_var;
- { int ret = r_adjective(z);
- if (ret == 0) return 0; /* call adjective, line 102 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 109 */
- z->ket = z->c; /* [, line 110 */
- among_var = find_among_b(z, a_2, 8); /* substring, line 110 */
- if (!(among_var)) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 110 */
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab0; }
- case 1:
- { int m = z->l - z->c; (void) m; /* or, line 115 */
- if (!(eq_s_b(z, 2, s_2))) goto lab2;
- goto lab1;
- lab2:
- z->c = z->l - m;
- if (!(eq_s_b(z, 2, s_3))) { z->c = z->l - m; goto lab0; }
- }
- lab1:
- { int ret;
- ret = slice_del(z); /* delete, line 115 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_del(z); /* delete, line 122 */
- if (ret < 0) return ret;
- }
- break;
- }
+ { int ret = r_adjective(z);
+ if (ret == 0) return 0; /* call adjective, line 102 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 109 */
+ z->ket = z->c; /* [, line 110 */
+ among_var = find_among_b(z, a_2, 8); /* substring, line 110 */
+ if (!(among_var)) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 110 */
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab0; }
+ case 1:
+ { int m = z->l - z->c; (void) m; /* or, line 115 */
+ if (!(eq_s_b(z, 2, s_2))) goto lab2;
+ goto lab1;
+ lab2:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 2, s_3))) { z->c = z->l - m; goto lab0; }
+ }
+ lab1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 115 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_del(z); /* delete, line 122 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
lab0:
- ;
+ ;
}
return 1;
}
@@ -500,13 +500,13 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 129 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 132 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 132 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -518,27 +518,27 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 137 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int m = z->l - z->c; (void) m; /* or, line 143 */
- if (!(eq_s_b(z, 2, s_4))) goto lab1;
- goto lab0;
- lab1:
- z->c = z->l - m;
- if (!(eq_s_b(z, 2, s_5))) return 0;
- }
- lab0:
- { int ret;
- ret = slice_del(z); /* delete, line 143 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_del(z); /* delete, line 151 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int m = z->l - z->c; (void) m; /* or, line 143 */
+ if (!(eq_s_b(z, 2, s_4))) goto lab1;
+ goto lab0;
+ lab1:
+ z->c = z->l - m;
+ if (!(eq_s_b(z, 2, s_5))) return 0;
+ }
+ lab0:
+ { int ret;
+ ret = slice_del(z); /* delete, line 143 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_del(z); /* delete, line 151 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -550,13 +550,13 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 160 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 167 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 167 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -567,18 +567,18 @@
among_var = find_among_b(z, a_6, 2); /* substring, line 176 */
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 176 */
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 176 */
- if (ret < 0) return ret;
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 176 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 179 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 179 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -590,127 +590,127 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 184 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 188 */
- if (ret < 0) return ret;
- }
- z->ket = z->c; /* [, line 189 */
- if (!(eq_s_b(z, 2, s_6))) return 0;
- z->bra = z->c; /* ], line 189 */
- if (!(eq_s_b(z, 2, s_7))) return 0;
- { int ret;
- ret = slice_del(z); /* delete, line 189 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- if (!(eq_s_b(z, 2, s_8))) return 0;
- { int ret;
- ret = slice_del(z); /* delete, line 192 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_del(z); /* delete, line 194 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 188 */
+ if (ret < 0) return ret;
+ }
+ z->ket = z->c; /* [, line 189 */
+ if (!(eq_s_b(z, 2, s_6))) return 0;
+ z->bra = z->c; /* ], line 189 */
+ if (!(eq_s_b(z, 2, s_7))) return 0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 189 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ if (!(eq_s_b(z, 2, s_8))) return 0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 192 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_del(z); /* delete, line 194 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
extern int russian_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 201 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab0; /* call mark_regions, line 201 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 201 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab0; /* call mark_regions, line 201 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 202 */
- { int m3; /* setlimit, line 202 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 202 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- { int m = z->l - z->c; (void) m; /* do, line 203 */
- { int m = z->l - z->c; (void) m; /* or, line 204 */
- { int ret = r_perfective_gerund(z);
- if (ret == 0) goto lab3; /* call perfective_gerund, line 204 */
- if (ret < 0) return ret;
- }
- goto lab2;
- lab3:
- z->c = z->l - m;
- { int m = z->l - z->c; (void) m; /* try, line 205 */
- { int ret = r_reflexive(z);
- if (ret == 0) { z->c = z->l - m; goto lab4; } /* call reflexive, line 205 */
- if (ret < 0) return ret;
- }
- lab4:
- ;
- }
- { int m = z->l - z->c; (void) m; /* or, line 206 */
- { int ret = r_adjectival(z);
- if (ret == 0) goto lab6; /* call adjectival, line 206 */
- if (ret < 0) return ret;
- }
- goto lab5;
- lab6:
- z->c = z->l - m;
- { int ret = r_verb(z);
- if (ret == 0) goto lab7; /* call verb, line 206 */
- if (ret < 0) return ret;
- }
- goto lab5;
- lab7:
- z->c = z->l - m;
- { int ret = r_noun(z);
- if (ret == 0) goto lab1; /* call noun, line 206 */
- if (ret < 0) return ret;
- }
- }
- lab5:
- ;
- }
- lab2:
- lab1:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* try, line 209 */
- z->ket = z->c; /* [, line 209 */
- if (!(eq_s_b(z, 2, s_9))) { z->c = z->l - m; goto lab8; }
- z->bra = z->c; /* ], line 209 */
- { int ret;
- ret = slice_del(z); /* delete, line 209 */
- if (ret < 0) return ret;
- }
- lab8:
- ;
- }
- { int m = z->l - z->c; (void) m; /* do, line 212 */
- { int ret = r_derivational(z);
- if (ret == 0) goto lab9; /* call derivational, line 212 */
- if (ret < 0) return ret;
- }
- lab9:
- z->c = z->l - m;
- }
- { int m = z->l - z->c; (void) m; /* do, line 213 */
- { int ret = r_tidy_up(z);
- if (ret == 0) goto lab10; /* call tidy_up, line 213 */
- if (ret < 0) return ret;
- }
- lab10:
- z->c = z->l - m;
- }
- z->lb = m3;
+ { int m3; /* setlimit, line 202 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 202 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ { int m = z->l - z->c; (void) m; /* do, line 203 */
+ { int m = z->l - z->c; (void) m; /* or, line 204 */
+ { int ret = r_perfective_gerund(z);
+ if (ret == 0) goto lab3; /* call perfective_gerund, line 204 */
+ if (ret < 0) return ret;
+ }
+ goto lab2;
+ lab3:
+ z->c = z->l - m;
+ { int m = z->l - z->c; (void) m; /* try, line 205 */
+ { int ret = r_reflexive(z);
+ if (ret == 0) { z->c = z->l - m; goto lab4; } /* call reflexive, line 205 */
+ if (ret < 0) return ret;
+ }
+ lab4:
+ ;
+ }
+ { int m = z->l - z->c; (void) m; /* or, line 206 */
+ { int ret = r_adjectival(z);
+ if (ret == 0) goto lab6; /* call adjectival, line 206 */
+ if (ret < 0) return ret;
+ }
+ goto lab5;
+ lab6:
+ z->c = z->l - m;
+ { int ret = r_verb(z);
+ if (ret == 0) goto lab7; /* call verb, line 206 */
+ if (ret < 0) return ret;
+ }
+ goto lab5;
+ lab7:
+ z->c = z->l - m;
+ { int ret = r_noun(z);
+ if (ret == 0) goto lab1; /* call noun, line 206 */
+ if (ret < 0) return ret;
+ }
+ }
+ lab5:
+ ;
+ }
+ lab2:
+ lab1:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 209 */
+ z->ket = z->c; /* [, line 209 */
+ if (!(eq_s_b(z, 2, s_9))) { z->c = z->l - m; goto lab8; }
+ z->bra = z->c; /* ], line 209 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 209 */
+ if (ret < 0) return ret;
+ }
+ lab8:
+ ;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 212 */
+ { int ret = r_derivational(z);
+ if (ret == 0) goto lab9; /* call derivational, line 212 */
+ if (ret < 0) return ret;
+ }
+ lab9:
+ z->c = z->l - m;
+ }
+ { int m = z->l - z->c; (void) m; /* do, line 213 */
+ { int ret = r_tidy_up(z);
+ if (ret == 0) goto lab10; /* call tidy_up, line 213 */
+ if (ret < 0) return ret;
+ }
+ lab10:
+ z->c = z->l - m;
+ }
+ z->lb = m3;
}
z->c = z->lb;
return 1;
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 15:12:19 2008
@@ -513,108 +513,108 @@
z->I[0] = z->l;
z->I[1] = z->l;
z->I[2] = z->l;
- { int c = z->c; /* do, line 37 */
- { int c = z->c; /* or, line 39 */
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab2;
- { int c = z->c; /* or, line 38 */
- if (!(out_grouping_U(z, g_v, 97, 252))) goto lab4;
- while(1) { /* gopast, line 38 */
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab5;
- break;
- lab5:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab4;
- z->c = c; /* gopast, line 38 */
- }
- }
- goto lab3;
- lab4:
- z->c = c;
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab2;
- while(1) { /* gopast, line 38 */
- if (!(out_grouping_U(z, g_v, 97, 252))) goto lab6;
- break;
- lab6:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab2;
- z->c = c; /* gopast, line 38 */
- }
- }
- }
- lab3:
- goto lab1;
- lab2:
- z->c = c;
- if (!(out_grouping_U(z, g_v, 97, 252))) goto lab0;
- { int c = z->c; /* or, line 40 */
- if (!(out_grouping_U(z, g_v, 97, 252))) goto lab8;
- while(1) { /* gopast, line 40 */
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab9;
- break;
- lab9:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab8;
- z->c = c; /* gopast, line 40 */
- }
- }
- goto lab7;
- lab8:
- z->c = c;
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab0;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 40 */
- }
- }
- lab7:
- ;
- }
+ { int c = z->c; /* do, line 37 */
+ { int c = z->c; /* or, line 39 */
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab2;
+ { int c = z->c; /* or, line 38 */
+ if (!(out_grouping_U(z, g_v, 97, 252))) goto lab4;
+ while(1) { /* gopast, line 38 */
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab5;
+ break;
+ lab5:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab4;
+ z->c = c; /* gopast, line 38 */
+ }
+ }
+ goto lab3;
+ lab4:
+ z->c = c;
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab2;
+ while(1) { /* gopast, line 38 */
+ if (!(out_grouping_U(z, g_v, 97, 252))) goto lab6;
+ break;
+ lab6:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab2;
+ z->c = c; /* gopast, line 38 */
+ }
+ }
+ }
+ lab3:
+ goto lab1;
+ lab2:
+ z->c = c;
+ if (!(out_grouping_U(z, g_v, 97, 252))) goto lab0;
+ { int c = z->c; /* or, line 40 */
+ if (!(out_grouping_U(z, g_v, 97, 252))) goto lab8;
+ while(1) { /* gopast, line 40 */
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab9;
+ break;
+ lab9:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab8;
+ z->c = c; /* gopast, line 40 */
+ }
+ }
+ goto lab7;
+ lab8:
+ z->c = c;
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab0;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 40 */
+ }
+ }
+ lab7:
+ ;
+ }
lab1:
- z->I[0] = z->c; /* setmark pV, line 41 */
+ z->I[0] = z->c; /* setmark pV, line 41 */
lab0:
- z->c = c;
+ z->c = c;
}
- { int c = z->c; /* do, line 43 */
- while(1) { /* gopast, line 44 */
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab11;
- break;
- lab11:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 44 */
- }
- }
- while(1) { /* gopast, line 44 */
- if (!(out_grouping_U(z, g_v, 97, 252))) goto lab12;
- break;
- lab12:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 44 */
- }
- }
- z->I[1] = z->c; /* setmark p1, line 44 */
- while(1) { /* gopast, line 45 */
- if (!(in_grouping_U(z, g_v, 97, 252))) goto lab13;
- break;
- lab13:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 45 */
- }
- }
- while(1) { /* gopast, line 45 */
- if (!(out_grouping_U(z, g_v, 97, 252))) goto lab14;
- break;
- lab14:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab10;
- z->c = c; /* gopast, line 45 */
- }
- }
- z->I[2] = z->c; /* setmark p2, line 45 */
+ { int c = z->c; /* do, line 43 */
+ while(1) { /* gopast, line 44 */
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab11;
+ break;
+ lab11:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 44 */
+ }
+ }
+ while(1) { /* gopast, line 44 */
+ if (!(out_grouping_U(z, g_v, 97, 252))) goto lab12;
+ break;
+ lab12:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 44 */
+ }
+ }
+ z->I[1] = z->c; /* setmark p1, line 44 */
+ while(1) { /* gopast, line 45 */
+ if (!(in_grouping_U(z, g_v, 97, 252))) goto lab13;
+ break;
+ lab13:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 45 */
+ }
+ }
+ while(1) { /* gopast, line 45 */
+ if (!(out_grouping_U(z, g_v, 97, 252))) goto lab14;
+ break;
+ lab14:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab10;
+ z->c = c; /* gopast, line 45 */
+ }
+ }
+ z->I[2] = z->c; /* setmark p2, line 45 */
lab10:
- z->c = c;
+ z->c = c;
}
return 1;
}
@@ -622,54 +622,54 @@
static int r_postlude(struct SN_env * z) {
int among_var;
while(1) { /* repeat, line 49 */
- int c = z->c;
- z->bra = z->c; /* [, line 50 */
- among_var = find_among(z, a_0, 6); /* substring, line 50 */
- if (!(among_var)) goto lab0;
- z->ket = z->c; /* ], line 50 */
- switch(among_var) {
- case 0: goto lab0;
- case 1:
- { int ret;
- ret = slice_from_s(z, 1, s_0); /* <-, line 51 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 1, s_1); /* <-, line 52 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 1, s_2); /* <-, line 53 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret;
- ret = slice_from_s(z, 1, s_3); /* <-, line 54 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret;
- ret = slice_from_s(z, 1, s_4); /* <-, line 55 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) goto lab0;
- z->c = c; /* next, line 57 */
- }
- break;
- }
- continue;
+ int c = z->c;
+ z->bra = z->c; /* [, line 50 */
+ among_var = find_among(z, a_0, 6); /* substring, line 50 */
+ if (!(among_var)) goto lab0;
+ z->ket = z->c; /* ], line 50 */
+ switch(among_var) {
+ case 0: goto lab0;
+ case 1:
+ { int ret;
+ ret = slice_from_s(z, 1, s_0); /* <-, line 51 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 1, s_1); /* <-, line 52 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 1, s_2); /* <-, line 53 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret;
+ ret = slice_from_s(z, 1, s_3); /* <-, line 54 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret;
+ ret = slice_from_s(z, 1, s_4); /* <-, line 55 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) goto lab0;
+ z->c = c; /* next, line 57 */
+ }
+ break;
+ }
+ continue;
lab0:
- z->c = c;
- break;
+ z->c = c;
+ break;
}
return 1;
}
@@ -696,60 +696,60 @@
z->bra = z->c; /* ], line 68 */
among_var = find_among_b(z, a_2, 11); /* substring, line 72 */
if (!(among_var)) return 0;
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 72 */
- if (ret < 0) return ret;
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 72 */
+ if (ret < 0) return ret;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- z->bra = z->c; /* ], line 73 */
- { int ret;
- ret = slice_from_s(z, 5, s_5); /* <-, line 73 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- z->bra = z->c; /* ], line 74 */
- { int ret;
- ret = slice_from_s(z, 4, s_6); /* <-, line 74 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- z->bra = z->c; /* ], line 75 */
- { int ret;
- ret = slice_from_s(z, 2, s_7); /* <-, line 75 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- z->bra = z->c; /* ], line 76 */
- { int ret;
- ret = slice_from_s(z, 2, s_8); /* <-, line 76 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- z->bra = z->c; /* ], line 77 */
- { int ret;
- ret = slice_from_s(z, 2, s_9); /* <-, line 77 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret;
- ret = slice_del(z); /* delete, line 81 */
- if (ret < 0) return ret;
- }
- break;
- case 7:
- if (!(eq_s_b(z, 1, s_10))) return 0;
- { int ret;
- ret = slice_del(z); /* delete, line 82 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ z->bra = z->c; /* ], line 73 */
+ { int ret;
+ ret = slice_from_s(z, 5, s_5); /* <-, line 73 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ z->bra = z->c; /* ], line 74 */
+ { int ret;
+ ret = slice_from_s(z, 4, s_6); /* <-, line 74 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ z->bra = z->c; /* ], line 75 */
+ { int ret;
+ ret = slice_from_s(z, 2, s_7); /* <-, line 75 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ z->bra = z->c; /* ], line 76 */
+ { int ret;
+ ret = slice_from_s(z, 2, s_8); /* <-, line 76 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ z->bra = z->c; /* ], line 77 */
+ { int ret;
+ ret = slice_from_s(z, 2, s_9); /* <-, line 77 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret;
+ ret = slice_del(z); /* delete, line 81 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 7:
+ if (!(eq_s_b(z, 1, s_10))) return 0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 82 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -761,270 +761,270 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 87 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 99 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 99 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 105 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 105 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 106 */
- z->ket = z->c; /* [, line 106 */
- if (!(eq_s_b(z, 2, s_11))) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 106 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab0; } /* call R2, line 106 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 106 */
- if (ret < 0) return ret;
- }
- lab0:
- ;
- }
- break;
- case 3:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 111 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 3, s_12); /* <-, line 111 */
- if (ret < 0) return ret;
- }
- break;
- case 4:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 115 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 1, s_13); /* <-, line 115 */
- if (ret < 0) return ret;
- }
- break;
- case 5:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 119 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_from_s(z, 4, s_14); /* <-, line 119 */
- if (ret < 0) return ret;
- }
- break;
- case 6:
- { int ret = r_R1(z);
- if (ret == 0) return 0; /* call R1, line 123 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 123 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 124 */
- z->ket = z->c; /* [, line 125 */
- among_var = find_among_b(z, a_3, 4); /* substring, line 125 */
- if (!(among_var)) { z->c = z->l - m; goto lab1; }
- z->bra = z->c; /* ], line 125 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab1; } /* call R2, line 125 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 125 */
- if (ret < 0) return ret;
- }
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab1; }
- case 1:
- z->ket = z->c; /* [, line 126 */
- if (!(eq_s_b(z, 2, s_15))) { z->c = z->l - m; goto lab1; }
- z->bra = z->c; /* ], line 126 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab1; } /* call R2, line 126 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 126 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab1:
- ;
- }
- break;
- case 7:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 135 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 135 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 136 */
- z->ket = z->c; /* [, line 137 */
- among_var = find_among_b(z, a_4, 3); /* substring, line 137 */
- if (!(among_var)) { z->c = z->l - m; goto lab2; }
- z->bra = z->c; /* ], line 137 */
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab2; }
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab2; } /* call R2, line 140 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 140 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab2:
- ;
- }
- break;
- case 8:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 147 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 147 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 148 */
- z->ket = z->c; /* [, line 149 */
- among_var = find_among_b(z, a_5, 3); /* substring, line 149 */
- if (!(among_var)) { z->c = z->l - m; goto lab3; }
- z->bra = z->c; /* ], line 149 */
- switch(among_var) {
- case 0: { z->c = z->l - m; goto lab3; }
- case 1:
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 152 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 152 */
- if (ret < 0) return ret;
- }
- break;
- }
- lab3:
- ;
- }
- break;
- case 9:
- { int ret = r_R2(z);
- if (ret == 0) return 0; /* call R2, line 159 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 159 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 160 */
- z->ket = z->c; /* [, line 161 */
- if (!(eq_s_b(z, 2, s_16))) { z->c = z->l - m; goto lab4; }
- z->bra = z->c; /* ], line 161 */
- { int ret = r_R2(z);
- if (ret == 0) { z->c = z->l - m; goto lab4; } /* call R2, line 161 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 161 */
- if (ret < 0) return ret;
- }
- lab4:
- ;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 99 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 99 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 105 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 105 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 106 */
+ z->ket = z->c; /* [, line 106 */
+ if (!(eq_s_b(z, 2, s_11))) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 106 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab0; } /* call R2, line 106 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 106 */
+ if (ret < 0) return ret;
+ }
+ lab0:
+ ;
+ }
+ break;
+ case 3:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 111 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 3, s_12); /* <-, line 111 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 4:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 115 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 1, s_13); /* <-, line 115 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 5:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 119 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_from_s(z, 4, s_14); /* <-, line 119 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 6:
+ { int ret = r_R1(z);
+ if (ret == 0) return 0; /* call R1, line 123 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 123 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 124 */
+ z->ket = z->c; /* [, line 125 */
+ among_var = find_among_b(z, a_3, 4); /* substring, line 125 */
+ if (!(among_var)) { z->c = z->l - m; goto lab1; }
+ z->bra = z->c; /* ], line 125 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab1; } /* call R2, line 125 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 125 */
+ if (ret < 0) return ret;
+ }
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab1; }
+ case 1:
+ z->ket = z->c; /* [, line 126 */
+ if (!(eq_s_b(z, 2, s_15))) { z->c = z->l - m; goto lab1; }
+ z->bra = z->c; /* ], line 126 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab1; } /* call R2, line 126 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 126 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab1:
+ ;
+ }
+ break;
+ case 7:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 135 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 135 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 136 */
+ z->ket = z->c; /* [, line 137 */
+ among_var = find_among_b(z, a_4, 3); /* substring, line 137 */
+ if (!(among_var)) { z->c = z->l - m; goto lab2; }
+ z->bra = z->c; /* ], line 137 */
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab2; }
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab2; } /* call R2, line 140 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 140 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab2:
+ ;
+ }
+ break;
+ case 8:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 147 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 147 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 148 */
+ z->ket = z->c; /* [, line 149 */
+ among_var = find_among_b(z, a_5, 3); /* substring, line 149 */
+ if (!(among_var)) { z->c = z->l - m; goto lab3; }
+ z->bra = z->c; /* ], line 149 */
+ switch(among_var) {
+ case 0: { z->c = z->l - m; goto lab3; }
+ case 1:
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab3; } /* call R2, line 152 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 152 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ lab3:
+ ;
+ }
+ break;
+ case 9:
+ { int ret = r_R2(z);
+ if (ret == 0) return 0; /* call R2, line 159 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 159 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 160 */
+ z->ket = z->c; /* [, line 161 */
+ if (!(eq_s_b(z, 2, s_16))) { z->c = z->l - m; goto lab4; }
+ z->bra = z->c; /* ], line 161 */
+ { int ret = r_R2(z);
+ if (ret == 0) { z->c = z->l - m; goto lab4; } /* call R2, line 161 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 161 */
+ if (ret < 0) return ret;
+ }
+ lab4:
+ ;
+ }
+ break;
}
return 1;
}
static int r_y_verb_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 168 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 168 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 168 */
- among_var = find_among_b(z, a_7, 12); /* substring, line 168 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 168 */
- z->lb = m3;
+ { int m3; /* setlimit, line 168 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 168 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 168 */
+ among_var = find_among_b(z, a_7, 12); /* substring, line 168 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 168 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- if (!(eq_s_b(z, 1, s_17))) return 0;
- { int ret;
- ret = slice_del(z); /* delete, line 171 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ if (!(eq_s_b(z, 1, s_17))) return 0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 171 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
static int r_verb_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 176 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 176 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 176 */
- among_var = find_among_b(z, a_8, 96); /* substring, line 176 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 176 */
- z->lb = m3;
+ { int m3; /* setlimit, line 176 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 176 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 176 */
+ among_var = find_among_b(z, a_8, 96); /* substring, line 176 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 176 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int m = z->l - z->c; (void) m; /* try, line 179 */
- if (!(eq_s_b(z, 1, s_18))) { z->c = z->l - m; goto lab0; }
- { int m_test = z->l - z->c; /* test, line 179 */
- if (!(eq_s_b(z, 1, s_19))) { z->c = z->l - m; goto lab0; }
- z->c = z->l - m_test;
- }
- lab0:
- ;
- }
- z->bra = z->c; /* ], line 179 */
- { int ret;
- ret = slice_del(z); /* delete, line 179 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_del(z); /* delete, line 200 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int m = z->l - z->c; (void) m; /* try, line 179 */
+ if (!(eq_s_b(z, 1, s_18))) { z->c = z->l - m; goto lab0; }
+ { int m_test = z->l - z->c; /* test, line 179 */
+ if (!(eq_s_b(z, 1, s_19))) { z->c = z->l - m; goto lab0; }
+ z->c = z->l - m_test;
+ }
+ lab0:
+ ;
+ }
+ z->bra = z->c; /* ], line 179 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 179 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_del(z); /* delete, line 200 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
@@ -1036,110 +1036,110 @@
if (!(among_var)) return 0;
z->bra = z->c; /* ], line 205 */
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 208 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 208 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret = r_RV(z);
- if (ret == 0) return 0; /* call RV, line 210 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 210 */
- if (ret < 0) return ret;
- }
- { int m = z->l - z->c; (void) m; /* try, line 210 */
- z->ket = z->c; /* [, line 210 */
- if (!(eq_s_b(z, 1, s_20))) { z->c = z->l - m; goto lab0; }
- z->bra = z->c; /* ], line 210 */
- { int m_test = z->l - z->c; /* test, line 210 */
- if (!(eq_s_b(z, 1, s_21))) { z->c = z->l - m; goto lab0; }
- z->c = z->l - m_test;
- }
- { int ret = r_RV(z);
- if (ret == 0) { z->c = z->l - m; goto lab0; } /* call RV, line 210 */
- if (ret < 0) return ret;
- }
- { int ret;
- ret = slice_del(z); /* delete, line 210 */
- if (ret < 0) return ret;
- }
- lab0:
- ;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 208 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 208 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret = r_RV(z);
+ if (ret == 0) return 0; /* call RV, line 210 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 210 */
+ if (ret < 0) return ret;
+ }
+ { int m = z->l - z->c; (void) m; /* try, line 210 */
+ z->ket = z->c; /* [, line 210 */
+ if (!(eq_s_b(z, 1, s_20))) { z->c = z->l - m; goto lab0; }
+ z->bra = z->c; /* ], line 210 */
+ { int m_test = z->l - z->c; /* test, line 210 */
+ if (!(eq_s_b(z, 1, s_21))) { z->c = z->l - m; goto lab0; }
+ z->c = z->l - m_test;
+ }
+ { int ret = r_RV(z);
+ if (ret == 0) { z->c = z->l - m; goto lab0; } /* call RV, line 210 */
+ if (ret < 0) return ret;
+ }
+ { int ret;
+ ret = slice_del(z); /* delete, line 210 */
+ if (ret < 0) return ret;
+ }
+ lab0:
+ ;
+ }
+ break;
}
return 1;
}
extern int spanish_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 216 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab0; /* call mark_regions, line 216 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 216 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab0; /* call mark_regions, line 216 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 217 */
- { int m = z->l - z->c; (void) m; /* do, line 218 */
- { int ret = r_attached_pronoun(z);
- if (ret == 0) goto lab1; /* call attached_pronoun, line 218 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 218 */
+ { int ret = r_attached_pronoun(z);
+ if (ret == 0) goto lab1; /* call attached_pronoun, line 218 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 219 */
- { int m = z->l - z->c; (void) m; /* or, line 219 */
- { int ret = r_standard_suffix(z);
- if (ret == 0) goto lab4; /* call standard_suffix, line 219 */
- if (ret < 0) return ret;
- }
- goto lab3;
- lab4:
- z->c = z->l - m;
- { int ret = r_y_verb_suffix(z);
- if (ret == 0) goto lab5; /* call y_verb_suffix, line 220 */
- if (ret < 0) return ret;
- }
- goto lab3;
- lab5:
- z->c = z->l - m;
- { int ret = r_verb_suffix(z);
- if (ret == 0) goto lab2; /* call verb_suffix, line 221 */
- if (ret < 0) return ret;
- }
- }
+ { int m = z->l - z->c; (void) m; /* do, line 219 */
+ { int m = z->l - z->c; (void) m; /* or, line 219 */
+ { int ret = r_standard_suffix(z);
+ if (ret == 0) goto lab4; /* call standard_suffix, line 219 */
+ if (ret < 0) return ret;
+ }
+ goto lab3;
+ lab4:
+ z->c = z->l - m;
+ { int ret = r_y_verb_suffix(z);
+ if (ret == 0) goto lab5; /* call y_verb_suffix, line 220 */
+ if (ret < 0) return ret;
+ }
+ goto lab3;
+ lab5:
+ z->c = z->l - m;
+ { int ret = r_verb_suffix(z);
+ if (ret == 0) goto lab2; /* call verb_suffix, line 221 */
+ if (ret < 0) return ret;
+ }
+ }
lab3:
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 223 */
- { int ret = r_residual_suffix(z);
- if (ret == 0) goto lab6; /* call residual_suffix, line 223 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 223 */
+ { int ret = r_residual_suffix(z);
+ if (ret == 0) goto lab6; /* call residual_suffix, line 223 */
+ if (ret < 0) return ret;
+ }
lab6:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
- { int c = z->c; /* do, line 225 */
- { int ret = r_postlude(z);
- if (ret == 0) goto lab7; /* call postlude, line 225 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 225 */
+ { int ret = r_postlude(z);
+ if (ret == 0) goto lab7; /* call postlude, line 225 */
+ if (ret < 0) return ret;
+ }
lab7:
- z->c = c;
+ z->c = c;
}
return 1;
}
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 15:12:19 2008
@@ -147,34 +147,34 @@
static int r_mark_regions(struct SN_env * z) {
z->I[0] = z->l;
- { int c_test = z->c; /* test, line 29 */
- { int c = skip_utf8(z->p, z->c, 0, z->l, + 3);
- if (c < 0) return 0;
- z->c = c; /* hop, line 29 */
- }
- z->I[1] = z->c; /* setmark x, line 29 */
- z->c = c_test;
+ { int c_test = z->c; /* test, line 29 */
+ { int c = skip_utf8(z->p, z->c, 0, z->l, + 3);
+ if (c < 0) return 0;
+ z->c = c; /* hop, line 29 */
+ }
+ z->I[1] = z->c; /* setmark x, line 29 */
+ z->c = c_test;
}
while(1) { /* goto, line 30 */
- int c = z->c;
- if (!(in_grouping_U(z, g_v, 97, 246))) goto lab0;
- z->c = c;
- break;
+ int c = z->c;
+ if (!(in_grouping_U(z, g_v, 97, 246))) goto lab0;
+ z->c = c;
+ break;
lab0:
- z->c = c;
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* goto, line 30 */
- }
+ z->c = c;
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* goto, line 30 */
+ }
}
while(1) { /* gopast, line 30 */
- if (!(out_grouping_U(z, g_v, 97, 246))) goto lab1;
- break;
+ if (!(out_grouping_U(z, g_v, 97, 246))) goto lab1;
+ break;
lab1:
- { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
- if (c < 0) return 0;
- z->c = c; /* gopast, line 30 */
- }
+ { int c = skip_utf8(z->p, z->c, 0, z->l, 1);
+ if (c < 0) return 0;
+ z->c = c; /* gopast, line 30 */
+ }
}
z->I[0] = z->c; /* setmark p1, line 30 */
/* try, line 31 */
@@ -186,135 +186,135 @@
static int r_main_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 37 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 37 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 37 */
- among_var = find_among_b(z, a_0, 37); /* substring, line 37 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 37 */
- z->lb = m3;
+ { int m3; /* setlimit, line 37 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 37 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 37 */
+ among_var = find_among_b(z, a_0, 37); /* substring, line 37 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 37 */
+ z->lb = m3;
}
switch(among_var) {
- case 0: return 0;
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 44 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- if (!(in_grouping_b_U(z, g_s_ending, 98, 121))) return 0;
- { int ret;
- ret = slice_del(z); /* delete, line 46 */
- if (ret < 0) return ret;
- }
- break;
+ case 0: return 0;
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 44 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ if (!(in_grouping_b_U(z, g_s_ending, 98, 121))) return 0;
+ { int ret;
+ ret = slice_del(z); /* delete, line 46 */
+ if (ret < 0) return ret;
+ }
+ break;
}
return 1;
}
static int r_consonant_pair(struct SN_env * z) {
- { int m3; /* setlimit, line 50 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 50 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- { int m = z->l - z->c; (void) m; /* and, line 52 */
- if (!(find_among_b(z, a_1, 7))) { z->lb = m3; return 0; } /* among, line 51 */
- z->c = z->l - m;
- z->ket = z->c; /* [, line 52 */
- { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
- if (c < 0) { z->lb = m3; return 0; }
- z->c = c; /* next, line 52 */
- }
- z->bra = z->c; /* ], line 52 */
- { int ret;
- ret = slice_del(z); /* delete, line 52 */
- if (ret < 0) return ret;
- }
- }
- z->lb = m3;
+ { int m3; /* setlimit, line 50 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 50 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ { int m = z->l - z->c; (void) m; /* and, line 52 */
+ if (!(find_among_b(z, a_1, 7))) { z->lb = m3; return 0; } /* among, line 51 */
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 52 */
+ { int c = skip_utf8(z->p, z->c, z->lb, 0, -1);
+ if (c < 0) { z->lb = m3; return 0; }
+ z->c = c; /* next, line 52 */
+ }
+ z->bra = z->c; /* ], line 52 */
+ { int ret;
+ ret = slice_del(z); /* delete, line 52 */
+ if (ret < 0) return ret;
+ }
+ }
+ z->lb = m3;
}
return 1;
}
static int r_other_suffix(struct SN_env * z) {
int among_var;
- { int m3; /* setlimit, line 55 */
- int m = z->l - z->c; (void) m;
- if (z->c < z->I[0]) return 0;
- z->c = z->I[0]; /* tomark, line 55 */
- m3 = z->lb; z->lb = z->c;
- z->c = z->l - m;
- z->ket = z->c; /* [, line 56 */
- among_var = find_among_b(z, a_2, 5); /* substring, line 56 */
- if (!(among_var)) { z->lb = m3; return 0; }
- z->bra = z->c; /* ], line 56 */
- switch(among_var) {
- case 0: { z->lb = m3; return 0; }
- case 1:
- { int ret;
- ret = slice_del(z); /* delete, line 57 */
- if (ret < 0) return ret;
- }
- break;
- case 2:
- { int ret;
- ret = slice_from_s(z, 4, s_0); /* <-, line 58 */
- if (ret < 0) return ret;
- }
- break;
- case 3:
- { int ret;
- ret = slice_from_s(z, 4, s_1); /* <-, line 59 */
- if (ret < 0) return ret;
- }
- break;
- }
- z->lb = m3;
+ { int m3; /* setlimit, line 55 */
+ int m = z->l - z->c; (void) m;
+ if (z->c < z->I[0]) return 0;
+ z->c = z->I[0]; /* tomark, line 55 */
+ m3 = z->lb; z->lb = z->c;
+ z->c = z->l - m;
+ z->ket = z->c; /* [, line 56 */
+ among_var = find_among_b(z, a_2, 5); /* substring, line 56 */
+ if (!(among_var)) { z->lb = m3; return 0; }
+ z->bra = z->c; /* ], line 56 */
+ switch(among_var) {
+ case 0: { z->lb = m3; return 0; }
+ case 1:
+ { int ret;
+ ret = slice_del(z); /* delete, line 57 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 2:
+ { int ret;
+ ret = slice_from_s(z, 4, s_0); /* <-, line 58 */
+ if (ret < 0) return ret;
+ }
+ break;
+ case 3:
+ { int ret;
+ ret = slice_from_s(z, 4, s_1); /* <-, line 59 */
+ if (ret < 0) return ret;
+ }
+ break;
+ }
+ z->lb = m3;
}
return 1;
}
extern int swedish_UTF_8_stem(struct SN_env * z) {
- { int c = z->c; /* do, line 66 */
- { int ret = r_mark_regions(z);
- if (ret == 0) goto lab0; /* call mark_regions, line 66 */
- if (ret < 0) return ret;
- }
+ { int c = z->c; /* do, line 66 */
+ { int ret = r_mark_regions(z);
+ if (ret == 0) goto lab0; /* call mark_regions, line 66 */
+ if (ret < 0) return ret;
+ }
lab0:
- z->c = c;
+ z->c = c;
}
z->lb = z->c; z->c = z->l; /* backwards, line 67 */
- { int m = z->l - z->c; (void) m; /* do, line 68 */
- { int ret = r_main_suffix(z);
- if (ret == 0) goto lab1; /* call main_suffix, line 68 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 68 */
+ { int ret = r_main_suffix(z);
+ if (ret == 0) goto lab1; /* call main_suffix, line 68 */
+ if (ret < 0) return ret;
+ }
lab1:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 69 */
- { int ret = r_consonant_pair(z);
- if (ret == 0) goto lab2; /* call consonant_pair, line 69 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 69 */
+ { int ret = r_consonant_pair(z);
+ if (ret == 0) goto lab2; /* call consonant_pair, line 69 */
+ if (ret < 0) return ret;
+ }
lab2:
- z->c = z->l - m;
+ z->c = z->l - m;
}
- { int m = z->l - z->c; (void) m; /* do, line 70 */
- { int ret = r_other_suffix(z);
- if (ret == 0) goto lab3; /* call other_suffix, line 70 */
- if (ret < 0) return ret;
- }
+ { int m = z->l - z->c; (void) m; /* do, line 70 */
+ { int ret = r_other_suffix(z);
+ if (ret == 0) goto lab3; /* call other_suffix, line 70 */
+ if (ret < 0) return ret;
+ }
lab3:
- z->c = z->l - m;
+ z->c = z->l - m;
}
z->c = z->lb;
return 1;
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 15:12:19 2008
@@ -48,30 +48,30 @@
extern int skip_utf8(const symbol * p, int c, int lb, int l, int n) {
int b;
if (n >= 0) {
- for (; n > 0; n--) {
- if (c >= l) return -1;
- b = p[c++];
- if (b >= 0xC0) { /* 1100 0000 */
- while (c < l) {
- b = p[c];
- if (b >= 0xC0 || b < 0x80) break;
- /* break unless b is 10------ */
- c++;
- }
- }
- }
+ for (; n > 0; n--) {
+ if (c >= l) return -1;
+ b = p[c++];
+ if (b >= 0xC0) { /* 1100 0000 */
+ while (c < l) {
+ b = p[c];
+ if (b >= 0xC0 || b < 0x80) break;
+ /* break unless b is 10------ */
+ c++;
+ }
+ }
+ }
} else {
- for (; n < 0; n++) {
- if (c <= lb) return -1;
- b = p[--c];
- if (b >= 0x80) { /* 1000 0000 */
- while (c > lb) {
- b = p[c];
- if (b >= 0xC0) break; /* 1100 0000 */
- c--;
- }
- }
- }
+ for (; n < 0; n++) {
+ if (c <= lb) return -1;
+ b = p[--c];
+ if (b >= 0x80) { /* 1000 0000 */
+ while (c > lb) {
+ b = p[c];
+ if (b >= 0xC0) break; /* 1100 0000 */
+ c--;
+ }
+ }
+ }
}
return c;
}
@@ -82,12 +82,12 @@
int b0, b1;
if (c >= l) return 0;
b0 = p[c++];
- if (b0 < 0xC0 || c == l) { /* 1100 0000 */
- * slot = b0; return 1;
+ if (b0 < 0xC0 || c == l) { /* 1100 0000 */
+ * slot = b0; return 1;
}
b1 = p[c++];
- if (b0 < 0xE0 || c == l) { /* 1110 0000 */
- * slot = (b0 & 0x1F) << 6 | (b1 & 0x3F); return 2;
+ if (b0 < 0xE0 || c == l) { /* 1110 0000 */
+ * slot = (b0 & 0x1F) << 6 | (b1 & 0x3F); return 2;
}
* slot = (b0 & 0xF) << 12 | (b1 & 0x3F) << 6 | (*p & 0x3F); return 3;
}
@@ -97,11 +97,11 @@
if (c <= lb) return 0;
b0 = p[--c];
if (b0 < 0x80 || c == lb) { /* 1000 0000 */
- * slot = b0; return 1;
+ * slot = b0; return 1;
}
b1 = p[--c];
if (b1 >= 0xC0 || c == lb) { /* 1100 0000 */
- * slot = (b1 & 0x1F) << 6 | (b0 & 0x3F); return 2;
+ * slot = (b1 & 0x1F) << 6 | (b0 & 0x3F); return 2;
}
* slot = (*p & 0xF) << 12 | (b1 & 0x3F) << 6 | (b0 & 0x3F); return 3;
}
@@ -206,45 +206,45 @@
int first_key_inspected = 0;
while(1) {
- int k = i + ((j - i) >> 1);
- int diff = 0;
- int common = common_i < common_j ? common_i : common_j; /* smaller */
- w = v + k;
- {
- int i; for (i = common; i < w->s_size; i++) {
- if (c + common == l) { diff = -1; break; }
- diff = q[common] - w->s[i];
- if (diff != 0) break;
- common++;
- }
- }
- if (diff < 0) { j = k; common_j = common; }
- else { i = k; common_i = common; }
- if (j - i <= 1) {
- if (i > 0) break; /* v->s has been inspected */
- if (j == i) break; /* only one item in v */
-
- /* - but now we need to go round once more to get
- v->s inspected. This looks messy, but is actually
- the optimal approach. */
-
- if (first_key_inspected) break;
- first_key_inspected = 1;
- }
+ int k = i + ((j - i) >> 1);
+ int diff = 0;
+ int common = common_i < common_j ? common_i : common_j; /* smaller */
+ w = v + k;
+ {
+ int i; for (i = common; i < w->s_size; i++) {
+ if (c + common == l) { diff = -1; break; }
+ diff = q[common] - w->s[i];
+ if (diff != 0) break;
+ common++;
+ }
+ }
+ if (diff < 0) { j = k; common_j = common; }
+ else { i = k; common_i = common; }
+ if (j - i <= 1) {
+ if (i > 0) break; /* v->s has been inspected */
+ if (j == i) break; /* only one item in v */
+
+ /* - but now we need to go round once more to get
+ v->s inspected. This looks messy, but is actually
+ the optimal approach. */
+
+ if (first_key_inspected) break;
+ first_key_inspected = 1;
+ }
}
while(1) {
- w = v + i;
- if (common_i >= w->s_size) {
- z->c = c + w->s_size;
- if (w->function == 0) return w->result;
- {
- int res = w->function(z);
- z->c = c + w->s_size;
- if (res) return w->result;
- }
- }
- i = w->substring_i;
- if (i < 0) return 0;
+ w = v + i;
+ if (common_i >= w->s_size) {
+ z->c = c + w->s_size;
+ if (w->function == 0) return w->result;
+ {
+ int res = w->function(z);
+ z->c = c + w->s_size;
+ if (res) return w->result;
+ }
+ }
+ i = w->substring_i;
+ if (i < 0) return 0;
}
}
@@ -266,40 +266,40 @@
int first_key_inspected = 0;
while(1) {
- int k = i + ((j - i) >> 1);
- int diff = 0;
- int common = common_i < common_j ? common_i : common_j;
- w = v + k;
- {
- int i; for (i = w->s_size - 1 - common; i >= 0; i--) {
- if (c - common == lb) { diff = -1; break; }
- diff = q[- common] - w->s[i];
- if (diff != 0) break;
- common++;
- }
- }
- if (diff < 0) { j = k; common_j = common; }
- else { i = k; common_i = common; }
- if (j - i <= 1) {
- if (i > 0) break;
- if (j == i) break;
- if (first_key_inspected) break;
- first_key_inspected = 1;
- }
+ int k = i + ((j - i) >> 1);
+ int diff = 0;
+ int common = common_i < common_j ? common_i : common_j;
+ w = v + k;
+ {
+ int i; for (i = w->s_size - 1 - common; i >= 0; i--) {
+ if (c - common == lb) { diff = -1; break; }
+ diff = q[- common] - w->s[i];
+ if (diff != 0) break;
+ common++;
+ }
+ }
+ if (diff < 0) { j = k; common_j = common; }
+ else { i = k; common_i = common; }
+ if (j - i <= 1) {
+ if (i > 0) break;
+ if (j == i) break;
+ if (first_key_inspected) break;
+ first_key_inspected = 1;
+ }
}
while(1) {
- w = v + i;
- if (common_i >= w->s_size) {
- z->c = c - w->s_size;
- if (w->function == 0) return w->result;
- {
- int res = w->function(z);
- z->c = c - w->s_size;
- if (res) return w->result;
- }
- }
- i = w->substring_i;
- if (i < 0) return 0;
+ w = v + i;
+ if (common_i >= w->s_size) {
+ z->c = c - w->s_size;
+ if (w->function == 0) return w->result;
+ {
+ int res = w->function(z);
+ z->c = c - w->s_size;
+ if (res) return w->result;
+ }
+ }
+ i = w->substring_i;
+ if (i < 0) return 0;
}
}
@@ -311,10 +311,10 @@
symbol * q;
int new_size = n + 20;
void * mem = realloc((char *) p - HEAD,
- HEAD + (new_size + 1) * sizeof(symbol));
+ HEAD + (new_size + 1) * sizeof(symbol));
if (mem == NULL) {
- lose_s(p);
- return NULL;
+ lose_s(p);
+ return NULL;
}
q = (symbol *) (HEAD + (char *)mem);
CAPACITY(q) = new_size;
@@ -331,46 +331,46 @@
int adjustment;
int len;
if (z->p == NULL) {
- z->p = create_s();
- if (z->p == NULL) return -1;
+ z->p = create_s();
+ if (z->p == NULL) return -1;
}
adjustment = s_size - (c_ket - c_bra);
len = SIZE(z->p);
if (adjustment != 0) {
- if (adjustment + len > CAPACITY(z->p)) {
- z->p = increase_size(z->p, adjustment + len);
- if (z->p == NULL) return -1;
- }
- memmove(z->p + c_ket + adjustment,
- z->p + c_ket,
- (len - c_ket) * sizeof(symbol));
- SET_SIZE(z->p, adjustment + len);
- z->l += adjustment;
- if (z->c >= c_ket)
- z->c += adjustment;
- else
- if (z->c > c_bra)
- z->c = c_bra;
+ if (adjustment + len > CAPACITY(z->p)) {
+ z->p = increase_size(z->p, adjustment + len);
+ if (z->p == NULL) return -1;
+ }
+ memmove(z->p + c_ket + adjustment,
+ z->p + c_ket,
+ (len - c_ket) * sizeof(symbol));
+ SET_SIZE(z->p, adjustment + len);
+ z->l += adjustment;
+ if (z->c >= c_ket)
+ z->c += adjustment;
+ else
+ if (z->c > c_bra)
+ z->c = c_bra;
}
unless (s_size == 0) memmove(z->p + c_bra, s, s_size * sizeof(symbol));
if (adjptr != NULL)
- *adjptr = adjustment;
+ *adjptr = adjustment;
return 0;
}
static int slice_check(struct SN_env * z) {
if (z->bra < 0 ||
- z->bra > z->ket ||
- z->ket > z->l ||
- z->p == NULL ||
- z->l > SIZE(z->p)) /* this line could be removed */
+ z->bra > z->ket ||
+ z->ket > z->l ||
+ z->p == NULL ||
+ z->l > SIZE(z->p)) /* this line could be removed */
{
#if 0
- fprintf(stderr, "faulty slice operation:\n");
- debug(z, -1, 0);
+ fprintf(stderr, "faulty slice operation:\n");
+ debug(z, -1, 0);
#endif
- return -1;
+ return -1;
}
return 0;
}
@@ -391,7 +391,7 @@
extern int insert_s(struct SN_env * z, int bra, int ket, int s_size, symbol * s) {
int adjustment;
if (replace_s(z, bra, ket, s_size, s, &adjustment))
- return -1;
+ return -1;
if (bra <= z->bra) z->bra += adjustment;
if (bra <= z->ket) z->ket += adjustment;
return 0;
@@ -400,7 +400,7 @@
extern int insert_v(struct SN_env * z, int bra, int ket, symbol * p) {
int adjustment;
if (replace_s(z, bra, ket, SIZE(p), p, &adjustment))
- return -1;
+ return -1;
if (bra <= z->bra) z->bra += adjustment;
if (bra <= z->ket) z->ket += adjustment;
return 0;
@@ -408,18 +408,18 @@
extern symbol * slice_to(struct SN_env * z, symbol * p) {
if (slice_check(z)) {
- lose_s(p);
- return NULL;
+ lose_s(p);
+ return NULL;
}
{
- int len = z->ket - z->bra;
- if (CAPACITY(p) < len) {
- p = increase_size(p, len);
- if (p == NULL)
- return NULL;
- }
- memmove(p, z->p + z->bra, len * sizeof(symbol));
- SET_SIZE(p, len);
+ int len = z->ket - z->bra;
+ if (CAPACITY(p) < len) {
+ p = increase_size(p, len);
+ if (p == NULL)
+ return NULL;
+ }
+ memmove(p, z->p + z->bra, len * sizeof(symbol));
+ SET_SIZE(p, len);
}
return p;
}
@@ -427,9 +427,9 @@
extern symbol * assign_to(struct SN_env * z, symbol * p) {
int len = z->l;
if (CAPACITY(p) < len) {
- p = increase_size(p, len);
- if (p == NULL)
- return NULL;
+ p = increase_size(p, len);
+ if (p == NULL)
+ return NULL;
}
memmove(p, z->p, len * sizeof(symbol));
SET_SIZE(p, len);
@@ -443,16 +443,16 @@
/*if (number >= 0) printf("%3d (line %4d): '", number, line_count);*/
if (number >= 0) printf("%3d (line %4d): [%d]'", number, line_count,limit);
for (i = 0; i <= limit; i++) {
- if (z->lb == i) printf("{");
- if (z->bra == i) printf("[");
- if (z->c == i) printf("|");
- if (z->ket == i) printf("]");
- if (z->l == i) printf("}");
- if (i < limit)
- { int ch = z->p[i];
- if (ch == 0) ch = '#';
- printf("%c", ch);
- }
+ if (z->lb == i) printf("{");
+ if (z->bra == i) printf("[");
+ if (z->c == i) printf("|");
+ if (z->ket == i) printf("]");
+ if (z->l == i) printf("}");
+ if (i < limit)
+ { int ch = z->p[i];
+ if (ch == 0) ch = '#';
+ printf("%c", ch);
+ }
}
printf("'\n");
}
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 15:12:19 2008
@@ -39,7 +39,7 @@
#define KEY_VERBOSITY "Verbosity"
#define KEY_INITIAL_SLEEP "InitialSleep"
#define KEY_LOW_MEMORY_MODE "LowMemoryMode"
-#define KEY_NFS_LOCKING "NFSLocking"
+#define KEY_NFS_LOCKING "NFSLocking"
#define GROUP_WATCHES "Watches"
#define KEY_WATCH_DIRECTORY_ROOTS "WatchDirectoryRoots"
#define KEY_CRAWL_DIRECTORY_ROOTS "CrawlDirectory"
@@ -51,7 +51,7 @@
#define KEY_ENABLE_INDEXING "EnableIndexing"
#define KEY_ENABLE_CONTENT_INDEXING "EnableFileContentIndexing"
#define KEY_ENABLE_THUMBNAILS "EnableThumbnails"
-#define KEY_DISABLED_MODULES "DisabledModules"
+#define KEY_DISABLED_MODULES "DisabledModules"
#define KEY_FAST_MERGES "FastMerges"
#define KEY_NO_INDEX_FILE_TYPES "NoIndexFileTypes"
#define KEY_MIN_WORD_LENGTH "MinWorldLength"
@@ -61,7 +61,7 @@
#define KEY_DISABLE_INDEXING_ON_BATTERY "BatteryIndex"
#define KEY_DISABLE_INDEXING_ON_BATTERY_INIT "BatteryIndexInitial"
#define KEY_LOW_DISK_SPACE_LIMIT "LowDiskSpaceLimit"
-#define KEY_INDEX_MOUNTED_DIRECTORIES "IndexMountedDirectories"
+#define KEY_INDEX_MOUNTED_DIRECTORIES "IndexMountedDirectories"
#define KEY_INDEX_REMOVABLE_DEVICES "IndexRemovableMedia"
#define GROUP_PERFORMANCE "Performance"
@@ -77,7 +77,7 @@
#define DEFAULT_VERBOSITY 0
#define DEFAULT_INITIAL_SLEEP 45 /* 0->1000 */
#define DEFAULT_LOW_MEMORY_MODE FALSE
-#define DEFAULT_NFS_LOCKING FALSE
+#define DEFAULT_NFS_LOCKING FALSE
#define DEFAULT_ENABLE_WATCHES TRUE
#define DEFAULT_THROTTLE 0 /* 0->20 */
#define DEFAULT_ENABLE_INDEXING TRUE
@@ -90,8 +90,8 @@
#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_REMOVABLE_DEVICES 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 */
#define DEFAULT_MAX_WORDS_TO_INDEX 10000
@@ -101,7 +101,7 @@
typedef struct _TrackerConfigPrivate TrackerConfigPrivate;
struct _TrackerConfigPrivate {
- GFile *file;
+ GFile *file;
GFileMonitor *monitor;
/* General */
@@ -121,7 +121,7 @@
gboolean enable_indexing;
gboolean enable_content_indexing;
gboolean enable_thumbnails;
- GSList *disabled_modules;
+ GSList *disabled_modules;
gboolean fast_merges;
GSList *no_index_file_types;
gint min_word_length;
@@ -153,7 +153,7 @@
guint param_id,
const GValue *value,
GParamSpec *pspec);
-static void config_load (TrackerConfig *config);
+static void config_load (TrackerConfig *config);
enum {
PROP_0,
@@ -768,7 +768,7 @@
static gboolean
config_create_with_defaults (const gchar *filename,
- GKeyFile *key_file)
+ GKeyFile *key_file)
{
GError *error = NULL;
gchar *content = NULL;
@@ -1051,7 +1051,7 @@
const gchar *key)
{
TrackerConfigPrivate *priv;
- GSList *l;
+ GSList *l;
gchar **value;
priv = TRACKER_CONFIG_GET_PRIVATE (config);
@@ -1113,13 +1113,13 @@
static void
config_changed_cb (GFileMonitor *monitor,
- GFile *file,
- GFile *other_file,
+ GFile *file,
+ GFile *other_file,
GFileMonitorEvent event_type,
- gpointer user_data)
+ gpointer user_data)
{
TrackerConfig *config;
- gchar *filename;
+ gchar *filename;
config = TRACKER_CONFIG (user_data);
@@ -1145,11 +1145,11 @@
config_load (TrackerConfig *config)
{
TrackerConfigPrivate *priv;
- GKeyFile *key_file;
- GError *error = NULL;
- gchar *filename;
- gchar *directory;
- gboolean value;
+ GKeyFile *key_file;
+ GError *error = NULL;
+ gchar *filename;
+ gchar *directory;
+ gboolean value;
key_file = g_key_file_new ();
@@ -1964,7 +1964,7 @@
void
tracker_config_set_index_removable_devices (TrackerConfig *config,
- gboolean value)
+ gboolean value)
{
TrackerConfigPrivate *priv;
@@ -2053,7 +2053,7 @@
gchar * const *roots)
{
TrackerConfigPrivate *priv;
- GSList *l;
+ GSList *l;
gchar *validated_root;
gchar * const *p;
@@ -2089,7 +2089,7 @@
gchar * const *roots)
{
TrackerConfigPrivate *priv;
- GSList *l;
+ GSList *l;
gchar *validated_root;
gchar * const *p;
@@ -2125,8 +2125,8 @@
gchar * const *roots)
{
TrackerConfigPrivate *priv;
- GSList *l;
- gchar *validated_root;
+ GSList *l;
+ gchar *validated_root;
gchar * const *p;
g_return_if_fail (TRACKER_IS_CONFIG (config));
@@ -2161,7 +2161,7 @@
gchar * const *modules)
{
TrackerConfigPrivate *priv;
- GSList *new_modules;
+ GSList *new_modules;
gchar * const *p;
g_return_if_fail (TRACKER_IS_CONFIG (config));
@@ -2192,7 +2192,7 @@
const gchar *module)
{
TrackerConfigPrivate *priv;
- GSList *l;
+ GSList *l;
g_return_if_fail (TRACKER_IS_CONFIG (config));
g_return_if_fail (module != NULL);
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 15:12:19 2008
@@ -27,14 +27,14 @@
G_BEGIN_DECLS
-#define TRACKER_TYPE_CONFIG (tracker_config_get_type ())
-#define TRACKER_CONFIG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
+#define TRACKER_TYPE_CONFIG (tracker_config_get_type ())
+#define TRACKER_CONFIG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
#define TRACKER_CONFIG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CONFIG, TrackerConfigClass))
-#define TRACKER_IS_CONFIG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
+#define TRACKER_IS_CONFIG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
#define TRACKER_IS_CONFIG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CONFIG))
#define TRACKER_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CONFIG, TrackerConfigClass))
-typedef struct _TrackerConfig TrackerConfig;
+typedef struct _TrackerConfig TrackerConfig;
typedef struct _TrackerConfigClass TrackerConfigClass;
struct _TrackerConfig {
@@ -45,99 +45,99 @@
GObjectClass parent_class;
};
-GType tracker_config_get_type (void) G_GNUC_CONST;
+GType tracker_config_get_type (void) G_GNUC_CONST;
-void tracker_config_load_file (void);
+void tracker_config_load_file (void);
-TrackerConfig *tracker_config_new (void);
-gint tracker_config_get_verbosity (TrackerConfig *config);
-gint tracker_config_get_initial_sleep (TrackerConfig *config);
-gboolean tracker_config_get_low_memory_mode (TrackerConfig *config);
-gboolean tracker_config_get_nfs_locking (TrackerConfig *config);
-GSList * tracker_config_get_watch_directory_roots (TrackerConfig *config);
-GSList * tracker_config_get_crawl_directory_roots (TrackerConfig *config);
-GSList * tracker_config_get_no_watch_directory_roots (TrackerConfig *config);
-gboolean tracker_config_get_enable_watches (TrackerConfig *config);
-gint tracker_config_get_throttle (TrackerConfig *config);
-gboolean tracker_config_get_enable_indexing (TrackerConfig *config);
-gboolean tracker_config_get_enable_xesam (TrackerConfig *config);
-gboolean tracker_config_get_enable_content_indexing (TrackerConfig *config);
-gboolean tracker_config_get_enable_thumbnails (TrackerConfig *config);
-GSList * tracker_config_get_disabled_modules (TrackerConfig *config);
-gboolean tracker_config_get_fast_merges (TrackerConfig *config);
-GSList * tracker_config_get_no_index_file_types (TrackerConfig *config);
-gint tracker_config_get_min_word_length (TrackerConfig *config);
-gint tracker_config_get_max_word_length (TrackerConfig *config);
-const gchar * tracker_config_get_language (TrackerConfig *config);
-gboolean tracker_config_get_enable_stemmer (TrackerConfig *config);
-gboolean tracker_config_get_disable_indexing_on_battery (TrackerConfig *config);
+TrackerConfig *tracker_config_new (void);
+gint tracker_config_get_verbosity (TrackerConfig *config);
+gint tracker_config_get_initial_sleep (TrackerConfig *config);
+gboolean tracker_config_get_low_memory_mode (TrackerConfig *config);
+gboolean tracker_config_get_nfs_locking (TrackerConfig *config);
+GSList * tracker_config_get_watch_directory_roots (TrackerConfig *config);
+GSList * tracker_config_get_crawl_directory_roots (TrackerConfig *config);
+GSList * tracker_config_get_no_watch_directory_roots (TrackerConfig *config);
+gboolean tracker_config_get_enable_watches (TrackerConfig *config);
+gint tracker_config_get_throttle (TrackerConfig *config);
+gboolean tracker_config_get_enable_indexing (TrackerConfig *config);
+gboolean tracker_config_get_enable_xesam (TrackerConfig *config);
+gboolean tracker_config_get_enable_content_indexing (TrackerConfig *config);
+gboolean tracker_config_get_enable_thumbnails (TrackerConfig *config);
+GSList * tracker_config_get_disabled_modules (TrackerConfig *config);
+gboolean tracker_config_get_fast_merges (TrackerConfig *config);
+GSList * tracker_config_get_no_index_file_types (TrackerConfig *config);
+gint tracker_config_get_min_word_length (TrackerConfig *config);
+gint tracker_config_get_max_word_length (TrackerConfig *config);
+const gchar * tracker_config_get_language (TrackerConfig *config);
+gboolean tracker_config_get_enable_stemmer (TrackerConfig *config);
+gboolean tracker_config_get_disable_indexing_on_battery (TrackerConfig *config);
gboolean tracker_config_get_disable_indexing_on_battery_init (TrackerConfig *config);
-gint tracker_config_get_low_disk_space_limit (TrackerConfig *config);
-gboolean tracker_config_get_index_removable_devices (TrackerConfig *config);
-gboolean tracker_config_get_index_mounted_directories (TrackerConfig *config);
-gint tracker_config_get_max_text_to_index (TrackerConfig *config);
-gint tracker_config_get_max_words_to_index (TrackerConfig *config);
-gint tracker_config_get_max_bucket_count (TrackerConfig *config);
-gint tracker_config_get_min_bucket_count (TrackerConfig *config);
-void tracker_config_set_verbosity (TrackerConfig *config,
- gint value);
-void tracker_config_set_initial_sleep (TrackerConfig *config,
- gint value);
-void tracker_config_set_low_memory_mode (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_nfs_locking (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_enable_watches (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_throttle (TrackerConfig *config,
- gint value);
-void tracker_config_set_enable_indexing (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_enable_xesam (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_enable_content_indexing (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_enable_thumbnails (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_fast_merges (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_min_word_length (TrackerConfig *config,
- gint value);
-void tracker_config_set_max_word_length (TrackerConfig *config,
- gint value);
-void tracker_config_set_language (TrackerConfig *config,
+gint tracker_config_get_low_disk_space_limit (TrackerConfig *config);
+gboolean tracker_config_get_index_removable_devices (TrackerConfig *config);
+gboolean tracker_config_get_index_mounted_directories (TrackerConfig *config);
+gint tracker_config_get_max_text_to_index (TrackerConfig *config);
+gint tracker_config_get_max_words_to_index (TrackerConfig *config);
+gint tracker_config_get_max_bucket_count (TrackerConfig *config);
+gint tracker_config_get_min_bucket_count (TrackerConfig *config);
+void tracker_config_set_verbosity (TrackerConfig *config,
+ gint value);
+void tracker_config_set_initial_sleep (TrackerConfig *config,
+ gint value);
+void tracker_config_set_low_memory_mode (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_nfs_locking (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_enable_watches (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_throttle (TrackerConfig *config,
+ gint value);
+void tracker_config_set_enable_indexing (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_enable_xesam (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_enable_content_indexing (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_enable_thumbnails (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_fast_merges (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_min_word_length (TrackerConfig *config,
+ gint value);
+void tracker_config_set_max_word_length (TrackerConfig *config,
+ gint value);
+void tracker_config_set_language (TrackerConfig *config,
const gchar *value);
-void tracker_config_set_enable_stemmer (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_disable_indexing_on_battery (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_disable_indexing_on_battery_init (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_low_disk_space_limit (TrackerConfig *config,
- gint value);
-void tracker_config_set_index_removable_devices (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_index_mounted_directories (TrackerConfig *config,
- gboolean value);
-void tracker_config_set_max_text_to_index (TrackerConfig *config,
- gint value);
-void tracker_config_set_max_words_to_index (TrackerConfig *config,
- gint value);
-void tracker_config_set_max_bucket_count (TrackerConfig *config,
- gint value);
-void tracker_config_set_min_bucket_count (TrackerConfig *config,
- gint value);
+void tracker_config_set_enable_stemmer (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_disable_indexing_on_battery (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_disable_indexing_on_battery_init (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_low_disk_space_limit (TrackerConfig *config,
+ gint value);
+void tracker_config_set_index_removable_devices (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_index_mounted_directories (TrackerConfig *config,
+ gboolean value);
+void tracker_config_set_max_text_to_index (TrackerConfig *config,
+ gint value);
+void tracker_config_set_max_words_to_index (TrackerConfig *config,
+ gint value);
+void tracker_config_set_max_bucket_count (TrackerConfig *config,
+ gint value);
+void tracker_config_set_min_bucket_count (TrackerConfig *config,
+ gint value);
/* Directory root APIs*/
-void tracker_config_add_watch_directory_roots (TrackerConfig *config,
+void tracker_config_add_watch_directory_roots (TrackerConfig *config,
gchar * const *roots);
-void tracker_config_add_crawl_directory_roots (TrackerConfig *config,
+void tracker_config_add_crawl_directory_roots (TrackerConfig *config,
gchar * const *roots);
-void tracker_config_add_no_watch_directory_roots (TrackerConfig *config,
+void tracker_config_add_no_watch_directory_roots (TrackerConfig *config,
gchar * const *roots);
-void tracker_config_add_disabled_modules (TrackerConfig *config,
+void tracker_config_add_disabled_modules (TrackerConfig *config,
gchar * const *modules);
-void tracker_config_remove_disabled_modules (TrackerConfig *config,
+void tracker_config_remove_disabled_modules (TrackerConfig *config,
const gchar *module);
G_END_DECLS
Modified: branches/indexer-split/src/libtracker-common/tracker-configuration.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-configuration.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-configuration.c Sat Sep 20 15:12:19 2008
@@ -258,31 +258,31 @@
g_key_file_free (configuration);
}
-#define TRACKER_CONFIGURATION_GET_(TypeName, GTypeName, Null) \
-GTypeName \
-tracker_configuration_get_##TypeName (const gchar * const key, GError ** error) \
-{ \
- gchar **data = g_strsplit (key, "/", 3); \
- GTypeName value = Null; \
- \
- if (g_key_file_has_key (configuration, data[1], data[2], error)) { \
- value = g_key_file_get_##TypeName (configuration, data[1], data[2], error); \
- } \
- \
- g_strfreev (data); \
- return value; \
-}
-
-#define TRACKER_CONFIGURATION_SET_(TypeName, GTypeName) \
-void \
-tracker_configuration_set_##TypeName (const gchar * const key, const GTypeName value) \
-{ \
- gchar **data = g_strsplit (key, "/", 3); \
- \
- g_key_file_set_##TypeName (configuration, data[1], data[2], value); \
- \
- g_strfreev (data); \
- dirty = TRUE; \
+#define TRACKER_CONFIGURATION_GET_(TypeName, GTypeName, Null) \
+GTypeName \
+tracker_configuration_get_##TypeName (const gchar * const key, GError ** error) \
+{ \
+ gchar **data = g_strsplit (key, "/", 3); \
+ GTypeName value = Null; \
+ \
+ if (g_key_file_has_key (configuration, data[1], data[2], error)) { \
+ value = g_key_file_get_##TypeName (configuration, data[1], data[2], error); \
+ } \
+ \
+ g_strfreev (data); \
+ return value; \
+}
+
+#define TRACKER_CONFIGURATION_SET_(TypeName, GTypeName) \
+void \
+tracker_configuration_set_##TypeName (const gchar * const key, const GTypeName value) \
+{ \
+ gchar **data = g_strsplit (key, "/", 3); \
+ \
+ g_key_file_set_##TypeName (configuration, data[1], data[2], value); \
+ \
+ g_strfreev (data); \
+ dirty = TRUE; \
}
TRACKER_CONFIGURATION_GET_(boolean, gboolean, FALSE)
@@ -297,69 +297,69 @@
#undef TRACKER_CONFIGURATION_GET_
#undef TRACKER_CONFIGURATION_SET_
-#define TRACKER_CONFIGURATION_LIST_GET_(TypeName, GTypeName) \
-static GSList * \
-tracker_configuration_get_##TypeName##_list (const gchar * const key, GError ** error) \
-{ \
- gchar **data = NULL; \
- GSList *retval = NULL; \
- \
- g_return_val_if_fail (key, NULL); \
- \
- data = g_strsplit (key, "/", 3); \
- \
- if (g_key_file_has_key (configuration, data[1], data[2], error)) { \
- gsize length = 0; \
- GTypeName *values = NULL; \
- \
- values = g_key_file_get_##TypeName##_list (configuration, data[1], data[2], &length, error); \
- \
- if (values) { \
- gsize i = 0; \
- \
- for (i = 0; i < length; i++) { \
- GTypeName *value = g_new0 (GTypeName, 1); \
- *value = values[i]; \
- \
- retval = g_slist_prepend (retval, value); \
- } \
- \
- g_free (values); \
- } \
- } \
- \
- g_strfreev (data); \
- return g_slist_reverse (retval); \
-}
-
-#define TRACKER_CONFIGURATION_LIST_SET_(TypeName, GTypeName) \
-static void \
-tracker_configuration_set_##TypeName##_list (const gchar * const key, GSList * value) \
-{ \
- gchar **data = NULL; \
- GTypeName *list = NULL; \
- guint length = 0; \
- \
- g_return_if_fail (key); \
- g_return_if_fail (value); \
- \
- data = g_strsplit (key, "/", 3); \
- length = g_slist_length (value); \
- list = g_new0 (GTypeName, length); \
- \
- guint i; \
- const GSList *tmp; \
- for (i = 0, tmp = value; tmp; tmp = tmp->next, i++) { \
- if (tmp->data) { \
- GTypeName *n = tmp->data; \
- list[i] = *n; \
- } \
- } \
- \
- g_key_file_set_##TypeName##_list (configuration, data[1], data[2], list, length); \
- \
- g_free (list); \
- g_strfreev (data); \
+#define TRACKER_CONFIGURATION_LIST_GET_(TypeName, GTypeName) \
+static GSList * \
+tracker_configuration_get_##TypeName##_list (const gchar * const key, GError ** error) \
+{ \
+ gchar **data = NULL; \
+ GSList *retval = NULL; \
+ \
+ g_return_val_if_fail (key, NULL); \
+ \
+ data = g_strsplit (key, "/", 3); \
+ \
+ if (g_key_file_has_key (configuration, data[1], data[2], error)) { \
+ gsize length = 0; \
+ GTypeName *values = NULL; \
+ \
+ values = g_key_file_get_##TypeName##_list (configuration, data[1], data[2], &length, error); \
+ \
+ if (values) { \
+ gsize i = 0; \
+ \
+ for (i = 0; i < length; i++) { \
+ GTypeName *value = g_new0 (GTypeName, 1); \
+ *value = values[i]; \
+ \
+ retval = g_slist_prepend (retval, value); \
+ } \
+ \
+ g_free (values); \
+ } \
+ } \
+ \
+ g_strfreev (data); \
+ return g_slist_reverse (retval); \
+}
+
+#define TRACKER_CONFIGURATION_LIST_SET_(TypeName, GTypeName) \
+static void \
+tracker_configuration_set_##TypeName##_list (const gchar * const key, GSList * value) \
+{ \
+ gchar **data = NULL; \
+ GTypeName *list = NULL; \
+ guint length = 0; \
+ \
+ g_return_if_fail (key); \
+ g_return_if_fail (value); \
+ \
+ data = g_strsplit (key, "/", 3); \
+ length = g_slist_length (value); \
+ list = g_new0 (GTypeName, length); \
+ \
+ guint i; \
+ const GSList *tmp; \
+ for (i = 0, tmp = value; tmp; tmp = tmp->next, i++) { \
+ if (tmp->data) { \
+ GTypeName *n = tmp->data; \
+ list[i] = *n; \
+ } \
+ } \
+ \
+ g_key_file_set_##TypeName##_list (configuration, data[1], data[2], list, length); \
+ \
+ g_free (list); \
+ g_strfreev (data); \
}
TRACKER_CONFIGURATION_LIST_GET_(boolean, gboolean)
Modified: branches/indexer-split/src/libtracker-common/tracker-configuration.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-configuration.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-configuration.h Sat Sep 20 15:12:19 2008
@@ -32,27 +32,27 @@
extern const LanguageMapEntry LanguageMap[];
-void tracker_configuration_load (void);
-void tracker_configuration_save (void);
-void tracker_configuration_free (void);
+void tracker_configuration_load (void);
+void tracker_configuration_save (void);
+void tracker_configuration_free (void);
gboolean tracker_configuration_get_boolean (const gchar * const key,
- GError **error);
-void tracker_configuration_set_boolean (const gchar * const key,
- const gboolean value);
-gint tracker_configuration_get_integer (const gchar * const key,
- GError **error);
-void tracker_configuration_set_integer (const gchar * const key,
- const gint value);
+ GError **error);
+void tracker_configuration_set_boolean (const gchar * const key,
+ const gboolean value);
+gint tracker_configuration_get_integer (const gchar * const key,
+ GError **error);
+void tracker_configuration_set_integer (const gchar * const key,
+ const gint value);
gchar * tracker_configuration_get_string (const gchar * const key,
- GError **error);
-void tracker_configuration_set_string (const gchar * const key,
- const gchar * const value);
+ GError **error);
+void tracker_configuration_set_string (const gchar * const key,
+ const gchar * const value);
GSList * tracker_configuration_get_list (const gchar * const key,
- GType g_type,
- GError **error);
-void tracker_configuration_set_list (const gchar * const key,
- GType g_type,
- GSList *value);
+ GType g_type,
+ GError **error);
+void tracker_configuration_set_list (const gchar * const key,
+ GType g_type,
+ GSList *value);
G_END_DECLS
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 15:12:19 2008
@@ -26,7 +26,7 @@
struct TrackerDBusRequestHandler {
TrackerDBusRequestFunc new;
TrackerDBusRequestFunc done;
- gpointer user_data;
+ gpointer user_data;
};
static GSList *hooks;
@@ -89,52 +89,52 @@
TrackerDBusData *
tracker_dbus_data_new (const gpointer arg1,
- const gpointer arg2)
+ const gpointer arg2)
{
- TrackerDBusData *data;
+ TrackerDBusData *data;
- data = g_new0 (TrackerDBusData, 1);
+ data = g_new0 (TrackerDBusData, 1);
- data->id = tracker_dbus_get_next_request_id ();
+ data->id = tracker_dbus_get_next_request_id ();
- data->data1 = arg1;
- data->data2 = arg2;
+ data->data1 = arg1;
+ data->data2 = arg2;
- return data;
+ return data;
}
gchar **
tracker_dbus_slist_to_strv (GSList *list)
{
- GSList *l;
+ GSList *l;
gchar **strv;
- gint i = 0;
+ gint i = 0;
strv = g_new0 (gchar*, g_slist_length (list) + 1);
- for (l = list; l != NULL; l = l->next) {
+ 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",
(gchar*) l->data);
continue;
}
- strv[i++] = g_strdup (l->data);
+ strv[i++] = g_strdup (l->data);
}
- strv[i] = NULL;
+ strv[i] = NULL;
return strv;
}
gchar **
tracker_dbus_queue_str_to_strv (GQueue *queue,
- gint max)
+ gint max)
{
gchar **strv;
gchar *str;
- gint i, j;
- gint length;
+ gint i, j;
+ gint length;
length = g_queue_get_length (queue);
@@ -160,20 +160,20 @@
strv[j++] = str;
}
- strv[j] = NULL;
+ strv[j] = NULL;
return strv;
}
gchar **
tracker_dbus_queue_gfile_to_strv (GQueue *queue,
- gint max)
+ gint max)
{
gchar **strv;
gchar *str;
GFile *file;
- gint i, j;
- gint length;
+ gint i, j;
+ gint length;
length = g_queue_get_length (queue);
@@ -202,7 +202,7 @@
strv[j++] = str;
}
- strv[j] = NULL;
+ strv[j] = NULL;
return strv;
}
@@ -222,15 +222,15 @@
guint
tracker_dbus_get_next_request_id (void)
{
- static guint request_id = 1;
+ static guint request_id = 1;
- return request_id++;
+ return request_id++;
}
TrackerDBusRequestHandler *
tracker_dbus_request_add_hook (TrackerDBusRequestFunc new,
TrackerDBusRequestFunc done,
- gpointer user_data)
+ gpointer user_data)
{
TrackerDBusRequestHandler *handler;
@@ -254,11 +254,11 @@
}
void
-tracker_dbus_request_new (gint request_id,
+tracker_dbus_request_new (gint request_id,
const gchar *format,
...)
{
- gchar *str;
+ gchar *str;
va_list args;
va_start (args, format);
@@ -284,12 +284,12 @@
}
void
-tracker_dbus_request_failed (gint request_id,
- GError **error,
+tracker_dbus_request_failed (gint request_id,
+ GError **error,
const gchar *format,
...)
{
- gchar *str;
+ gchar *str;
va_list args;
request_handler_call_for_done (request_id);
@@ -314,11 +314,11 @@
}
void
-tracker_dbus_request_comment (gint request_id,
+tracker_dbus_request_comment (gint request_id,
const gchar *format,
...)
{
- gchar *str;
+ gchar *str;
va_list args;
va_start (args, format);
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 15:12:19 2008
@@ -35,7 +35,7 @@
G_BEGIN_DECLS
#define TRACKER_DBUS_ERROR_DOMAIN "TrackerDBus"
-#define TRACKER_DBUS_ERROR tracker_dbus_error_quark()
+#define TRACKER_DBUS_ERROR tracker_dbus_error_quark()
#define tracker_dbus_async_return_if_fail(expr,context) \
G_STMT_START { \
@@ -59,7 +59,7 @@
G_STMT_START { \
if G_LIKELY(expr) { } else { \
g_set_error (error, \
- TRACKER_DBUS_ERROR, \
+ TRACKER_DBUS_ERROR, \
0, \
_("Assertion `%s' failed"), \
#expr); \
@@ -70,48 +70,48 @@
typedef struct TrackerDBusRequestHandler TrackerDBusRequestHandler;
-typedef void (*TrackerDBusRequestFunc) (guint request_id,
+typedef void (*TrackerDBusRequestFunc) (guint request_id,
gpointer user_data);
typedef struct {
- guint id;
- gpointer data1;
- gpointer data2;
+ guint id;
+ gpointer data1;
+ gpointer data2;
} TrackerDBusData;
-GQuark tracker_dbus_error_quark (void);
-TrackerDBusData *tracker_dbus_data_new (const gpointer arg1,
- const gpointer arg2);
+GQuark tracker_dbus_error_quark (void);
+TrackerDBusData *tracker_dbus_data_new (const gpointer arg1,
+ const gpointer arg2);
/* Utils */
-GValue * tracker_dbus_gvalue_slice_new (GType type);
-void tracker_dbus_gvalue_slice_free (GValue *value);
-gchar ** tracker_dbus_slist_to_strv (GSList *list);
-gchar ** tracker_dbus_queue_str_to_strv (GQueue *queue,
- gint max);
-gchar ** tracker_dbus_queue_gfile_to_strv (GQueue *queue,
- gint max);
-void tracker_dbus_results_ptr_array_free (GPtrArray **ptr_array);
+GValue * tracker_dbus_gvalue_slice_new (GType type);
+void tracker_dbus_gvalue_slice_free (GValue *value);
+gchar ** tracker_dbus_slist_to_strv (GSList *list);
+gchar ** tracker_dbus_queue_str_to_strv (GQueue *queue,
+ gint max);
+gchar ** tracker_dbus_queue_gfile_to_strv (GQueue *queue,
+ gint max);
+void tracker_dbus_results_ptr_array_free (GPtrArray **ptr_array);
/* Requests */
-guint tracker_dbus_get_next_request_id (void);
+guint tracker_dbus_get_next_request_id (void);
TrackerDBusRequestHandler *
- tracker_dbus_request_add_hook (TrackerDBusRequestFunc new,
- TrackerDBusRequestFunc done,
- gpointer user_data);
-void tracker_dbus_request_remove_hook (TrackerDBusRequestHandler *handler);
+ tracker_dbus_request_add_hook (TrackerDBusRequestFunc new,
+ TrackerDBusRequestFunc done,
+ gpointer user_data);
+void tracker_dbus_request_remove_hook (TrackerDBusRequestHandler *handler);
-void tracker_dbus_request_new (gint request_id,
- const gchar *format,
+void tracker_dbus_request_new (gint request_id,
+ const gchar *format,
...);
-void tracker_dbus_request_success (gint request_id);
-void tracker_dbus_request_failed (gint request_id,
- GError **error,
- const gchar *format,
+void tracker_dbus_request_success (gint request_id);
+void tracker_dbus_request_failed (gint request_id,
+ GError **error,
+ const gchar *format,
...);
-void tracker_dbus_request_comment (gint request_id,
- const gchar *format,
+void tracker_dbus_request_comment (gint request_id,
+ const gchar *format,
...);
G_END_DECLS
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 15:12:19 2008
@@ -31,30 +31,30 @@
typedef struct _TrackerFieldDataPriv TrackerFieldDataPriv;
struct _TrackerFieldDataPriv {
- gchar *alias;
+ gchar *alias;
- gchar *table_name;
- gchar *field_name;
+ gchar *table_name;
+ gchar *field_name;
- gchar *select_field;
- gchar *where_field;
- gchar *id_field;
+ gchar *select_field;
+ gchar *where_field;
+ gchar *id_field;
TrackerFieldType data_type;
- gboolean multiple_values;
- gboolean is_select;
- gboolean is_condition;
- gboolean needs_join;
+ gboolean multiple_values;
+ gboolean is_select;
+ gboolean is_condition;
+ gboolean needs_join;
};
-static void field_data_finalize (GObject *object);
-static void field_data_get_property (GObject *object,
- guint param_id,
- GValue *value,
+static void field_data_finalize (GObject *object);
+static void field_data_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
GParamSpec *pspec);
-static void field_data_set_property (GObject *object,
- guint param_id,
+static void field_data_set_property (GObject *object,
+ guint param_id,
const GValue *value,
GParamSpec *pspec);
@@ -80,7 +80,7 @@
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = field_data_finalize;
+ object_class->finalize = field_data_finalize;
object_class->get_property = field_data_get_property;
object_class->set_property = field_data_set_property;
@@ -192,7 +192,7 @@
static void
field_data_get_property (GObject *object,
- guint param_id,
+ guint param_id,
GValue *value,
GParamSpec *pspec)
{
@@ -242,7 +242,7 @@
static void
field_data_set_property (GObject *object,
- guint param_id,
+ guint param_id,
const GValue *value,
GParamSpec *pspec)
{
@@ -463,7 +463,7 @@
void
tracker_field_data_set_table_name (TrackerFieldData *field_data,
- const gchar *value)
+ const gchar *value)
{
TrackerFieldDataPriv *priv;
@@ -484,7 +484,7 @@
void
tracker_field_data_set_field_name (TrackerFieldData *field_data,
- const gchar *value)
+ const gchar *value)
{
TrackerFieldDataPriv *priv;
@@ -547,7 +547,7 @@
void
tracker_field_data_set_id_field (TrackerFieldData *field_data,
- const gchar *value)
+ const gchar *value)
{
TrackerFieldDataPriv *priv;
@@ -582,7 +582,7 @@
void
tracker_field_data_set_multiple_values (TrackerFieldData *field_data,
- gboolean value)
+ gboolean value)
{
TrackerFieldDataPriv *priv;
@@ -596,7 +596,7 @@
void
tracker_field_data_set_is_select (TrackerFieldData *field_data,
- gboolean value)
+ gboolean value)
{
TrackerFieldDataPriv *priv;
@@ -610,7 +610,7 @@
void
tracker_field_data_set_is_condition (TrackerFieldData *field_data,
- gboolean value)
+ gboolean value)
{
TrackerFieldDataPriv *priv;
@@ -624,7 +624,7 @@
void
tracker_field_data_set_needs_join (TrackerFieldData *field_data,
- gboolean value)
+ gboolean value)
{
TrackerFieldDataPriv *priv;
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 15:12:19 2008
@@ -28,11 +28,11 @@
G_BEGIN_DECLS
-#define TRACKER_TYPE_FIELD_DATA (tracker_field_data_get_type ())
-#define TRACKER_FIELD_DATA(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FIELD_DATA, TrackerFieldData))
-#define TRACKER_FIELD_DATA_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_FIELD_DATA, TrackerFieldDataClass))
-#define TRACKER_IS_FIELD_DATA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_FIELD_DATA))
-#define TRACKER_IS_FIELD_DATA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_FIELD_DATA))
+#define TRACKER_TYPE_FIELD_DATA (tracker_field_data_get_type ())
+#define TRACKER_FIELD_DATA(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FIELD_DATA, TrackerFieldData))
+#define TRACKER_FIELD_DATA_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_FIELD_DATA, TrackerFieldDataClass))
+#define TRACKER_IS_FIELD_DATA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_FIELD_DATA))
+#define TRACKER_IS_FIELD_DATA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_FIELD_DATA))
#define TRACKER_FIELD_DATA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_FIELD_DATA, TrackerFieldDataClass))
typedef struct _TrackerFieldData TrackerFieldData;
@@ -46,44 +46,44 @@
GObjectClass parent_class;
};
-GType tracker_field_data_get_type (void) G_GNUC_CONST;
+GType tracker_field_data_get_type (void) G_GNUC_CONST;
-TrackerFieldData *tracker_field_data_new (void);
+TrackerFieldData *tracker_field_data_new (void);
-const gchar * tracker_field_data_get_alias (TrackerFieldData *field_data);
-const gchar * tracker_field_data_get_table_name (TrackerFieldData *field_data);
-const gchar * tracker_field_data_get_field_name (TrackerFieldData *field_data);
-const gchar * tracker_field_data_get_select_field (TrackerFieldData *field_data);
-const gchar * tracker_field_data_get_where_field (TrackerFieldData *field_data);
-const gchar * tracker_field_data_get_id_field (TrackerFieldData *field_data);
-TrackerFieldType tracker_field_data_get_data_type (TrackerFieldData *field_data);
-gboolean tracker_field_data_get_multiple_values (TrackerFieldData *field_data);
-gboolean tracker_field_data_get_is_select (TrackerFieldData *field_data);
-gboolean tracker_field_data_get_is_condition (TrackerFieldData *field_data);
-gboolean tracker_field_data_get_needs_join (TrackerFieldData *field_data);
-
-void tracker_field_data_set_alias (TrackerFieldData *field_data,
- const gchar *value);
-void tracker_field_data_set_table_name (TrackerFieldData *field_data,
- const gchar *value);
-void tracker_field_data_set_field_name (TrackerFieldData *field_data,
- const gchar *value);
-void tracker_field_data_set_select_field (TrackerFieldData *field_data,
- const gchar *value);
-void tracker_field_data_set_where_field (TrackerFieldData *field_data,
- const gchar *value);
-void tracker_field_data_set_id_field (TrackerFieldData *field_data,
- const gchar *value);
-void tracker_field_data_set_data_type (TrackerFieldData *field_data,
+const gchar * tracker_field_data_get_alias (TrackerFieldData *field_data);
+const gchar * tracker_field_data_get_table_name (TrackerFieldData *field_data);
+const gchar * tracker_field_data_get_field_name (TrackerFieldData *field_data);
+const gchar * tracker_field_data_get_select_field (TrackerFieldData *field_data);
+const gchar * tracker_field_data_get_where_field (TrackerFieldData *field_data);
+const gchar * tracker_field_data_get_id_field (TrackerFieldData *field_data);
+TrackerFieldType tracker_field_data_get_data_type (TrackerFieldData *field_data);
+gboolean tracker_field_data_get_multiple_values (TrackerFieldData *field_data);
+gboolean tracker_field_data_get_is_select (TrackerFieldData *field_data);
+gboolean tracker_field_data_get_is_condition (TrackerFieldData *field_data);
+gboolean tracker_field_data_get_needs_join (TrackerFieldData *field_data);
+
+void tracker_field_data_set_alias (TrackerFieldData *field_data,
+ const gchar *value);
+void tracker_field_data_set_table_name (TrackerFieldData *field_data,
+ const gchar *value);
+void tracker_field_data_set_field_name (TrackerFieldData *field_data,
+ const gchar *value);
+void tracker_field_data_set_select_field (TrackerFieldData *field_data,
+ const gchar *value);
+void tracker_field_data_set_where_field (TrackerFieldData *field_data,
+ const gchar *value);
+void tracker_field_data_set_id_field (TrackerFieldData *field_data,
+ const gchar *value);
+void tracker_field_data_set_data_type (TrackerFieldData *field_data,
TrackerFieldType value);
-void tracker_field_data_set_multiple_values (TrackerFieldData *field_data,
- gboolean value);
-void tracker_field_data_set_is_select (TrackerFieldData *field_data,
- gboolean value);
-void tracker_field_data_set_is_condition (TrackerFieldData *field_data,
- gboolean value);
-void tracker_field_data_set_needs_join (TrackerFieldData *field_data,
- gboolean value);
+void tracker_field_data_set_multiple_values (TrackerFieldData *field_data,
+ gboolean value);
+void tracker_field_data_set_is_select (TrackerFieldData *field_data,
+ gboolean value);
+void tracker_field_data_set_is_condition (TrackerFieldData *field_data,
+ gboolean value);
+void tracker_field_data_set_needs_join (TrackerFieldData *field_data,
+ gboolean value);
G_END_DECLS
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 15:12:19 2008
@@ -31,28 +31,28 @@
typedef struct _TrackerFieldPriv TrackerFieldPriv;
struct _TrackerFieldPriv {
- gchar *id;
+ gchar *id;
gchar *name;
TrackerFieldType data_type;
- gchar *field_name;
- gint weight;
+ gchar *field_name;
+ gint weight;
gboolean embedded;
gboolean multiple_values;
gboolean delimited;
gboolean filtered;
gboolean store_metadata;
- GSList *child_ids;
+ GSList *child_ids;
};
static void field_finalize (GObject *object);
static void field_get_property (GObject *object,
- guint param_id,
- GValue *value,
+ guint param_id,
+ GValue *value,
GParamSpec *pspec);
static void field_set_property (GObject *object,
- guint param_id,
+ guint param_id,
const GValue *value,
GParamSpec *pspec);
@@ -122,19 +122,19 @@
const gchar *
tracker_field_type_to_string (TrackerFieldType fieldtype)
{
- GType type;
- GEnumClass *enum_class;
- GEnumValue *enum_value;
-
- 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);
+ GType type;
+ GEnumClass *enum_class;
+ GEnumValue *enum_value;
+
+ 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) {
+ if (!enum_value) {
return NULL;
- }
+ }
- return enum_value->value_nick;
+ return enum_value->value_nick;
}
static void
@@ -142,7 +142,7 @@
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = field_finalize;
+ object_class->finalize = field_finalize;
object_class->get_property = field_get_property;
object_class->set_property = field_set_property;
@@ -257,7 +257,7 @@
static void
field_get_property (GObject *object,
- guint param_id,
+ guint param_id,
GValue *value,
GParamSpec *pspec)
{
@@ -306,10 +306,10 @@
}
static void
-field_set_property (GObject *object,
- guint param_id,
+field_set_property (GObject *object,
+ guint param_id,
const GValue *value,
- GParamSpec *pspec)
+ GParamSpec *pspec)
{
switch (param_id) {
case PROP_ID:
@@ -611,7 +611,7 @@
void
tracker_field_set_weight (TrackerField *field,
- gint value)
+ gint value)
{
TrackerFieldPriv *priv;
g_return_if_fail (TRACKER_IS_FIELD (field));
@@ -628,7 +628,7 @@
void
tracker_field_set_embedded (TrackerField *field,
- gboolean value)
+ gboolean value)
{
TrackerFieldPriv *priv;
@@ -642,7 +642,7 @@
void
tracker_field_set_multiple_values (TrackerField *field,
- gboolean value)
+ gboolean value)
{
TrackerFieldPriv *priv;
@@ -656,7 +656,7 @@
void
tracker_field_set_delimited (TrackerField *field,
- gboolean value)
+ gboolean value)
{
TrackerFieldPriv *priv;
@@ -670,7 +670,7 @@
void
tracker_field_set_filtered (TrackerField *field,
- gboolean value)
+ gboolean value)
{
TrackerFieldPriv *priv;
@@ -684,7 +684,7 @@
void
tracker_field_set_store_metadata (TrackerField *field,
- gboolean value)
+ gboolean value)
{
TrackerFieldPriv *priv;
@@ -710,7 +710,7 @@
g_slist_free (priv->child_ids);
if (value) {
- GSList *new_list;
+ GSList *new_list;
const GSList *l;
new_list = NULL;
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 15:12:19 2008
@@ -41,20 +41,20 @@
TRACKER_FIELD_TYPE_LINK,
} TrackerFieldType;
-GType tracker_field_type_get_type (void) G_GNUC_CONST;
+GType tracker_field_type_get_type (void) G_GNUC_CONST;
const gchar *tracker_field_type_to_string (TrackerFieldType fieldtype);
-#define TRACKER_TYPE_FIELD (tracker_field_get_type ())
+#define TRACKER_TYPE_FIELD (tracker_field_get_type ())
#define TRACKER_TYPE_FIELD_TYPE (tracker_field_type_get_type ())
-#define TRACKER_FIELD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FIELD, TrackerField))
-#define TRACKER_FIELD_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_FIELD, TrackerFieldClass))
-#define TRACKER_IS_FIELD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_FIELD))
+#define TRACKER_FIELD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FIELD, TrackerField))
+#define TRACKER_FIELD_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_FIELD, TrackerFieldClass))
+#define TRACKER_IS_FIELD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_FIELD))
#define TRACKER_IS_FIELD_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_FIELD))
#define TRACKER_FIELD_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_FIELD, TrackerFieldClass))
-typedef struct _TrackerField TrackerField;
+typedef struct _TrackerField TrackerField;
typedef struct _TrackerFieldClass TrackerFieldClass;
struct _TrackerField {
@@ -65,45 +65,45 @@
GObjectClass parent_class;
};
-GType tracker_field_get_type (void) G_GNUC_CONST;
+GType tracker_field_get_type (void) G_GNUC_CONST;
-TrackerField * tracker_field_new (void);
+TrackerField * tracker_field_new (void);
-const gchar * tracker_field_get_id (TrackerField *field);
-const gchar * tracker_field_get_name (TrackerField *field);
-TrackerFieldType tracker_field_get_data_type (TrackerField *field);
-const gchar * tracker_field_get_field_name (TrackerField *field);
-gint tracker_field_get_weight (TrackerField *service);
-gboolean tracker_field_get_embedded (TrackerField *field);
-gboolean tracker_field_get_multiple_values (TrackerField *field);
-gboolean tracker_field_get_delimited (TrackerField *field);
-gboolean tracker_field_get_filtered (TrackerField *field);
-gboolean tracker_field_get_store_metadata (TrackerField *field);
-const GSList * tracker_field_get_child_ids (TrackerField *field);
+const gchar * tracker_field_get_id (TrackerField *field);
+const gchar * tracker_field_get_name (TrackerField *field);
+TrackerFieldType tracker_field_get_data_type (TrackerField *field);
+const gchar * tracker_field_get_field_name (TrackerField *field);
+gint tracker_field_get_weight (TrackerField *service);
+gboolean tracker_field_get_embedded (TrackerField *field);
+gboolean tracker_field_get_multiple_values (TrackerField *field);
+gboolean tracker_field_get_delimited (TrackerField *field);
+gboolean tracker_field_get_filtered (TrackerField *field);
+gboolean tracker_field_get_store_metadata (TrackerField *field);
+const GSList * tracker_field_get_child_ids (TrackerField *field);
-void tracker_field_set_id (TrackerField *field,
+void tracker_field_set_id (TrackerField *field,
const gchar *value);
-void tracker_field_set_name (TrackerField *field,
+void tracker_field_set_name (TrackerField *field,
const gchar *value);
-void tracker_field_set_data_type (TrackerField *field,
+void tracker_field_set_data_type (TrackerField *field,
TrackerFieldType value);
-void tracker_field_set_field_name (TrackerField *field,
+void tracker_field_set_field_name (TrackerField *field,
const gchar *value);
-void tracker_field_set_weight (TrackerField *field,
- gint value);
-void tracker_field_set_embedded (TrackerField *field,
- gboolean value);
-void tracker_field_set_multiple_values (TrackerField *field,
- gboolean value);
-void tracker_field_set_delimited (TrackerField *field,
- gboolean value);
-void tracker_field_set_filtered (TrackerField *field,
- gboolean value);
-void tracker_field_set_store_metadata (TrackerField *field,
- gboolean value);
-void tracker_field_set_child_ids (TrackerField *field,
+void tracker_field_set_weight (TrackerField *field,
+ gint value);
+void tracker_field_set_embedded (TrackerField *field,
+ gboolean value);
+void tracker_field_set_multiple_values (TrackerField *field,
+ gboolean value);
+void tracker_field_set_delimited (TrackerField *field,
+ gboolean value);
+void tracker_field_set_filtered (TrackerField *field,
+ gboolean value);
+void tracker_field_set_store_metadata (TrackerField *field,
+ gboolean value);
+void tracker_field_set_child_ids (TrackerField *field,
const GSList *value);
-void tracker_field_append_child_id (TrackerField *field,
+void tracker_field_append_child_id (TrackerField *field,
const gchar *id);
G_END_DECLS
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 15:12:19 2008
@@ -40,7 +40,7 @@
gint
tracker_file_open (const gchar *uri,
- gboolean readahead)
+ gboolean readahead)
{
gint fd;
@@ -86,7 +86,7 @@
gboolean
tracker_file_unlink (const gchar *uri)
{
- gchar *str;
+ gchar *str;
gboolean result;
str = g_filename_from_utf8 (uri, -1, NULL, NULL, NULL);
@@ -104,13 +104,13 @@
if (g_lstat (uri, &finfo) == -1) {
return 0;
} else {
- return (guint32) finfo.st_size;
- }
+ return (guint32) finfo.st_size;
+ }
}
static inline gboolean
is_utf8 (const gchar *buffer,
- gint buffer_length)
+ gint buffer_length)
{
gchar *end;
@@ -123,9 +123,9 @@
/* Check whether the string was truncated in the middle of
* a valid UTF8 char, or if we really have an invalid
* UTF8 string.
- */
+ */
gunichar validated;
- gint remaining_bytes;
+ gint remaining_bytes;
remaining_bytes = buffer_length;
remaining_bytes -= end - ((gchar *) buffer);
@@ -136,7 +136,7 @@
validated = g_utf8_get_char_validated (end, (gsize) remaining_bytes);
- if (validated == (gunichar) - 2) {
+ if (validated == (gunichar) - 2) {
return TRUE;
}
}
@@ -175,7 +175,7 @@
gboolean
tracker_file_is_directory (const gchar *uri)
{
- gchar *str;
+ gchar *str;
gboolean is_directory;
str = g_filename_from_utf8 (uri, -1, NULL, NULL, NULL);
@@ -195,7 +195,7 @@
gboolean
tracker_file_is_indexable (const gchar *uri)
{
- gchar *str;
+ gchar *str;
struct stat finfo;
gboolean is_indexable;
@@ -227,7 +227,7 @@
tracker_file_get_mtime (const gchar *uri)
{
struct stat finfo;
- gchar *str;
+ gchar *str;
str = g_filename_from_utf8 (uri, -1, NULL, NULL, NULL);
@@ -251,9 +251,9 @@
tracker_file_get_mime_type (const gchar *path)
{
GFileInfo *info;
- GFile *file;
- GError *error = NULL;
- gchar *content_type;
+ GFile *file;
+ GError *error = NULL;
+ gchar *content_type;
file = g_file_new_for_path (path);
info = g_file_query_info (file,
@@ -335,7 +335,7 @@
*p = '\0';
}
- /* Search backwards to the next slash. */
+ /* Search backwards to the next slash. */
while (p != tmp && *p != G_DIR_SEPARATOR) {
p--;
}
@@ -358,11 +358,11 @@
static gchar *
normalize_uri (const gchar *uri) {
- GFile *f;
+ GFile *f;
gchar *normalized;
f = g_file_new_for_path (uri);
- normalized = g_file_get_path (f);
+ normalized = g_file_get_path (f);
g_object_unref (f);
return normalized;
@@ -446,8 +446,8 @@
tracker_path_is_in_path (const gchar *path,
const gchar *in_path)
{
- gchar *new_path;
- gchar *new_in_path;
+ gchar *new_path;
+ gchar *new_in_path;
gboolean is_in_path = FALSE;
g_return_val_if_fail (path != NULL, FALSE);
@@ -552,7 +552,7 @@
*/
for (l1 = roots; l1; l1 = l1->next) {
- gchar *path;
+ gchar *path;
gboolean should_add = TRUE;
if (!g_str_has_suffix (l1->data, G_DIR_SEPARATOR_S)) {
@@ -623,13 +623,13 @@
gchar *
tracker_path_evaluate_name (const gchar *uri)
{
- gchar *final_path;
- gchar **tokens;
- gchar **token;
- gchar *start;
- gchar *end;
+ gchar *final_path;
+ gchar **tokens;
+ gchar **token;
+ gchar *start;
+ gchar *end;
const gchar *env;
- gchar *expanded;
+ gchar *expanded;
if (!uri || uri[0] == '\0') {
return NULL;
@@ -708,28 +708,28 @@
path_has_write_access (const gchar *path,
gboolean *exists)
{
- GFile *file;
+ GFile *file;
GFileInfo *info;
- GError *error = NULL;
- gboolean writable;
+ GError *error = NULL;
+ gboolean writable;
- g_return_val_if_fail (path != NULL, FALSE);
- g_return_val_if_fail (path[0] != '\0', FALSE);
+ g_return_val_if_fail (path != NULL, FALSE);
+ g_return_val_if_fail (path[0] != '\0', FALSE);
- file = g_file_new_for_path (path);
+ file = g_file_new_for_path (path);
info = g_file_query_info (file,
- G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
- 0,
- NULL,
- &error);
- g_object_unref (file);
+ G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
+ 0,
+ NULL,
+ &error);
+ g_object_unref (file);
if (G_UNLIKELY (error)) {
- if (error->code == G_IO_ERROR_NOT_FOUND) {
- if (exists) {
- *exists = FALSE;
- }
- } else {
+ if (error->code == G_IO_ERROR_NOT_FOUND) {
+ if (exists) {
+ *exists = FALSE;
+ }
+ } else {
g_warning ("Could not check if we have write access for "
"path '%s', %s",
path,
@@ -747,35 +747,35 @@
writable = g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
}
- g_object_unref (info);
+ g_object_unref (info);
- return writable;
+ return writable;
}
static gboolean
path_has_write_access_or_was_created (const gchar *path)
{
- gboolean writable;
- gboolean exists;
+ gboolean writable;
+ gboolean exists;
+
+ writable = path_has_write_access (path, &exists);
+ if (exists) {
+ if (writable) {
+ g_message (" Path is OK");
+ return TRUE;
+ }
- writable = path_has_write_access (path, &exists);
- if (exists) {
- 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...");
-
- if (g_mkdir_with_parents (path, 0700) == 0) {
- g_message (" Path was created");
- return TRUE;
- }
+ g_message (" Path can not be written to");
+ } else {
+ g_message (" Path does not exist, attempting to create...");
- g_message (" Path could not be created");
- }
+ if (g_mkdir_with_parents (path, 0700) == 0) {
+ g_message (" Path was created");
+ return TRUE;
+ }
+
+ g_message (" Path could not be created");
+ }
return FALSE;
}
@@ -783,11 +783,11 @@
gboolean
tracker_env_check_xdg_dirs (void)
{
- const gchar *user_data_dir;
- gchar *new_dir;
- gboolean success;
+ const gchar *user_data_dir;
+ gchar *new_dir;
+ gboolean success;
- g_message ("Checking XDG_DATA_HOME is writable and exists");
+ g_message ("Checking XDG_DATA_HOME is writable and exists");
/* NOTE: We don't use g_get_user_data_dir() here because as
* soon as we do, it sets the result and doesn't re-fetch the
@@ -796,14 +796,14 @@
user_data_dir = g_getenv ("XDG_DATA_HOME");
/* Check the default XDG_DATA_HOME location */
- g_message (" XDG_DATA_HOME is '%s'", user_data_dir);
+ g_message (" XDG_DATA_HOME is '%s'", user_data_dir);
if (user_data_dir && path_has_write_access_or_was_created (user_data_dir)) {
return TRUE;
}
- /* Change environment, this is actually what we have on Ubuntu. */
- new_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".local", "share", NULL);
+ /* Change environment, this is actually what we have on Ubuntu. */
+ new_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".local", "share", NULL);
/* Check the new XDG_DATA_HOME location */
success = g_setenv ("XDG_DATA_HOME", new_dir, TRUE);
Modified: branches/indexer-split/src/libtracker-common/tracker-file-utils.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-file-utils.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-file-utils.h Sat Sep 20 15:12:19 2008
@@ -24,26 +24,26 @@
#include <glib.h>
-gint tracker_file_open (const gchar *uri,
- gboolean readahead);
-void tracker_file_close (gint fd,
- gboolean no_longer_needed);
-gboolean tracker_file_unlink (const gchar *uri);
-gboolean tracker_file_is_valid (const gchar *uri);
-gboolean tracker_file_is_directory (const gchar *uri);
-gboolean tracker_file_is_indexable (const gchar *uri);
-guint32 tracker_file_get_size (const gchar *uri);
-gint32 tracker_file_get_mtime (const gchar *uri);
-gchar * tracker_file_get_mime_type (const gchar *uri);
-void tracker_file_get_path_and_name (const gchar *uri,
+gint tracker_file_open (const gchar *uri,
+ gboolean readahead);
+void tracker_file_close (gint fd,
+ gboolean no_longer_needed);
+gboolean tracker_file_unlink (const gchar *uri);
+gboolean tracker_file_is_valid (const gchar *uri);
+gboolean tracker_file_is_directory (const gchar *uri);
+gboolean tracker_file_is_indexable (const gchar *uri);
+guint32 tracker_file_get_size (const gchar *uri);
+gint32 tracker_file_get_mtime (const gchar *uri);
+gchar * tracker_file_get_mime_type (const gchar *uri);
+void tracker_file_get_path_and_name (const gchar *uri,
gchar **path,
gchar **name);
-void tracker_path_remove (const gchar *uri);
-gboolean tracker_path_is_in_path (const gchar *path,
+void tracker_path_remove (const gchar *uri);
+gboolean tracker_path_is_in_path (const gchar *path,
const gchar *in_path);
-void tracker_path_hash_table_filter_duplicates (GHashTable *roots);
-GSList * tracker_path_list_filter_duplicates (GSList *roots);
-gchar * tracker_path_evaluate_name (const gchar *uri);
-gboolean tracker_env_check_xdg_dirs (void);
+void tracker_path_hash_table_filter_duplicates (GHashTable *roots);
+GSList * tracker_path_list_filter_duplicates (GSList *roots);
+gchar * tracker_path_evaluate_name (const gchar *uri);
+gboolean tracker_env_check_xdg_dirs (void);
#endif /* __LIBTRACKER_COMMON_FILE_UTILS_H__ */
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 15:12:19 2008
@@ -35,7 +35,7 @@
#include "tracker-utils.h"
#define DEVICE_AC_ADAPTER "ac_adapter"
-#define DEVICE_VOLUME "volume"
+#define DEVICE_VOLUME "volume"
#define PROP_AC_ADAPTER_ON "ac_adapter.present"
#define PROP_IS_MOUNTED "volume.is_mounted"
@@ -43,42 +43,42 @@
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_HAL, TrackerHalPriv))
typedef struct {
- LibHalContext *context;
+ LibHalContext *context;
- GHashTable *all_devices;
- GHashTable *mounted_devices;
- GHashTable *removable_devices;
+ GHashTable *all_devices;
+ GHashTable *mounted_devices;
+ GHashTable *removable_devices;
- gchar *battery_udi;
- gboolean battery_in_use;
+ gchar *battery_udi;
+ gboolean battery_in_use;
} TrackerHalPriv;
typedef struct {
- LibHalContext *context;
- GSList *roots;
+ LibHalContext *context;
+ GSList *roots;
} GetRoots;
-static void tracker_hal_class_init (TrackerHalClass *klass);
-static void tracker_hal_init (TrackerHal *hal);
-static void tracker_hal_finalize (GObject *object);
-static void hal_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec);
-static gboolean hal_setup_devices (TrackerHal *hal);
-static gboolean hal_setup_batteries (TrackerHal *hal);
-
-static gboolean hal_device_add (TrackerHal *hal,
- LibHalVolume *volume);
-static void hal_device_added_cb (LibHalContext *context,
- const gchar *udi);
-static void hal_device_removed_cb (LibHalContext *context,
- const gchar *udi);
-static void hal_device_property_modified_cb (LibHalContext *context,
- const char *udi,
- const char *key,
- dbus_bool_t is_removed,
- dbus_bool_t is_added);
+static void tracker_hal_class_init (TrackerHalClass *klass);
+static void tracker_hal_init (TrackerHal *hal);
+static void tracker_hal_finalize (GObject *object);
+static void hal_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec);
+static gboolean hal_setup_devices (TrackerHal *hal);
+static gboolean hal_setup_batteries (TrackerHal *hal);
+
+static gboolean hal_device_add (TrackerHal *hal,
+ LibHalVolume *volume);
+static void hal_device_added_cb (LibHalContext *context,
+ const gchar *udi);
+static void hal_device_removed_cb (LibHalContext *context,
+ const gchar *udi);
+static void hal_device_property_modified_cb (LibHalContext *context,
+ const char *udi,
+ const char *key,
+ dbus_bool_t is_removed,
+ dbus_bool_t is_added);
enum {
PROP_0,
@@ -103,7 +103,7 @@
object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = tracker_hal_finalize;
+ object_class->finalize = tracker_hal_finalize;
object_class->get_property = hal_get_property;
signals[SIG_MOUNT_POINT_ADDED] =
@@ -129,18 +129,18 @@
g_object_class_install_property (object_class,
PROP_BATTERY_IN_USE,
g_param_spec_boolean ("battery-in-use",
- "Battery exists",
- "There is a battery on this machine",
- FALSE,
- G_PARAM_READABLE));
+ "Battery exists",
+ "There is a battery on this machine",
+ FALSE,
+ G_PARAM_READABLE));
g_object_class_install_property (object_class,
PROP_BATTERY_EXISTS,
g_param_spec_boolean ("battery-exists",
- "Battery exists",
- "There is a battery on this machine",
- FALSE,
- G_PARAM_READABLE));
+ "Battery exists",
+ "There is a battery on this machine",
+ FALSE,
+ G_PARAM_READABLE));
g_type_class_add_private (object_class, sizeof (TrackerHalPriv));
}
@@ -149,24 +149,24 @@
tracker_hal_init (TrackerHal *hal)
{
TrackerHalPriv *priv;
- DBusError error;
+ DBusError error;
DBusConnection *connection;
- g_message ("Initializing HAL...");
+ g_message ("Initializing HAL...");
priv = GET_PRIV (hal);
- priv->all_devices = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_free);
+ priv->all_devices = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify) g_free);
+
+ priv->mounted_devices = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify) g_free);
- priv->mounted_devices = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_free);
-
- priv->removable_devices = g_hash_table_new_full (g_str_hash,
+ priv->removable_devices = g_hash_table_new_full (g_str_hash,
g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_free);
@@ -174,14 +174,14 @@
dbus_error_init (&error);
connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
- if (dbus_error_is_set (&error)) {
- g_critical ("Could not get the system DBus connection, %s",
+ if (dbus_error_is_set (&error)) {
+ g_critical ("Could not get the system DBus connection, %s",
error.message);
- dbus_error_free (&error);
- return;
- }
+ dbus_error_free (&error);
+ return;
+ }
- dbus_connection_setup_with_g_main (connection, NULL);
+ dbus_connection_setup_with_g_main (connection, NULL);
priv->context = libhal_ctx_new ();
@@ -190,39 +190,39 @@
return;
}
- libhal_ctx_set_user_data (priv->context, hal);
- libhal_ctx_set_dbus_connection (priv->context, connection);
+ libhal_ctx_set_user_data (priv->context, hal);
+ libhal_ctx_set_dbus_connection (priv->context, connection);
if (!libhal_ctx_init (priv->context, &error)) {
if (dbus_error_is_set (&error)) {
- g_critical ("Could not initialize the HAL context, %s",
+ g_critical ("Could not initialize the HAL context, %s",
error.message);
- dbus_error_free (&error);
- } else {
- g_critical ("Could not initialize the HAL context, "
+ dbus_error_free (&error);
+ } else {
+ g_critical ("Could not initialize the HAL context, "
"no error, is hald running?");
- }
+ }
- libhal_ctx_free (priv->context);
- return;
- }
+ libhal_ctx_free (priv->context);
+ return;
+ }
- /* Volume and property notification callbacks */
- g_message ("HAL monitors set for devices added/removed/mounted/umounted...");
+ /* 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);
libhal_ctx_set_device_removed (priv->context, hal_device_removed_cb);
libhal_ctx_set_device_property_modified (priv->context, hal_device_property_modified_cb);
- /* Get all devices which are mountable and set them up */
- if (!hal_setup_devices (hal)) {
- return;
- }
-
- /* Get all battery devices and set them up */
- if (!hal_setup_batteries (hal)) {
- return;
- }
+ /* Get all devices which are mountable and set them up */
+ if (!hal_setup_devices (hal)) {
+ return;
+ }
+
+ /* Get all battery devices and set them up */
+ if (!hal_setup_batteries (hal)) {
+ return;
+ }
}
static void
@@ -244,7 +244,7 @@
g_hash_table_unref (priv->all_devices);
}
- g_free (priv->battery_udi);
+ g_free (priv->battery_udi);
if (priv->context) {
libhal_ctx_set_user_data (priv->context, NULL);
@@ -256,9 +256,9 @@
static void
hal_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec)
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec)
{
TrackerHalPriv *priv;
@@ -280,19 +280,19 @@
static gboolean
hal_setup_devices (TrackerHal *hal)
{
- TrackerHalPriv *priv;
- DBusError error;
- gchar **devices, **p;
- gint num;
+ TrackerHalPriv *priv;
+ DBusError error;
+ gchar **devices, **p;
+ gint num;
- priv = GET_PRIV (hal);
+ priv = GET_PRIV (hal);
dbus_error_init (&error);
- devices = libhal_find_device_by_capability (priv->context,
- DEVICE_VOLUME,
- &num,
- &error);
+ devices = libhal_find_device_by_capability (priv->context,
+ DEVICE_VOLUME,
+ &num,
+ &error);
if (dbus_error_is_set (&error)) {
g_critical ("Could not get devices with 'volume' capability, %s",
@@ -301,27 +301,27 @@
return FALSE;
}
- if (!devices || !devices[0]) {
- 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;
- }
+ if (!devices || !devices[0]) {
+ 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"
+ g_message ("HAL device found:\n"
+ " - udi : %s\n"
" - mount point: %s\n"
" - device file: %s\n"
- " - uuid : %s\n"
- " - mounted : %s\n"
+ " - 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),
@@ -330,31 +330,31 @@
libhal_volume_get_fstype (volume),
libhal_volume_get_label (volume));
- hal_device_add (hal, volume);
- libhal_volume_free (volume);
- }
+ hal_device_add (hal, volume);
+ libhal_volume_free (volume);
+ }
- libhal_free_string_array (devices);
+ libhal_free_string_array (devices);
- return TRUE;
+ return TRUE;
}
static gboolean
hal_setup_batteries (TrackerHal *hal)
{
- TrackerHalPriv *priv;
- DBusError error;
- gchar **devices, **p;
- gint num;
+ TrackerHalPriv *priv;
+ DBusError error;
+ gchar **devices, **p;
+ gint num;
- priv = GET_PRIV (hal);
+ priv = GET_PRIV (hal);
dbus_error_init (&error);
devices = libhal_find_device_by_capability (priv->context,
- DEVICE_AC_ADAPTER,
- &num,
- &error);
+ DEVICE_AC_ADAPTER,
+ &num,
+ &error);
if (dbus_error_is_set (&error)) {
g_critical ("Could not get AC adapter capable devices, %s",
@@ -363,10 +363,10 @@
return FALSE;
}
- g_message ("HAL found %d AC adapter capable devices", num);
+ g_message ("HAL found %d AC adapter capable devices", num);
- if (!devices || !devices[0]) {
- libhal_free_string_array (devices);
+ if (!devices || !devices[0]) {
+ libhal_free_string_array (devices);
priv->battery_in_use = FALSE;
g_object_notify (G_OBJECT (hal), "battery-in-use");
@@ -374,40 +374,40 @@
priv->battery_udi = NULL;
g_object_notify (G_OBJECT (hal), "battery-exists");
- return TRUE;
- }
+ return TRUE;
+ }
- for (p = devices; *p; p++) {
- if (!priv->battery_udi) {
- /* For now just use the first one we find */
- priv->battery_udi = g_strdup (*p);
+ for (p = devices; *p; p++) {
+ if (!priv->battery_udi) {
+ /* For now just use the first one we find */
+ priv->battery_udi = g_strdup (*p);
g_object_notify (G_OBJECT (hal), "battery-exists");
- g_message (" - Device '%s' (default)", *p);
- } 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,
- &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,
- NULL);
+ g_message (" - Device '%s' (default)", *p);
+ } 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,
+ &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,
+ NULL);
g_message ("HAL reports system is currently powered by %s",
priv->battery_in_use ? "battery" : "AC adapter");
@@ -419,21 +419,21 @@
static void
hal_mount_point_add (TrackerHal *hal,
- const gchar *udi,
- const gchar *mount_point,
- gboolean removable_device)
+ const gchar *udi,
+ const gchar *mount_point,
+ gboolean removable_device)
{
- TrackerHalPriv *priv;
+ TrackerHalPriv *priv;
- priv = GET_PRIV (hal);
+ priv = GET_PRIV (hal);
- g_message ("HAL device with mount point:'%s', removable:%s now being tracked",
- mount_point,
+ g_message ("HAL device with mount point:'%s', removable:%s now being tracked",
+ mount_point,
removable_device ? "yes" : "no");
- g_hash_table_insert (priv->mounted_devices,
- g_strdup (udi),
- g_strdup (mount_point));
+ g_hash_table_insert (priv->mounted_devices,
+ g_strdup (udi),
+ g_strdup (mount_point));
if (removable_device) {
g_hash_table_insert (priv->removable_devices,
@@ -441,31 +441,31 @@
g_strdup (mount_point));
}
- g_signal_emit (hal, signals[SIG_MOUNT_POINT_ADDED], 0, mount_point, NULL);
+ g_signal_emit (hal, signals[SIG_MOUNT_POINT_ADDED], 0, mount_point, NULL);
}
static void
hal_mount_point_remove (TrackerHal *hal,
- const gchar *udi)
+ const gchar *udi)
{
- TrackerHalPriv *priv;
- const gchar *mount_point;
+ TrackerHalPriv *priv;
+ const gchar *mount_point;
- priv = GET_PRIV (hal);
+ priv = GET_PRIV (hal);
- mount_point = g_hash_table_lookup (priv->mounted_devices, udi);
- if (!mount_point) {
- return;
- }
+ mount_point = g_hash_table_lookup (priv->mounted_devices, udi);
+ if (!mount_point) {
+ return;
+ }
- g_message ("HAL device with mount point:'%s', removable:%s NO LONGER being tracked",
- mount_point,
+ 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_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 *
@@ -474,33 +474,33 @@
switch (type) {
case LIBHAL_DRIVE_TYPE_REMOVABLE_DISK:
return "LIBHAL_DRIVE_TYPE_REMOVABLE_DISK";
- case LIBHAL_DRIVE_TYPE_DISK:
+ case LIBHAL_DRIVE_TYPE_DISK:
return "LIBHAL_DRIVE_TYPE_DISK";
- case LIBHAL_DRIVE_TYPE_CDROM:
+ case LIBHAL_DRIVE_TYPE_CDROM:
return "LIBHAL_DRIVE_TYPE_CDROM";
- case LIBHAL_DRIVE_TYPE_FLOPPY:
+ case LIBHAL_DRIVE_TYPE_FLOPPY:
return "LIBHAL_DRIVE_TYPE_FLOPPY";
- case LIBHAL_DRIVE_TYPE_TAPE:
+ case LIBHAL_DRIVE_TYPE_TAPE:
return "LIBHAL_DRIVE_TYPE_TAPE";
- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH:
+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH:
return "LIBHAL_DRIVE_TYPE_COMPACT_FLASH";
- case LIBHAL_DRIVE_TYPE_MEMORY_STICK:
+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK:
return "LIBHAL_DRIVE_TYPE_MEMORY_STICK";
- case LIBHAL_DRIVE_TYPE_SMART_MEDIA:
+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA:
return "LIBHAL_DRIVE_TYPE_SMART_MEDIA";
- case LIBHAL_DRIVE_TYPE_SD_MMC:
+ case LIBHAL_DRIVE_TYPE_SD_MMC:
return "LIBHAL_DRIVE_TYPE_SD_MMC";
- case LIBHAL_DRIVE_TYPE_CAMERA:
+ case LIBHAL_DRIVE_TYPE_CAMERA:
return "LIBHAL_DRIVE_TYPE_CAMERA";
- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
return "LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER";
- case LIBHAL_DRIVE_TYPE_ZIP:
+ case LIBHAL_DRIVE_TYPE_ZIP:
return "LIBHAL_DRIVE_TYPE_ZIP";
- case LIBHAL_DRIVE_TYPE_JAZ:
+ case LIBHAL_DRIVE_TYPE_JAZ:
return "LIBHAL_DRIVE_TYPE_JAZ";
- case LIBHAL_DRIVE_TYPE_FLASHKEY:
+ case LIBHAL_DRIVE_TYPE_FLASHKEY:
return "LIBHAL_DRIVE_TYPE_FLASHKEY";
- case LIBHAL_DRIVE_TYPE_MO:
+ case LIBHAL_DRIVE_TYPE_MO:
return "LIBHAL_DRIVE_TYPE_MO";
}
@@ -511,67 +511,67 @@
hal_device_is_removable (TrackerHal *hal,
const gchar *device_file)
{
- TrackerHalPriv *priv;
- LibHalDrive *drive;
- gboolean removable;
-
- if (!device_file) {
- return FALSE;
- }
-
- priv = GET_PRIV (hal);
-
- drive = libhal_drive_from_device_file (priv->context, device_file);
- if (!drive) {
- return FALSE;
- }
+ TrackerHalPriv *priv;
+ LibHalDrive *drive;
+ gboolean removable;
+
+ if (!device_file) {
+ return FALSE;
+ }
+
+ priv = GET_PRIV (hal);
+
+ drive = libhal_drive_from_device_file (priv->context, device_file);
+ if (!drive) {
+ return FALSE;
+ }
removable = libhal_drive_uses_removable_media (drive);
- libhal_drive_free (drive);
+ libhal_drive_free (drive);
return removable;
}
static gboolean
hal_device_should_be_tracked (TrackerHal *hal,
- const gchar *device_file)
+ const gchar *device_file)
{
- TrackerHalPriv *priv;
- LibHalDrive *drive;
+ TrackerHalPriv *priv;
+ LibHalDrive *drive;
LibHalDriveType drive_type;
- gboolean eligible;
+ gboolean eligible;
+
+ if (!device_file) {
+ return FALSE;
+ }
- if (!device_file) {
- return FALSE;
- }
-
- priv = GET_PRIV (hal);
-
- drive = libhal_drive_from_device_file (priv->context, device_file);
- if (!drive) {
- return FALSE;
- }
-
- /* From the list, the first one below seems to be the ONLY one
- * to ignore:
- *
- * LIBHAL_DRIVE_TYPE_REMOVABLE_DISK = 0x00,
- * LIBHAL_DRIVE_TYPE_DISK = 0x01,
- * LIBHAL_DRIVE_TYPE_CDROM = 0x02,
- * LIBHAL_DRIVE_TYPE_FLOPPY = 0x03,
- * LIBHAL_DRIVE_TYPE_TAPE = 0x04,
- * LIBHAL_DRIVE_TYPE_COMPACT_FLASH = 0x05,
- * LIBHAL_DRIVE_TYPE_MEMORY_STICK = 0x06,
- * LIBHAL_DRIVE_TYPE_SMART_MEDIA = 0x07,
- * LIBHAL_DRIVE_TYPE_SD_MMC = 0x08,
- * LIBHAL_DRIVE_TYPE_CAMERA = 0x09,
- * LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER = 0x0a,
- * LIBHAL_DRIVE_TYPE_ZIP = 0x0b,
- * LIBHAL_DRIVE_TYPE_JAZ = 0x0c,
- * LIBHAL_DRIVE_TYPE_FLASHKEY = 0x0d,
- * LIBHAL_DRIVE_TYPE_MO = 0x0e
- *
- */
+ priv = GET_PRIV (hal);
+
+ drive = libhal_drive_from_device_file (priv->context, device_file);
+ if (!drive) {
+ return FALSE;
+ }
+
+ /* From the list, the first one below seems to be the ONLY one
+ * to ignore:
+ *
+ * LIBHAL_DRIVE_TYPE_REMOVABLE_DISK = 0x00,
+ * LIBHAL_DRIVE_TYPE_DISK = 0x01,
+ * LIBHAL_DRIVE_TYPE_CDROM = 0x02,
+ * LIBHAL_DRIVE_TYPE_FLOPPY = 0x03,
+ * LIBHAL_DRIVE_TYPE_TAPE = 0x04,
+ * LIBHAL_DRIVE_TYPE_COMPACT_FLASH = 0x05,
+ * LIBHAL_DRIVE_TYPE_MEMORY_STICK = 0x06,
+ * LIBHAL_DRIVE_TYPE_SMART_MEDIA = 0x07,
+ * LIBHAL_DRIVE_TYPE_SD_MMC = 0x08,
+ * LIBHAL_DRIVE_TYPE_CAMERA = 0x09,
+ * LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER = 0x0a,
+ * LIBHAL_DRIVE_TYPE_ZIP = 0x0b,
+ * LIBHAL_DRIVE_TYPE_JAZ = 0x0c,
+ * LIBHAL_DRIVE_TYPE_FLASHKEY = 0x0d,
+ * LIBHAL_DRIVE_TYPE_MO = 0x0e
+ *
+ */
drive_type = libhal_drive_get_type (drive);
@@ -584,224 +584,224 @@
eligible &= drive_type != LIBHAL_DRIVE_TYPE_DISK;
eligible &= drive_type != LIBHAL_DRIVE_TYPE_CDROM;
- libhal_drive_free (drive);
+ libhal_drive_free (drive);
- if (!eligible) {
- g_message ("HAL device is not eligible, type is '%s'",
+ if (!eligible) {
+ g_message ("HAL device is not eligible, type is '%s'",
hal_drive_type_to_string (drive_type));
- } else {
- g_message ("HAL device is eligible, type is '%s'",
+ } else {
+ g_message ("HAL device is eligible, type is '%s'",
hal_drive_type_to_string (drive_type));
}
- return eligible;
+ return eligible;
}
static gboolean
hal_device_add (TrackerHal *hal,
- LibHalVolume *volume)
+ LibHalVolume *volume)
{
- TrackerHalPriv *priv;
- DBusError error;
- const gchar *udi;
- const gchar *mount_point;
- const gchar *device_file;
+ TrackerHalPriv *priv;
+ DBusError error;
+ const gchar *udi;
+ const gchar *mount_point;
+ const gchar *device_file;
- priv = GET_PRIV (hal);
+ priv = GET_PRIV (hal);
dbus_error_init (&error);
- udi = libhal_volume_get_udi (volume);
- mount_point = libhal_volume_get_mount_point (volume);
- device_file = libhal_volume_get_device_file (volume);
-
- if (g_hash_table_lookup (priv->all_devices, udi)) {
- return TRUE;
- }
-
- /* If there is no mount point, then there is nothing to track */
- if (!hal_device_should_be_tracked (hal, device_file)) {
- g_message ("HAL device should not be tracked (not eligible)");
- return TRUE;
- }
-
- /* 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_strdup (device_file));
+ udi = libhal_volume_get_udi (volume);
+ mount_point = libhal_volume_get_mount_point (volume);
+ device_file = libhal_volume_get_device_file (volume);
+
+ if (g_hash_table_lookup (priv->all_devices, udi)) {
+ return TRUE;
+ }
+
+ /* If there is no mount point, then there is nothing to track */
+ if (!hal_device_should_be_tracked (hal, device_file)) {
+ g_message ("HAL device should not be tracked (not eligible)");
+ return TRUE;
+ }
+
+ /* 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_strdup (device_file));
- if (mount_point) {
- hal_mount_point_add (hal,
+ if (mount_point) {
+ hal_mount_point_add (hal,
udi,
mount_point,
hal_device_is_removable (hal, device_file));
- }
+ }
- return TRUE;
+ return TRUE;
}
static void
hal_device_added_cb (LibHalContext *context,
- const gchar *udi)
+ const gchar *udi)
{
- TrackerHal *hal;
- DBusError error;
- LibHalVolume *volume;
+ TrackerHal *hal;
+ DBusError error;
+ LibHalVolume *volume;
dbus_error_init (&error);
- volume = libhal_volume_from_udi (context, udi);
- if (!volume) {
- /* Not a device with a volume */
- return;
- }
-
- g_message ("HAL device added:\n"
- " - udi : %s\n"
- " - mount point: %s\n"
- " - device file: %s\n"
- " - uuid : %s\n"
- " - mounted : %s\n"
- " - file system: %s\n"
- " - label : %s",
- udi,
- libhal_volume_get_mount_point (volume),
- libhal_volume_get_device_file (volume),
- libhal_volume_get_uuid (volume),
- libhal_volume_is_mounted (volume) ? "yes" : "no",
- libhal_volume_get_fstype (volume),
- libhal_volume_get_label (volume));
-
- hal = (TrackerHal*) libhal_ctx_get_user_data (context);
- hal_device_add (hal, volume);
- libhal_volume_free (volume);
+ volume = libhal_volume_from_udi (context, udi);
+ if (!volume) {
+ /* Not a device with a volume */
+ return;
+ }
+
+ g_message ("HAL device added:\n"
+ " - udi : %s\n"
+ " - mount point: %s\n"
+ " - device file: %s\n"
+ " - uuid : %s\n"
+ " - mounted : %s\n"
+ " - file system: %s\n"
+ " - label : %s",
+ udi,
+ libhal_volume_get_mount_point (volume),
+ libhal_volume_get_device_file (volume),
+ libhal_volume_get_uuid (volume),
+ libhal_volume_is_mounted (volume) ? "yes" : "no",
+ libhal_volume_get_fstype (volume),
+ libhal_volume_get_label (volume));
+
+ hal = (TrackerHal*) libhal_ctx_get_user_data (context);
+ hal_device_add (hal, volume);
+ libhal_volume_free (volume);
}
static void
hal_device_removed_cb (LibHalContext *context,
- const gchar *udi)
+ const gchar *udi)
{
- TrackerHal *hal;
- TrackerHalPriv *priv;
- const gchar *device_file;
- const gchar *mount_point;
+ TrackerHal *hal;
+ TrackerHalPriv *priv;
+ const gchar *device_file;
+ const gchar *mount_point;
- hal = (TrackerHal*) libhal_ctx_get_user_data (context);
- priv = GET_PRIV (hal);
+ hal = (TrackerHal*) libhal_ctx_get_user_data (context);
+ priv = GET_PRIV (hal);
- device_file = g_hash_table_lookup (priv->all_devices, udi);
+ device_file = g_hash_table_lookup (priv->all_devices, udi);
- if (!device_file) {
- /* Don't report about unknown devices */
- return;
- }
+ if (!device_file) {
+ /* Don't report about unknown devices */
+ return;
+ }
- mount_point = g_hash_table_lookup (priv->mounted_devices, udi);
+ 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,
- mount_point,
- device_file);
+ g_message ("HAL device removed:\n"
+ " - udi : %s\n"
+ " - mount point: %s\n"
+ " - device_file: %s",
+ 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);
+ hal_mount_point_remove (hal, udi);
}
static void
hal_device_property_modified_cb (LibHalContext *context,
- const char *udi,
- const char *key,
- dbus_bool_t is_removed,
- dbus_bool_t is_added)
-{
- TrackerHal *hal;
- TrackerHalPriv *priv;
- DBusError error;
- gboolean device_is_battery;
- gboolean current_state;
+ const char *udi,
+ const char *key,
+ dbus_bool_t is_removed,
+ dbus_bool_t is_added)
+{
+ TrackerHal *hal;
+ TrackerHalPriv *priv;
+ DBusError error;
+ gboolean device_is_battery;
+ gboolean current_state;
- hal = (TrackerHal*) libhal_ctx_get_user_data (context);
- priv = GET_PRIV (hal);
+ hal = (TrackerHal*) libhal_ctx_get_user_data (context);
+ priv = GET_PRIV (hal);
- current_state = priv->battery_in_use;
- device_is_battery = priv->battery_udi && strcmp (priv->battery_udi, udi) == 0;
+ current_state = priv->battery_in_use;
+ device_is_battery = priv->battery_udi && strcmp (priv->battery_udi, udi) == 0;
if (!device_is_battery &&
- !g_hash_table_lookup (priv->all_devices, udi)) {
- g_message ("HAL device property change for another device, ignoring");
- return;
- }
+ !g_hash_table_lookup (priv->all_devices, udi)) {
+ g_message ("HAL device property change for another device, ignoring");
+ return;
+ }
dbus_error_init (&error);
- /* We either get notifications about the battery state OR a
- * 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,
- &error);
- g_message ("HAL reports system is now powered by %s",
+ /* We either get notifications about the battery state OR a
+ * 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,
+ &error);
+ g_message ("HAL reports system is now powered by %s",
priv->battery_in_use ? "battery" : "AC adapter");
g_object_notify (G_OBJECT (hal), "battery-in-use");
- if (dbus_error_is_set (&error)) {
- g_critical ("Could not get device property:'%s' for udi:'%s', %s",
+ if (dbus_error_is_set (&error)) {
+ g_critical ("Could not get device property:'%s' for udi:'%s', %s",
udi, PROP_AC_ADAPTER_ON, error.message);
- dbus_error_free (&error);
- return;
- }
- } else {
- gboolean is_mounted;
+ dbus_error_free (&error);
+ return;
+ }
+ } 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,
- key,
- &error);
+ if (strcmp (key, PROP_IS_MOUNTED) != 0) {
+ return;
+ }
+
+ is_mounted = libhal_device_get_property_bool (context,
+ udi,
+ key,
+ &error);
- if (dbus_error_is_set (&error)) {
- g_message ("Could not get device property:'%s' for udi:'%s', %s",
+ if (dbus_error_is_set (&error)) {
+ g_message ("Could not get device property:'%s' for udi:'%s', %s",
udi, key, error.message);
- dbus_error_free (&error);
+ dbus_error_free (&error);
- g_message ("HAL device with udi:'%s' is now unmounted (due to error)",
+ g_message ("HAL device with udi:'%s' is now unmounted (due to error)",
udi);
- hal_mount_point_remove (hal, udi);
- return;
- }
-
- if (is_mounted) {
- LibHalVolume *volume;
- const gchar *mount_point;
+ hal_mount_point_remove (hal, udi);
+ return;
+ }
+
+ if (is_mounted) {
+ LibHalVolume *volume;
+ const gchar *mount_point;
const gchar *device_file;
- volume = libhal_volume_from_udi (context, udi);
- mount_point = libhal_volume_get_mount_point (volume);
+ volume = libhal_volume_from_udi (context, udi);
+ mount_point = libhal_volume_get_mount_point (volume);
device_file = libhal_volume_get_device_file (volume);
- g_message ("HAL device with udi:'%s' is now mounted",
+ g_message ("HAL device with udi:'%s' is now mounted",
udi);
hal_mount_point_add (hal,
@@ -809,44 +809,44 @@
mount_point,
hal_device_is_removable (hal, device_file));
- libhal_volume_free (volume);
- } else {
- g_message ("HAL device with udi:'%s' is now unmounted",
+ libhal_volume_free (volume);
+ } else {
+ g_message ("HAL device with udi:'%s' is now unmounted",
udi);
- hal_mount_point_remove (hal, udi);
- }
- }
+ hal_mount_point_remove (hal, udi);
+ }
+ }
}
TrackerHal *
tracker_hal_new (void)
{
- return g_object_new (TRACKER_TYPE_HAL, NULL);
+ return g_object_new (TRACKER_TYPE_HAL, NULL);
}
gboolean
tracker_hal_get_battery_in_use (TrackerHal *hal)
{
- TrackerHalPriv *priv;
+ TrackerHalPriv *priv;
- g_return_val_if_fail (TRACKER_IS_HAL (hal), TRUE);
+ g_return_val_if_fail (TRACKER_IS_HAL (hal), TRUE);
- priv = GET_PRIV (hal);
+ priv = GET_PRIV (hal);
- return priv->battery_in_use;
+ return priv->battery_in_use;
}
gboolean
tracker_hal_get_battery_exists (TrackerHal *hal)
{
- TrackerHalPriv *priv;
+ TrackerHalPriv *priv;
- g_return_val_if_fail (TRACKER_IS_HAL (hal), TRUE);
+ g_return_val_if_fail (TRACKER_IS_HAL (hal), TRUE);
- priv = GET_PRIV (hal);
+ priv = GET_PRIV (hal);
- return priv->battery_udi != NULL;
+ return priv->battery_udi != NULL;
}
static void
@@ -854,71 +854,71 @@
gpointer value,
gpointer user_data)
{
- LibHalVolume *volume;
- GetRoots *gr;
- const gchar *udi;
- const gchar *mount_point;
- gboolean is_mounted;
-
- gr = (GetRoots*) user_data;
- udi = (const gchar*) key;
-
- volume = libhal_volume_from_udi (gr->context, udi);
- if (!volume) {
- g_message ("HAL device with udi:'%s' has no volume, "
+ LibHalVolume *volume;
+ GetRoots *gr;
+ const gchar *udi;
+ const gchar *mount_point;
+ gboolean is_mounted;
+
+ gr = (GetRoots*) user_data;
+ udi = (const gchar*) key;
+
+ volume = libhal_volume_from_udi (gr->context, udi);
+ if (!volume) {
+ g_message ("HAL device with udi:'%s' has no volume, "
"should we delete?",
udi);
- return;
- }
+ return;
+ }
- mount_point = libhal_volume_get_mount_point (volume);
- is_mounted = libhal_volume_is_mounted (volume);
+ mount_point = libhal_volume_get_mount_point (volume);
+ is_mounted = libhal_volume_is_mounted (volume);
- if (is_mounted && mount_point) {
- gr->roots = g_slist_prepend (gr->roots, g_strdup (mount_point));
- }
+ if (is_mounted && mount_point) {
+ gr->roots = g_slist_prepend (gr->roots, g_strdup (mount_point));
+ }
- libhal_volume_free (volume);
+ libhal_volume_free (volume);
}
GSList *
tracker_hal_get_mounted_directory_roots (TrackerHal *hal)
{
- TrackerHalPriv *priv;
- GetRoots gr;
+ TrackerHalPriv *priv;
+ GetRoots gr;
- g_return_val_if_fail (TRACKER_IS_HAL (hal), NULL);
+ g_return_val_if_fail (TRACKER_IS_HAL (hal), NULL);
- priv = GET_PRIV (hal);
+ priv = GET_PRIV (hal);
- gr.context = priv->context;
- gr.roots = NULL;
+ gr.context = priv->context;
+ gr.roots = NULL;
- g_hash_table_foreach (priv->mounted_devices,
- hal_get_mount_point_by_udi_foreach,
- &gr);
+ g_hash_table_foreach (priv->mounted_devices,
+ hal_get_mount_point_by_udi_foreach,
+ &gr);
- return gr.roots;
+ return gr.roots;
}
GSList *
tracker_hal_get_removable_device_roots (TrackerHal *hal)
{
- TrackerHalPriv *priv;
- GetRoots gr;
+ TrackerHalPriv *priv;
+ GetRoots gr;
- g_return_val_if_fail (TRACKER_IS_HAL (hal), NULL);
+ g_return_val_if_fail (TRACKER_IS_HAL (hal), NULL);
- priv = GET_PRIV (hal);
+ priv = GET_PRIV (hal);
- gr.context = priv->context;
- gr.roots = NULL;
+ gr.context = priv->context;
+ gr.roots = NULL;
- g_hash_table_foreach (priv->removable_devices,
- hal_get_mount_point_by_udi_foreach,
- &gr);
+ g_hash_table_foreach (priv->removable_devices,
+ hal_get_mount_point_by_udi_foreach,
+ &gr);
- return gr.roots;
+ return gr.roots;
}
#endif /* HAVE_HAL */
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 15:12:19 2008
@@ -28,14 +28,14 @@
#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))
-#define TRACKER_HAL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_HAL, TrackerHalClass))
-#define TRACKER_IS_HAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_HAL))
+#define TRACKER_TYPE_HAL (tracker_hal_get_type ())
+#define TRACKER_HAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_HAL, TrackerHal))
+#define TRACKER_HAL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_HAL, TrackerHalClass))
+#define TRACKER_IS_HAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_HAL))
#define TRACKER_IS_HAL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_HAL))
#define TRACKER_HAL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_HAL, TrackerHalClass))
-typedef struct _TrackerHal TrackerHal;
+typedef struct _TrackerHal TrackerHal;
typedef struct _TrackerHalClass TrackerHalClass;
struct _TrackerHal {
@@ -46,11 +46,11 @@
GObjectClass parent_class;
};
-GType tracker_hal_get_type (void) G_GNUC_CONST;
+GType tracker_hal_get_type (void) G_GNUC_CONST;
-TrackerHal *tracker_hal_new (void);
-gboolean tracker_hal_get_battery_in_use (TrackerHal *hal);
-gboolean tracker_hal_get_battery_exists (TrackerHal *hal);
+TrackerHal *tracker_hal_new (void);
+gboolean tracker_hal_get_battery_in_use (TrackerHal *hal);
+gboolean tracker_hal_get_battery_exists (TrackerHal *hal);
GSList * tracker_hal_get_mounted_directory_roots (TrackerHal *hal);
GSList * tracker_hal_get_removable_device_roots (TrackerHal *hal);
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 15:12:19 2008
@@ -48,35 +48,35 @@
#ifndef __NR_ioprio_set
#if defined(__i386__)
-#define __NR_ioprio_set 289
-#define __NR_ioprio_get 290
+#define __NR_ioprio_set 289
+#define __NR_ioprio_get 290
#elif defined(__powerpc__) || defined(__powerpc64__)
-#define __NR_ioprio_set 273
-#define __NR_ioprio_get 274
+#define __NR_ioprio_set 273
+#define __NR_ioprio_get 274
#elif defined(__x86_64__)
-#define __NR_ioprio_set 251
-#define __NR_ioprio_get 252
+#define __NR_ioprio_set 251
+#define __NR_ioprio_get 252
#elif defined(__ia64__)
-#define __NR_ioprio_set 1274
-#define __NR_ioprio_get 1275
+#define __NR_ioprio_set 1274
+#define __NR_ioprio_get 1275
#elif defined(__alpha__)
-#define __NR_ioprio_set 442
-#define __NR_ioprio_get 443
+#define __NR_ioprio_set 442
+#define __NR_ioprio_get 443
#elif defined(__s390x__) || defined(__s390__)
-#define __NR_ioprio_set 282
-#define __NR_ioprio_get 283
+#define __NR_ioprio_set 282
+#define __NR_ioprio_get 283
#elif defined(__SH4__)
-#define __NR_ioprio_set 288
-#define __NR_ioprio_get 289
+#define __NR_ioprio_set 288
+#define __NR_ioprio_get 289
#elif defined(__SH5__)
-#define __NR_ioprio_set 316
-#define __NR_ioprio_get 317
+#define __NR_ioprio_set 316
+#define __NR_ioprio_get 317
#elif defined(__sparc__) || defined(__sparc64__)
-#define __NR_ioprio_set 196
-#define __NR_ioprio_get 218
+#define __NR_ioprio_set 196
+#define __NR_ioprio_get 218
#elif defined(__arm__)
-#define __NR_ioprio_set 314
-#define __NR_ioprio_get 315
+#define __NR_ioprio_set 314
+#define __NR_ioprio_get 315
#else
#error "Unsupported architecture!"
#endif
@@ -107,22 +107,22 @@
static int
set_io_priority_idle (void)
{
- int ioprio, ioclass;
+ int ioprio, ioclass;
- ioprio = 7; /* priority is ignored with idle class */
- ioclass = IOPRIO_CLASS_IDLE << IOPRIO_CLASS_SHIFT;
+ ioprio = 7; /* priority is ignored with idle class */
+ ioclass = IOPRIO_CLASS_IDLE << IOPRIO_CLASS_SHIFT;
- return ioprio_set (IOPRIO_WHO_PROCESS, 0, ioprio | ioclass);
+ return ioprio_set (IOPRIO_WHO_PROCESS, 0, ioprio | ioclass);
}
static int
set_io_priority_best_effort (int ioprio_val)
{
- int ioclass;
+ int ioclass;
- ioclass = IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
+ ioclass = IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
- return ioprio_set (IOPRIO_WHO_PROCESS, 0, ioprio_val | ioclass);
+ return ioprio_set (IOPRIO_WHO_PROCESS, 0, ioprio_val | ioclass);
}
void
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 15:12:19 2008
@@ -33,37 +33,37 @@
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_LANGUAGE, TrackerLanguagePriv))
typedef struct _TrackerLanguagePriv TrackerLanguagePriv;
-typedef struct _Languages Languages;
+typedef struct _Languages Languages;
struct _TrackerLanguagePriv {
TrackerConfig *config;
GHashTable *stop_words;
- GMutex *stemmer_mutex;
+ GMutex *stemmer_mutex;
gpointer stemmer;
};
struct _Languages {
- gchar *code;
- gchar *name;
+ gchar *code;
+ gchar *name;
};
static Languages all_langs[] = {
- { "da", "danish" },
- { "nl", "dutch" },
- { "en", "english" },
- { "fi", "finnish" },
- { "fr", "french" },
- { "de", "german" },
+ { "da", "danish" },
+ { "nl", "dutch" },
+ { "en", "english" },
+ { "fi", "finnish" },
+ { "fr", "french" },
+ { "de", "german" },
{ "hu", "hungarian" },
- { "it", "italian" },
- { "nb", "norwegian" },
- { "pt", "portuguese" },
- { "ru", "russian" },
- { "es", "spanish" },
- { "sv", "swedish" },
- { NULL, NULL },
+ { "it", "italian" },
+ { "nb", "norwegian" },
+ { "pt", "portuguese" },
+ { "ru", "russian" },
+ { "es", "spanish" },
+ { "sv", "swedish" },
+ { NULL, NULL },
};
/* GObject properties */
@@ -74,17 +74,17 @@
PROP_STOP_WORDS
};
-static void language_finalize (GObject *object);
-static void language_get_property (GObject *object,
- guint param_id,
- GValue *value,
+static void language_finalize (GObject *object);
+static void language_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
GParamSpec *pspec);
-static void language_set_property (GObject *object,
- guint param_id,
+static void language_set_property (GObject *object,
+ guint param_id,
const GValue *value,
GParamSpec *pspec);
static const gchar *language_get_name_for_code (const gchar *language_code);
-static void language_notify_cb (TrackerConfig *config,
+static void language_notify_cb (TrackerConfig *config,
GParamSpec *param,
gpointer user_data);
@@ -122,7 +122,7 @@
tracker_language_init (TrackerLanguage *language)
{
TrackerLanguagePriv *priv;
- const gchar *stem_language;
+ const gchar *stem_language;
priv = GET_PRIV (language);
@@ -248,13 +248,13 @@
static void
language_add_stopwords (TrackerLanguage *language,
- const gchar *filename)
+ const gchar *filename)
{
TrackerLanguagePriv *priv;
- GMappedFile *mapped_file;
- GError *error = NULL;
- gchar *content;
- gchar **words, **p;
+ GMappedFile *mapped_file;
+ GError *error = NULL;
+ gchar *content;
+ gchar **words, **p;
priv = GET_PRIV (language);
@@ -286,8 +286,8 @@
const gchar *language_code)
{
TrackerLanguagePriv *priv;
- gchar *stopword_filename;
- const gchar *stem_language;
+ gchar *stopword_filename;
+ const gchar *stem_language;
g_return_if_fail (TRACKER_IS_LANGUAGE (language));
@@ -327,8 +327,8 @@
static void
language_notify_cb (TrackerConfig *config,
- GParamSpec *param,
- gpointer user_data)
+ GParamSpec *param,
+ gpointer user_data)
{
TrackerLanguage *language;
@@ -415,10 +415,10 @@
const gchar *
tracker_language_stem_word (TrackerLanguage *language,
const gchar *word,
- gint word_length)
+ gint word_length)
{
TrackerLanguagePriv *priv;
- const gchar *stem_word;
+ const gchar *stem_word;
g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
@@ -461,28 +461,28 @@
tracker_language_get_default_code (void)
{
const gchar **local_languages;
- const gchar **p;
+ const gchar **p;
/* Get langauges for user's locale */
local_languages = (const gchar**) g_get_language_names ();
for (p = local_languages; *p; p++) {
- const gchar *code;
- gint i = 0;
+ const gchar *code;
+ gint i = 0;
- if (!*p || *p[0] == '\0') {
- continue;
- }
-
- code = all_langs[i].code;
-
- while (code) {
- if (g_str_has_prefix (*p, code)) {
- return g_strndup (*p, strlen (code));
- }
+ if (!*p || *p[0] == '\0') {
+ continue;
+ }
+
+ code = all_langs[i].code;
- code = all_langs[i++].code;
- }
+ while (code) {
+ if (g_str_has_prefix (*p, code)) {
+ return g_strndup (*p, strlen (code));
+ }
+
+ code = all_langs[i++].code;
+ }
}
return g_strdup ("en");
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 15:12:19 2008
@@ -28,10 +28,10 @@
G_BEGIN_DECLS
-#define TRACKER_TYPE_LANGUAGE (tracker_language_get_type ())
-#define TRACKER_LANGUAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_LANGUAGE, TrackerLanguage))
+#define TRACKER_TYPE_LANGUAGE (tracker_language_get_type ())
+#define TRACKER_LANGUAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_LANGUAGE, TrackerLanguage))
#define TRACKER_LANGUAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_LANGUAGE, TrackerLanguageClass))
-#define TRACKER_IS_LANGUAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_LANGUAGE))
+#define TRACKER_IS_LANGUAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_LANGUAGE))
#define TRACKER_IS_LANGUAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_LANGUAGE))
#define TRACKER_LANGUAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_LANGUAGE, TrackerLanguageClass))
@@ -46,20 +46,20 @@
GObjectClass parent_class;
};
-GType tracker_language_get_type (void) G_GNUC_CONST;
+GType tracker_language_get_type (void) G_GNUC_CONST;
-TrackerLanguage *tracker_language_new (TrackerConfig *language);
-TrackerConfig * tracker_language_get_config (TrackerLanguage *language);
-GHashTable * tracker_language_get_stop_words (TrackerLanguage *language);
-void tracker_language_set_config (TrackerLanguage *language,
+TrackerLanguage *tracker_language_new (TrackerConfig *language);
+TrackerConfig * tracker_language_get_config (TrackerLanguage *language);
+GHashTable * tracker_language_get_stop_words (TrackerLanguage *language);
+void tracker_language_set_config (TrackerLanguage *language,
TrackerConfig *config);
-const gchar * tracker_language_stem_word (TrackerLanguage *language,
+const gchar * tracker_language_stem_word (TrackerLanguage *language,
const gchar *word,
- gint word_length);
+ gint word_length);
/* Utility functions */
-gboolean tracker_language_check_exists (const gchar *language_code);
-gchar * tracker_language_get_default_code (void);
+gboolean tracker_language_check_exists (const gchar *language_code);
+gchar * tracker_language_get_default_code (void);
G_END_DECLS
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 15:12:19 2008
@@ -36,19 +36,19 @@
#include "tracker-log.h"
static gboolean initialized;
-static GMutex *mutex;
-static FILE *fd;
-static gint verbosity;
-static guint log_handler_id;
+static GMutex *mutex;
+static FILE *fd;
+static gint verbosity;
+static guint log_handler_id;
static inline void
log_output (const gchar *domain,
GLogLevelFlags log_level,
const gchar *message)
{
- time_t now;
- gchar time_str[64];
- gchar *output;
+ time_t now;
+ gchar time_str[64];
+ gchar *output;
struct tm *local_time;
GTimeVal current_time;
const gchar *log_level_str;
@@ -115,7 +115,7 @@
tracker_log_handler (const gchar *domain,
GLogLevelFlags log_level,
const gchar *message,
- gpointer user_data)
+ gpointer user_data)
{
if (((log_level & G_LOG_LEVEL_DEBUG) && verbosity < 3) ||
((log_level & G_LOG_LEVEL_INFO) && verbosity < 2) ||
@@ -131,7 +131,7 @@
gboolean
tracker_log_init (const gchar *filename,
- gint this_verbosity)
+ gint this_verbosity)
{
g_return_val_if_fail (filename != NULL, FALSE);
Modified: branches/indexer-split/src/libtracker-common/tracker-log.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-log.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-log.h Sat Sep 20 15:12:19 2008
@@ -27,8 +27,8 @@
G_BEGIN_DECLS
gboolean tracker_log_init (const char *filename,
- gint verbosity);
-void tracker_log_shutdown (void);
+ gint verbosity);
+void tracker_log_shutdown (void);
G_END_DECLS
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 15:12:19 2008
@@ -38,7 +38,7 @@
typedef struct {
/* General */
- gchar *description;
+ gchar *description;
gboolean enabled;
/* Monitors */
@@ -49,14 +49,14 @@
GHashTable *ignored_directories;
GHashTable *ignored_files;
- GList *ignored_directory_patterns;
- GList *ignored_file_patterns;
+ GList *ignored_directory_patterns;
+ GList *ignored_file_patterns;
/* Index */
- gchar *index_service;
+ gchar *index_service;
GHashTable *index_mime_types;
GHashTable *index_files;
- GList *index_file_patterns;
+ GList *index_file_patterns;
/* Specific Options, FIXME: Finish */
@@ -92,11 +92,11 @@
NULL);
g_list_free (mc->ignored_directory_patterns);
- g_hash_table_unref (mc->ignored_files);
- g_hash_table_unref (mc->ignored_directories);
+ g_hash_table_unref (mc->ignored_files);
+ g_hash_table_unref (mc->ignored_directories);
- g_hash_table_unref (mc->monitor_recurse_directories);
- g_hash_table_unref (mc->monitor_directories);
+ g_hash_table_unref (mc->monitor_recurse_directories);
+ g_hash_table_unref (mc->monitor_directories);
g_free (mc->description);
@@ -164,9 +164,9 @@
set_ignored_file_patterns (ModuleConfig *mc)
{
GPatternSpec *spec;
- GList *ignored_files;
- GList *l;
- GList *patterns = NULL;
+ GList *ignored_files;
+ GList *l;
+ GList *patterns = NULL;
g_list_foreach (mc->ignored_file_patterns,
(GFunc) g_pattern_spec_free,
@@ -191,9 +191,9 @@
set_ignored_directory_patterns (ModuleConfig *mc)
{
GPatternSpec *spec;
- GList *ignored_directories;
- GList *l;
- GList *patterns = NULL;
+ GList *ignored_directories;
+ GList *l;
+ GList *patterns = NULL;
g_list_foreach (mc->ignored_directory_patterns,
(GFunc) g_pattern_spec_free,
@@ -218,9 +218,9 @@
set_index_file_patterns (ModuleConfig *mc)
{
GPatternSpec *spec;
- GList *index_files;
- GList *l;
- GList *patterns = NULL;
+ GList *index_files;
+ GList *l;
+ GList *patterns = NULL;
g_list_foreach (mc->index_file_patterns,
(GFunc) g_pattern_spec_free,
@@ -242,11 +242,11 @@
}
static gboolean
-load_boolean (GKeyFile *key_file,
+load_boolean (GKeyFile *key_file,
const gchar *group,
const gchar *key)
{
- GError *error = NULL;
+ GError *error = NULL;
gboolean boolean;
boolean = g_key_file_get_boolean (key_file, group, key, &error);
@@ -268,10 +268,10 @@
}
static gchar *
-load_string (GKeyFile *key_file,
+load_string (GKeyFile *key_file,
const gchar *group,
const gchar *key,
- gboolean expand_string_as_path)
+ gboolean expand_string_as_path)
{
GError *error = NULL;
gchar *str;
@@ -310,11 +310,11 @@
gboolean expand_strings_as_paths,
gboolean remove_hierarchy_dups)
{
- GError *error = NULL;
+ GError *error = NULL;
GHashTable *table;
- gchar **str;
- gchar **p;
- gsize size;
+ gchar **str;
+ gchar **p;
+ gsize size;
table = g_hash_table_new_full (g_str_hash,
g_str_equal,
@@ -382,7 +382,7 @@
load_file (const gchar *filename)
{
GKeyFile *key_file;
- GError *error = NULL;
+ GError *error = NULL;
ModuleConfig *mc;
key_file = g_key_file_new ();
@@ -470,15 +470,15 @@
static gboolean
load_directory (void)
{
- GFile *file;
+ GFile *file;
GFileEnumerator *enumerator;
- GFileInfo *info;
- GError *error = NULL;
- gchar *path;
- gchar *filename;
- const gchar *name;
- const gchar *extension;
- glong extension_len;
+ GFileInfo *info;
+ GError *error = NULL;
+ gchar *path;
+ gchar *filename;
+ const gchar *name;
+ const gchar *extension;
+ glong extension_len;
path = get_directory ();
file = g_file_new_for_path (path);
@@ -509,7 +509,7 @@
for (info = g_file_enumerator_next_file (enumerator, NULL, &error);
info && !error;
info = g_file_enumerator_next_file (enumerator, NULL, &error)) {
- GFile *child;
+ GFile *child;
ModuleConfig *mc;
name = g_file_info_get_name (info);
@@ -557,10 +557,10 @@
static void
changed_cb (GFileMonitor *monitor,
- GFile *file,
- GFile *other_file,
+ GFile *file,
+ GFile *other_file,
GFileMonitorEvent event_type,
- gpointer user_data)
+ gpointer user_data)
{
gchar *filename;
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 15:12:19 2008
@@ -25,28 +25,28 @@
G_BEGIN_DECLS
-gboolean tracker_module_config_init (void);
-void tracker_module_config_shutdown (void);
+gboolean tracker_module_config_init (void);
+void tracker_module_config_shutdown (void);
-GList * tracker_module_config_get_modules (void);
+GList * tracker_module_config_get_modules (void);
-const gchar *tracker_module_config_get_description (const gchar *name);
-gboolean tracker_module_config_get_enabled (const gchar *name);
+const gchar *tracker_module_config_get_description (const gchar *name);
+gboolean tracker_module_config_get_enabled (const gchar *name);
-GList * tracker_module_config_get_monitor_directories (const gchar *name);
+GList * tracker_module_config_get_monitor_directories (const gchar *name);
GList * tracker_module_config_get_monitor_recurse_directories (const gchar *name);
-GList * tracker_module_config_get_ignored_directories (const gchar *name);
-GList * tracker_module_config_get_ignored_files (const gchar *name);
+GList * tracker_module_config_get_ignored_directories (const gchar *name);
+GList * tracker_module_config_get_ignored_files (const gchar *name);
-const gchar *tracker_module_config_get_index_service (const gchar *name);
-GList * tracker_module_config_get_index_mime_types (const gchar *name);
-GList * tracker_module_config_get_index_files (const gchar *name);
+const gchar *tracker_module_config_get_index_service (const gchar *name);
+GList * tracker_module_config_get_index_mime_types (const gchar *name);
+GList * tracker_module_config_get_index_files (const gchar *name);
/* Convenience functions */
GList * tracker_module_config_get_ignored_directory_patterns (const gchar *name);
-GList * tracker_module_config_get_ignored_file_patterns (const gchar *name);
-GList * tracker_module_config_get_index_file_patterns (const gchar *name);
+GList * tracker_module_config_get_ignored_file_patterns (const gchar *name);
+GList * tracker_module_config_get_index_file_patterns (const gchar *name);
G_END_DECLS
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 15:12:19 2008
@@ -61,7 +61,7 @@
static gboolean
is_initialized (void)
{
- return lock_filename != NULL || tmp_dir != NULL;
+ return lock_filename != NULL || tmp_dir != NULL;
}
/* Serialises db access via a lock file for safe use on (lock broken)
@@ -72,25 +72,25 @@
{
gchar *filename;
gint attempt;
- gint fd;
+ gint fd;
if (!use_nfs_safe_locking) {
return TRUE;
}
- if (!is_initialized()) {
- g_critical ("Could not initialize NFS lock");
- return FALSE;
- }
+ if (!is_initialized()) {
+ g_critical ("Could not initialize NFS lock");
+ return FALSE;
+ }
filename = g_strdup_printf ("%s_%s.lock",
- tmp_dir,
- g_get_user_name ());
+ tmp_dir,
+ g_get_user_name ());
for (attempt = 0; attempt < 10000; ++attempt) {
/* Delete existing lock file if older than 5 mins */
if (g_file_test (lock_filename, G_FILE_TEST_EXISTS) &&
- time ((time_t *) - get_mtime (lock_filename)) > 300) {
+ time ((time_t *) - get_mtime (lock_filename)) > 300) {
g_unlink (lock_filename);
}
@@ -98,9 +98,9 @@
if (fd >= 0) {
/* Create host specific file and link to lock file */
- if (link (lock_filename, filename) == -1) {
- goto error;
- }
+ if (link (lock_filename, filename) == -1) {
+ goto error;
+ }
/* For atomic NFS-safe locks, stat links = 2
* if file locked. If greater than 2 then we
@@ -134,10 +134,10 @@
return;
}
- if (!is_initialized ()) {
- g_critical ("Could not initialize NFS lock");
- return;
- }
+ if (!is_initialized ()) {
+ g_critical ("Could not initialize NFS lock");
+ return;
+ }
filename = g_strdup_printf ("%s_%s.lock",
tmp_dir,
@@ -152,46 +152,46 @@
void
tracker_nfs_lock_init (gboolean nfs)
{
- if (is_initialized ()) {
+ if (is_initialized ()) {
return;
- }
+ }
use_nfs_safe_locking = nfs;
- if (lock_filename == NULL) {
- lock_filename = g_build_filename (g_get_user_data_dir (),
+ if (lock_filename == NULL) {
+ 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 (),
+ if (tmp_dir == NULL) {
+ tmp_dir = g_build_filename (g_get_user_data_dir (),
"tracker",
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)");
}
void
tracker_nfs_lock_shutdown (void)
{
- if (!is_initialized ()) {
+ if (!is_initialized ()) {
return;
- }
+ }
- if (lock_filename) {
- g_free (lock_filename);
+ if (lock_filename) {
+ g_free (lock_filename);
lock_filename = NULL;
- }
+ }
- if (tmp_dir) {
- g_free (tmp_dir);
+ if (tmp_dir) {
+ g_free (tmp_dir);
tmp_dir = NULL;
- }
+ }
- g_message ("NFS lock finalized");
+ g_message ("NFS lock finalized");
}
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 15:12:19 2008
@@ -26,10 +26,10 @@
G_BEGIN_DECLS
-void tracker_nfs_lock_init (gboolean nfs);
-void tracker_nfs_lock_shutdown (void);
+void tracker_nfs_lock_init (gboolean nfs);
+void tracker_nfs_lock_shutdown (void);
gboolean tracker_nfs_lock_obtain (void);
-void tracker_nfs_lock_release (void);
+void tracker_nfs_lock_release (void);
G_END_DECLS
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 15:12:19 2008
@@ -43,7 +43,7 @@
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;
@@ -79,7 +79,7 @@
const gchar *str)
{
gpointer data;
- gchar *str_lower;
+ gchar *str_lower;
str_lower = g_utf8_collate_key (str, -1);
if (!str_lower) {
@@ -95,11 +95,11 @@
#endif
static gpointer
-ontology_hash_lookup_by_id (GHashTable *hash_table,
- gint id)
+ontology_hash_lookup_by_id (GHashTable *hash_table,
+ gint id)
{
gpointer data;
- gchar *str;
+ gchar *str;
str = g_strdup_printf ("%d", id);
if (!str) {
@@ -183,14 +183,14 @@
void
tracker_ontology_service_add (TrackerService *service,
- GSList *mimes,
- GSList *mime_prefixes)
+ GSList *mimes,
+ GSList *mime_prefixes)
{
- GSList *l;
+ GSList *l;
ServiceMimePrefixes *service_mime_prefix;
- gint id;
- const gchar *name;
+ gint id;
+ const gchar *name;
g_return_if_fail (TRACKER_IS_SERVICE (service));
@@ -198,7 +198,7 @@
name = tracker_service_get_name (service);
g_hash_table_insert (service_names,
- /* g_utf8_collate_key (name, -1), */
+ /* g_utf8_collate_key (name, -1), */
g_strdup (name),
g_object_ref (service));
g_hash_table_insert (service_ids,
@@ -246,9 +246,9 @@
gchar *
tracker_ontology_get_service_by_mime (const gchar *mime)
{
- gpointer id;
+ gpointer id;
ServiceMimePrefixes *item;
- GSList *prefix_service;
+ GSList *prefix_service;
g_return_val_if_fail (mime != NULL, g_strdup ("Other"));
@@ -348,7 +348,7 @@
tracker_ontology_get_service_db_by_name (const gchar *service_str)
{
TrackerDBType type;
- gchar *str;
+ gchar *str;
g_return_val_if_fail (service_str != NULL, TRACKER_DB_TYPE_FILES);
@@ -374,8 +374,8 @@
tracker_ontology_get_service_names_registered (void)
{
TrackerService *service;
- GList *services, *l;
- GSList *names = NULL;
+ GList *services, *l;
+ GSList *names = NULL;
services = g_hash_table_get_values (service_names);
@@ -390,9 +390,9 @@
GSList *
tracker_ontology_get_field_names_registered (const gchar *service_str)
{
- GList *fields;
- GList *l;
- GSList *names;
+ GList *fields;
+ GList *l;
+ GSList *names;
const gchar *prefix;
const gchar *parent_prefix;
@@ -533,7 +533,7 @@
const gchar *meta_name)
{
TrackerService *service;
- gint i;
+ gint i;
const GSList *l;
g_return_val_if_fail (service_str != NULL, 0);
@@ -617,8 +617,8 @@
tracker_ontology_get_field_by_id (gint id)
{
TrackerField *field = NULL;
- GList *values;
- GList *l;
+ GList *values;
+ GList *l;
/* TODO Create a hashtable with id -> field def. More efficient */
@@ -641,7 +641,7 @@
{
const gchar *field_name;
const gchar *meta_name;
- gint key_field;
+ gint key_field;
g_return_val_if_fail (TRACKER_IS_FIELD (field), NULL);
g_return_val_if_fail (service_str != NULL, NULL);
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 15:12:19 2008
@@ -29,47 +29,47 @@
G_BEGIN_DECLS
-void tracker_ontology_init (void);
-void tracker_ontology_shutdown (void);
+void tracker_ontology_init (void);
+void tracker_ontology_shutdown (void);
/* Service mechanics */
-void tracker_ontology_service_add (TrackerService *service,
- GSList *mimes,
- GSList *mime_prefixes);
-TrackerService *tracker_ontology_get_service_by_name (const gchar *service_str);
-gchar * tracker_ontology_get_service_by_id (gint id);
-gchar * tracker_ontology_get_service_by_mime (const gchar *mime);
-gint tracker_ontology_get_service_id_by_name (const gchar *service_str);
-TrackerDBType tracker_ontology_get_service_db_by_name (const gchar *service_str);
-gchar * tracker_ontology_get_service_parent (const gchar *service_str);
-gchar * tracker_ontology_get_service_parent_by_id (gint id);
-gint tracker_ontology_get_service_parent_id_by_id (gint id);
-GSList * tracker_ontology_get_service_names_registered (void);
-GSList * tracker_ontology_get_field_names_registered (const gchar *service_str);
+void tracker_ontology_service_add (TrackerService *service,
+ GSList *mimes,
+ GSList *mime_prefixes);
+TrackerService *tracker_ontology_get_service_by_name (const gchar *service_str);
+gchar * tracker_ontology_get_service_by_id (gint id);
+gchar * tracker_ontology_get_service_by_mime (const gchar *mime);
+gint tracker_ontology_get_service_id_by_name (const gchar *service_str);
+TrackerDBType tracker_ontology_get_service_db_by_name (const gchar *service_str);
+gchar * tracker_ontology_get_service_parent (const gchar *service_str);
+gchar * tracker_ontology_get_service_parent_by_id (gint id);
+gint tracker_ontology_get_service_parent_id_by_id (gint id);
+GSList * tracker_ontology_get_service_names_registered (void);
+GSList * tracker_ontology_get_field_names_registered (const gchar *service_str);
/* Service data */
-gboolean tracker_ontology_service_is_valid (const gchar *service_str);
-gboolean tracker_ontology_service_has_embedded (const gchar *service_str);
-gboolean tracker_ontology_service_has_metadata (const gchar *service_str);
-gboolean tracker_ontology_service_has_thumbnails (const gchar *service_str);
-gboolean tracker_ontology_service_has_text (const gchar *service_str);
-gint tracker_ontology_service_get_key_metadata (const gchar *service_str,
- const gchar *meta_name);
-gboolean tracker_ontology_service_get_show_directories (const gchar *service_str);
-gboolean tracker_ontology_service_get_show_files (const gchar *service_str);
+gboolean tracker_ontology_service_is_valid (const gchar *service_str);
+gboolean tracker_ontology_service_has_embedded (const gchar *service_str);
+gboolean tracker_ontology_service_has_metadata (const gchar *service_str);
+gboolean tracker_ontology_service_has_thumbnails (const gchar *service_str);
+gboolean tracker_ontology_service_has_text (const gchar *service_str);
+gint tracker_ontology_service_get_key_metadata (const gchar *service_str,
+ const gchar *meta_name);
+gboolean tracker_ontology_service_get_show_directories (const gchar *service_str);
+gboolean tracker_ontology_service_get_show_files (const gchar *service_str);
/* Field mechanics */
-void tracker_ontology_field_add (TrackerField *field);
-TrackerField * tracker_ontology_get_field_by_name (const gchar *name);
-TrackerField * tracker_ontology_get_field_by_id (gint id);
-gchar * tracker_ontology_get_field_name_by_service_name (TrackerField *field,
- const gchar *service_str);
+void tracker_ontology_field_add (TrackerField *field);
+TrackerField * tracker_ontology_get_field_by_name (const gchar *name);
+TrackerField * tracker_ontology_get_field_by_id (gint id);
+gchar * tracker_ontology_get_field_name_by_service_name (TrackerField *field,
+ const gchar *service_str);
/* Field data */
-gchar * tracker_ontology_field_get_display_name (TrackerField *field);
-const gchar * tracker_ontology_field_get_id (const gchar *name);
-gboolean tracker_ontology_field_is_child_of (const gchar *child,
- const gchar *parent);
+gchar * tracker_ontology_field_get_display_name (TrackerField *field);
+const gchar * tracker_ontology_field_get_id (const gchar *name);
+gboolean tracker_ontology_field_is_child_of (const gchar *child,
+ const gchar *parent);
G_END_DECLS
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 15:12:19 2008
@@ -37,102 +37,102 @@
gboolean
tracker_spawn (gchar **argv,
- gint timeout,
- gchar **tmp_stdout,
- gint *exit_status)
+ gint timeout,
+ gchar **tmp_stdout,
+ gint *exit_status)
{
- GError *error = NULL;
+ GError *error = NULL;
GSpawnFlags flags;
- gboolean result;
+ gboolean result;
- g_return_val_if_fail (argv != NULL, FALSE);
- g_return_val_if_fail (argv[0] != NULL, FALSE);
- g_return_val_if_fail (timeout > 0, FALSE);
+ g_return_val_if_fail (argv != NULL, FALSE);
+ g_return_val_if_fail (argv[0] != NULL, FALSE);
+ g_return_val_if_fail (timeout > 0, FALSE);
- flags = G_SPAWN_SEARCH_PATH |
- G_SPAWN_STDERR_TO_DEV_NULL;
+ flags = G_SPAWN_SEARCH_PATH |
+ G_SPAWN_STDERR_TO_DEV_NULL;
if (!tmp_stdout) {
flags = flags | G_SPAWN_STDOUT_TO_DEV_NULL;
}
result = g_spawn_sync (NULL,
- argv,
- NULL,
- flags,
- tracker_spawn_child_func,
- GINT_TO_POINTER (timeout),
- tmp_stdout,
- NULL,
- exit_status,
- &error);
-
- if (error) {
- g_warning ("Could not spawn command:'%s', %s",
- argv[0],
- error->message);
- g_error_free (error);
- }
+ argv,
+ NULL,
+ flags,
+ tracker_spawn_child_func,
+ GINT_TO_POINTER (timeout),
+ tmp_stdout,
+ NULL,
+ exit_status,
+ &error);
+
+ if (error) {
+ g_warning ("Could not spawn command:'%s', %s",
+ argv[0],
+ error->message);
+ g_error_free (error);
+ }
- return result;
+ return result;
}
gboolean
tracker_spawn_async_with_channels (const gchar **argv,
- gint timeout,
- GPid *pid,
- GIOChannel **stdin_channel,
- GIOChannel **stdout_channel,
- GIOChannel **stderr_channel)
+ gint timeout,
+ GPid *pid,
+ GIOChannel **stdin_channel,
+ GIOChannel **stdout_channel,
+ GIOChannel **stderr_channel)
{
- GError *error = NULL;
- gboolean result;
- gint stdin, stdout, stderr;
-
- g_return_val_if_fail (argv != NULL, FALSE);
- g_return_val_if_fail (argv[0] != NULL, FALSE);
- g_return_val_if_fail (timeout > 0, FALSE);
- g_return_val_if_fail (pid != NULL, FALSE);
-
- result = g_spawn_async_with_pipes (NULL,
- (gchar **) argv,
- NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
- tracker_spawn_child_func,
- GINT_TO_POINTER (timeout),
- pid,
- stdin_channel ? &stdin : NULL,
- stdout_channel ? &stdout : NULL,
- stderr_channel ? &stderr : NULL,
- &error);
-
- if (error) {
- g_warning ("Could not spawn command:'%s', %s",
- argv[0],
- error->message);
- g_error_free (error);
- }
-
- if (stdin_channel) {
- *stdin_channel = result ? g_io_channel_unix_new (stdin) : NULL;
- }
-
- if (stdout_channel) {
- *stdout_channel = result ? g_io_channel_unix_new (stdout) : NULL;
- }
-
- if (stderr_channel) {
- *stderr_channel = result ? g_io_channel_unix_new (stderr) : NULL;
- }
+ GError *error = NULL;
+ gboolean result;
+ gint stdin, stdout, stderr;
+
+ g_return_val_if_fail (argv != NULL, FALSE);
+ g_return_val_if_fail (argv[0] != NULL, FALSE);
+ g_return_val_if_fail (timeout > 0, FALSE);
+ g_return_val_if_fail (pid != NULL, FALSE);
+
+ result = g_spawn_async_with_pipes (NULL,
+ (gchar **) argv,
+ NULL,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+ tracker_spawn_child_func,
+ GINT_TO_POINTER (timeout),
+ pid,
+ stdin_channel ? &stdin : NULL,
+ stdout_channel ? &stdout : NULL,
+ stderr_channel ? &stderr : NULL,
+ &error);
+
+ if (error) {
+ g_warning ("Could not spawn command:'%s', %s",
+ argv[0],
+ error->message);
+ g_error_free (error);
+ }
+
+ if (stdin_channel) {
+ *stdin_channel = result ? g_io_channel_unix_new (stdin) : NULL;
+ }
+
+ if (stdout_channel) {
+ *stdout_channel = result ? g_io_channel_unix_new (stdout) : NULL;
+ }
- return result;
+ if (stderr_channel) {
+ *stderr_channel = result ? g_io_channel_unix_new (stderr) : NULL;
+ }
+
+ return result;
}
void
tracker_spawn_child_func (gpointer user_data)
{
struct rlimit cpu_limit;
- gint timeout = GPOINTER_TO_INT (user_data);
+ gint timeout = GPOINTER_TO_INT (user_data);
/* set cpu limit */
getrlimit (RLIMIT_CPU, &cpu_limit);
@@ -146,27 +146,27 @@
tracker_memory_setrlimits ();
/* Set child's niceness to 19 */
- errno = 0;
+ errno = 0;
- /* 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...
- */
- if (nice (19) == -1 && errno) {
- g_warning ("Failed to set nice value");
- }
+ /* 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...
+ */
+ if (nice (19) == -1 && errno) {
+ g_warning ("Failed to set nice value");
+ }
/* Have this as a precaution in cases where cpu limit has not
- * been reached due to spawned app sleeping.
- */
+ * been reached due to spawned app sleeping.
+ */
alarm (timeout + 2);
}
gchar *
tracker_create_permission_string (struct stat finfo)
{
- gchar *str;
+ gchar *str;
gint n, bit;
/* Create permissions string */
@@ -212,11 +212,11 @@
/* We want to limit the max virtual memory
* most extractors use mmap() so only virtual memory can be
* effectively limited.
- */
+ */
#ifdef __x86_64__
/* Many extractors on AMD64 require 512M of virtual memory, so
- * we limit heap too.
- */
+ * we limit heap too.
+ */
getrlimit (RLIMIT_AS, &rl);
rl.rlim_cur = MAX_MEM_AMD64 * 1024 * 1024;
fail |= setrlimit (RLIMIT_AS, &rl);
@@ -226,8 +226,8 @@
fail |= setrlimit (RLIMIT_DATA, &rl);
#else /* __x86_64__ */
/* On other architectures, 128M of virtual memory seems to be
- * enough.
- */
+ * enough.
+ */
getrlimit (RLIMIT_AS, &rl);
rl.rlim_cur = MAX_MEM * 1024 * 1024;
fail |= setrlimit (RLIMIT_AS, &rl);
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 15:12:19 2008
@@ -31,78 +31,78 @@
gboolean
tracker_spawn (gchar **argv,
- gint timeout,
- gchar **tmp_stdout,
- gint *exit_status)
+ gint timeout,
+ gchar **tmp_stdout,
+ gint *exit_status)
{
GSpawnFlags flags;
- GError *error = NULL;
- gchar **new_argv;
- gboolean result;
- gint length;
- gint i;
-
- g_return_val_if_fail (argv != NULL, FALSE);
- g_return_val_if_fail (argv[0] != NULL, FALSE);
- g_return_val_if_fail (timeout > 0, FALSE);
+ GError *error = NULL;
+ gchar **new_argv;
+ gboolean result;
+ gint length;
+ gint i;
+
+ g_return_val_if_fail (argv != NULL, FALSE);
+ g_return_val_if_fail (argv[0] != NULL, FALSE);
+ g_return_val_if_fail (timeout > 0, FALSE);
length = g_strv_length (argv);
- new_argv = g_new0 (gchar*, length + 3);
+ new_argv = g_new0 (gchar*, length + 3);
- new_argv[0] = "cmd.exe";
- new_argv[1] = "/c";
+ new_argv[0] = "cmd.exe";
+ new_argv[1] = "/c";
- for (i = 0; argv[i]; i++) {
- new_argv[i + 2] = argv[i];
- }
+ for (i = 0; argv[i]; i++) {
+ new_argv[i + 2] = argv[i];
+ }
- flags = G_SPAWN_SEARCH_PATH |
- G_SPAWN_STDERR_TO_DEV_NULL;
+ flags = G_SPAWN_SEARCH_PATH |
+ G_SPAWN_STDERR_TO_DEV_NULL;
if (!tmp_stdout) {
flags |= G_SPAWN_STDOUT_TO_DEV_NULL;
}
result = g_spawn_sync (NULL,
- new_argv,
- NULL,
- flags,
- NULL,
- GINT_TO_POINTER (timeout),
- tmp_stdout,
- NULL,
- exit_status,
- &error);
-
- if (error) {
- g_warning ("Could not spawn command:'%s', %s",
- argv[0],
- error->message);
- g_error_free (error);
- }
+ new_argv,
+ NULL,
+ flags,
+ NULL,
+ GINT_TO_POINTER (timeout),
+ tmp_stdout,
+ NULL,
+ exit_status,
+ &error);
+
+ if (error) {
+ g_warning ("Could not spawn command:'%s', %s",
+ argv[0],
+ error->message);
+ g_error_free (error);
+ }
- g_strfreev (new_argv);
+ g_strfreev (new_argv);
return result;
}
gboolean
tracker_spawn_async_with_channels (const gchar **argv,
- gint timeout,
- GPid *pid,
+ gint timeout,
+ GPid *pid,
GIOChannel **stdin_channel,
GIOChannel **stdout_channel,
GIOChannel **strerr_channel)
{
- GError *error = NULL;
+ GError *error = NULL;
gboolean result;
- gint stdin, stdout, stderr;
+ gint stdin, stdout, stderr;
- g_return_val_if_fail (argv != NULL, FALSE);
- g_return_val_if_fail (argv[0] != NULL, FALSE);
- g_return_val_if_fail (timeout > 0, FALSE);
- g_return_val_if_fail (pid != NULL, FALSE);
+ g_return_val_if_fail (argv != NULL, FALSE);
+ g_return_val_if_fail (argv[0] != NULL, FALSE);
+ g_return_val_if_fail (timeout > 0, FALSE);
+ g_return_val_if_fail (pid != NULL, FALSE);
result = g_spawn_async_with_pipes (NULL,
(gchar **) argv,
@@ -117,10 +117,10 @@
&error);
if (error) {
- g_warning ("Could not spawn command:'%s', %s",
- argv[0],
- error->message);
- g_error_free (error);
+ g_warning ("Could not spawn command:'%s', %s",
+ argv[0],
+ error->message);
+ g_error_free (error);
}
if (stdin_channel) {
@@ -146,7 +146,7 @@
gchar *
tracker_create_permission_string (struct stat finfo)
{
- gchar *str;
+ gchar *str;
gint n, bit;
/* Create permissions string */
Modified: branches/indexer-split/src/libtracker-common/tracker-os-dependant.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-os-dependant.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-os-dependant.h Sat Sep 20 15:12:19 2008
@@ -26,17 +26,17 @@
#include <glib/gstdio.h>
/* Process spawning */
-gboolean tracker_spawn (gchar **argv,
- gint timeout,
- gchar **tmp_stdout,
- gint *exit_status);
+gboolean tracker_spawn (gchar **argv,
+ gint timeout,
+ gchar **tmp_stdout,
+ gint *exit_status);
gboolean tracker_spawn_async_with_channels (const gchar **argv,
- gint timeout,
- GPid *pid,
- GIOChannel **stdin_channel,
- GIOChannel **stdout_channel,
- GIOChannel **stderr_channel);
-void tracker_spawn_child_func (gpointer user_data);
+ gint timeout,
+ GPid *pid,
+ GIOChannel **stdin_channel,
+ GIOChannel **stdout_channel,
+ GIOChannel **stderr_channel);
+void tracker_spawn_child_func (gpointer user_data);
/* File permissions */
gchar * tracker_create_permission_string (struct stat finfo);
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 15:12:19 2008
@@ -32,21 +32,21 @@
/* Need pango for CJK ranges which are : 0x3400 - 0x4DB5, 0x4E00 -
* 0x9FA5, 0x20000 - <= 0x2A6D6
*/
-#define NEED_PANGO(c) (((c) >= 0x3400 && (c) <= 0x4DB5) || \
- ((c) >= 0x4E00 && (c) <= 0x9FA5) || \
- ((c) >= 0x20000 && (c) <= 0x2A6D6))
-#define IS_LATIN(c) (((c) <= 0x02AF) || \
- ((c) >= 0x1E00 && (c) <= 0x1EFF))
-#define IS_ASCII(c) ((c) <= 0x007F)
+#define NEED_PANGO(c) (((c) >= 0x3400 && (c) <= 0x4DB5) || \
+ ((c) >= 0x4E00 && (c) <= 0x9FA5) || \
+ ((c) >= 0x20000 && (c) <= 0x2A6D6))
+#define IS_LATIN(c) (((c) <= 0x02AF) || \
+ ((c) >= 0x1E00 && (c) <= 0x1EFF))
+#define IS_ASCII(c) ((c) <= 0x007F)
#define IS_ASCII_ALPHA_LOWER(c) ((c) >= 0x0061 && (c) <= 0x007A)
#define IS_ASCII_ALPHA_HIGHER(c) ((c) >= 0x0041 && (c) <= 0x005A)
-#define IS_ASCII_NUMERIC(c) ((c) >= 0x0030 && (c) <= 0x0039)
-#define IS_ASCII_IGNORE(c) ((c) <= 0x002C)
-#define IS_HYPHEN(c) ((c) == 0x002D)
-#define IS_UNDERSCORE(c) ((c) == 0x005F)
-#define IS_NEWLINE(c) ((c) == 0x000D)
-#define IS_O(c) ((c) == 0x006F)
-#define IS_R(c) ((c) == 0x0072)
+#define IS_ASCII_NUMERIC(c) ((c) >= 0x0030 && (c) <= 0x0039)
+#define IS_ASCII_IGNORE(c) ((c) <= 0x002C)
+#define IS_HYPHEN(c) ((c) == 0x002D)
+#define IS_UNDERSCORE(c) ((c) == 0x005F)
+#define IS_NEWLINE(c) ((c) == 0x000D)
+#define IS_O(c) ((c) == 0x006F)
+#define IS_R(c) ((c) == 0x0072)
typedef enum {
TRACKER_PARSER_WORD_ASCII_HIGHER,
@@ -111,8 +111,8 @@
static inline gchar *
strip_word (const gchar *str,
- gint length,
- guint32 *len)
+ gint length,
+ guint32 *len)
{
#ifdef HAVE_UNAC
gchar *s = NULL;
@@ -133,7 +133,7 @@
{
const gchar *p;
gunichar c;
- gint i = 0;
+ gint i = 0;
/* Grab first 1024 non-whitespace chars and test */
for (p = text; *p && i < 1024; p = g_utf8_next_char (p)) {
@@ -156,7 +156,7 @@
{
const gchar *p;
gunichar c;
- gint i = 0;
+ gint i = 0;
/* Grab first 255 non-whitespace chars and test */
for (p = txt; *p && i < 255; p = g_utf8_next_char (p)) {
@@ -181,212 +181,212 @@
static gboolean
is_stop_word (TrackerLanguage *language,
- const gchar *word)
+ const gchar *word)
{
- GHashTable *stop_words;
+ GHashTable *stop_words;
- if (!word) {
- return FALSE;
- }
+ if (!word) {
+ return FALSE;
+ }
- stop_words = tracker_language_get_stop_words (language);
+ stop_words = tracker_language_get_stop_words (language);
- return g_hash_table_lookup (stop_words, word) != NULL;
+ return g_hash_table_lookup (stop_words, word) != NULL;
}
static const gchar *
analyze_text (const gchar *text,
- TrackerLanguage *language,
- gint max_word_length,
- gint min_word_length,
- gboolean filter_words,
- gboolean filter_numbers,
- gboolean delimit_hyphen,
- gchar **index_word)
+ TrackerLanguage *language,
+ gint max_word_length,
+ gint min_word_length,
+ gboolean filter_words,
+ gboolean filter_numbers,
+ gboolean delimit_hyphen,
+ gchar **index_word)
{
- TrackerParserWordType word_type;
- gunichar word[64];
- gboolean do_strip;
- gboolean is_valid;
- gint length;
- glong bytes;
- const char *p;
- const char *start;
+ TrackerParserWordType word_type;
+ gunichar word[64];
+ gboolean do_strip;
+ gboolean is_valid;
+ gint length;
+ glong bytes;
+ const char *p;
+ const char *start;
*index_word = NULL;
if (text == NULL || text[0] == '\0') {
- return NULL;
- }
+ return NULL;
+ }
- word_type = TRACKER_PARSER_WORD_IGNORE;
- do_strip = FALSE;
- is_valid = TRUE;
- length = 0;
- bytes = 0;
- start = NULL;
-
- for (p = text; *p; p = g_utf8_next_char (p)) {
- TrackerParserWordType type;
- gunichar c;
+ word_type = TRACKER_PARSER_WORD_IGNORE;
+ do_strip = FALSE;
+ is_valid = TRUE;
+ length = 0;
+ bytes = 0;
+ start = NULL;
+
+ for (p = text; *p; p = g_utf8_next_char (p)) {
+ TrackerParserWordType type;
+ gunichar c;
- c = g_utf8_get_char (p);
- type = get_word_type (c);
+ 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 ||
- type == TRACKER_PARSER_WORD_UNDERSCORE))) {
- if (!start) {
- continue;
- } else {
- break;
- }
- }
-
- if (!is_valid) {
- continue;
- }
-
- if (!start) {
- start = p;
-
- /* Valid words must start with an alpha or
- * underscore if we are filtering.
- */
- if (filter_numbers) {
- if (type == TRACKER_PARSER_WORD_NUM) {
- is_valid = FALSE;
- continue;
- } else {
- if (type == TRACKER_PARSER_WORD_HYPHEN) {
- is_valid = FALSE;
- continue;
- }
- }
- }
- }
-
- if (length >= max_word_length) {
- continue;
- }
-
- length++;
-
- switch (type) {
- case TRACKER_PARSER_WORD_ASCII_HIGHER:
- c += 32;
-
- case TRACKER_PARSER_WORD_ASCII_LOWER:
- case TRACKER_PARSER_WORD_HYPHEN:
- case TRACKER_PARSER_WORD_UNDERSCORE:
- if (word_type == TRACKER_PARSER_WORD_NUM ||
- word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
- word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
- } else {
- word_type = TRACKER_PARSER_WORD_ALPHA;
- }
-
- break;
-
- case TRACKER_PARSER_WORD_NUM:
- if (word_type == TRACKER_PARSER_WORD_ALPHA ||
- word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
- word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
- } else {
- word_type = TRACKER_PARSER_WORD_NUM;
- }
- break;
-
- case TRACKER_PARSER_WORD_ALPHA_HIGHER:
- c = g_unichar_tolower (c);
-
- case TRACKER_PARSER_WORD_ALPHA_LOWER:
- if (!do_strip) {
- do_strip = TRUE;
- }
-
- if (word_type == TRACKER_PARSER_WORD_NUM ||
- word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
- word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
- } else {
- word_type = TRACKER_PARSER_WORD_ALPHA;
- }
-
- break;
-
- default:
- break;
- }
-
- word[length -1] = c;
- }
-
- if (!is_valid) {
- return p;
- }
-
- if (word_type == TRACKER_PARSER_WORD_NUM) {
- if (!filter_numbers || length >= INDEX_NUMBER_MIN_LENGTH) {
- *index_word = g_ucs4_to_utf8 (word, length, NULL, NULL, NULL);
- }
- } else if (length >= min_word_length) {
- const gchar *stem_word;
- gchar *stripped_word;
- gchar *str;
- gchar *utf8;
- guint32 len;
-
- utf8 = g_ucs4_to_utf8 (word, length, NULL, &bytes, NULL);
-
- if (!utf8) {
- return p;
- }
-
- if (do_strip && get_encoding (utf8) == TRACKER_PARSER_ENCODING_LATIN) {
- stripped_word = strip_word (utf8, bytes, &len);
- } else {
- stripped_word = NULL;
- }
-
- if (!stripped_word) {
- str = g_utf8_normalize (utf8,
- bytes,
- G_NORMALIZE_NFC);
- } else {
- str = g_utf8_normalize (stripped_word,
- len,
- G_NORMALIZE_NFC);
- g_free (stripped_word);
- }
-
- g_free (utf8);
-
- stem_word = tracker_language_stem_word (language,
- str,
- strlen (str));
- g_free (str);
-
- if (!filter_words || !is_stop_word (language, stem_word)) {
- *index_word = g_strdup (stem_word);
- }
- }
+ (delimit_hyphen &&
+ (type == TRACKER_PARSER_WORD_HYPHEN ||
+ type == TRACKER_PARSER_WORD_UNDERSCORE))) {
+ if (!start) {
+ continue;
+ } else {
+ break;
+ }
+ }
+
+ if (!is_valid) {
+ continue;
+ }
+
+ if (!start) {
+ start = p;
+
+ /* Valid words must start with an alpha or
+ * underscore if we are filtering.
+ */
+ if (filter_numbers) {
+ if (type == TRACKER_PARSER_WORD_NUM) {
+ is_valid = FALSE;
+ continue;
+ } else {
+ if (type == TRACKER_PARSER_WORD_HYPHEN) {
+ is_valid = FALSE;
+ continue;
+ }
+ }
+ }
+ }
+
+ if (length >= max_word_length) {
+ continue;
+ }
+
+ length++;
+
+ switch (type) {
+ case TRACKER_PARSER_WORD_ASCII_HIGHER:
+ c += 32;
+
+ case TRACKER_PARSER_WORD_ASCII_LOWER:
+ case TRACKER_PARSER_WORD_HYPHEN:
+ case TRACKER_PARSER_WORD_UNDERSCORE:
+ if (word_type == TRACKER_PARSER_WORD_NUM ||
+ word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
+ word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
+ } else {
+ word_type = TRACKER_PARSER_WORD_ALPHA;
+ }
+
+ break;
+
+ case TRACKER_PARSER_WORD_NUM:
+ if (word_type == TRACKER_PARSER_WORD_ALPHA ||
+ word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
+ word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
+ } else {
+ word_type = TRACKER_PARSER_WORD_NUM;
+ }
+ break;
+
+ case TRACKER_PARSER_WORD_ALPHA_HIGHER:
+ c = g_unichar_tolower (c);
+
+ case TRACKER_PARSER_WORD_ALPHA_LOWER:
+ if (!do_strip) {
+ do_strip = TRUE;
+ }
+
+ if (word_type == TRACKER_PARSER_WORD_NUM ||
+ word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
+ word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
+ } else {
+ word_type = TRACKER_PARSER_WORD_ALPHA;
+ }
+
+ break;
+
+ default:
+ break;
+ }
+
+ word[length -1] = c;
+ }
+
+ if (!is_valid) {
+ return p;
+ }
+
+ if (word_type == TRACKER_PARSER_WORD_NUM) {
+ if (!filter_numbers || length >= INDEX_NUMBER_MIN_LENGTH) {
+ *index_word = g_ucs4_to_utf8 (word, length, NULL, NULL, NULL);
+ }
+ } else if (length >= min_word_length) {
+ const gchar *stem_word;
+ gchar *stripped_word;
+ gchar *str;
+ gchar *utf8;
+ guint32 len;
+
+ utf8 = g_ucs4_to_utf8 (word, length, NULL, &bytes, NULL);
+
+ if (!utf8) {
+ return p;
+ }
- return p;
+ if (do_strip && get_encoding (utf8) == TRACKER_PARSER_ENCODING_LATIN) {
+ stripped_word = strip_word (utf8, bytes, &len);
+ } else {
+ stripped_word = NULL;
+ }
+
+ if (!stripped_word) {
+ str = g_utf8_normalize (utf8,
+ bytes,
+ G_NORMALIZE_NFC);
+ } else {
+ str = g_utf8_normalize (stripped_word,
+ len,
+ G_NORMALIZE_NFC);
+ g_free (stripped_word);
+ }
+
+ g_free (utf8);
+
+ stem_word = tracker_language_stem_word (language,
+ str,
+ strlen (str));
+ g_free (str);
+
+ if (!filter_words || !is_stop_word (language, stem_word)) {
+ *index_word = g_strdup (stem_word);
+ }
+ }
+
+ return p;
}
static gboolean
pango_next (TrackerParser *parser,
- gint *byte_offset_start,
- gint *byte_offset_end,
- gboolean *is_new_paragraph)
+ gint *byte_offset_start,
+ gint *byte_offset_end,
+ gboolean *is_new_paragraph)
{
/* CJK text does not need stemming or other treatment */
- gint word_start = -1;
- gint old_word_start = -1;
- guint i;
+ gint word_start = -1;
+ gint old_word_start = -1;
+ guint i;
*is_new_paragraph = FALSE;
@@ -409,17 +409,17 @@
gchar *index_word;
/* Normalize word */
- str = g_utf8_casefold (start_word, end_word - start_word);
+ str = g_utf8_casefold (start_word, end_word - start_word);
if (!str) {
- continue;
- }
+ continue;
+ }
- index_word = g_utf8_normalize (str, -1, G_NORMALIZE_NFC);
+ index_word = g_utf8_normalize (str, -1, G_NORMALIZE_NFC);
g_free (str);
if (!index_word) {
- continue;
- }
+ continue;
+ }
if (word_start > 1 && parser->attrs[word_start -1].is_sentence_boundary) {
*is_new_paragraph = TRUE;
@@ -449,185 +449,185 @@
static gboolean
parser_next (TrackerParser *parser,
- gint *byte_offset_start,
- gint *byte_offset_end,
- gboolean *is_new_paragraph)
+ gint *byte_offset_start,
+ gint *byte_offset_end,
+ gboolean *is_new_paragraph)
{
TrackerParserWordType word_type;
- gunichar word[64];
- gboolean is_valid;
- guint length;
- gint char_count = 0;
- glong bytes;
- const gchar *p;
- const gchar *start;
- const gchar *end;
+ gunichar word[64];
+ gboolean is_valid;
+ guint length;
+ gint char_count = 0;
+ glong bytes;
+ const gchar *p;
+ const gchar *start;
+ const gchar *end;
gboolean do_strip = FALSE;
- *byte_offset_start = 0;
+ *byte_offset_start = 0;
*byte_offset_end = 0;
- *is_new_paragraph = FALSE;
+ *is_new_paragraph = FALSE;
g_return_val_if_fail (parser, FALSE);
if (!parser->cursor) {
- return FALSE;
- }
+ return FALSE;
+ }
+
+ word_type = TRACKER_PARSER_WORD_IGNORE;
+ is_valid = TRUE;
+ length = 0;
+ bytes = 0;
+
+ start = NULL;
+ end = NULL;
+
+ for (p = parser->cursor; *p; p = g_utf8_next_char (p)) {
+ TrackerParserWordType type;
+ gunichar c;
+
+ char_count++;
+ c = g_utf8_get_char (p);
+ type = get_word_type (c);
+
+ if (type == TRACKER_PARSER_WORD_NEWLINE) {
+ *is_new_paragraph = TRUE;
+ }
+
+ if (type == TRACKER_PARSER_WORD_IGNORE || type == TRACKER_PARSER_WORD_NEWLINE ||
+ (parser->delimit_words &&
+ (type == TRACKER_PARSER_WORD_HYPHEN ||
+ type == TRACKER_PARSER_WORD_UNDERSCORE))) {
+ if (!start) {
+ 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') {
+ break;
+ }
+ }
+
+ 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;
+ bytes = 0;
+ start = NULL;
+ end = NULL;
+ do_strip = FALSE;
+
+ continue;
+ }
+
+ break;
+ }
+ }
+
+ if (!is_valid) {
+ continue;
+ }
+
+ if (!start) {
+ start = g_utf8_offset_to_pointer (parser->cursor, char_count-1);
- word_type = TRACKER_PARSER_WORD_IGNORE;
- is_valid = TRUE;
- length = 0;
- bytes = 0;
-
- start = NULL;
- end = NULL;
-
- for (p = parser->cursor; *p; p = g_utf8_next_char (p)) {
- TrackerParserWordType type;
- gunichar c;
-
- char_count++;
- c = g_utf8_get_char (p);
- type = get_word_type (c);
-
- if (type == TRACKER_PARSER_WORD_NEWLINE) {
- *is_new_paragraph = TRUE;
- }
-
- if (type == TRACKER_PARSER_WORD_IGNORE || type == TRACKER_PARSER_WORD_NEWLINE ||
- (parser->delimit_words &&
- (type == TRACKER_PARSER_WORD_HYPHEN ||
- type == TRACKER_PARSER_WORD_UNDERSCORE))) {
- if (!start) {
- 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') {
- break;
- }
- }
-
- 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;
- bytes = 0;
- start = NULL;
- end = NULL;
- do_strip = FALSE;
-
- continue;
- }
-
- break;
- }
- }
-
- if (!is_valid) {
- continue;
- }
-
- if (!start) {
- start = g_utf8_offset_to_pointer (parser->cursor, char_count-1);
-
- /* Valid words must start with an alpha or
- * underscore if we are filtering.
- */
+ /* Valid words must start with an alpha or
+ * underscore if we are filtering.
+ */
if (type == TRACKER_PARSER_WORD_NUM) {
is_valid = FALSE;
- start = NULL;
- continue;
+ start = NULL;
+ continue;
} else {
- if (type == TRACKER_PARSER_WORD_HYPHEN) {
- is_valid = parser->parse_reserved_words;
- start = NULL;
- continue;
- }
- }
- }
-
- if (length >= parser->max_word_length) {
- continue;
- }
-
- length++;
-
- switch (type) {
- case TRACKER_PARSER_WORD_ASCII_HIGHER:
- c += 32;
-
- case TRACKER_PARSER_WORD_ASCII_LOWER:
- case TRACKER_PARSER_WORD_HYPHEN:
- case TRACKER_PARSER_WORD_UNDERSCORE:
- if (word_type == TRACKER_PARSER_WORD_NUM ||
- word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
- word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
- } else {
- word_type = TRACKER_PARSER_WORD_ALPHA;
- }
-
- break;
-
- case TRACKER_PARSER_WORD_NUM:
- if (word_type == TRACKER_PARSER_WORD_ALPHA ||
- word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
- word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
- } else {
- word_type = TRACKER_PARSER_WORD_NUM;
- }
- break;
-
- case TRACKER_PARSER_WORD_ALPHA_HIGHER:
- c = g_unichar_tolower (c);
-
- case TRACKER_PARSER_WORD_ALPHA_LOWER:
- if (!do_strip) {
- do_strip = TRUE;
- }
-
- if (word_type == TRACKER_PARSER_WORD_NUM ||
- word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
- word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
- } else {
- word_type = TRACKER_PARSER_WORD_ALPHA;
- }
-
- break;
-
- default:
- break;
- }
+ if (type == TRACKER_PARSER_WORD_HYPHEN) {
+ is_valid = parser->parse_reserved_words;
+ start = NULL;
+ continue;
+ }
+ }
+ }
- word[length -1] = c;
- }
+ if (length >= parser->max_word_length) {
+ continue;
+ }
+
+ length++;
+
+ switch (type) {
+ case TRACKER_PARSER_WORD_ASCII_HIGHER:
+ c += 32;
+
+ case TRACKER_PARSER_WORD_ASCII_LOWER:
+ case TRACKER_PARSER_WORD_HYPHEN:
+ case TRACKER_PARSER_WORD_UNDERSCORE:
+ if (word_type == TRACKER_PARSER_WORD_NUM ||
+ word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
+ word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
+ } else {
+ word_type = TRACKER_PARSER_WORD_ALPHA;
+ }
+
+ break;
+
+ case TRACKER_PARSER_WORD_NUM:
+ if (word_type == TRACKER_PARSER_WORD_ALPHA ||
+ word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
+ word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
+ } else {
+ word_type = TRACKER_PARSER_WORD_NUM;
+ }
+ break;
+
+ case TRACKER_PARSER_WORD_ALPHA_HIGHER:
+ c = g_unichar_tolower (c);
+
+ case TRACKER_PARSER_WORD_ALPHA_LOWER:
+ if (!do_strip) {
+ do_strip = TRUE;
+ }
+
+ if (word_type == TRACKER_PARSER_WORD_NUM ||
+ word_type == TRACKER_PARSER_WORD_ALPHA_NUM) {
+ word_type = TRACKER_PARSER_WORD_ALPHA_NUM;
+ } else {
+ word_type = TRACKER_PARSER_WORD_ALPHA;
+ }
+
+ break;
+
+ default:
+ break;
+ }
+
+ word[length -1] = c;
+ }
parser->cursor = NULL;
- if (!is_valid) {
- return FALSE;
- }
+ if (!is_valid) {
+ return FALSE;
+ }
- if (word_type == TRACKER_PARSER_WORD_ALPHA_NUM || word_type == TRACKER_PARSER_WORD_ALPHA) {
- gchar *utf8;
- gchar *processed_word;
+ if (word_type == TRACKER_PARSER_WORD_ALPHA_NUM || word_type == TRACKER_PARSER_WORD_ALPHA) {
+ gchar *utf8;
+ gchar *processed_word;
- utf8 = g_ucs4_to_utf8 (word, length, NULL, &bytes, NULL);
+ utf8 = g_ucs4_to_utf8 (word, length, NULL, &bytes, NULL);
- if (!utf8) {
- return FALSE;
- }
+ if (!utf8) {
+ return FALSE;
+ }
- *byte_offset_start = start-parser->txt;
+ *byte_offset_start = start-parser->txt;
*byte_offset_end = *byte_offset_start + bytes;
parser->cursor = g_utf8_next_char (parser->txt + *byte_offset_end);
@@ -641,52 +641,52 @@
return TRUE;
- }
+ }
- return FALSE;
+ return FALSE;
}
static gboolean
word_table_increment (GHashTable *word_table,
- gchar *index_word,
- gint weight,
- gint total_words,
- gint max_words_to_index)
+ gchar *index_word,
+ gint weight,
+ gint total_words,
+ gint max_words_to_index)
{
- gboolean update_count;
+ gboolean update_count;
- update_count = total_words <= max_words_to_index;
+ update_count = total_words <= max_words_to_index;
- if (update_count) {
- gpointer p;
- gint count;
+ if (update_count) {
+ gpointer p;
+ gint count;
- p = g_hash_table_lookup (word_table, index_word);
- count = GPOINTER_TO_INT (p);
+ p = g_hash_table_lookup (word_table, index_word);
+ count = GPOINTER_TO_INT (p);
- g_hash_table_replace (word_table,
- index_word,
- GINT_TO_POINTER (count + weight));
- } else {
- g_free (index_word);
- }
+ g_hash_table_replace (word_table,
+ index_word,
+ GINT_TO_POINTER (count + weight));
+ } else {
+ g_free (index_word);
+ }
- return update_count;
+ return update_count;
}
TrackerParser *
tracker_parser_new (TrackerLanguage *language,
- gint max_word_length,
- gint min_word_length)
+ gint max_word_length,
+ gint min_word_length)
{
TrackerParser *parser;
- g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
- g_return_val_if_fail (min_word_length > 0, NULL);
- g_return_val_if_fail (min_word_length < max_word_length, NULL);
+ g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
+ g_return_val_if_fail (min_word_length > 0, NULL);
+ g_return_val_if_fail (min_word_length < max_word_length, NULL);
- parser = g_new0 (TrackerParser, 1);
+ parser = g_new0 (TrackerParser, 1);
parser->language = g_object_ref (language);
@@ -701,15 +701,15 @@
void
tracker_parser_free (TrackerParser *parser)
{
- g_return_if_fail (parser != NULL);
+ g_return_if_fail (parser != NULL);
- if (parser->language) {
- g_object_unref (parser->language);
- }
+ if (parser->language) {
+ g_object_unref (parser->language);
+ }
- g_free (parser->attrs);
+ g_free (parser->attrs);
- g_free (parser->word);
+ g_free (parser->word);
g_free (parser);
}
@@ -717,17 +717,17 @@
void
tracker_parser_reset (TrackerParser *parser,
const gchar *txt,
- gint txt_size,
- gboolean delimit_words,
- gboolean enable_stemmer,
- gboolean enable_stop_words,
- gboolean parse_reserved_words)
+ gint txt_size,
+ gboolean delimit_words,
+ gboolean enable_stemmer,
+ gboolean enable_stop_words,
+ gboolean parse_reserved_words)
{
- g_return_if_fail (parser != NULL);
+ g_return_if_fail (parser != NULL);
g_return_if_fail (txt != NULL);
g_free (parser->attrs);
- parser->attrs = NULL;
+ parser->attrs = NULL;
parser->enable_stemmer = enable_stemmer;
parser->enable_stop_words = enable_stop_words;
@@ -751,38 +751,38 @@
parser->txt_size = strlen (parser->txt);
}
- parser->attr_length = g_utf8_strlen (parser->txt, parser->txt_size) + 1;
+ parser->attr_length = g_utf8_strlen (parser->txt, parser->txt_size) + 1;
attrs = g_new0 (PangoLogAttr, parser->attr_length);
pango_get_log_attrs (parser->txt,
- txt_size,
- 0,
- pango_language_from_string ("C"),
- attrs,
- parser->attr_length);
+ txt_size,
+ 0,
+ pango_language_from_string ("C"),
+ attrs,
+ parser->attr_length);
- parser->attrs = attrs;
- parser->attr_pos = 0;
+ parser->attrs = attrs;
+ parser->attr_pos = 0;
}
}
gchar *
tracker_parser_process_word (TrackerParser *parser,
- const char *word,
- gint length,
- gboolean do_strip)
+ const char *word,
+ gint length,
+ gboolean do_strip)
{
const gchar *stem_word;
- gchar *str;
- gchar *stripped_word;
- guint bytes, len;
+ gchar *str;
+ gchar *stripped_word;
+ guint bytes, len;
- g_return_val_if_fail (parser != NULL, NULL);
- g_return_val_if_fail (word != NULL, NULL);
+ g_return_val_if_fail (parser != NULL, NULL);
+ g_return_val_if_fail (word != NULL, NULL);
- str = NULL;
- stripped_word = NULL;
+ str = NULL;
+ stripped_word = NULL;
if (word) {
if (length == -1) {
@@ -792,35 +792,35 @@
}
if (do_strip) {
- stripped_word = strip_word (word, bytes, &len);
- } else {
- stripped_word = NULL;
- }
-
- if (!stripped_word) {
- str = g_utf8_normalize (word,
- bytes,
- G_NORMALIZE_NFC);
- } else {
- str = g_utf8_normalize (stripped_word,
- len,
- G_NORMALIZE_NFC);
- g_free (stripped_word);
- }
-
- if (!parser->enable_stemmer) {
- return str;
- }
+ stripped_word = strip_word (word, bytes, &len);
+ } else {
+ stripped_word = NULL;
+ }
+
+ if (!stripped_word) {
+ str = g_utf8_normalize (word,
+ bytes,
+ G_NORMALIZE_NFC);
+ } else {
+ str = g_utf8_normalize (stripped_word,
+ len,
+ G_NORMALIZE_NFC);
+ g_free (stripped_word);
+ }
+
+ if (!parser->enable_stemmer) {
+ return str;
+ }
- len = strlen (str);
+ len = strlen (str);
- stem_word = tracker_language_stem_word (parser->language, str, len);
+ stem_word = tracker_language_stem_word (parser->language, str, len);
if (stem_word) {
gchar *result;
- result = g_strdup (stem_word);
- g_free (str);
+ result = g_strdup (stem_word);
+ g_free (str);
return result;
}
@@ -843,21 +843,21 @@
const gchar *
tracker_parser_next (TrackerParser *parser,
- gint *position,
- gint *byte_offset_start,
- gint *byte_offset_end,
- gboolean *new_paragraph,
- gboolean *stop_word,
+ gint *position,
+ gint *byte_offset_start,
+ gint *byte_offset_end,
+ gboolean *new_paragraph,
+ gboolean *stop_word,
gint *word_length)
{
const gchar *str;
- gint byte_start = 0, byte_end = 0;
+ gint byte_start = 0, byte_end = 0;
gboolean new_para;
str = NULL;
- g_free (parser->word);
- parser->word = NULL;
+ g_free (parser->word);
+ parser->word = NULL;
if (parser->encoding == TRACKER_PARSER_ENCODING_CJK) {
if (pango_next (parser, &byte_start, &byte_end, &new_para)) {
@@ -865,7 +865,7 @@
}
parser->word_position++;
- *stop_word = FALSE;
+ *stop_word = FALSE;
} else {
if (parser_next (parser, &byte_start, &byte_end, &new_para)) {
str = parser->word;
@@ -891,142 +891,142 @@
gchar *
tracker_parser_text_to_string (const gchar *text,
- TrackerLanguage *language,
- gint max_word_length,
- gint min_word_length,
- gboolean filter_words,
- gboolean filter_numbers,
- gboolean delimit)
+ TrackerLanguage *language,
+ gint max_word_length,
+ gint min_word_length,
+ gboolean filter_words,
+ gboolean filter_numbers,
+ gboolean delimit)
{
const gchar *p;
- gchar *parsed_text;
+ gchar *parsed_text;
guint32 i = 0;
- gint len;
+ gint len;
- g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
+ g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
if (text == NULL || text[0] == '\0') {
- return NULL;
- }
+ return NULL;
+ }
+
+ p = text;
+ len = strlen (text);
+ len = MIN (len, 500);
+
+ if (!g_utf8_validate (text, len, NULL)) {
+ return NULL;
+ }
+
+ if (text_needs_pango (text)) {
+ /* CJK text does not need stemming or other
+ * treatment.
+ */
+ PangoLogAttr *attrs;
+ guint str_len, word_start;
+ GString *strs;
- p = text;
- len = strlen (text);
- len = MIN (len, 500);
-
- if (!g_utf8_validate (text, len, NULL)) {
- return NULL;
- }
-
- if (text_needs_pango (text)) {
- /* CJK text does not need stemming or other
- * treatment.
- */
- PangoLogAttr *attrs;
- guint str_len, word_start;
- GString *strs;
-
- str_len = g_utf8_strlen (text, -1);
-
- strs = g_string_new (" ");
-
- attrs = g_new0 (PangoLogAttr, str_len + 1);
-
- pango_get_log_attrs (text,
- len,
- 0,
- pango_language_from_string ("C"),
- attrs,
- str_len + 1);
-
- word_start = 0;
-
- for (i = 0; i < str_len + 1; i++) {
- if (attrs[i].is_word_end) {
- gchar *start_word, *end_word;
-
- start_word = g_utf8_offset_to_pointer (text, word_start);
- end_word = g_utf8_offset_to_pointer (text, i);
-
- if (start_word != end_word) {
- /* Normalize word */
- gchar *s;
- gchar *index_word;
-
- s = g_utf8_casefold (start_word, end_word - start_word);
- index_word = g_utf8_normalize (s, -1, G_NORMALIZE_NFC);
- g_free (s);
-
- strs = g_string_append (strs, index_word);
- strs = g_string_append_c (strs, ' ');
- g_free (index_word);
- }
-
- word_start = i;
- }
-
- if (attrs[i].is_word_start) {
- word_start = i;
- }
- }
+ str_len = g_utf8_strlen (text, -1);
- g_free (attrs);
+ strs = g_string_new (" ");
+
+ attrs = g_new0 (PangoLogAttr, str_len + 1);
+
+ pango_get_log_attrs (text,
+ len,
+ 0,
+ pango_language_from_string ("C"),
+ attrs,
+ str_len + 1);
+
+ word_start = 0;
+
+ for (i = 0; i < str_len + 1; i++) {
+ if (attrs[i].is_word_end) {
+ gchar *start_word, *end_word;
+
+ start_word = g_utf8_offset_to_pointer (text, word_start);
+ end_word = g_utf8_offset_to_pointer (text, i);
+
+ if (start_word != end_word) {
+ /* Normalize word */
+ gchar *s;
+ gchar *index_word;
+
+ s = g_utf8_casefold (start_word, end_word - start_word);
+ index_word = g_utf8_normalize (s, -1, G_NORMALIZE_NFC);
+ g_free (s);
+
+ strs = g_string_append (strs, index_word);
+ strs = g_string_append_c (strs, ' ');
+ g_free (index_word);
+ }
+
+ word_start = i;
+ }
+
+ if (attrs[i].is_word_start) {
+ word_start = i;
+ }
+ }
+
+ g_free (attrs);
parsed_text = g_string_free (strs, FALSE);
return g_strstrip (parsed_text);
- } else {
- GString *str;
- gchar *word;
-
- str = g_string_new (" ");
-
- while (TRUE) {
- i++;
- p = analyze_text (p,
- language,
- max_word_length,
- min_word_length,
- filter_words,
- filter_numbers,
- delimit,
- &word);
-
- if (word) {
- g_string_append (str, word);
- g_string_append_c (str, ' ');
- g_free (word);
- }
+ } else {
+ GString *str;
+ gchar *word;
+
+ str = g_string_new (" ");
+
+ while (TRUE) {
+ i++;
+ p = analyze_text (p,
+ language,
+ max_word_length,
+ min_word_length,
+ filter_words,
+ filter_numbers,
+ delimit,
+ &word);
+
+ if (word) {
+ g_string_append (str, word);
+ g_string_append_c (str, ' ');
+ g_free (word);
+ }
- if (!p || !*p) {
- parsed_text = g_string_free (str, FALSE);
+ if (!p || !*p) {
+ parsed_text = g_string_free (str, FALSE);
return g_strstrip (parsed_text);
- }
- }
+ }
+ }
- g_string_free (str, TRUE);
- }
+ g_string_free (str, TRUE);
+ }
return NULL;
}
gchar **
-tracker_parser_text_into_array (const gchar *text,
- TrackerLanguage *language,
- gint max_word_length,
- gint min_word_length)
+tracker_parser_text_into_array (const gchar *text,
+ TrackerLanguage *language,
+ gint max_word_length,
+ gint min_word_length)
{
gchar *s;
gchar **strv;
- g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
+ g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
- s = tracker_parser_text_to_string (text,
- language,
- max_word_length,
- min_word_length,
- TRUE,
- FALSE,
- FALSE);
- strv = g_strsplit (g_strstrip (s), " ", -1);
+ s = tracker_parser_text_to_string (text,
+ language,
+ max_word_length,
+ min_word_length,
+ TRUE,
+ FALSE,
+ FALSE);
+ strv = g_strsplit (g_strstrip (s), " ", -1);
g_free (s);
return strv;
@@ -1034,18 +1034,18 @@
GHashTable *
tracker_parser_text_fast (GHashTable *word_table,
- const gchar *txt,
- gint weight)
+ const gchar *txt,
+ gint weight)
{
gchar **array;
gchar **p;
- /* Use this for already processed text only */
+ /* Use this for already processed text only */
if (!word_table) {
word_table = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
- NULL);
+ g_str_equal,
+ g_free,
+ NULL);
}
if (!txt || weight == 0) {
@@ -1053,43 +1053,43 @@
}
array = g_strsplit (txt, " ", -1);
- if (!array) {
- return word_table;
- }
+ if (!array) {
+ return word_table;
+ }
for (p = array; *p; p++) {
- word_table_increment (word_table, *p, weight, 0, 0);
+ word_table_increment (word_table, *p, weight, 0, 0);
}
- g_free (array);
+ g_free (array);
return word_table;
}
GHashTable *
tracker_parser_text (GHashTable *word_table,
- const gchar *text,
- gint weight,
- TrackerLanguage *language,
- gint max_words_to_index,
- gint max_word_length,
- gint min_word_length,
- gboolean filter_words,
- gboolean delimit_words)
+ const gchar *text,
+ gint weight,
+ TrackerLanguage *language,
+ gint max_words_to_index,
+ gint max_word_length,
+ gint min_word_length,
+ gboolean filter_words,
+ gboolean delimit_words)
{
const gchar *p;
guint32 i;
- /* Use this for unprocessed raw text */
- gint total_words;
+ /* Use this for unprocessed raw text */
+ gint total_words;
- g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
+ g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
if (!word_table) {
word_table = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
- NULL);
+ g_str_equal,
+ g_free,
+ NULL);
total_words = 0;
} else {
total_words = g_hash_table_size (word_table);
@@ -1107,17 +1107,17 @@
PangoLogAttr *attrs;
guint len, str_len, word_start;
- len = strlen (text);
- str_len = g_utf8_strlen (text, -1);
+ len = strlen (text);
+ str_len = g_utf8_strlen (text, -1);
attrs = g_new0 (PangoLogAttr, str_len + 1);
pango_get_log_attrs (text,
- len,
- 0,
- pango_language_from_string ("C"),
- attrs,
- str_len + 1);
+ len,
+ 0,
+ pango_language_from_string ("C"),
+ attrs,
+ str_len + 1);
word_start = 0;
@@ -1129,33 +1129,33 @@
end_word = g_utf8_offset_to_pointer (text, i);
if (start_word != end_word) {
- gchar *str;
- gchar *index_word;
- gboolean was_updated;
+ gchar *str;
+ gchar *index_word;
+ gboolean was_updated;
/* Normalize word */
- str = g_utf8_casefold (start_word, end_word - start_word);
+ str = g_utf8_casefold (start_word, end_word - start_word);
if (!str) {
- continue;
- }
+ continue;
+ }
- index_word = g_utf8_normalize (str, -1, G_NORMALIZE_NFC);
+ index_word = g_utf8_normalize (str, -1, G_NORMALIZE_NFC);
g_free (str);
if (!index_word) {
- continue;
- }
+ continue;
+ }
total_words++;
- was_updated = word_table_increment (word_table,
- index_word,
- weight,
- total_words,
- max_words_to_index);
-
- if (!was_updated) {
- break;
- }
+ was_updated = word_table_increment (word_table,
+ index_word,
+ weight,
+ total_words,
+ max_words_to_index);
+
+ if (!was_updated) {
+ break;
+ }
}
word_start = i;
@@ -1168,29 +1168,29 @@
g_free (attrs);
} else {
- gchar *word;
+ gchar *word;
while (TRUE) {
i++;
p = analyze_text (p,
- language,
- max_word_length,
- min_word_length,
- filter_words,
- filter_words,
- delimit_words,
- &word);
+ language,
+ max_word_length,
+ min_word_length,
+ filter_words,
+ filter_words,
+ delimit_words,
+ &word);
if (word) {
total_words++;
- if (!word_table_increment (word_table,
- word,
- weight,
- total_words,
- max_words_to_index)) {
- break;
- }
+ if (!word_table_increment (word_table,
+ word,
+ weight,
+ total_words,
+ max_words_to_index)) {
+ break;
+ }
}
if (!p || !*p) {
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 15:12:19 2008
@@ -37,57 +37,57 @@
} TrackerParserEncoding;
typedef struct {
- const gchar *txt;
- gint txt_size;
+ const gchar *txt;
+ gint txt_size;
TrackerLanguage *language;
- gboolean enable_stemmer;
- gboolean enable_stop_words;
- guint max_words_to_index;
- guint max_word_length;
- guint min_word_length;
- gboolean delimit_words;
+ gboolean enable_stemmer;
+ gboolean enable_stop_words;
+ guint max_words_to_index;
+ guint max_word_length;
+ 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;
+ guint word_position;
+ TrackerParserEncoding encoding;
+ const gchar *cursor;
/* Pango members for CJK text parsing */
- PangoLogAttr *attrs;
- guint attr_length;
- guint attr_pos;
+ PangoLogAttr *attrs;
+ guint attr_length;
+ guint attr_pos;
} TrackerParser;
-TrackerParser *tracker_parser_new (TrackerLanguage *language,
- gint max_word_length,
- gint min_word_length);
-void tracker_parser_reset (TrackerParser *parser,
+TrackerParser *tracker_parser_new (TrackerLanguage *language,
+ gint max_word_length,
+ gint min_word_length);
+void tracker_parser_reset (TrackerParser *parser,
const gchar *txt,
- gint txt_size,
- gboolean delimit_words,
- gboolean enable_stemmer,
- gboolean enable_stop_words,
+ gint txt_size,
+ gboolean delimit_words,
+ gboolean enable_stemmer,
+ gboolean enable_stop_words,
gboolean parse_reserved_words);
-const gchar * tracker_parser_next (TrackerParser *parser,
- gint *position,
- gint *byte_offset_start,
- gint *byte_offset_end,
+const gchar * tracker_parser_next (TrackerParser *parser,
+ gint *position,
+ gint *byte_offset_start,
+ gint *byte_offset_end,
gboolean *new_paragraph,
gboolean *stop_word,
gint *word_length);
-void tracker_parser_set_posititon (TrackerParser *parser,
- gint position);
+void tracker_parser_set_posititon (TrackerParser *parser,
+ gint position);
gboolean tracker_parser_is_stop_word (TrackerParser *parser,
const gchar *word);
gchar * tracker_parser_process_word (TrackerParser *parser,
const char *word,
- gint length,
- gboolean do_strip);
-void tracker_parser_free (TrackerParser *parser);
+ gint length,
+ gboolean do_strip);
+void tracker_parser_free (TrackerParser *parser);
/*
@@ -101,33 +101,33 @@
*
* 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,
+GHashTable * tracker_parser_text (GHashTable *word_table,
const gchar *txt,
- gint weight,
+ gint weight,
TrackerLanguage *language,
- gint max_words_to_index,
- gint max_word_length,
- gint min_word_length,
- gboolean filter_words,
- gboolean delimit_words);
+ gint max_words_to_index,
+ gint max_word_length,
+ gint min_word_length,
+ gboolean filter_words,
+ gboolean delimit_words);
GHashTable * tracker_parser_text_fast (GHashTable *word_table,
const char *txt,
- gint weight);
+ gint weight);
gchar * tracker_parser_text_to_string (const gchar *txt,
TrackerLanguage *language,
- gint max_word_length,
- gint min_word_length,
- gboolean filter_words,
- gboolean filter_numbers,
- gboolean delimit);
+ gint max_word_length,
+ gint min_word_length,
+ gboolean filter_words,
+ gboolean filter_numbers,
+ gboolean delimit);
gchar ** tracker_parser_text_into_array (const gchar *text,
TrackerLanguage *language,
- gint max_word_length,
- gint min_word_length);
+ gint max_word_length,
+ gint min_word_length);
G_END_DECLS
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 15:12:19 2008
@@ -31,12 +31,12 @@
typedef struct _TrackerServicePriv TrackerServicePriv;
struct _TrackerServicePriv {
- gint id;
+ gint id;
gchar *name;
gchar *parent;
- gchar *property_prefix;
+ gchar *property_prefix;
gchar *content_metadata;
GSList *key_metadata;
@@ -53,13 +53,13 @@
gboolean show_service_directories;
};
-static void service_finalize (GObject *object);
+static void service_finalize (GObject *object);
static void service_get_property (GObject *object,
- guint param_id,
+ guint param_id,
GValue *value,
GParamSpec *pspec);
static void service_set_property (GObject *object,
- guint param_id,
+ guint param_id,
const GValue *value,
GParamSpec *pspec);
@@ -134,7 +134,7 @@
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = service_finalize;
+ object_class->finalize = service_finalize;
object_class->get_property = service_get_property;
object_class->set_property = service_set_property;
@@ -265,9 +265,9 @@
}
static void
-service_get_property (GObject *object,
- guint param_id,
- GValue *value,
+service_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
GParamSpec *pspec)
{
TrackerServicePriv *priv;
@@ -324,8 +324,8 @@
}
static void
-service_set_property (GObject *object,
- guint param_id,
+service_set_property (GObject *object,
+ guint param_id,
const GValue *value,
GParamSpec *pspec)
{
@@ -600,7 +600,7 @@
void
tracker_service_set_id (TrackerService *service,
- gint value)
+ gint value)
{
TrackerServicePriv *priv;
@@ -618,7 +618,7 @@
void
tracker_service_set_name (TrackerService *service,
- const gchar *value)
+ const gchar *value)
{
TrackerServicePriv *priv;
@@ -702,7 +702,7 @@
void
tracker_service_set_key_metadata (TrackerService *service,
- const GSList *value)
+ const GSList *value)
{
TrackerServicePriv *priv;
@@ -714,7 +714,7 @@
g_slist_free (priv->key_metadata);
if (value) {
- GSList *new_list;
+ GSList *new_list;
const GSList *l;
new_list = NULL;
@@ -748,7 +748,7 @@
void
tracker_service_set_enabled (TrackerService *service,
- gboolean value)
+ gboolean value)
{
TrackerServicePriv *priv;
@@ -762,7 +762,7 @@
void
tracker_service_set_embedded (TrackerService *service,
- gboolean value)
+ gboolean value)
{
TrackerServicePriv *priv;
@@ -776,7 +776,7 @@
void
tracker_service_set_has_metadata (TrackerService *service,
- gboolean value)
+ gboolean value)
{
TrackerServicePriv *priv;
@@ -790,7 +790,7 @@
void
tracker_service_set_has_full_text (TrackerService *service,
- gboolean value)
+ gboolean value)
{
TrackerServicePriv *priv;
@@ -804,7 +804,7 @@
void
tracker_service_set_has_thumbs (TrackerService *service,
- gboolean value)
+ gboolean value)
{
TrackerServicePriv *priv;
@@ -818,7 +818,7 @@
void
tracker_service_set_show_service_files (TrackerService *service,
- gboolean value)
+ gboolean value)
{
TrackerServicePriv *priv;
@@ -832,7 +832,7 @@
void
tracker_service_set_show_service_directories (TrackerService *service,
- gboolean value)
+ gboolean value)
{
TrackerServicePriv *priv;
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 15:12:19 2008
@@ -44,14 +44,14 @@
GType tracker_db_type_get_type (void) G_GNUC_CONST;
-#define TRACKER_TYPE_SERVICE (tracker_service_get_type ())
-#define TRACKER_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_SERVICE, TrackerService))
+#define TRACKER_TYPE_SERVICE (tracker_service_get_type ())
+#define TRACKER_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_SERVICE, TrackerService))
#define TRACKER_SERVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_SERVICE, TrackerServiceClass))
-#define TRACKER_IS_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_SERVICE))
+#define TRACKER_IS_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_SERVICE))
#define TRACKER_IS_SERVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_SERVICE))
#define TRACKER_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_SERVICE, TrackerServiceClass))
-typedef struct _TrackerService TrackerService;
+typedef struct _TrackerService TrackerService;
typedef struct _TrackerServiceClass TrackerServiceClass;
struct _TrackerService {
@@ -62,53 +62,53 @@
GObjectClass parent_class;
};
-GType tracker_service_get_type (void) G_GNUC_CONST;
+GType tracker_service_get_type (void) G_GNUC_CONST;
-TrackerService *tracker_service_new (void);
+TrackerService *tracker_service_new (void);
-gint tracker_service_get_id (TrackerService *service);
-const gchar * tracker_service_get_name (TrackerService *service);
-const gchar * tracker_service_get_parent (TrackerService *service);
-const gchar * tracker_service_get_property_prefix (TrackerService *service);
-const gchar * tracker_service_get_content_metadata (TrackerService *service);
-const GSList * tracker_service_get_key_metadata (TrackerService *service);
-TrackerDBType tracker_service_get_db_type (TrackerService *service);
-gboolean tracker_service_get_enabled (TrackerService *service);
-gboolean tracker_service_get_embedded (TrackerService *service);
-gboolean tracker_service_get_has_metadata (TrackerService *service);
-gboolean tracker_service_get_has_full_text (TrackerService *service);
-gboolean tracker_service_get_has_thumbs (TrackerService *service);
-gboolean tracker_service_get_show_service_files (TrackerService *service);
-gboolean tracker_service_get_show_service_directories (TrackerService *service);
-
-void tracker_service_set_id (TrackerService *service,
- gint value);
-void tracker_service_set_name (TrackerService *service,
+gint tracker_service_get_id (TrackerService *service);
+const gchar * tracker_service_get_name (TrackerService *service);
+const gchar * tracker_service_get_parent (TrackerService *service);
+const gchar * tracker_service_get_property_prefix (TrackerService *service);
+const gchar * tracker_service_get_content_metadata (TrackerService *service);
+const GSList * tracker_service_get_key_metadata (TrackerService *service);
+TrackerDBType tracker_service_get_db_type (TrackerService *service);
+gboolean tracker_service_get_enabled (TrackerService *service);
+gboolean tracker_service_get_embedded (TrackerService *service);
+gboolean tracker_service_get_has_metadata (TrackerService *service);
+gboolean tracker_service_get_has_full_text (TrackerService *service);
+gboolean tracker_service_get_has_thumbs (TrackerService *service);
+gboolean tracker_service_get_show_service_files (TrackerService *service);
+gboolean tracker_service_get_show_service_directories (TrackerService *service);
+
+void tracker_service_set_id (TrackerService *service,
+ gint value);
+void tracker_service_set_name (TrackerService *service,
const gchar *value);
-void tracker_service_set_parent (TrackerService *service,
+void tracker_service_set_parent (TrackerService *service,
const gchar *value);
-void tracker_service_set_property_prefix (TrackerService *service,
+void tracker_service_set_property_prefix (TrackerService *service,
const gchar *value);
-void tracker_service_set_content_metadata (TrackerService *service,
+void tracker_service_set_content_metadata (TrackerService *service,
const gchar *value);
-void tracker_service_set_key_metadata (TrackerService *service,
+void tracker_service_set_key_metadata (TrackerService *service,
const GSList *value);
-void tracker_service_set_db_type (TrackerService *service,
+void tracker_service_set_db_type (TrackerService *service,
TrackerDBType value);
-void tracker_service_set_enabled (TrackerService *service,
- gboolean value);
-void tracker_service_set_embedded (TrackerService *service,
- gboolean value);
-void tracker_service_set_has_metadata (TrackerService *service,
- gboolean value);
-void tracker_service_set_has_full_text (TrackerService *service,
- gboolean value);
-void tracker_service_set_has_thumbs (TrackerService *service,
- gboolean value);
-void tracker_service_set_show_service_files (TrackerService *service,
- gboolean value);
-void tracker_service_set_show_service_directories (TrackerService *service,
- gboolean value);
+void tracker_service_set_enabled (TrackerService *service,
+ gboolean value);
+void tracker_service_set_embedded (TrackerService *service,
+ gboolean value);
+void tracker_service_set_has_metadata (TrackerService *service,
+ gboolean value);
+void tracker_service_set_has_full_text (TrackerService *service,
+ gboolean value);
+void tracker_service_set_has_thumbs (TrackerService *service,
+ gboolean value);
+void tracker_service_set_show_service_files (TrackerService *service,
+ gboolean value);
+void tracker_service_set_show_service_directories (TrackerService *service,
+ gboolean value);
G_END_DECLS
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 15:12:19 2008
@@ -41,7 +41,7 @@
static gboolean
is_int (const gchar *str)
{
- gint i, len;
+ gint i, len;
if (!str || str[0] == '\0') {
return FALSE;
@@ -418,16 +418,16 @@
long val;
time_t t;
- g_return_val_if_fail (timestamp, -1);
+ 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
*/
- if (!is_valid_8601_datetime (timestamp)) {
+ if (!is_valid_8601_datetime (timestamp)) {
return -1;
}
- memset (&tm, 0, sizeof (struct tm));
+ memset (&tm, 0, sizeof (struct tm));
val = strtoul (timestamp, (gchar**) ×tamp, 10);
if (*timestamp == '-') {
@@ -465,11 +465,11 @@
tm.tm_sec = strtoul (timestamp, (gchar**) ×tamp, 10);
}
- /* mktime() always assumes that "tm" is in locale time but we
+ /* mktime() always assumes that "tm" is in locale time but we
* want to keep control on time, so we go to UTC
*/
t = mktime (&tm);
- t -= timezone;
+ t -= timezone;
if (*timestamp == '+' ||
*timestamp == '-') {
@@ -477,44 +477,44 @@
sign = *timestamp++ == '+' ? -1 : 1;
- /* We have format hh:mm or hhmm */
- /* Now, we are reading hours */
- if (timestamp[0] &&
+ /* We have format hh:mm or hhmm */
+ /* Now, we are reading hours */
+ 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];
+ gchar buff[3];
- buff[0] = timestamp[0];
- buff[1] = timestamp[1];
- buff[2] = '\0';
-
- val = strtoul (buff, NULL, 10);
- t += sign * (3600 * val);
- timestamp += 2;
- }
-
- if (*timestamp == ':' || *timestamp == '\'') {
- timestamp++;
- }
- }
+ buff[0] = timestamp[0];
+ buff[1] = timestamp[1];
+ buff[2] = '\0';
+
+ val = strtoul (buff, NULL, 10);
+ t += sign * (3600 * val);
+ timestamp += 2;
+ }
+
+ if (*timestamp == ':' || *timestamp == '\'') {
+ timestamp++;
+ }
+ }
- /* Now, we are reading minutes */
- if (timestamp[0] &&
+ /* Now, we are reading minutes */
+ 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];
+ gchar buff[3];
- buff[0] = timestamp[0];
- buff[1] = timestamp[1];
- buff[2] = '\0';
-
- val = strtoul (buff, NULL, 10);
- t += sign * (60 * val);
- timestamp += 2;
- }
- }
+ buff[0] = timestamp[0];
+ buff[1] = timestamp[1];
+ buff[2] = '\0';
+
+ val = strtoul (buff, NULL, 10);
+ t += sign * (60 * val);
+ timestamp += 2;
+ }
+ }
}
return t;
@@ -523,7 +523,7 @@
gchar *
tracker_date_to_string (time_t date_time)
{
- gchar buffer[30];
+ gchar buffer[30];
struct tm local_time;
size_t count;
@@ -535,13 +535,13 @@
/* Output is ISO 8160 format : "YYYY-MM-DDThh:mm:ss+zz:zz" */
count = strftime (buffer, sizeof (buffer), "%FT%T%z", &local_time);
- return count > 0 ? g_strdup (buffer) : NULL;
+ return count > 0 ? g_strdup (buffer) : NULL;
}
gchar *
tracker_glong_to_string (glong i)
{
- return g_strdup_printf ("%ld", i);
+ return g_strdup_printf ("%ld", i);
}
gchar *
@@ -559,21 +559,21 @@
gchar *
tracker_gint32_to_string (gint32 i)
{
- return g_strdup_printf ("%" G_GINT32_FORMAT, i);
+ return g_strdup_printf ("%" G_GINT32_FORMAT, i);
}
gchar *
tracker_guint32_to_string (guint32 i)
{
- return g_strdup_printf ("%" G_GUINT32_FORMAT, i);
+ return g_strdup_printf ("%" G_GUINT32_FORMAT, i);
}
gboolean
tracker_string_to_uint (const gchar *s,
- guint *value)
+ guint *value)
{
unsigned long int n;
- gchar *end;
+ gchar *end;
g_return_val_if_fail (s != NULL, FALSE);
g_return_val_if_fail (value != NULL, FALSE);
@@ -597,10 +597,10 @@
gint
tracker_string_in_string_list (const gchar *str,
- gchar **strv)
+ gchar **strv)
{
gchar **p;
- gint i;
+ gint i;
g_return_val_if_fail (str != NULL, -1);
@@ -622,8 +622,8 @@
gsize size)
{
GSList *list;
- gsize i;
- gsize size_used;
+ gsize i;
+ gsize size_used;
g_return_val_if_fail (strv != NULL, NULL);
@@ -652,8 +652,8 @@
gchar sep)
{
GString *string;
- gsize i;
- gsize size_used;
+ gsize i;
+ gsize size_used;
g_return_val_if_fail (strv != NULL, NULL);
@@ -696,16 +696,16 @@
gchar **
tracker_gslist_to_string_list (GSList *list)
{
- GSList *l;
+ GSList *l;
gchar **strv;
- gint i;
+ gint i;
strv = g_new0 (gchar*, g_slist_length (list) + 1);
for (l = list, i = 0; l; l = l->next) {
- if (!l->data) {
+ if (!l->data) {
continue;
- }
+ }
strv[i++] = g_strdup (l->data);
}
@@ -728,9 +728,9 @@
new_list = NULL;
for (l = list; l; l = l->next) {
- if (!l->data) {
+ if (!l->data) {
continue;
- }
+ }
new_list = g_slist_prepend (new_list, g_strdup (l->data));
}
Modified: branches/indexer-split/src/libtracker-common/tracker-type-utils.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-type-utils.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-type-utils.h Sat Sep 20 15:12:19 2008
@@ -26,27 +26,27 @@
G_BEGIN_DECLS
-gchar * tracker_date_format (const gchar *time_string);
-gchar * tracker_date_to_time_string (const gchar *date_string);
-time_t tracker_string_to_date (const gchar *time_string);
-gchar * tracker_date_to_string (time_t date_time);
-gchar * tracker_glong_to_string (glong i);
-gchar * tracker_gint_to_string (gint i);
-gchar * tracker_guint_to_string (guint i);
-gchar * tracker_gint32_to_string (gint32 i);
-gchar * tracker_guint32_to_string (guint32 i);
-gboolean tracker_string_to_uint (const gchar *s,
- guint *ret);
-gint tracker_string_in_string_list (const gchar *str,
- gchar **strv);
-GSList * tracker_string_list_to_gslist (gchar **strv,
- gsize length);
-gchar * tracker_string_list_to_string (gchar **strv,
- gsize length,
- gchar sep);
-gchar ** tracker_string_to_string_list (const gchar *str);
-gchar ** tracker_gslist_to_string_list (GSList *list);
-GSList * tracker_gslist_copy_with_string_data (GSList *list);
+gchar * tracker_date_format (const gchar *time_string);
+gchar * tracker_date_to_time_string (const gchar *date_string);
+time_t tracker_string_to_date (const gchar *time_string);
+gchar * tracker_date_to_string (time_t date_time);
+gchar * tracker_glong_to_string (glong i);
+gchar * tracker_gint_to_string (gint i);
+gchar * tracker_guint_to_string (guint i);
+gchar * tracker_gint32_to_string (gint32 i);
+gchar * tracker_guint32_to_string (guint32 i);
+gboolean tracker_string_to_uint (const gchar *s,
+ guint *ret);
+gint tracker_string_in_string_list (const gchar *str,
+ gchar **strv);
+GSList * tracker_string_list_to_gslist (gchar **strv,
+ gsize length);
+gchar * tracker_string_list_to_string (gchar **strv,
+ gsize length,
+ gchar sep);
+gchar ** tracker_string_to_string_list (const gchar *str);
+gchar ** tracker_gslist_to_string_list (GSList *list);
+GSList * tracker_gslist_copy_with_string_data (GSList *list);
gchar * tracker_string_boolean_to_string_gint (const gchar *value);
G_END_DECLS
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 15:12:19 2008
@@ -34,7 +34,7 @@
/* Removes a substring modifing haystack in place */
gchar *
-tracker_string_remove (gchar *haystack,
+tracker_string_remove (gchar *haystack,
const gchar *needle)
{
gchar *current, *pos, *next, *end;
@@ -56,15 +56,15 @@
next = end;
}
- while (pos < next) {
+ while (pos < next) {
*current = *pos;
- current++;
- pos++;
- }
-
- if (*pos == '\0') {
- *current = *pos;
- }
+ current++;
+ pos++;
+ }
+
+ if (*pos == '\0') {
+ *current = *pos;
+ }
}
return haystack;
@@ -75,30 +75,30 @@
const gchar *needle,
const gchar *replacement)
{
- GString *str;
- gint pos, needle_len;
+ GString *str;
+ gint pos, needle_len;
g_return_val_if_fail (haystack != NULL, NULL);
g_return_val_if_fail (needle != NULL, NULL);
needle_len = strlen (needle);
- str = g_string_new ("");
+ str = g_string_new ("");
/* FIXME: should use strstr */
- for (pos = 0; haystack[pos]; pos++) {
- if (strncmp (&haystack[pos], needle, needle_len) == 0) {
+ for (pos = 0; haystack[pos]; pos++) {
+ if (strncmp (&haystack[pos], needle, needle_len) == 0) {
if (replacement) {
- str = g_string_append (str, replacement);
+ str = g_string_append (str, replacement);
}
- pos += needle_len - 1;
- } else {
- str = g_string_append_c (str, haystack[pos]);
+ pos += needle_len - 1;
+ } else {
+ str = g_string_append_c (str, haystack[pos]);
}
- }
+ }
- return g_string_free (str, FALSE);
+ return g_string_free (str, FALSE);
}
gchar *
@@ -148,20 +148,20 @@
gboolean short_string)
{
GString *s;
- gchar *str;
+ gchar *str;
gdouble total;
- gint days, hours, minutes, seconds;
+ gint days, hours, minutes, seconds;
g_return_val_if_fail (seconds_elapsed >= 0.0, g_strdup (_("unknown time")));
- total = seconds_elapsed;
+ total = seconds_elapsed;
seconds = (gint) total % 60;
- total /= 60;
+ total /= 60;
minutes = (gint) total % 60;
- total /= 60;
- hours = (gint) total % 24;
- days = (gint) total / 24;
+ total /= 60;
+ hours = (gint) total % 24;
+ days = (gint) total / 24;
s = g_string_new ("");
@@ -221,20 +221,20 @@
void
tracker_throttle (TrackerConfig *config,
- gint multiplier)
+ gint multiplier)
{
- gint throttle;
+ gint throttle;
g_return_if_fail (TRACKER_IS_CONFIG (config));
/* Get the throttle, add 5 (minimum value) so we don't do
* nothing and then multiply it by the factor given
*/
- throttle = tracker_config_get_throttle (config);
+ throttle = tracker_config_get_throttle (config);
throttle += 5;
- throttle *= multiplier;
+ throttle *= multiplier;
- if (throttle > 0) {
- g_usleep (throttle);
- }
+ if (throttle > 0) {
+ g_usleep (throttle);
+ }
}
Modified: branches/indexer-split/src/libtracker-common/tracker-utils.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-utils.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-utils.h Sat Sep 20 15:12:19 2008
@@ -26,20 +26,20 @@
#include "tracker-config.h"
-gboolean tracker_is_empty_string (const char *str);
-gchar * tracker_string_replace (const gchar *haystack,
+gboolean tracker_is_empty_string (const char *str);
+gchar * tracker_string_replace (const gchar *haystack,
const gchar *needle,
const gchar *replacement);
-gchar * tracker_string_remove (gchar *haystack,
+gchar * tracker_string_remove (gchar *haystack,
const gchar *needle);
-gchar * tracker_escape_string (const gchar *in);
-gchar * tracker_seconds_estimate_to_string (gdouble seconds_elapsed,
- gboolean short_string,
- guint items_done,
- guint items_remaining);
-gchar * tracker_seconds_to_string (gdouble seconds_elapsed,
- gboolean short_string);
-void tracker_throttle (TrackerConfig *config,
- gint multiplier);
+gchar * tracker_escape_string (const gchar *in);
+gchar * tracker_seconds_estimate_to_string (gdouble seconds_elapsed,
+ gboolean short_string,
+ guint items_done,
+ guint items_remaining);
+gchar * tracker_seconds_to_string (gdouble seconds_elapsed,
+ gboolean short_string);
+void tracker_throttle (TrackerConfig *config,
+ gint multiplier);
#endif /* __LIBTRACKER_COMMON_UTILS_H__ */
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 15:12:19 2008
@@ -26,123 +26,123 @@
GType
tracker_db_action_get_type (void)
{
- static GType etype = 0;
+ static GType etype = 0;
- if (etype == 0) {
- static const GEnumValue values[] = {
- { TRACKER_DB_ACTION_IGNORE,
- "TRACKER_DB_ACTION_IGNORE",
- "Ignoring" },
- { TRACKER_DB_ACTION_CHECK,
- "TRACKER_DB_ACTION_CHECK",
- "Checking" },
- { TRACKER_DB_ACTION_DELETE,
- "TRACKER_DB_ACTION_DELETE",
- "Deleting" },
- { TRACKER_DB_ACTION_DELETE_SELF,
- "TRACKER_DB_ACTION_DELETE_SELF",
- "Deleting Self" },
- { TRACKER_DB_ACTION_CREATE,
- "TRACKER_DB_ACTION_CREATE",
- "Creating" },
- { TRACKER_DB_ACTION_MOVED_FROM,
- "TRACKER_DB_ACTION_MOVED_FROM",
- "Moved From" },
- { TRACKER_DB_ACTION_MOVED_TO,
- "TRACKER_DB_ACTION_MOVED_TO",
- "Moved To" },
- { TRACKER_DB_ACTION_FILE_CHECK,
- "TRACKER_DB_ACTION_FILE_CHECK",
- "File Check" },
- { TRACKER_DB_ACTION_FILE_CHANGED,
- "TRACKER_DB_ACTION_FILE_CHANGED",
- "File Changed" },
- { TRACKER_DB_ACTION_FILE_DELETED,
- "TRACKER_DB_ACTION_FILE_DELETED",
- "File Deleted" },
- { TRACKER_DB_ACTION_FILE_CREATED,
- "TRACKER_DB_ACTION_FILE_CREATED",
- "File Created" },
- { TRACKER_DB_ACTION_FILE_MOVED_FROM,
- "TRACKER_DB_ACTION_FILE_MOVED_FROM",
- "File Moved From" },
- { TRACKER_DB_ACTION_FILE_MOVED_TO,
- "TRACKER_DB_ACTION_FILE_MOVED_TO",
- "File Moved To" },
- { TRACKER_DB_ACTION_WRITABLE_FILE_CLOSED,
- "TRACKER_DB_ACTION_WRITABLE_FILE_CLOSED",
- "Writable File Closed" },
- { TRACKER_DB_ACTION_DIRECTORY_CHECK,
- "TRACKER_DB_ACTION_DIRECTORY_CHECK",
- "Directory Check" },
- { TRACKER_DB_ACTION_DIRECTORY_CREATED,
- "TRACKER_DB_ACTION_DIRECTORY_CREATED",
- "Directory Created" },
- { TRACKER_DB_ACTION_DIRECTORY_UNMOUNTED,
- "TRACKER_DB_ACTION_DIRECTORY_UNMOUNTED",
- "Directory Unmounted" },
- { TRACKER_DB_ACTION_DIRECTORY_DELETED,
- "TRACKER_DB_ACTION_DIRECTORY_DELETED",
- "Directory Deleted" },
- { TRACKER_DB_ACTION_DIRECTORY_MOVED_FROM,
- "TRACKER_DB_ACTION_DIRECTORY_MOVED_FROM",
- "Directory Moved From" },
- { TRACKER_DB_ACTION_DIRECTORY_MOVED_TO,
- "TRACKER_DB_ACTION_DIRECTORY_MOVED_TO",
- "Directory Moved To" },
- { TRACKER_DB_ACTION_DIRECTORY_REFRESH,
- "TRACKER_DB_ACTION_DIRECTORY_REFRESH",
- "Directory Refresh" },
- { TRACKER_DB_ACTION_EXTRACT_METADATA,
- "TRACKER_DB_ACTION_EXTRACT_METADATA",
- "Extract Metadata" },
- { TRACKER_DB_ACTION_FORCE_REFRESH,
- "TRACKER_DB_ACTION_FORCE_REFRESH",
- "Forcing Refresh" },
- { 0, NULL, NULL }
- };
-
- etype = g_enum_register_static ("TrackerDBAction", values);
-
- /* Since we don't reference this enum anywhere, we do
- * 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.
- */
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ { TRACKER_DB_ACTION_IGNORE,
+ "TRACKER_DB_ACTION_IGNORE",
+ "Ignoring" },
+ { TRACKER_DB_ACTION_CHECK,
+ "TRACKER_DB_ACTION_CHECK",
+ "Checking" },
+ { TRACKER_DB_ACTION_DELETE,
+ "TRACKER_DB_ACTION_DELETE",
+ "Deleting" },
+ { TRACKER_DB_ACTION_DELETE_SELF,
+ "TRACKER_DB_ACTION_DELETE_SELF",
+ "Deleting Self" },
+ { TRACKER_DB_ACTION_CREATE,
+ "TRACKER_DB_ACTION_CREATE",
+ "Creating" },
+ { TRACKER_DB_ACTION_MOVED_FROM,
+ "TRACKER_DB_ACTION_MOVED_FROM",
+ "Moved From" },
+ { TRACKER_DB_ACTION_MOVED_TO,
+ "TRACKER_DB_ACTION_MOVED_TO",
+ "Moved To" },
+ { TRACKER_DB_ACTION_FILE_CHECK,
+ "TRACKER_DB_ACTION_FILE_CHECK",
+ "File Check" },
+ { TRACKER_DB_ACTION_FILE_CHANGED,
+ "TRACKER_DB_ACTION_FILE_CHANGED",
+ "File Changed" },
+ { TRACKER_DB_ACTION_FILE_DELETED,
+ "TRACKER_DB_ACTION_FILE_DELETED",
+ "File Deleted" },
+ { TRACKER_DB_ACTION_FILE_CREATED,
+ "TRACKER_DB_ACTION_FILE_CREATED",
+ "File Created" },
+ { TRACKER_DB_ACTION_FILE_MOVED_FROM,
+ "TRACKER_DB_ACTION_FILE_MOVED_FROM",
+ "File Moved From" },
+ { TRACKER_DB_ACTION_FILE_MOVED_TO,
+ "TRACKER_DB_ACTION_FILE_MOVED_TO",
+ "File Moved To" },
+ { TRACKER_DB_ACTION_WRITABLE_FILE_CLOSED,
+ "TRACKER_DB_ACTION_WRITABLE_FILE_CLOSED",
+ "Writable File Closed" },
+ { TRACKER_DB_ACTION_DIRECTORY_CHECK,
+ "TRACKER_DB_ACTION_DIRECTORY_CHECK",
+ "Directory Check" },
+ { TRACKER_DB_ACTION_DIRECTORY_CREATED,
+ "TRACKER_DB_ACTION_DIRECTORY_CREATED",
+ "Directory Created" },
+ { TRACKER_DB_ACTION_DIRECTORY_UNMOUNTED,
+ "TRACKER_DB_ACTION_DIRECTORY_UNMOUNTED",
+ "Directory Unmounted" },
+ { TRACKER_DB_ACTION_DIRECTORY_DELETED,
+ "TRACKER_DB_ACTION_DIRECTORY_DELETED",
+ "Directory Deleted" },
+ { TRACKER_DB_ACTION_DIRECTORY_MOVED_FROM,
+ "TRACKER_DB_ACTION_DIRECTORY_MOVED_FROM",
+ "Directory Moved From" },
+ { TRACKER_DB_ACTION_DIRECTORY_MOVED_TO,
+ "TRACKER_DB_ACTION_DIRECTORY_MOVED_TO",
+ "Directory Moved To" },
+ { TRACKER_DB_ACTION_DIRECTORY_REFRESH,
+ "TRACKER_DB_ACTION_DIRECTORY_REFRESH",
+ "Directory Refresh" },
+ { TRACKER_DB_ACTION_EXTRACT_METADATA,
+ "TRACKER_DB_ACTION_EXTRACT_METADATA",
+ "Extract Metadata" },
+ { TRACKER_DB_ACTION_FORCE_REFRESH,
+ "TRACKER_DB_ACTION_FORCE_REFRESH",
+ "Forcing Refresh" },
+ { 0, NULL, NULL }
+ };
+
+ etype = g_enum_register_static ("TrackerDBAction", values);
+
+ /* Since we don't reference this enum anywhere, we do
+ * 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.
+ */
- g_type_class_ref (etype);
- }
+ g_type_class_ref (etype);
+ }
- return etype;
+ return etype;
}
const gchar *
tracker_db_action_to_string (TrackerDBAction action)
{
- GType type;
- GEnumClass *enum_class;
- GEnumValue *enum_value;
-
- 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);
- }
+ GType type;
+ GEnumClass *enum_class;
+ GEnumValue *enum_value;
+
+ 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);
+ }
- return enum_value->value_nick;
+ return enum_value->value_nick;
}
gboolean
tracker_db_action_is_delete (TrackerDBAction action)
{
return
- action == TRACKER_DB_ACTION_DELETE ||
+ action == TRACKER_DB_ACTION_DELETE ||
action == TRACKER_DB_ACTION_DELETE_SELF ||
action == TRACKER_DB_ACTION_FILE_DELETED ||
action == TRACKER_DB_ACTION_DIRECTORY_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 15:12:19 2008
@@ -29,32 +29,32 @@
#define TRACKER_TYPE_ACTION (tracker_db_action_get_type ())
typedef enum {
- TRACKER_DB_ACTION_IGNORE,
- TRACKER_DB_ACTION_CHECK,
- TRACKER_DB_ACTION_DELETE,
- TRACKER_DB_ACTION_DELETE_SELF,
- TRACKER_DB_ACTION_CREATE,
- TRACKER_DB_ACTION_MOVED_FROM,
- TRACKER_DB_ACTION_MOVED_TO,
- TRACKER_DB_ACTION_FILE_CHECK,
- TRACKER_DB_ACTION_FILE_CHANGED,
- TRACKER_DB_ACTION_FILE_DELETED,
- TRACKER_DB_ACTION_FILE_CREATED,
- TRACKER_DB_ACTION_FILE_MOVED_FROM,
- TRACKER_DB_ACTION_FILE_MOVED_TO,
- TRACKER_DB_ACTION_WRITABLE_FILE_CLOSED,
- TRACKER_DB_ACTION_DIRECTORY_CHECK,
- TRACKER_DB_ACTION_DIRECTORY_CREATED,
- TRACKER_DB_ACTION_DIRECTORY_UNMOUNTED,
- TRACKER_DB_ACTION_DIRECTORY_DELETED,
- TRACKER_DB_ACTION_DIRECTORY_MOVED_FROM,
- TRACKER_DB_ACTION_DIRECTORY_MOVED_TO,
- TRACKER_DB_ACTION_DIRECTORY_REFRESH,
- TRACKER_DB_ACTION_EXTRACT_METADATA,
+ TRACKER_DB_ACTION_IGNORE,
+ TRACKER_DB_ACTION_CHECK,
+ TRACKER_DB_ACTION_DELETE,
+ TRACKER_DB_ACTION_DELETE_SELF,
+ TRACKER_DB_ACTION_CREATE,
+ TRACKER_DB_ACTION_MOVED_FROM,
+ TRACKER_DB_ACTION_MOVED_TO,
+ TRACKER_DB_ACTION_FILE_CHECK,
+ TRACKER_DB_ACTION_FILE_CHANGED,
+ TRACKER_DB_ACTION_FILE_DELETED,
+ TRACKER_DB_ACTION_FILE_CREATED,
+ TRACKER_DB_ACTION_FILE_MOVED_FROM,
+ TRACKER_DB_ACTION_FILE_MOVED_TO,
+ TRACKER_DB_ACTION_WRITABLE_FILE_CLOSED,
+ TRACKER_DB_ACTION_DIRECTORY_CHECK,
+ TRACKER_DB_ACTION_DIRECTORY_CREATED,
+ TRACKER_DB_ACTION_DIRECTORY_UNMOUNTED,
+ TRACKER_DB_ACTION_DIRECTORY_DELETED,
+ TRACKER_DB_ACTION_DIRECTORY_MOVED_FROM,
+ TRACKER_DB_ACTION_DIRECTORY_MOVED_TO,
+ TRACKER_DB_ACTION_DIRECTORY_REFRESH,
+ TRACKER_DB_ACTION_EXTRACT_METADATA,
TRACKER_DB_ACTION_FORCE_REFRESH
} TrackerDBAction;
-GType tracker_db_action_get_type (void) G_GNUC_CONST;
+GType tracker_db_action_get_type (void) G_GNUC_CONST;
const gchar *tracker_db_action_to_string (TrackerDBAction action);
gboolean tracker_db_action_is_delete (TrackerDBAction action);
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 15:12:19 2008
@@ -25,24 +25,24 @@
static gchar **
dbus_query_result_to_strv (TrackerDBResultSet *result_set,
- gint column,
- gint *count,
- gboolean numeric)
+ gint column,
+ gint *count,
+ gboolean numeric)
{
gchar **strv = NULL;
- gint rows = 0;
- gint i = 0;
+ gint rows = 0;
+ gint i = 0;
if (result_set) {
- gchar *str;
+ gchar *str;
gboolean valid = TRUE;
- gint value;
+ gint value;
/* Make sure we rewind before iterating the result set */
tracker_db_result_set_rewind (result_set);
- rows = tracker_db_result_set_get_n_rows (result_set);
+ rows = tracker_db_result_set_get_n_rows (result_set);
strv = g_new (gchar*, rows + 1);
while (valid) {
@@ -71,25 +71,25 @@
strv[i] = NULL;
}
- if (count) {
- *count = i;
- }
+ if (count) {
+ *count = i;
+ }
return strv;
}
gchar **
tracker_dbus_query_result_to_strv (TrackerDBResultSet *result_set,
- gint column,
- gint *count)
+ gint column,
+ gint *count)
{
return dbus_query_result_to_strv (result_set, column, count, FALSE);
}
gchar **
tracker_dbus_query_result_numeric_to_strv (TrackerDBResultSet *result_set,
- gint column,
- gint *count)
+ gint column,
+ gint *count)
{
return dbus_query_result_to_strv (result_set, column, count, TRUE);
}
@@ -101,8 +101,8 @@
gboolean rewind)
{
gchar **strv = NULL;
- gint i = 0;
- gint columns;
+ gint i = 0;
+ gint columns;
if (result_set) {
columns = tracker_db_result_set_get_n_columns (result_set);
@@ -127,7 +127,7 @@
for (i = offset_column ; i < until_column; i++) {
GValue value = {0, };
- GValue transform = {0, };
+ GValue transform = {0, };
g_value_init (&transform, G_TYPE_STRING);
@@ -149,7 +149,7 @@
tracker_dbus_query_result_to_hash_table (TrackerDBResultSet *result_set)
{
GHashTable *hash_table;
- gint field_count;
+ gint field_count;
gboolean valid = FALSE;
hash_table = g_hash_table_new_full (g_str_hash,
@@ -181,7 +181,7 @@
values = tracker_dbus_gvalue_slice_new (G_TYPE_STRV);
for (i = 1; i < field_count; i++) {
- GValue value = { 0, };
+ GValue value = { 0, };
gchar *str;
_tracker_db_result_set_get_value (result_set, i, &value);
@@ -208,18 +208,18 @@
g_hash_table_insert (hash_table, key, values);
valid = tracker_db_result_set_iter_next (result_set);
- }
+ }
- return hash_table;
+ return hash_table;
}
GPtrArray *
tracker_dbus_query_result_to_ptr_array (TrackerDBResultSet *result_set)
{
- GPtrArray *ptr_array;
+ GPtrArray *ptr_array;
gboolean valid = FALSE;
- gint columns;
- gint i;
+ gint columns;
+ gint i;
ptr_array = g_ptr_array_new ();
@@ -234,13 +234,13 @@
}
while (valid) {
- GSList *list = NULL;
+ GSList *list = NULL;
gchar **p;
/* Append fields to the array */
for (i = 0; i < columns; i++) {
- GValue transform = { 0, };
- GValue value = { 0, };
+ GValue transform = { 0, };
+ GValue value = { 0, };
gchar *str;
g_value_init (&transform, G_TYPE_STRING);
@@ -278,6 +278,6 @@
valid = tracker_db_result_set_iter_next (result_set);
}
- return ptr_array;
+ return ptr_array;
}
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 15:12:19 2008
@@ -29,11 +29,11 @@
#include "tracker-db-interface.h"
gchar ** tracker_dbus_query_result_to_strv (TrackerDBResultSet *result_set,
- gint column,
- gint *count);
+ gint column,
+ gint *count);
gchar ** tracker_dbus_query_result_numeric_to_strv (TrackerDBResultSet *result_set,
- gint column,
- gint *count);
+ gint column,
+ gint *count);
gchar ** tracker_dbus_query_result_columns_to_strv (TrackerDBResultSet *result_set,
gint offset_column,
gint until_column,
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 15:12:19 2008
@@ -42,74 +42,74 @@
GType
tracker_db_watch_get_type (void)
{
- static GType etype = 0;
+ static GType etype = 0;
- if (etype == 0) {
- static const GEnumValue values[] = {
- { TRACKER_DB_WATCH_ROOT,
- "TRACKER_DB_WATCH_ROOT",
- "Watching Root" },
- { TRACKER_DB_WATCH_SUBFOLDER,
- "TRACKER_DB_WATCH_SUBFOLDER",
- "Watching Subfolder" },
- { TRACKER_DB_WATCH_SPECIAL_FOLDER,
- "TRACKER_DB_WATCH_SPECIAL_FOLDER",
- "Watching Special Folder" },
- { TRACKER_DB_WATCH_SPECIAL_FILE,
- "TRACKER_DB_WATCH_SPECIAL_FILE",
- "Watching Special File" },
- { TRACKER_DB_WATCH_NO_INDEX,
- "TRACKER_DB_WATCH_NO_INDEX",
- "Watching No Index" },
- { TRACKER_DB_WATCH_OTHER,
- "TRACKER_DB_WATCH_OTHER",
- "Watching Other" },
- { 0, NULL, NULL }
- };
-
- etype = g_enum_register_static ("TrackerDBWatch", values);
-
- /* Since we don't reference this enum anywhere, we do
- * 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.
- */
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ { TRACKER_DB_WATCH_ROOT,
+ "TRACKER_DB_WATCH_ROOT",
+ "Watching Root" },
+ { TRACKER_DB_WATCH_SUBFOLDER,
+ "TRACKER_DB_WATCH_SUBFOLDER",
+ "Watching Subfolder" },
+ { TRACKER_DB_WATCH_SPECIAL_FOLDER,
+ "TRACKER_DB_WATCH_SPECIAL_FOLDER",
+ "Watching Special Folder" },
+ { TRACKER_DB_WATCH_SPECIAL_FILE,
+ "TRACKER_DB_WATCH_SPECIAL_FILE",
+ "Watching Special File" },
+ { TRACKER_DB_WATCH_NO_INDEX,
+ "TRACKER_DB_WATCH_NO_INDEX",
+ "Watching No Index" },
+ { TRACKER_DB_WATCH_OTHER,
+ "TRACKER_DB_WATCH_OTHER",
+ "Watching Other" },
+ { 0, NULL, NULL }
+ };
+
+ etype = g_enum_register_static ("TrackerDBWatch", values);
+
+ /* Since we don't reference this enum anywhere, we do
+ * 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.
+ */
- g_type_class_ref (etype);
- }
+ g_type_class_ref (etype);
+ }
- return etype;
+ return etype;
}
const gchar *
tracker_db_watch_to_string (TrackerDBWatch watch)
{
- GType type;
- GEnumClass *enum_class;
- GEnumValue *enum_value;
-
- 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);
- }
+ GType type;
+ GEnumClass *enum_class;
+ GEnumValue *enum_value;
+
+ 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);
+ }
- return enum_value->value_nick;
+ return enum_value->value_nick;
}
/*
* TrackerDBFileInfo
*/
TrackerDBFileInfo *
-tracker_db_file_info_new (const char *uri,
+tracker_db_file_info_new (const char *uri,
TrackerDBAction action,
- gint counter,
+ gint counter,
TrackerDBWatch watch)
{
TrackerDBFileInfo *info;
@@ -217,12 +217,12 @@
#if 0
static TrackerDBFileInfo *
-db_file_info_get_pending (guint32 file_id,
- const gchar *uri,
- const gchar *mime,
- gint counter,
+db_file_info_get_pending (guint32 file_id,
+ const gchar *uri,
+ const gchar *mime,
+ gint counter,
TrackerDBAction action,
- gboolean is_directory)
+ gboolean is_directory)
{
TrackerDBFileInfo *info;
@@ -269,7 +269,7 @@
tracker_db_file_info_get (TrackerDBFileInfo *info)
{
struct stat finfo;
- gchar *str, *uri_in_locale;
+ gchar *str, *uri_in_locale;
if (!info || !info->uri) {
return info;
@@ -329,18 +329,18 @@
gboolean
tracker_db_file_info_is_valid (TrackerDBFileInfo *info)
{
- g_return_val_if_fail (info != NULL, FALSE);
- g_return_val_if_fail (info->uri != NULL, FALSE);
+ g_return_val_if_fail (info != NULL, FALSE);
+ g_return_val_if_fail (info->uri != NULL, FALSE);
- if (!g_utf8_validate (info->uri, -1, NULL)) {
- g_warning ("Expected UTF-8 validation of TrackerDBFileInfo URI");
- return FALSE;
- }
-
- if (info->action == TRACKER_DB_ACTION_IGNORE) {
- return FALSE;
- }
+ if (!g_utf8_validate (info->uri, -1, NULL)) {
+ g_warning ("Expected UTF-8 validation of TrackerDBFileInfo URI");
+ return FALSE;
+ }
+
+ if (info->action == TRACKER_DB_ACTION_IGNORE) {
+ return FALSE;
+ }
- return TRUE;
+ 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 15:12:19 2008
@@ -40,8 +40,8 @@
TRACKER_DB_WATCH_OTHER
} TrackerDBWatch;
-GType tracker_db_watch_get_type (void) G_GNUC_CONST;
-const gchar * tracker_db_watch_to_string (TrackerDBWatch watch);
+GType tracker_db_watch_get_type (void) G_GNUC_CONST;
+const gchar * tracker_db_watch_to_string (TrackerDBWatch watch);
/*
* File Information
@@ -50,59 +50,59 @@
struct _TrackerDBFileInfo {
/* File name/path related info */
- gchar *uri;
- guint32 file_id;
+ gchar *uri;
+ guint32 file_id;
TrackerDBAction action;
- guint32 cookie;
- gint counter;
- TrackerDBWatch watch_type;
+ guint32 cookie;
+ gint counter;
+ TrackerDBWatch watch_type;
/* Symlink info - File ID of link might not be in DB so need
- * to store path/filename too.
- */
- gint32 link_id;
- gchar *link_path;
- gchar *link_name;
-
- gchar *mime;
- gint service_type_id;
- guint32 file_size;
- gchar *permissions;
- gint32 mtime;
- gint32 atime;
- gint32 indextime;
- gint32 offset;
+ * to store path/filename too.
+ */
+ gint32 link_id;
+ gchar *link_path;
+ gchar *link_name;
+
+ gchar *mime;
+ gint service_type_id;
+ guint32 file_size;
+ gchar *permissions;
+ gint32 mtime;
+ gint32 atime;
+ gint32 indextime;
+ gint32 offset;
/* Options */
- gchar *moved_to_uri;
+ gchar *moved_to_uri;
- gint aux_id;
+ gint aux_id;
- guint is_new : 1;
- guint is_directory : 1;
- guint is_link : 1;
- guint extract_embedded : 1;
- guint extract_contents : 1;
- guint extract_thumbs : 1;
- guint is_hidden : 1;
+ guint is_new : 1;
+ guint is_directory : 1;
+ guint is_link : 1;
+ guint extract_embedded : 1;
+ guint extract_contents : 1;
+ guint extract_thumbs : 1;
+ guint is_hidden : 1;
/* We ref count FileInfo as it has a complex lifespan and is
- * tossed between various threads, lists, queues and hash
- * tables.
- */
- gint ref_count;
+ * tossed between various threads, lists, queues and hash
+ * tables.
+ */
+ gint ref_count;
};
-TrackerDBFileInfo *tracker_db_file_info_new (const gchar *uri,
+TrackerDBFileInfo *tracker_db_file_info_new (const gchar *uri,
TrackerDBAction action,
- gint counter,
+ gint counter,
TrackerDBWatch watch);
-void tracker_db_file_info_free (TrackerDBFileInfo *info);
-TrackerDBFileInfo *tracker_db_file_info_ref (TrackerDBFileInfo *info);
-TrackerDBFileInfo *tracker_db_file_info_unref (TrackerDBFileInfo *info);
-TrackerDBFileInfo *tracker_db_file_info_get (TrackerDBFileInfo *info);
-gboolean tracker_db_file_info_is_valid (TrackerDBFileInfo *info);
+void tracker_db_file_info_free (TrackerDBFileInfo *info);
+TrackerDBFileInfo *tracker_db_file_info_ref (TrackerDBFileInfo *info);
+TrackerDBFileInfo *tracker_db_file_info_unref (TrackerDBFileInfo *info);
+TrackerDBFileInfo *tracker_db_file_info_get (TrackerDBFileInfo *info);
+gboolean tracker_db_file_info_is_valid (TrackerDBFileInfo *info);
#endif /* __TRACKER_DB_FILE_INFO_H__ */
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 15:12:19 2008
@@ -25,8 +25,8 @@
gint score)
{
unsigned char a[4];
- gint16 score16;
- guint8 service_type_8;
+ gint16 score16;
+ guint8 service_type_8;
if (score > 30000) {
score16 = 30000;
@@ -37,8 +37,8 @@
service_type_8 = (guint8) service_type;
/* Amalgamate and combine score and service_type into a single
- * 32-bit int for compact storage.
- */
+ * 32-bit int for compact storage.
+ */
a[0] = service_type_8;
a[1] = (score16 >> 8) & 0xFF;
a[2] = score16 & 0xFF;
@@ -50,7 +50,7 @@
guint8
tracker_db_index_item_get_service_type (TrackerDBIndexItem *item)
{
- g_return_val_if_fail (item != NULL, 0);
+ g_return_val_if_fail (item != NULL, 0);
return (item->amalgamated >> 24) & 0xFF;
}
@@ -60,7 +60,7 @@
{
unsigned char a[2];
- g_return_val_if_fail (item != NULL, 0);
+ g_return_val_if_fail (item != NULL, 0);
a[0] = (item->amalgamated >> 16) & 0xFF;
a[1] = (item->amalgamated >> 8) & 0xFF;
@@ -73,5 +73,5 @@
{
g_return_val_if_fail (item != NULL, 0);
- return item->id;
+ 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 15:12:19 2008
@@ -32,20 +32,20 @@
/* Amalgamation of service_type and score of the word in the
* document's metadata.
*/
- gint amalgamated;
+ gint amalgamated;
} TrackerDBIndexItem;
typedef struct {
- guint32 service_id; /* Service ID of the document */
+ guint32 service_id; /* Service ID of the document */
guint32 service_type_id; /* Service type ID of the document */
- guint32 score; /* Ranking score */
+ guint32 score; /* Ranking score */
} TrackerDBIndexItemRank;
-guint32 tracker_db_index_item_calc_amalgamated (gint service_type,
- gint score);
-guint8 tracker_db_index_item_get_service_type (TrackerDBIndexItem *details);
-gint16 tracker_db_index_item_get_score (TrackerDBIndexItem *details);
-guint32 tracker_db_index_item_get_id (TrackerDBIndexItem *details);
+guint32 tracker_db_index_item_calc_amalgamated (gint service_type,
+ gint score);
+guint8 tracker_db_index_item_get_service_type (TrackerDBIndexItem *details);
+gint16 tracker_db_index_item_get_score (TrackerDBIndexItem *details);
+guint32 tracker_db_index_item_get_id (TrackerDBIndexItem *details);
G_END_DECLS
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 15:12:19 2008
@@ -35,49 +35,49 @@
#define MAX_INDEX_FILE_SIZE 2000000000
typedef struct {
- TrackerDBIndexType type;
- TrackerDBIndex *index;
- const gchar *file;
- const gchar *name;
- gchar *abs_filename;
+ TrackerDBIndexType type;
+ TrackerDBIndex *index;
+ const gchar *file;
+ const gchar *name;
+ gchar *abs_filename;
} TrackerDBIndexDefinition;
-static gboolean initialized;
-static gchar *data_dir;
+static gboolean initialized;
+static gchar *data_dir;
static TrackerDBIndexDefinition indexes[] = {
- { TRACKER_DB_INDEX_UNKNOWN,
+ { TRACKER_DB_INDEX_UNKNOWN,
NULL,
- NULL,
- NULL,
- NULL },
- { TRACKER_DB_INDEX_FILE,
NULL,
- "file-index.db",
- "file-index",
- NULL },
- { TRACKER_DB_INDEX_FILE_UPDATE,
NULL,
- "file-index-update.db",
- "file-index-update",
- NULL },
- { TRACKER_DB_INDEX_EMAIL,
+ NULL },
+ { TRACKER_DB_INDEX_FILE,
NULL,
- "email-index.db",
- "email-index",
- NULL }
+ "file-index.db",
+ "file-index",
+ NULL },
+ { TRACKER_DB_INDEX_FILE_UPDATE,
+ NULL,
+ "file-index-update.db",
+ "file-index-update",
+ NULL },
+ { TRACKER_DB_INDEX_EMAIL,
+ NULL,
+ "email-index.db",
+ "email-index",
+ NULL }
};
static gboolean
has_tmp_merge_files (TrackerDBIndexType type)
{
- GFile *file;
+ GFile *file;
GFileEnumerator *enumerator;
- GFileInfo *info;
- GError *error = NULL;
- gchar *prefix;
- gchar *dirname;
- gboolean found;
+ GFileInfo *info;
+ GError *error = NULL;
+ gchar *prefix;
+ gchar *dirname;
+ gboolean found;
if (type == TRACKER_DB_INDEX_UNKNOWN) {
return FALSE;
@@ -139,22 +139,22 @@
gboolean
tracker_db_index_manager_init (TrackerDBIndexManagerFlags flags,
- gint min_bucket,
- gint max_bucket)
+ gint min_bucket,
+ gint max_bucket)
{
- gchar *final_index_filename;
- gchar *name;
+ gchar *final_index_filename;
+ gchar *name;
gboolean need_reindex = FALSE;
gboolean force_reindex;
gboolean readonly;
- guint i;
+ guint i;
g_return_val_if_fail (min_bucket >= 0, FALSE);
g_return_val_if_fail (max_bucket >= min_bucket, FALSE);
- if (initialized) {
- return TRUE;
- }
+ if (initialized) {
+ return TRUE;
+ }
g_message ("Setting index database locations");
@@ -239,7 +239,7 @@
readonly);
}
- initialized = TRUE;
+ initialized = TRUE;
return TRUE;
}
@@ -249,9 +249,9 @@
{
guint i;
- if (!initialized) {
- return;
- }
+ if (!initialized) {
+ return;
+ }
for (i = 1; i < G_N_ELEMENTS (indexes); i++) {
g_object_unref (indexes[i].index);
@@ -263,7 +263,7 @@
g_free (data_dir);
- initialized = FALSE;
+ initialized = FALSE;
}
TrackerDBIndex *
@@ -275,7 +275,7 @@
TrackerDBIndex *
tracker_db_index_manager_get_index_by_service (const gchar *service)
{
- TrackerDBType type;
+ TrackerDBType type;
TrackerDBIndexType index_type;
g_return_val_if_fail (initialized == TRUE, NULL);
@@ -302,9 +302,9 @@
TrackerDBIndex *
tracker_db_index_manager_get_index_by_service_id (gint id)
{
- TrackerDBType type;
+ TrackerDBType type;
TrackerDBIndexType index_type;
- gchar *service;
+ gchar *service;
g_return_val_if_fail (initialized == TRUE, NULL);
@@ -339,14 +339,14 @@
const gchar *
tracker_db_index_manager_get_filename (TrackerDBIndexType type)
{
- return indexes[type].abs_filename;
+ return indexes[type].abs_filename;
}
gboolean
tracker_db_index_manager_are_indexes_too_big (void)
{
- gboolean too_big;
- guint i;
+ gboolean too_big;
+ guint i;
g_return_val_if_fail (initialized == TRUE, FALSE);
@@ -354,7 +354,7 @@
too_big = tracker_file_get_size (indexes[i].abs_filename) > MAX_INDEX_FILE_SIZE;
}
- if (too_big) {
+ if (too_big) {
g_critical ("One or more index files are too big, indexing disabled");
return TRUE;
}
Modified: branches/indexer-split/src/libtracker-db/tracker-db-index-manager.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-index-manager.h (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index-manager.h Sat Sep 20 15:12:19 2008
@@ -40,15 +40,15 @@
TRACKER_DB_INDEX_MANAGER_READONLY = 1 << 2
} TrackerDBIndexManagerFlags;
-gboolean tracker_db_index_manager_init (TrackerDBIndexManagerFlags flags,
- gint min_bucket,
- gint max_bucket);
-void tracker_db_index_manager_shutdown (void);
-TrackerDBIndex *tracker_db_index_manager_get_index (TrackerDBIndexType index);
-TrackerDBIndex *tracker_db_index_manager_get_index_by_service (const gchar *service);
-TrackerDBIndex *tracker_db_index_manager_get_index_by_service_id (gint id);
-const gchar * tracker_db_index_manager_get_filename (TrackerDBIndexType index);
-gboolean tracker_db_index_manager_are_indexes_too_big (void);
+gboolean tracker_db_index_manager_init (TrackerDBIndexManagerFlags flags,
+ gint min_bucket,
+ gint max_bucket);
+void tracker_db_index_manager_shutdown (void);
+TrackerDBIndex *tracker_db_index_manager_get_index (TrackerDBIndexType index);
+TrackerDBIndex *tracker_db_index_manager_get_index_by_service (const gchar *service);
+TrackerDBIndex *tracker_db_index_manager_get_index_by_service_id (gint id);
+const gchar * tracker_db_index_manager_get_filename (TrackerDBIndexType index);
+gboolean tracker_db_index_manager_are_indexes_too_big (void);
G_END_DECLS
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 15:12:19 2008
@@ -44,39 +44,39 @@
struct TrackerDBIndexPrivate {
/* From the daemon */
- DEPOT *index;
+ DEPOT *index;
- guint min_bucket;
- guint max_bucket;
+ guint min_bucket;
+ guint max_bucket;
- guint reload : 1;
- guint readonly : 1;
- guint in_pause : 1;
- guint in_flush : 1;
+ guint reload : 1;
+ guint readonly : 1;
+ guint in_pause : 1;
+ guint in_flush : 1;
/* From the indexer */
GHashTable *cache;
- gchar *filename;
- gint bucket_count;
+ gchar *filename;
+ gint bucket_count;
};
static void tracker_db_index_class_init (TrackerDBIndexClass *class);
-static void tracker_db_index_init (TrackerDBIndex *tree);
-static void tracker_db_index_finalize (GObject *object);
-static void tracker_db_index_set_property (GObject *object,
- guint prop_id,
+static void tracker_db_index_init (TrackerDBIndex *tree);
+static void tracker_db_index_finalize (GObject *object);
+static void tracker_db_index_set_property (GObject *object,
+ guint prop_id,
const GValue *value,
- GParamSpec *pspec);
-static void tracker_db_index_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void free_cache_values (GArray *array);
+ GParamSpec *pspec);
+static void tracker_db_index_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void free_cache_values (GArray *array);
enum {
PROP_0,
PROP_FILENAME,
- PROP_MIN_BUCKET,
+ PROP_MIN_BUCKET,
PROP_MAX_BUCKET,
PROP_RELOAD,
PROP_READONLY
@@ -159,7 +159,7 @@
static void
tracker_db_index_finalize (GObject *object)
{
- TrackerDBIndex *index;
+ TrackerDBIndex *index;
TrackerDBIndexPrivate *priv;
index = TRACKER_DB_INDEX (object);
@@ -177,8 +177,8 @@
}
static void
-tracker_db_index_set_property (GObject *object,
- guint prop_id,
+tracker_db_index_set_property (GObject *object,
+ guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
@@ -210,9 +210,9 @@
}
static void
-tracker_db_index_get_property (GObject *object,
- guint prop_id,
- GValue *value,
+tracker_db_index_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
GParamSpec *pspec)
{
TrackerDBIndexPrivate *priv;
@@ -249,11 +249,11 @@
TrackerDBIndex *
tracker_db_index_new (const gchar *filename,
- gint min_bucket,
- gint max_bucket,
- gboolean readonly)
+ gint min_bucket,
+ gint max_bucket,
+ gboolean readonly)
{
- TrackerDBIndex *index;
+ TrackerDBIndex *index;
g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (min_bucket > 0, NULL);
@@ -268,7 +268,7 @@
tracker_db_index_open (index);
- return index;
+ return index;
}
void
@@ -292,7 +292,7 @@
void
tracker_db_index_set_min_bucket (TrackerDBIndex *index,
- gint min_bucket)
+ gint min_bucket)
{
TrackerDBIndexPrivate *priv;
@@ -307,7 +307,7 @@
void
tracker_db_index_set_max_bucket (TrackerDBIndex *index,
- gint max_bucket)
+ gint max_bucket)
{
TrackerDBIndexPrivate *priv;
@@ -322,7 +322,7 @@
void
tracker_db_index_set_reload (TrackerDBIndex *index,
- gboolean reload)
+ gboolean reload)
{
TrackerDBIndexPrivate *priv;
@@ -376,27 +376,27 @@
static inline gboolean
has_word (TrackerDBIndex *index,
- const gchar *word)
+ const gchar *word)
{
- TrackerDBIndexPrivate *priv;
- gchar buffer[32];
- gint count;
+ TrackerDBIndexPrivate *priv;
+ gchar buffer[32];
+ gint count;
- priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
+ priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
- count = dpgetwb (priv->index, word, -1, 0, 32, buffer);
+ count = dpgetwb (priv->index, word, -1, 0, 32, buffer);
return count > 7;
}
static inline gint
count_hit_size_for_word (TrackerDBIndex *index,
- const gchar *word)
+ const gchar *word)
{
- TrackerDBIndexPrivate *priv;
- gint tsiz;
+ TrackerDBIndexPrivate *priv;
+ gint tsiz;
- priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
+ priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
tsiz = dpvsiz (priv->index, word, -1);
@@ -412,8 +412,8 @@
*/
static gint
levenshtein (const gchar *source,
- gchar *target,
- gint maxdist)
+ gchar *target,
+ gint maxdist)
{
gchar n, m;
gint l;
@@ -441,13 +441,13 @@
return MIN(n, maxdist);
/* Store the min. value on each column, so that, if it
- * reaches. maxdist, we break early.
- */
+ * reaches. maxdist, we break early.
+ */
for (j = 0; j <= m; j++)
matrix[0][(gint)j] = j;
for (i = 1; i <= n; i++) {
- gchar s_i;
+ gchar s_i;
mincolval = MAX(m, i);
matrix[(gint)i][0] = i;
@@ -464,11 +464,11 @@
cell = MIN(above + 1, MIN(left + 1, diag + cost));
/* Cover transposition, in addition to deletion,
- * insertion and substitution. This step is taken from:
- * Berghel, Hal ; Roach, David : "An Extension of Ukkonen's
- * Enhanced Dynamic Programming ASM Algorithm"
- * (http://www.acm.org/~hlb/publications/asm/asm.html)
- */
+ * insertion and substitution. This step is taken from:
+ * Berghel, Hal ; Roach, David : "An Extension of Ukkonen's
+ * Enhanced Dynamic Programming ASM Algorithm"
+ * (http://www.acm.org/~hlb/publications/asm/asm.html)
+ */
if (i > 2 && j > 2) {
gchar trans = matrix[i-2][j-2] + 1;
@@ -492,37 +492,37 @@
return (gint) matrix[(gint)n][(gint)m];
} else {
return maxdist;
- }
+ }
}
static gint
count_hits_for_word (TrackerDBIndex *index,
- const gchar *str)
+ const gchar *str)
{
- gint tsiz;
- gint hits = 0;
+ gint tsiz;
+ gint hits = 0;
- tsiz = count_hit_size_for_word (index, str);
+ tsiz = count_hit_size_for_word (index, str);
- if (tsiz == -1 ||
- tsiz % sizeof (TrackerDBIndexItem) != 0) {
- return -1;
- }
+ if (tsiz == -1 ||
+ tsiz % sizeof (TrackerDBIndexItem) != 0) {
+ return -1;
+ }
- hits = tsiz / sizeof (TrackerDBIndexItem);
+ hits = tsiz / sizeof (TrackerDBIndexItem);
- return hits;
+ return hits;
}
static gboolean
check_index_is_up_to_date (TrackerDBIndex *index)
{
- TrackerDBIndexPrivate *priv;
+ TrackerDBIndexPrivate *priv;
- g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), FALSE);
+ g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), FALSE);
- priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
+ priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
if (priv->reload) {
g_message ("Reloading index:'%s'", priv->filename);
@@ -540,20 +540,20 @@
* new.
*/
static gboolean
-indexer_update_word (DEPOT *index,
+indexer_update_word (DEPOT *index,
const gchar *word,
- GArray *new_hits)
+ GArray *new_hits)
{
TrackerDBIndexItem *new_hit;
TrackerDBIndexItem *previous_hits;
- GArray *pending_hits;
- gboolean write_back;
- gboolean edited;
- gboolean result;
- gint old_hit_count;
- gint score;
- gint tsiz;
- guint j;
+ GArray *pending_hits;
+ gboolean write_back;
+ gboolean edited;
+ gboolean result;
+ gint old_hit_count;
+ gint score;
+ gint tsiz;
+ guint j;
g_return_val_if_fail (index != NULL, FALSE);
g_return_val_if_fail (word != NULL, FALSE);
@@ -727,9 +727,9 @@
tracker_db_index_open (TrackerDBIndex *index)
{
TrackerDBIndexPrivate *priv;
- gint flags;
- gint bucket_count;
- gint rec_count;
+ gint flags;
+ gint bucket_count;
+ gint rec_count;
g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), FALSE);
@@ -796,7 +796,7 @@
tracker_db_index_close (TrackerDBIndex *index)
{
TrackerDBIndexPrivate *priv;
- gboolean retval;
+ gboolean retval;
g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), FALSE);
@@ -821,7 +821,7 @@
void
tracker_db_index_set_paused (TrackerDBIndex *index,
- gboolean paused)
+ gboolean paused)
{
TrackerDBIndexPrivate *priv;
@@ -840,7 +840,7 @@
tracker_db_index_flush (TrackerDBIndex *index)
{
TrackerDBIndexPrivate *priv;
- guint size, removed_items;
+ guint size, removed_items;
g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), 0);
@@ -890,38 +890,38 @@
guint32
tracker_db_index_get_size (TrackerDBIndex *index)
{
- TrackerDBIndexPrivate *priv;
- guint32 size;
+ TrackerDBIndexPrivate *priv;
+ guint32 size;
- g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), 0);
+ g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), 0);
if (!check_index_is_up_to_date (index)) {
return 0;
}
- priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
+ priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
- size = dpfsiz (priv->index);
+ size = dpfsiz (priv->index);
return size;
}
gchar *
tracker_db_index_get_suggestion (TrackerDBIndex *index,
- const gchar *term,
- gint maxdist)
+ const gchar *term,
+ gint maxdist)
{
- TrackerDBIndexPrivate *priv;
- gchar *str;
- gint dist;
+ TrackerDBIndexPrivate *priv;
+ gchar *str;
+ gint dist;
gchar *winner_str;
- gint winner_dist;
+ gint winner_dist;
gint hits;
GTimeVal start, current;
- g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), NULL);
- g_return_val_if_fail (term != NULL, NULL);
- g_return_val_if_fail (maxdist >= 0, NULL);
+ g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), NULL);
+ g_return_val_if_fail (term != NULL, NULL);
+ g_return_val_if_fail (maxdist >= 0, NULL);
if (!check_index_is_up_to_date (index)) {
return NULL;
@@ -930,9 +930,9 @@
priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
winner_str = g_strdup (term);
- winner_dist = G_MAXINT; /* Initialize to the worst case */
+ winner_dist = G_MAXINT; /* Initialize to the worst case */
- dpiterinit (priv->index);
+ dpiterinit (priv->index);
g_get_current_time (&start);
@@ -942,20 +942,20 @@
dist = levenshtein (term, str, 0);
if (dist != -1 &&
- dist < maxdist &&
- dist < winner_dist) {
- hits = count_hits_for_word (index, str);
-
- if (hits < 0) {
- g_free (winner_str);
- g_free (str);
+ dist < maxdist &&
+ dist < winner_dist) {
+ hits = count_hits_for_word (index, str);
+
+ if (hits < 0) {
+ g_free (winner_str);
+ g_free (str);
- return NULL;
+ return NULL;
} else if (hits > 0) {
- g_free (winner_str);
- winner_str = g_strdup (str);
- winner_dist = dist;
- } else {
+ g_free (winner_str);
+ winner_str = g_strdup (str);
+ winner_dist = dist;
+ } else {
g_message ("No hits for:'%s'!", str);
}
}
@@ -968,27 +968,27 @@
if (current.tv_sec - start.tv_sec >= 2) {
g_message ("Timed out in %s, not collecting more suggestions.",
__FUNCTION__);
- break;
+ break;
}
str = dpiternext (priv->index, NULL);
}
- return winner_str;
+ return winner_str;
}
TrackerDBIndexItem *
tracker_db_index_get_word_hits (TrackerDBIndex *index,
const gchar *word,
- guint *count)
+ guint *count)
{
- TrackerDBIndexPrivate *priv;
+ TrackerDBIndexPrivate *priv;
TrackerDBIndexItem *details;
- gint tsiz;
- gchar *tmp;
+ gint tsiz;
+ gchar *tmp;
- g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), NULL);
- g_return_val_if_fail (word != NULL, NULL);
+ g_return_val_if_fail (TRACKER_IS_DB_INDEX (index), NULL);
+ g_return_val_if_fail (word != NULL, NULL);
priv = TRACKER_DB_INDEX_GET_PRIVATE (index);
@@ -999,17 +999,17 @@
details = NULL;
- if (count) {
- *count = 0;
- }
+ if (count) {
+ *count = 0;
+ }
if ((tmp = dpget (priv->index, word, -1, 0, MAX_HIT_BUFFER, &tsiz)) != NULL) {
if (tsiz >= (gint) sizeof (TrackerDBIndexItem)) {
details = (TrackerDBIndexItem *) tmp;
- if (count) {
- *count = tsiz / sizeof (TrackerDBIndexItem);
- }
+ if (count) {
+ *count = tsiz / sizeof (TrackerDBIndexItem);
+ }
}
}
@@ -1019,16 +1019,16 @@
void
tracker_db_index_add_word (TrackerDBIndex *index,
- const gchar *word,
- guint32 service_id,
- gint service_type,
- gint weight)
+ const gchar *word,
+ guint32 service_id,
+ gint service_type,
+ gint weight)
{
TrackerDBIndexPrivate *priv;
TrackerDBIndexItem elem;
TrackerDBIndexItem *current;
- GArray *array;
- guint i, new_score;
+ GArray *array;
+ guint i, new_score;
g_return_if_fail (TRACKER_IS_DB_INDEX (index));
g_return_if_fail (word != NULL);
@@ -1095,13 +1095,13 @@
*/
gboolean
tracker_db_index_remove_dud_hits (TrackerDBIndex *index,
- const gchar *word,
- GSList *dud_list)
+ const gchar *word,
+ GSList *dud_list)
{
- TrackerDBIndexPrivate *priv;
- gchar *tmp;
- gint tsiz;
- gboolean retval = FALSE;
+ TrackerDBIndexPrivate *priv;
+ gchar *tmp;
+ gint tsiz;
+ gboolean retval = FALSE;
g_return_val_if_fail (index, FALSE);
g_return_val_if_fail (word, FALSE);
@@ -1118,31 +1118,31 @@
/* Check if existing record is there */
tmp = dpget (priv->index,
- word,
- -1,
- 0,
- MAX_HIT_BUFFER,
- &tsiz);
-
- if (!tmp) {
- return FALSE;
- }
-
- if (tsiz >= (int) sizeof (TrackerDBIndexItem)) {
- TrackerDBIndexItem *details;
- gint wi, i, pnum;
-
- details = (TrackerDBIndexItem *) tmp;
- pnum = tsiz / sizeof (TrackerDBIndexItem);
- wi = 0;
+ word,
+ -1,
+ 0,
+ MAX_HIT_BUFFER,
+ &tsiz);
- for (i = 0; i < pnum; i++) {
- GSList *lst;
+ if (!tmp) {
+ return FALSE;
+ }
+
+ if (tsiz >= (int) sizeof (TrackerDBIndexItem)) {
+ TrackerDBIndexItem *details;
+ gint wi, i, pnum;
+
+ details = (TrackerDBIndexItem *) tmp;
+ pnum = tsiz / sizeof (TrackerDBIndexItem);
+ wi = 0;
+
+ for (i = 0; i < pnum; i++) {
+ GSList *lst;
- for (lst = dud_list; lst; lst = lst->next) {
- TrackerDBIndexItemRank *rank = lst->data;
+ for (lst = dud_list; lst; lst = lst->next) {
+ TrackerDBIndexItemRank *rank = lst->data;
- if (!rank) {
+ if (!rank) {
continue;
}
@@ -1165,15 +1165,15 @@
break;
}
- }
- }
+ }
+ }
- dpput (priv->index, word, -1, (gchar *) details, tsiz, DP_DOVER);
+ dpput (priv->index, word, -1, (gchar *) details, tsiz, DP_DOVER);
retval = TRUE;
- }
+ }
- g_free (tmp);
+ g_free (tmp);
return retval;
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 15:12:19 2008
@@ -29,15 +29,15 @@
#include <libtracker-db/tracker-db-index-item.h>
-#define TRACKER_TYPE_DB_INDEX (tracker_db_index_get_type())
-#define TRACKER_DB_INDEX(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_INDEX, TrackerDBIndex))
+#define TRACKER_TYPE_DB_INDEX (tracker_db_index_get_type())
+#define TRACKER_DB_INDEX(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_INDEX, TrackerDBIndex))
#define TRACKER_DB_INDEX_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_DB_INDEX, TrackerDBIndexClass))
-#define TRACKER_IS_DB_INDEX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_INDEX))
+#define TRACKER_IS_DB_INDEX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_INDEX))
#define TRACKER_IS_DB_INDEX_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKER_TYPE_DB_INDEX))
#define TRACKER_DB_INDEX_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_DB_INDEX, TrackerDBIndexClass))
-typedef struct TrackerDBIndex TrackerDBIndex;
-typedef struct TrackerDBIndexClass TrackerDBIndexClass;
+typedef struct TrackerDBIndex TrackerDBIndex;
+typedef struct TrackerDBIndexClass TrackerDBIndexClass;
typedef struct TrackerDBIndexWordDetails TrackerDBIndexWordDetails;
struct TrackerDBIndex {
@@ -48,48 +48,48 @@
GObjectClass parent_class;
};
-GType tracker_db_index_get_type (void);
-TrackerDBIndex * tracker_db_index_new (const gchar *filename,
- gint min_bucket,
- gint max_bucket,
- gboolean readonly);
-void tracker_db_index_set_filename (TrackerDBIndex *index,
+GType tracker_db_index_get_type (void);
+TrackerDBIndex * tracker_db_index_new (const gchar *filename,
+ gint min_bucket,
+ gint max_bucket,
+ gboolean readonly);
+void tracker_db_index_set_filename (TrackerDBIndex *index,
const gchar *filename);
-void tracker_db_index_set_min_bucket (TrackerDBIndex *index,
- gint min_bucket);
-void tracker_db_index_set_max_bucket (TrackerDBIndex *index,
- gint max_bucket);
-void tracker_db_index_set_reload (TrackerDBIndex *index,
- gboolean reload);
-void tracker_db_index_set_readonly (TrackerDBIndex *index,
- gboolean readonly);
-gboolean tracker_db_index_get_reload (TrackerDBIndex *index);
-gboolean tracker_db_index_get_readonly (TrackerDBIndex *index);
+void tracker_db_index_set_min_bucket (TrackerDBIndex *index,
+ gint min_bucket);
+void tracker_db_index_set_max_bucket (TrackerDBIndex *index,
+ gint max_bucket);
+void tracker_db_index_set_reload (TrackerDBIndex *index,
+ gboolean reload);
+void tracker_db_index_set_readonly (TrackerDBIndex *index,
+ gboolean readonly);
+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 */
-gboolean tracker_db_index_open (TrackerDBIndex *index);
-gboolean tracker_db_index_close (TrackerDBIndex *index);
-guint tracker_db_index_flush (TrackerDBIndex *index);
+gboolean tracker_db_index_open (TrackerDBIndex *index);
+gboolean tracker_db_index_close (TrackerDBIndex *index);
+guint tracker_db_index_flush (TrackerDBIndex *index);
/* Using the index */
-guint32 tracker_db_index_get_size (TrackerDBIndex *index);
-char * tracker_db_index_get_suggestion (TrackerDBIndex *index,
+guint32 tracker_db_index_get_size (TrackerDBIndex *index);
+char * tracker_db_index_get_suggestion (TrackerDBIndex *index,
const gchar *term,
- gint maxdist);
+ gint maxdist);
TrackerDBIndexItem *tracker_db_index_get_word_hits (TrackerDBIndex *index,
const gchar *word,
- guint *count);
-void tracker_db_index_add_word (TrackerDBIndex *index,
+ guint *count);
+void tracker_db_index_add_word (TrackerDBIndex *index,
const gchar *word,
- guint32 service_id,
- gint service_type,
- gint weight);
-gboolean tracker_db_index_remove_dud_hits (TrackerDBIndex *index,
+ guint32 service_id,
+ gint service_type,
+ gint weight);
+gboolean tracker_db_index_remove_dud_hits (TrackerDBIndex *index,
const gchar *word,
- GSList *dud_list);
+ GSList *dud_list);
G_END_DECLS
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 15:12:19 2008
@@ -55,8 +55,8 @@
tracker_db_interface_sqlite_iface_init))
static GObject *
-tracker_db_interface_sqlite_constructor (GType type,
- guint n_construct_properties,
+tracker_db_interface_sqlite_constructor (GType type,
+ guint n_construct_properties,
GObjectConstructParam *construct_params)
{
GObject *object;
@@ -71,8 +71,8 @@
if (sqlite3_open (priv->filename, &priv->db) != SQLITE_OK) {
g_critical ("Could not open sqlite3 database:'%s'", priv->filename);
} else {
- g_message ("Opened sqlite3 database:'%s'", priv->filename);
- }
+ g_message ("Opened sqlite3 database:'%s'", priv->filename);
+ }
sqlite3_extended_result_codes (priv->db, 0);
sqlite3_busy_timeout (priv->db, 10000000);
@@ -81,10 +81,10 @@
}
static void
-tracker_db_interface_sqlite_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+tracker_db_interface_sqlite_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
TrackerDBInterfaceSqlitePrivate *priv;
@@ -141,7 +141,7 @@
g_slist_free (priv->function_data);
sqlite3_close (priv->db);
- g_message ("Closed sqlite3 database:'%s'", priv->filename);
+ g_message ("Closed sqlite3 database:'%s'", priv->filename);
g_free (priv->filename);
@@ -188,7 +188,7 @@
static void
add_row (TrackerDBResultSet *result_set,
- sqlite3_stmt *stmt)
+ sqlite3_stmt *stmt)
{
gint cols, i;
@@ -230,7 +230,7 @@
static void
internal_sqlite3_function (sqlite3_context *context,
- int argc,
+ int argc,
sqlite3_value *argv[])
{
SqliteFunctionData *data;
@@ -273,7 +273,7 @@
}
default:
g_critical ("Unknown sqlite3 database value type:%d",
- sqlite3_value_type (argv[i]));
+ sqlite3_value_type (argv[i]));
}
}
@@ -299,7 +299,7 @@
sqlite3_result_null (context);
} else {
g_critical ("Sqlite3 returned type not managed:'%s'",
- G_VALUE_TYPE_NAME (&result));
+ G_VALUE_TYPE_NAME (&result));
sqlite3_result_null (context);
}
@@ -317,7 +317,7 @@
static void
tracker_db_interface_sqlite_set_procedure_table (TrackerDBInterface *db_interface,
- GHashTable *procedure_table)
+ GHashTable *procedure_table)
{
TrackerDBInterfaceSqlitePrivate *priv;
@@ -342,8 +342,8 @@
static TrackerDBResultSet *
create_result_set_from_stmt (TrackerDBInterfaceSqlite *interface,
- sqlite3_stmt *stmt,
- GError **error)
+ sqlite3_stmt *stmt,
+ GError **error)
{
TrackerDBInterfaceSqlitePrivate *priv;
TrackerDBResultSet *result_set = NULL;
@@ -352,7 +352,7 @@
priv = TRACKER_DB_INTERFACE_SQLITE_GET_PRIVATE (interface);
columns = sqlite3_column_count (stmt);
result = SQLITE_OK;
- busy_count = 0;
+ busy_count = 0;
while (result == SQLITE_OK ||
result == SQLITE_ROW ||
@@ -395,7 +395,7 @@
if (result == SQLITE_CORRUPT) {
g_critical ("Sqlite3 database:'%s' is corrupt, can not live without it",
- priv->filename);
+ priv->filename);
g_assert_not_reached ();
}
@@ -421,7 +421,7 @@
static sqlite3_stmt *
get_stored_stmt (TrackerDBInterfaceSqlite *db_interface,
- const gchar *procedure_name)
+ const gchar *procedure_name)
{
TrackerDBInterfaceSqlitePrivate *priv;
sqlite3_stmt *stmt;
@@ -437,7 +437,7 @@
if (!procedure) {
g_critical ("Sqlite3 prepared query:'%s' was not found",
- procedure_name);
+ procedure_name);
return NULL;
}
@@ -457,9 +457,9 @@
static TrackerDBResultSet *
tracker_db_interface_sqlite_execute_procedure (TrackerDBInterface *db_interface,
- GError **error,
- const gchar *procedure_name,
- va_list args)
+ GError **error,
+ const gchar *procedure_name,
+ va_list args)
{
TrackerDBInterfaceSqlitePrivate *priv;
sqlite3_stmt *stmt;
@@ -480,9 +480,9 @@
static TrackerDBResultSet *
tracker_db_interface_sqlite_execute_procedure_len (TrackerDBInterface *db_interface,
- GError **error,
- const gchar *procedure_name,
- va_list args)
+ GError **error,
+ const gchar *procedure_name,
+ va_list args)
{
TrackerDBInterfaceSqlitePrivate *priv;
sqlite3_stmt *stmt;
@@ -511,19 +511,19 @@
static TrackerDBResultSet *
tracker_db_interface_sqlite_execute_query (TrackerDBInterface *db_interface,
- GError **error,
- const gchar *query)
+ GError **error,
+ const gchar *query)
{
TrackerDBInterfaceSqlitePrivate *priv;
TrackerDBResultSet *result_set;
sqlite3_stmt *stmt;
- int retval;
+ int retval;
priv = TRACKER_DB_INTERFACE_SQLITE_GET_PRIVATE (db_interface);
retval = sqlite3_prepare_v2 (priv->db, query, -1, &stmt, NULL);
- if (retval != SQLITE_OK) {
+ if (retval != SQLITE_OK) {
g_set_error (error,
TRACKER_DB_INTERFACE_ERROR,
TRACKER_DB_QUERY_ERROR,
@@ -534,10 +534,10 @@
TRACKER_DB_INTERFACE_ERROR,
TRACKER_DB_QUERY_ERROR,
"Could not prepare SQL statement:'%s'",
- query);
+ query);
return NULL;
- }
+ }
result_set = create_result_set_from_stmt (TRACKER_DB_INTERFACE_SQLITE (db_interface), stmt, error);
sqlite3_finalize (stmt);
@@ -563,10 +563,10 @@
}
static gint
-collation_function (gpointer data,
- int len1,
+collation_function (gpointer data,
+ int len1,
gconstpointer str1,
- int len2,
+ int len2,
gconstpointer str2)
{
TrackerDBCollationFunc func;
@@ -578,9 +578,9 @@
void
tracker_db_interface_sqlite_create_function (TrackerDBInterface *interface,
- const gchar *name,
- TrackerDBFunc func,
- gint n_args)
+ const gchar *name,
+ TrackerDBFunc func,
+ gint n_args)
{
SqliteFunctionData *data;
TrackerDBInterfaceSqlitePrivate *priv;
@@ -598,7 +598,7 @@
gboolean
tracker_db_interface_sqlite_set_collation_function (TrackerDBInterfaceSqlite *interface,
- const gchar *name,
+ const gchar *name,
TrackerDBCollationFunc func)
{
TrackerDBInterfaceSqlitePrivate *priv;
Modified: branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.h (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-interface-sqlite.h Sat Sep 20 15:12:19 2008
@@ -24,10 +24,10 @@
G_BEGIN_DECLS
-#define TRACKER_TYPE_DB_INTERFACE_SQLITE (tracker_db_interface_sqlite_get_type ())
-#define TRACKER_DB_INTERFACE_SQLITE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_INTERFACE_SQLITE, TrackerDBInterfaceSqlite))
-#define TRACKER_DB_INTERFACE_SQLITE_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_DB_INTERFACE_SQLITE, TrackerDBInterfaceSqliteClass))
-#define TRACKER_IS_DB_INTERFACE_SQLITE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_INTERFACE_SQLITE))
+#define TRACKER_TYPE_DB_INTERFACE_SQLITE (tracker_db_interface_sqlite_get_type ())
+#define TRACKER_DB_INTERFACE_SQLITE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_INTERFACE_SQLITE, TrackerDBInterfaceSqlite))
+#define TRACKER_DB_INTERFACE_SQLITE_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_DB_INTERFACE_SQLITE, TrackerDBInterfaceSqliteClass))
+#define TRACKER_IS_DB_INTERFACE_SQLITE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_INTERFACE_SQLITE))
#define TRACKER_IS_DB_INTERFACE_SQLITE_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((o), TRACKER_TYPE_DB_INTERFACE_SQLITE))
#define TRACKER_DB_INTERFACE_SQLITE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_DB_INTERFACE_SQLITE, TrackerDBInterfaceSqliteClass))
@@ -35,12 +35,12 @@
typedef struct TrackerDBInterfaceSqliteClass TrackerDBInterfaceSqliteClass;
typedef gint (* TrackerDBCollationFunc) (gchar *str1,
- gint len1,
+ gint len1,
gchar *str2,
- gint len2);
+ gint len2);
typedef GValue (* TrackerDBFunc) (TrackerDBInterface *interface,
- gint argc,
- GValue argv[]);
+ gint argc,
+ GValue argv[]);
struct TrackerDBInterfaceSqlite {
GObject parent_instance;
@@ -54,15 +54,15 @@
TrackerDBInterface * tracker_db_interface_sqlite_new (const gchar *filename);
-void tracker_db_interface_sqlite_create_function (TrackerDBInterface *interface,
- const gchar *name,
- TrackerDBFunc func,
- gint n_args);
-gboolean tracker_db_interface_sqlite_set_collation_function (TrackerDBInterfaceSqlite *interface,
- const gchar *name,
+void tracker_db_interface_sqlite_create_function (TrackerDBInterface *interface,
+ const gchar *name,
+ TrackerDBFunc func,
+ gint n_args);
+gboolean tracker_db_interface_sqlite_set_collation_function (TrackerDBInterfaceSqlite *interface,
+ const gchar *name,
TrackerDBCollationFunc func);
-gint64 tracker_db_interface_sqlite_get_last_insert_id (TrackerDBInterfaceSqlite *interface);
+gint64 tracker_db_interface_sqlite_get_last_insert_id (TrackerDBInterfaceSqlite *interface);
G_END_DECLS
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 15:12:19 2008
@@ -115,10 +115,10 @@
/* TrackerDBResultSet */
static void
-tracker_db_result_set_set_property (GObject *object,
- guint prop_id,
+tracker_db_result_set_set_property (GObject *object,
+ guint prop_id,
const GValue *value,
- GParamSpec *pspec)
+ GParamSpec *pspec)
{
TrackerDBResultSetPrivate *priv;
@@ -136,7 +136,7 @@
static void
tracker_db_result_set_get_property (GObject *object,
- guint prop_id,
+ guint prop_id,
GValue *value,
GParamSpec *pspec)
{
@@ -235,9 +235,9 @@
TrackerDBResultSet *
tracker_db_interface_execute_vquery (TrackerDBInterface *interface,
- GError **error,
- const gchar *query,
- va_list args)
+ GError **error,
+ const gchar *query,
+ va_list args)
{
TrackerDBResultSet *result_set = NULL;
gchar *str;
@@ -264,9 +264,9 @@
TrackerDBResultSet *
-tracker_db_interface_execute_query (TrackerDBInterface *interface,
- GError **error,
- const gchar *query,
+tracker_db_interface_execute_query (TrackerDBInterface *interface,
+ GError **error,
+ const gchar *query,
...)
{
TrackerDBResultSet *result_set;
@@ -284,7 +284,7 @@
void
tracker_db_interface_set_procedure_table (TrackerDBInterface *interface,
- GHashTable *procedure_table)
+ GHashTable *procedure_table)
{
g_return_if_fail (TRACKER_IS_DB_INTERFACE (interface));
g_return_if_fail (procedure_table != NULL);
@@ -302,9 +302,9 @@
TrackerDBResultSet *
tracker_db_interface_execute_vprocedure (TrackerDBInterface *interface,
- GError **error,
- const gchar *procedure,
- va_list args)
+ GError **error,
+ const gchar *procedure,
+ va_list args)
{
TrackerDBResultSet *result_set;
@@ -330,9 +330,9 @@
TrackerDBResultSet *
tracker_db_interface_execute_vprocedure_len (TrackerDBInterface *interface,
- GError **error,
- const gchar *procedure,
- va_list args)
+ GError **error,
+ const gchar *procedure,
+ va_list args)
{
TrackerDBResultSet *result_set;
@@ -356,8 +356,8 @@
TrackerDBResultSet *
tracker_db_interface_execute_procedure (TrackerDBInterface *interface,
- GError **error,
- const gchar *procedure,
+ GError **error,
+ const gchar *procedure,
...)
{
TrackerDBResultSet *result_set;
@@ -374,9 +374,9 @@
}
TrackerDBResultSet *
-tracker_db_interface_execute_procedure_len (TrackerDBInterface *interface,
- GError **error,
- const gchar *procedure,
+tracker_db_interface_execute_procedure_len (TrackerDBInterface *interface,
+ GError **error,
+ const gchar *procedure,
...)
{
TrackerDBResultSet *result_set;
@@ -467,8 +467,8 @@
void
_tracker_db_result_set_set_value (TrackerDBResultSet *result_set,
- guint column,
- const GValue *value)
+ guint column,
+ const GValue *value)
{
TrackerDBResultSetPrivate *priv;
gpointer *row = NULL;
@@ -521,7 +521,7 @@
}
static void
-fill_in_value (GValue *value,
+fill_in_value (GValue *value,
gpointer data)
{
switch (G_VALUE_TYPE (value)) {
@@ -539,8 +539,8 @@
void
_tracker_db_result_set_get_value (TrackerDBResultSet *result_set,
- guint column,
- GValue *value)
+ guint column,
+ GValue *value)
{
TrackerDBResultSetPrivate *priv;
gpointer *row;
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 15:12:19 2008
@@ -25,21 +25,21 @@
G_BEGIN_DECLS
-#define TRACKER_TYPE_DB_INTERFACE (tracker_db_interface_get_type ())
-#define TRACKER_DB_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_DB_INTERFACE, TrackerDBInterface))
-#define TRACKER_IS_DB_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_DB_INTERFACE))
+#define TRACKER_TYPE_DB_INTERFACE (tracker_db_interface_get_type ())
+#define TRACKER_DB_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_DB_INTERFACE, TrackerDBInterface))
+#define TRACKER_IS_DB_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_DB_INTERFACE))
#define TRACKER_DB_INTERFACE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TRACKER_TYPE_DB_INTERFACE, TrackerDBInterfaceIface))
-#define TRACKER_TYPE_DB_RESULT_SET (tracker_db_result_set_get_type ())
-#define TRACKER_DB_RESULT_SET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_RESULT_SET, TrackerDbResultSet))
-#define TRACKER_DB_RESULT_SET_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_DB_RESULT_SET, TrackerDbResultSetClass))
-#define TRACKER_IS_DB_RESULT_SET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_RESULT_SET))
+#define TRACKER_TYPE_DB_RESULT_SET (tracker_db_result_set_get_type ())
+#define TRACKER_DB_RESULT_SET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_DB_RESULT_SET, TrackerDbResultSet))
+#define TRACKER_DB_RESULT_SET_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_DB_RESULT_SET, TrackerDbResultSetClass))
+#define TRACKER_IS_DB_RESULT_SET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_DB_RESULT_SET))
#define TRACKER_IS_DB_RESULT_SET_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((o), TRACKER_TYPE_DB_RESULT_SET))
#define TRACKER_DB_RESULT_SET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_DB_RESULT_SET, TrackerDbResultSetClass))
-#define TRACKER_TYPE_DB_BLOB (tracker_db_blob_get_type ())
+#define TRACKER_TYPE_DB_BLOB (tracker_db_blob_get_type ())
-#define TRACKER_DB_INTERFACE_ERROR (tracker_db_interface_error_quark ())
+#define TRACKER_DB_INTERFACE_ERROR (tracker_db_interface_error_quark ())
typedef enum {
TRACKER_DB_QUERY_ERROR,
@@ -54,19 +54,19 @@
struct TrackerDBInterfaceIface {
GTypeInterface iface;
- void (* set_procedure_table) (TrackerDBInterface *interface,
- GHashTable *procedure_table);
+ void (* set_procedure_table) (TrackerDBInterface *interface,
+ GHashTable *procedure_table);
TrackerDBResultSet * (* execute_procedure) (TrackerDBInterface *interface,
- GError **error,
- const gchar *procedure,
- va_list args);
+ GError **error,
+ const gchar *procedure,
+ va_list args);
TrackerDBResultSet * (* execute_procedure_len) (TrackerDBInterface *interface,
- GError **error,
- const gchar *procedure,
- va_list args);
- TrackerDBResultSet * (* execute_query) (TrackerDBInterface *interface,
- GError **error,
- const gchar *query);
+ GError **error,
+ const gchar *procedure,
+ va_list args);
+ TrackerDBResultSet * (* execute_query) (TrackerDBInterface *interface,
+ GError **error,
+ const gchar *query);
};
@@ -87,55 +87,55 @@
/* Functions to create queries/procedures */
-TrackerDBResultSet * tracker_db_interface_execute_vquery (TrackerDBInterface *interface,
- GError **error,
- const gchar *query,
- va_list args);
-TrackerDBResultSet * tracker_db_interface_execute_query (TrackerDBInterface *interface,
- GError **error,
- const gchar *query,
+TrackerDBResultSet * tracker_db_interface_execute_vquery (TrackerDBInterface *interface,
+ GError **error,
+ const gchar *query,
+ va_list args);
+TrackerDBResultSet * tracker_db_interface_execute_query (TrackerDBInterface *interface,
+ GError **error,
+ const gchar *query,
...) G_GNUC_PRINTF (3, 4);
-void tracker_db_interface_set_procedure_table (TrackerDBInterface *interface,
- GHashTable *procedure_table);
-TrackerDBResultSet * tracker_db_interface_execute_vprocedure (TrackerDBInterface *interface,
- GError **error,
- const gchar *procedure,
- va_list args);
-TrackerDBResultSet * tracker_db_interface_execute_procedure (TrackerDBInterface *interface,
- GError **error,
- const gchar *procedure,
+void tracker_db_interface_set_procedure_table (TrackerDBInterface *interface,
+ GHashTable *procedure_table);
+TrackerDBResultSet * tracker_db_interface_execute_vprocedure (TrackerDBInterface *interface,
+ GError **error,
+ const gchar *procedure,
+ va_list args);
+TrackerDBResultSet * tracker_db_interface_execute_procedure (TrackerDBInterface *interface,
+ GError **error,
+ const gchar *procedure,
...) G_GNUC_NULL_TERMINATED;
-TrackerDBResultSet * tracker_db_interface_execute_vprocedure_len (TrackerDBInterface *interface,
- GError **error,
- const gchar *procedure,
- va_list args);
-TrackerDBResultSet * tracker_db_interface_execute_procedure_len (TrackerDBInterface *interface,
- GError **error,
- const gchar *procedure,
+TrackerDBResultSet * tracker_db_interface_execute_vprocedure_len (TrackerDBInterface *interface,
+ GError **error,
+ const gchar *procedure,
+ va_list args);
+TrackerDBResultSet * tracker_db_interface_execute_procedure_len (TrackerDBInterface *interface,
+ GError **error,
+ const gchar *procedure,
...) G_GNUC_NULL_TERMINATED;
-gboolean tracker_db_interface_start_transaction (TrackerDBInterface *interface);
-gboolean tracker_db_interface_end_transaction (TrackerDBInterface *interface);
+gboolean tracker_db_interface_start_transaction (TrackerDBInterface *interface);
+gboolean tracker_db_interface_end_transaction (TrackerDBInterface *interface);
/* Semi private TrackerDBResultSet functions */
-TrackerDBResultSet * _tracker_db_result_set_new (guint cols);
-void _tracker_db_result_set_append (TrackerDBResultSet *result_set);
-void _tracker_db_result_set_set_value (TrackerDBResultSet *result_set,
- guint column,
- const GValue *value);
-void _tracker_db_result_set_get_value (TrackerDBResultSet *result_set,
- guint column,
- GValue *value);
+TrackerDBResultSet * _tracker_db_result_set_new (guint cols);
+void _tracker_db_result_set_append (TrackerDBResultSet *result_set);
+void _tracker_db_result_set_set_value (TrackerDBResultSet *result_set,
+ guint column,
+ const GValue *value);
+void _tracker_db_result_set_get_value (TrackerDBResultSet *result_set,
+ guint column,
+ GValue *value);
/* Functions to deal with the resultset */
-void tracker_db_result_set_get (TrackerDBResultSet *result_set,
+void tracker_db_result_set_get (TrackerDBResultSet *result_set,
...);
-void tracker_db_result_set_rewind (TrackerDBResultSet *result_set);
-gboolean tracker_db_result_set_iter_next (TrackerDBResultSet *result_set);
-guint tracker_db_result_set_get_n_columns (TrackerDBResultSet *result_set);
-guint tracker_db_result_set_get_n_rows (TrackerDBResultSet *result_set);
+void tracker_db_result_set_rewind (TrackerDBResultSet *result_set);
+gboolean tracker_db_result_set_iter_next (TrackerDBResultSet *result_set);
+guint tracker_db_result_set_get_n_columns (TrackerDBResultSet *result_set);
+guint tracker_db_result_set_get_n_rows (TrackerDBResultSet *result_set);
G_END_DECLS
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 15:12:19 2008
@@ -40,27 +40,27 @@
#define TRACKER_DB_PAGE_SIZE_DEFAULT 4096
#define TRACKER_DB_PAGE_SIZE_DONT_SET -1
-#define ZLIBBUFSIZ 8192
+#define ZLIBBUFSIZ 8192
-#define MAX_DB_FILE_SIZE 2000000000
+#define MAX_DB_FILE_SIZE 2000000000
typedef enum {
- TRACKER_DB_LOCATION_DATA_DIR,
- TRACKER_DB_LOCATION_USER_DATA_DIR,
- TRACKER_DB_LOCATION_SYS_TMP_DIR,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ TRACKER_DB_LOCATION_USER_DATA_DIR,
+ TRACKER_DB_LOCATION_SYS_TMP_DIR,
} TrackerDBLocation;
typedef struct {
- TrackerDB db;
- TrackerDBLocation location;
+ TrackerDB db;
+ TrackerDBLocation location;
TrackerDBInterface *iface;
- const gchar *file;
- const gchar *name;
- gchar *abs_filename;
- gint cache_size;
- gint page_size;
- gboolean add_functions;
- gboolean attached;
+ const gchar *file;
+ const gchar *name;
+ gchar *abs_filename;
+ gint cache_size;
+ gint page_size;
+ gboolean add_functions;
+ gboolean attached;
} TrackerDBDefinition;
static TrackerDBDefinition dbs[] = {
@@ -71,94 +71,94 @@
NULL,
NULL,
32,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- FALSE,
- FALSE },
- { TRACKER_DB_COMMON,
- TRACKER_DB_LOCATION_USER_DATA_DIR,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ FALSE,
+ FALSE },
+ { TRACKER_DB_COMMON,
+ TRACKER_DB_LOCATION_USER_DATA_DIR,
+ NULL,
+ "common.db",
+ "common",
NULL,
- "common.db",
- "common",
- NULL,
- 32,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- FALSE,
- FALSE },
- { TRACKER_DB_CACHE,
- TRACKER_DB_LOCATION_SYS_TMP_DIR,
+ 32,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ FALSE,
+ FALSE },
+ { TRACKER_DB_CACHE,
+ TRACKER_DB_LOCATION_SYS_TMP_DIR,
NULL,
- "cache.db",
- "cache",
- NULL,
- 128,
- TRACKER_DB_PAGE_SIZE_DONT_SET,
- FALSE,
- FALSE },
- { TRACKER_DB_FILE_METADATA,
- TRACKER_DB_LOCATION_DATA_DIR,
+ "cache.db",
+ "cache",
NULL,
- "file-meta.db",
+ 128,
+ TRACKER_DB_PAGE_SIZE_DONT_SET,
+ FALSE,
+ FALSE },
+ { TRACKER_DB_FILE_METADATA,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ NULL,
+ "file-meta.db",
"file-meta",
- NULL,
- 512,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- TRUE,
- FALSE },
- { TRACKER_DB_FILE_CONTENTS,
- TRACKER_DB_LOCATION_DATA_DIR,
NULL,
- "file-contents.db",
+ 512,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ TRUE,
+ FALSE },
+ { TRACKER_DB_FILE_CONTENTS,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ NULL,
+ "file-contents.db",
"file-contents",
- NULL,
- 1024,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- FALSE,
- FALSE },
- { TRACKER_DB_EMAIL_METADATA,
- TRACKER_DB_LOCATION_DATA_DIR,
NULL,
- "email-meta.db",
+ 1024,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ FALSE,
+ FALSE },
+ { TRACKER_DB_EMAIL_METADATA,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ NULL,
+ "email-meta.db",
"email-meta",
- NULL,
- 512,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- TRUE,
- FALSE},
- { TRACKER_DB_EMAIL_CONTENTS,
- TRACKER_DB_LOCATION_DATA_DIR,
NULL,
- "email-contents.db",
+ 512,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ TRUE,
+ FALSE},
+ { TRACKER_DB_EMAIL_CONTENTS,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ NULL,
+ "email-contents.db",
"email-contents",
- NULL,
- 512,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- FALSE,
- FALSE },
- { TRACKER_DB_XESAM,
- TRACKER_DB_LOCATION_DATA_DIR,
NULL,
- "xesam.db",
+ 512,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ FALSE,
+ FALSE },
+ { TRACKER_DB_XESAM,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ NULL,
+ "xesam.db",
"xesam",
- NULL,
- 512,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- TRUE,
- FALSE },
+ NULL,
+ 512,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ TRUE,
+ FALSE },
};
-static gboolean db_exec_no_reply (TrackerDBInterface *iface,
- const gchar *query,
+static gboolean db_exec_no_reply (TrackerDBInterface *iface,
+ const gchar *query,
...);
-static TrackerDBInterface *db_interface_create (TrackerDB db);
+static TrackerDBInterface *db_interface_create (TrackerDB db);
-static gboolean initialized;
-static GHashTable *prepared_queries;
-static gchar *services_dir;
-static gchar *sql_dir;
-static gchar *data_dir;
-static gchar *user_data_dir;
-static gchar *sys_tmp_dir;
-static gpointer db_type_enum_class_pointer;
+static gboolean initialized;
+static GHashTable *prepared_queries;
+static gchar *services_dir;
+static gchar *sql_dir;
+static gchar *data_dir;
+static gchar *user_data_dir;
+static gchar *sys_tmp_dir;
+static gpointer db_type_enum_class_pointer;
static TrackerDBInterface *file_iface = NULL;
static TrackerDBInterface *email_iface = NULL;
static TrackerDBInterface *xesam_iface = NULL;
@@ -166,22 +166,22 @@
static const gchar *
location_to_directory (TrackerDBLocation location)
{
- switch (location) {
- case TRACKER_DB_LOCATION_DATA_DIR:
- return data_dir;
- case TRACKER_DB_LOCATION_USER_DATA_DIR:
- return user_data_dir;
- case TRACKER_DB_LOCATION_SYS_TMP_DIR:
- return sys_tmp_dir;
- };
+ switch (location) {
+ case TRACKER_DB_LOCATION_DATA_DIR:
+ return data_dir;
+ case TRACKER_DB_LOCATION_USER_DATA_DIR:
+ return user_data_dir;
+ case TRACKER_DB_LOCATION_SYS_TMP_DIR:
+ return sys_tmp_dir;
+ };
return NULL;
}
static void
load_sql_file (TrackerDBInterface *iface,
- const gchar *file,
- const gchar *delimiter)
+ const gchar *file,
+ const gchar *delimiter)
{
gchar *path, *content, **queries;
gint count;
@@ -235,10 +235,10 @@
const gchar *filename)
{
GKeyFile *key_file = NULL;
- gchar *service_file, *str_id;
- gchar **groups, **keys;
+ gchar *service_file, *str_id;
+ gchar **groups, **keys;
TrackerField *def;
- gint id, i, j;
+ gint id, i, j;
key_file = g_key_file_new ();
service_file = g_build_filename (services_dir, filename, NULL);
@@ -256,10 +256,10 @@
if (!def) {
tracker_db_interface_execute_procedure (iface,
- NULL,
- "InsertMetadataType",
- groups[i],
- NULL);
+ NULL,
+ "InsertMetadataType",
+ groups[i],
+ NULL);
id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (iface));
} else {
id = atoi (tracker_field_get_id (def));
@@ -283,11 +283,11 @@
if (strcasecmp (keys[j], "Parent") == 0) {
tracker_db_interface_execute_procedure (iface,
- NULL,
- "InsertMetaDataChildren",
+ NULL,
+ "InsertMetaDataChildren",
str_id,
- new_value,
- NULL);
+ new_value,
+ NULL);
} else if (strcasecmp (keys[j], "DataType") == 0) {
GEnumValue *enum_value;
@@ -324,13 +324,13 @@
static void
load_service_file (TrackerDBInterface *iface,
- const gchar *filename)
+ const gchar *filename)
{
- TrackerService *service;
- GKeyFile *key_file = NULL;
- gchar *service_file, *str_id;
- gchar **groups, **keys;
- gint i, j, id;
+ TrackerService *service;
+ GKeyFile *key_file = NULL;
+ gchar *service_file, *str_id;
+ gchar **groups, **keys;
+ gint i, j, id;
service_file = g_build_filename (services_dir, filename, NULL);
@@ -366,7 +366,7 @@
for (j = 0; keys[j]; j++) {
if (strcasecmp (keys[j], "TabularMetadata") == 0) {
gchar **tab_array;
- gint k;
+ gint k;
tab_array = g_key_file_get_string_list (key_file,
groups[i],
@@ -386,7 +386,7 @@
g_strfreev (tab_array);
} else if (strcasecmp (keys[j], "TileMetadata") == 0) {
gchar **tab_array;
- gint k;
+ gint k;
tab_array = g_key_file_get_string_list (key_file,
groups[i],
@@ -406,7 +406,7 @@
g_strfreev (tab_array);
} else if (strcasecmp (keys[j], "Mimes") == 0) {
gchar **tab_array;
- gint k;
+ gint k;
tab_array = g_key_file_get_string_list (key_file,
groups[i],
@@ -429,7 +429,7 @@
g_strfreev (tab_array);
} else if (strcasecmp (keys[j], "MimePrefixes") == 0) {
gchar **tab_array;
- gint k;
+ gint k;
tab_array = g_key_file_get_string_list (key_file,
groups[i],
@@ -482,11 +482,11 @@
static TrackerDBResultSet *
db_exec_proc (TrackerDBInterface *iface,
- const gchar *procedure,
+ const gchar *procedure,
...)
{
TrackerDBResultSet *result_set;
- va_list args;
+ va_list args;
va_start (args, procedure);
result_set = tracker_db_interface_execute_vprocedure (iface,
@@ -500,11 +500,11 @@
static gboolean
db_exec_no_reply (TrackerDBInterface *iface,
- const gchar *query,
+ const gchar *query,
...)
{
TrackerDBResultSet *result_set;
- va_list args;
+ va_list args;
tracker_nfs_lock_obtain ();
@@ -523,9 +523,9 @@
static void
load_service_file_xesam_map (TrackerDBInterface *iface,
- const gchar *db_proc,
- const gchar *data_to_split,
- const gchar *data_to_insert)
+ const gchar *db_proc,
+ const gchar *data_to_split,
+ const gchar *data_to_insert)
{
gchar **mappings;
gchar **mapping;
@@ -553,9 +553,9 @@
static void
load_service_file_xesam_insert (TrackerDBInterface *iface,
- const gchar *sql_format,
- const gchar *data_to_split,
- const gchar *data_to_insert)
+ const gchar *sql_format,
+ const gchar *data_to_split,
+ const gchar *data_to_insert)
{
gchar **parents;
gchar **parent;
@@ -579,10 +579,10 @@
static void
load_service_file_xesam_update (TrackerDBInterface *iface,
- const gchar *sql_format,
- const gchar *data_to_update,
- const gchar *data_key,
- const gchar *data_value)
+ const gchar *sql_format,
+ const gchar *data_to_update,
+ const gchar *data_key,
+ const gchar *data_value)
{
gchar *str;
gchar *sql;
@@ -599,21 +599,21 @@
static gboolean
load_service_file_xesam (TrackerDBInterface *iface,
- const gchar *filename)
+ const gchar *filename)
{
- GKeyFile *key_file;
- GError *error = NULL;
+ GKeyFile *key_file;
+ GError *error = NULL;
const gchar * const *language_names;
- gchar **groups;
- gchar *service_file;
- gchar *sql;
- gboolean is_metadata;
- gboolean is_service;
- gboolean is_metadata_mapping;
- gboolean is_service_mapping;
- gint i, j;
+ gchar **groups;
+ gchar *service_file;
+ gchar *sql;
+ gboolean is_metadata;
+ gboolean is_service;
+ gboolean is_metadata_mapping;
+ gboolean is_service_mapping;
+ gint i, j;
- const gchar *data_types[] = {
+ const gchar *data_types[] = {
"string",
"float",
"integer",
@@ -669,7 +669,7 @@
for (i = 0; groups[i]; i++) {
gchar *str_id;
gchar **keys;
- gint id = -1;
+ gint id = -1;
if (is_metadata) {
db_exec_proc (iface,
@@ -683,7 +683,7 @@
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);
@@ -777,12 +777,12 @@
}
} else {
load_service_file_xesam_update (iface,
- "update XesamMetadataTypes set %s = '%s' where ID = %s",
+ "update XesamMetadataTypes set %s = '%s' where ID = %s",
keys[j],
value,
str_id);
}
- } else if (is_service) {
+ } else if (is_service) {
if (strcasecmp (keys[j], "Parents") == 0) {
load_service_file_xesam_insert (iface,
"INSERT INTO XesamServiceChildren (Parent, Child) VALUES ('%s', '%s')",
@@ -790,7 +790,7 @@
groups[i]);
} else if (strcasecmp (keys[j], "Mimes") == 0) {
gchar **tab_array;
- gint k;
+ gint k;
tab_array = g_key_file_get_string_list (key_file,
groups[i],
@@ -813,7 +813,7 @@
g_strfreev (tab_array);
} else if (strcasecmp (keys[j], "MimePrefixes") == 0) {
gchar **tab_array;
- gint k;
+ gint k;
tab_array = g_key_file_get_string_list (key_file,
groups[i],
@@ -842,7 +842,7 @@
value,
str_id);
}
- } else if (is_metadata_mapping) {
+ } else if (is_metadata_mapping) {
load_service_file_xesam_map (iface,
"InsertXesamMetaDataMapping",
value,
@@ -870,11 +870,11 @@
static gboolean
load_prepared_queries (void)
{
- GTimer *t;
- GError *error = NULL;
+ GTimer *t;
+ GError *error = NULL;
GMappedFile *mapped_file;
- GStrv queries;
- gchar *filename;
+ GStrv queries;
+ gchar *filename;
gdouble secs;
g_message ("Loading prepared queries...");
@@ -953,11 +953,11 @@
static TrackerField *
db_row_to_field_def (TrackerDBResultSet *result_set)
{
- TrackerField *field_def;
+ TrackerField *field_def;
TrackerFieldType field_type;
- gchar *id_str, *field_name, *name;
- gint weight, id;
- gboolean embedded, multiple_values, delimited, filtered, store_metadata;
+ gchar *id_str, *field_name, *name;
+ gint weight, id;
+ gboolean embedded, multiple_values, delimited, filtered, store_metadata;
field_def = tracker_field_new ();
@@ -997,14 +997,14 @@
static TrackerService *
db_row_to_service (TrackerDBResultSet *result_set)
{
- TrackerService *service;
- GSList *new_list = NULL;
- gint id, i;
- gchar *name, *parent, *content_metadata, *property_prefix = NULL;
- gboolean enabled, embedded, has_metadata, has_fulltext;
- gboolean has_thumbs, show_service_files, show_service_directories;
+ TrackerService *service;
+ GSList *new_list = NULL;
+ gint id, i;
+ gchar *name, *parent, *content_metadata, *property_prefix = NULL;
+ gboolean enabled, embedded, has_metadata, has_fulltext;
+ gboolean has_thumbs, show_service_files, show_service_directories;
- service = tracker_service_new ();
+ service = tracker_service_new ();
tracker_db_result_set_get (result_set,
0, &id,
@@ -1021,21 +1021,21 @@
12, &show_service_directories,
-1);
- tracker_service_set_id (service, id);
- tracker_service_set_name (service, name);
- tracker_service_set_parent (service, parent);
+ tracker_service_set_id (service, id);
+ tracker_service_set_name (service, name);
+ tracker_service_set_parent (service, parent);
tracker_service_set_property_prefix (service, property_prefix);
- tracker_service_set_enabled (service, enabled);
- tracker_service_set_embedded (service, embedded);
- tracker_service_set_has_metadata (service, has_metadata);
- tracker_service_set_has_full_text (service, has_fulltext);
- tracker_service_set_has_thumbs (service, has_thumbs);
+ tracker_service_set_enabled (service, enabled);
+ tracker_service_set_embedded (service, embedded);
+ tracker_service_set_has_metadata (service, has_metadata);
+ tracker_service_set_has_full_text (service, has_fulltext);
+ tracker_service_set_has_thumbs (service, has_thumbs);
tracker_service_set_content_metadata (service, content_metadata);
- tracker_service_set_show_service_files (service, show_service_files);
- tracker_service_set_show_service_directories (service, show_service_directories);
+ tracker_service_set_show_service_files (service, show_service_files);
+ tracker_service_set_show_service_directories (service, show_service_directories);
- for (i = 13; i < 24; i++) {
+ for (i = 13; i < 24; i++) {
gchar *metadata;
tracker_db_result_set_get (result_set, i, &metadata, -1);
@@ -1043,59 +1043,59 @@
if (metadata) {
new_list = g_slist_prepend (new_list, metadata);
}
- }
+ }
/* FIXME: is this necessary?
* This values are set as key metadata in default.service already
*/
#if 0
- /* Hack to prevent db change late in the cycle, check the
- * service name matches "Applications", then add some voodoo.
- */
- if (strcmp (name, "Applications") == 0) {
- /* These strings should be definitions at the top of
- * this file somewhere really.
- */
- new_list = g_slist_prepend (new_list, g_strdup ("App:DisplayName"));
- new_list = g_slist_prepend (new_list, g_strdup ("App:Exec"));
- new_list = g_slist_prepend (new_list, g_strdup ("App:Icon"));
- }
+ /* Hack to prevent db change late in the cycle, check the
+ * service name matches "Applications", then add some voodoo.
+ */
+ if (strcmp (name, "Applications") == 0) {
+ /* These strings should be definitions at the top of
+ * this file somewhere really.
+ */
+ new_list = g_slist_prepend (new_list, g_strdup ("App:DisplayName"));
+ new_list = g_slist_prepend (new_list, g_strdup ("App:Exec"));
+ new_list = g_slist_prepend (new_list, g_strdup ("App:Icon"));
+ }
#endif
- new_list = g_slist_reverse (new_list);
+ new_list = g_slist_reverse (new_list);
- tracker_service_set_key_metadata (service, new_list);
+ tracker_service_set_key_metadata (service, new_list);
g_slist_foreach (new_list, (GFunc) g_free, NULL);
- g_slist_free (new_list);
+ g_slist_free (new_list);
g_free (name);
g_free (parent);
g_free (property_prefix);
g_free (content_metadata);
- return service;
+ return service;
}
static GSList *
db_mime_query (TrackerDBInterface *iface,
- const gchar *stored_proc,
- gint service_id)
+ const gchar *stored_proc,
+ gint service_id)
{
TrackerDBResultSet *result_set;
- GSList *result = NULL;
- gchar *service_id_str;
+ GSList *result = NULL;
+ gchar *service_id_str;
service_id_str = g_strdup_printf ("%d", service_id);
result_set = tracker_db_interface_execute_procedure (iface,
- NULL,
- stored_proc,
- service_id_str,
- NULL);
+ NULL,
+ stored_proc,
+ service_id_str,
+ NULL);
g_free (service_id_str);
if (result_set) {
- gchar *str;
+ gchar *str;
gboolean valid = TRUE;
while (valid) {
@@ -1112,28 +1112,28 @@
static GSList *
db_get_mimes_for_service_id (TrackerDBInterface *iface,
- gint service_id)
+ gint service_id)
{
return db_mime_query (iface, "GetMimeForServiceId", service_id);
}
static GSList *
db_get_mime_prefixes_for_service_id (TrackerDBInterface *iface,
- gint service_id)
+ gint service_id)
{
return db_mime_query (iface, "GetMimePrefixForServiceId", service_id);
}
static GSList *
db_get_xesam_mimes_for_service_id (TrackerDBInterface *iface,
- gint service_id)
+ gint service_id)
{
return db_mime_query (iface, "GetXesamMimeForServiceId", service_id);
}
static GSList *
db_get_xesam_mime_prefixes_for_service_id (TrackerDBInterface *iface,
- gint service_id)
+ gint service_id)
{
return db_mime_query (iface, "GetXesamMimePrefixForServiceId", service_id);
}
@@ -1163,10 +1163,10 @@
/* Converts date/time in UTC format to ISO 8160 standardised format for display */
static GValue
function_date_to_str (TrackerDBInterface *interface,
- gint argc,
- GValue values[])
+ gint argc,
+ GValue values[])
{
- GValue result = { 0, };
+ GValue result = { 0, };
gchar *str;
str = tracker_date_to_string (g_value_get_double (&values[0]));
@@ -1178,10 +1178,10 @@
static GValue
function_regexp (TrackerDBInterface *interface,
- gint argc,
- GValue values[])
+ gint argc,
+ GValue values[])
{
- GValue result = { 0, };
+ GValue result = { 0, };
regex_t regex;
int ret;
@@ -1212,10 +1212,10 @@
static GValue
function_get_service_name (TrackerDBInterface *interface,
- gint argc,
- GValue values[])
+ gint argc,
+ GValue values[])
{
- GValue result = { 0, };
+ GValue result = { 0, };
gchar *str;
str = tracker_ontology_get_service_by_id (g_value_get_int (&values[0]));
@@ -1227,8 +1227,8 @@
static GValue
function_get_service_type (TrackerDBInterface *interface,
- gint argc,
- GValue values[])
+ gint argc,
+ GValue values[])
{
GValue result = { 0, };
gint id;
@@ -1242,8 +1242,8 @@
static GValue
function_get_max_service_type (TrackerDBInterface *interface,
- gint argc,
- GValue values[])
+ gint argc,
+ GValue values[])
{
GValue result = { 0, };
gint id;
@@ -1257,13 +1257,13 @@
static gchar *
function_uncompress_string (const gchar *ptr,
- gint size,
- gint *uncompressed_size)
+ gint size,
+ gint *uncompressed_size)
{
z_stream zs;
- gchar *buf, *swap;
+ gchar *buf, *swap;
unsigned char obuf[ZLIBBUFSIZ];
- gint rv, asiz, bsiz, osiz;
+ gint rv, asiz, bsiz, osiz;
zs.zalloc = Z_NULL;
zs.zfree = Z_NULL;
@@ -1432,13 +1432,13 @@
static GValue
function_uncompress (TrackerDBInterface *interface,
- gint argc,
- GValue values[])
+ gint argc,
+ GValue values[])
{
GByteArray *array;
- GValue result = { 0, };
- gchar *output;
- gint len;
+ GValue result = { 0, };
+ gchar *output;
+ gint len;
array = g_value_get_boxed (&values[0]);
@@ -1463,8 +1463,8 @@
static GValue
function_compress (TrackerDBInterface *interface,
- gint argc,
- GValue values[])
+ gint argc,
+ GValue values[])
{
GByteArray *array;
GValue result = { 0, };
@@ -1487,8 +1487,8 @@
static GValue
function_replace (TrackerDBInterface *interface,
- gint argc,
- GValue values[])
+ gint argc,
+ GValue values[])
{
GValue result = { 0, };
gchar *str;
@@ -1505,9 +1505,9 @@
static void
db_set_params (TrackerDBInterface *iface,
- gint cache_size,
- gint page_size,
- gboolean add_functions)
+ gint cache_size,
+ gint page_size,
+ gboolean add_functions)
{
tracker_db_interface_execute_query (iface, NULL, "PRAGMA synchronous = NORMAL;");
tracker_db_interface_execute_query (iface, NULL, "PRAGMA count_changes = 0;");
@@ -1583,12 +1583,12 @@
if (result_set) {
gboolean valid = TRUE;
- gint id;
+ gint id;
while (valid) {
TrackerDBResultSet *result_set2;
- TrackerField *def;
- GSList *child_ids = NULL;
+ TrackerField *def;
+ GSList *child_ids = NULL;
def = db_row_to_field_def (result_set);
@@ -1640,34 +1640,34 @@
while (valid) {
TrackerService *service;
- GSList *mimes, *mime_prefixes;
+ GSList *mimes, *mime_prefixes;
const gchar *name;
- gint id;
+ gint id;
- service = db_row_to_service (result_set);
+ service = db_row_to_service (result_set);
- if (!service) {
- continue;
+ if (!service) {
+ continue;
}
- id = tracker_service_get_id (service);
- name = tracker_service_get_name (service);
+ id = tracker_service_get_id (service);
+ name = tracker_service_get_name (service);
- mimes = db_get_mimes_for_service_id (iface, id);
- mime_prefixes = db_get_mime_prefixes_for_service_id (iface, id);
+ mimes = db_get_mimes_for_service_id (iface, id);
+ mime_prefixes = db_get_mime_prefixes_for_service_id (iface, id);
- g_message ("Adding service:'%s' with id:%d and mimes:%d",
+ g_message ("Adding service:'%s' with id:%d and mimes:%d",
name,
id,
g_slist_length (mimes));
- tracker_ontology_service_add (service,
+ tracker_ontology_service_add (service,
mimes,
mime_prefixes);
- g_slist_free (mimes);
- g_slist_free (mime_prefixes);
- g_object_unref (service);
+ g_slist_free (mimes);
+ g_slist_free (mime_prefixes);
+ g_object_unref (service);
valid = tracker_db_result_set_iter_next (result_set);
}
@@ -1699,8 +1699,8 @@
* files are assigned to a wrong category
*
* g_message ("Loading xesam metadata def:'%s' with type:%d",
- * tracker_field_get_name (def),
- * tracker_field_get_data_type (def));
+ * tracker_field_get_name (def),
+ * tracker_field_get_data_type (def));
*
* tracker_ontology_field_add (def);
*/
@@ -1722,21 +1722,21 @@
while (valid) {
TrackerService *service;
- GSList *mimes, *mime_prefixes;
+ GSList *mimes, *mime_prefixes;
const gchar *name;
- gint id;
+ gint id;
- service = db_row_to_service (result_set);
+ service = db_row_to_service (result_set);
- if (!service) {
- continue;
+ if (!service) {
+ continue;
}
- id = tracker_service_get_id (service);
- name = tracker_service_get_name (service);
+ id = tracker_service_get_id (service);
+ name = tracker_service_get_name (service);
- mimes = db_get_xesam_mimes_for_service_id (iface, id);
- mime_prefixes = db_get_xesam_mime_prefixes_for_service_id (iface, id);
+ 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
@@ -1750,9 +1750,9 @@
* mimes,
* mime_prefixes);
*/
- g_slist_free (mimes);
- g_slist_free (mime_prefixes);
- g_object_unref (service);
+ g_slist_free (mimes);
+ g_slist_free (mime_prefixes);
+ g_object_unref (service);
valid = tracker_db_result_set_iter_next (result_set);
}
@@ -1764,19 +1764,19 @@
static const gchar *
db_type_to_string (TrackerDB db)
{
- GType type;
- GEnumClass *enum_class;
- GEnumValue *enum_value;
-
- 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";
- }
+ GType type;
+ GEnumClass *enum_class;
+ GEnumValue *enum_value;
+
+ 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";
+ }
- return enum_value->value_nick;
+ return enum_value->value_nick;
}
static TrackerDBInterface *
@@ -1784,7 +1784,7 @@
gboolean *create)
{
TrackerDBInterface *iface;
- const gchar *path;
+ const gchar *path;
path = dbs[type].abs_filename;
@@ -1816,7 +1816,7 @@
db_interface_get_common (void)
{
TrackerDBInterface *iface;
- gboolean create;
+ gboolean create;
iface = db_interface_get (TRACKER_DB_COMMON, &create);
@@ -1852,7 +1852,7 @@
db_interface_get_cache (void)
{
TrackerDBInterface *iface;
- gboolean create;
+ gboolean create;
iface = db_interface_get (TRACKER_DB_CACHE, &create);
@@ -1869,7 +1869,7 @@
db_interface_get_file_metadata (void)
{
TrackerDBInterface *iface;
- gboolean create;
+ gboolean create;
iface = db_interface_get (TRACKER_DB_FILE_METADATA, &create);
@@ -1887,7 +1887,7 @@
db_interface_get_file_contents (void)
{
TrackerDBInterface *iface;
- gboolean create;
+ gboolean create;
iface = db_interface_get (TRACKER_DB_FILE_CONTENTS, &create);
@@ -1913,7 +1913,7 @@
db_interface_get_email_metadata (void)
{
TrackerDBInterface *iface;
- gboolean create;
+ gboolean create;
iface = db_interface_get (TRACKER_DB_EMAIL_METADATA, &create);
@@ -1932,7 +1932,7 @@
db_interface_get_email_contents (void)
{
TrackerDBInterface *iface;
- gboolean create;
+ gboolean create;
iface = db_interface_get (TRACKER_DB_EMAIL_CONTENTS, &create);
@@ -1956,11 +1956,11 @@
static gboolean
db_xesam_get_service_mapping (TrackerDBInterface *iface,
- const gchar *type,
- GList **list)
+ const gchar *type,
+ GList **list)
{
TrackerDBResultSet *result_set;
- gboolean valid = TRUE;
+ gboolean valid = TRUE;
result_set = db_exec_proc (iface,
"GetXesamServiceMappings",
@@ -2009,11 +2009,11 @@
static gboolean
db_xesam_get_metadata_mapping (TrackerDBInterface *iface,
- const gchar *type,
- GList **list)
+ const gchar *type,
+ GList **list)
{
TrackerDBResultSet *result_set;
- gboolean valid = TRUE;
+ gboolean valid = TRUE;
result_set = db_exec_proc (iface,
"GetXesamMetaDataMappings",
@@ -2065,7 +2065,7 @@
db_xesam_create_lookup (TrackerDBInterface *iface)
{
TrackerDBResultSet *result_set;
- gboolean valid;
+ gboolean valid;
valid = TRUE;
@@ -2144,7 +2144,7 @@
db_interface_get_xesam (void)
{
TrackerDBInterface *iface;
- gboolean create;
+ gboolean create;
iface = db_interface_get (TRACKER_DB_XESAM, &create);
@@ -2172,25 +2172,25 @@
db_interface_create (TrackerDB db)
{
switch (db) {
- case TRACKER_DB_UNKNOWN:
+ case TRACKER_DB_UNKNOWN:
return NULL;
- case TRACKER_DB_COMMON:
+ case TRACKER_DB_COMMON:
return db_interface_get_common ();
- case TRACKER_DB_CACHE:
+ case TRACKER_DB_CACHE:
return db_interface_get_cache ();
- case TRACKER_DB_FILE_METADATA:
+ case TRACKER_DB_FILE_METADATA:
return db_interface_get_file_metadata ();
- case TRACKER_DB_FILE_CONTENTS:
+ case TRACKER_DB_FILE_CONTENTS:
return db_interface_get_file_contents ();
- case TRACKER_DB_EMAIL_METADATA:
+ case TRACKER_DB_EMAIL_METADATA:
return db_interface_get_email_metadata ();
- case TRACKER_DB_EMAIL_CONTENTS:
+ case TRACKER_DB_EMAIL_CONTENTS:
return db_interface_get_email_contents ();
case TRACKER_DB_XESAM:
@@ -2256,20 +2256,20 @@
}
void
-tracker_db_manager_init (TrackerDBManagerFlags flags,
- gboolean *first_time)
+tracker_db_manager_init (TrackerDBManagerFlags flags,
+ gboolean *first_time)
{
- GType etype;
- gchar *filename;
- const gchar *dir;
- gboolean need_reindex;
- guint i;
+ GType etype;
+ gchar *filename;
+ const gchar *dir;
+ gboolean need_reindex;
+ guint i;
if (first_time) {
*first_time = FALSE;
}
- if (initialized) {
+ if (initialized) {
return;
}
@@ -2297,9 +2297,9 @@
NULL);
user_data_dir = g_build_filename (g_get_user_data_dir (),
- "tracker",
- "data",
- NULL);
+ "tracker",
+ "data",
+ NULL);
data_dir = g_build_filename (g_get_user_cache_dir (),
"tracker",
@@ -2318,9 +2318,9 @@
g_message ("Checking database files exist");
- for (i = 1, need_reindex = FALSE; i < G_N_ELEMENTS (dbs); i++) {
- /* Fill absolute path for the database */
- dir = location_to_directory (dbs[i].location);
+ for (i = 1, need_reindex = FALSE; i < G_N_ELEMENTS (dbs); i++) {
+ /* Fill absolute path for the database */
+ dir = location_to_directory (dbs[i].location);
dbs[i].abs_filename = g_build_filename (dir, dbs[i].file, NULL);
if (flags & TRACKER_DB_MANAGER_LOW_MEMORY_MODE) {
@@ -2347,7 +2347,7 @@
g_message ("One or more database files are missing, a reindex will be forced");
need_reindex = TRUE;
}
- }
+ }
/* Add prepared queries */
prepared_queries = g_hash_table_new_full (g_str_hash,
@@ -2426,23 +2426,23 @@
void
tracker_db_manager_shutdown (void)
{
- guint i;
+ guint i;
- if (!initialized) {
- return;
- }
-
- for (i = 1; i < G_N_ELEMENTS (dbs); i++) {
- if (dbs[i].abs_filename) {
- g_free (dbs[i].abs_filename);
+ if (!initialized) {
+ return;
+ }
+
+ for (i = 1; i < G_N_ELEMENTS (dbs); i++) {
+ if (dbs[i].abs_filename) {
+ g_free (dbs[i].abs_filename);
dbs[i].abs_filename = NULL;
if (dbs[i].iface) {
g_object_unref (dbs[i].iface);
dbs[i].iface = NULL;
}
- }
- }
+ }
+ }
g_hash_table_unref (prepared_queries);
prepared_queries = NULL;
@@ -2450,8 +2450,8 @@
g_free (data_dir);
g_free (user_data_dir);
g_free (sys_tmp_dir);
- g_free (services_dir);
- g_free (sql_dir);
+ g_free (services_dir);
+ g_free (sql_dir);
if (file_iface)
g_object_unref (file_iface);
@@ -2476,7 +2476,7 @@
/* Make sure we shutdown all other modules we depend on */
tracker_ontology_shutdown ();
- initialized = FALSE;
+ initialized = FALSE;
}
void
@@ -2492,7 +2492,7 @@
{
g_return_val_if_fail (initialized != FALSE, NULL);
- return dbs[db].abs_filename;
+ return dbs[db].abs_filename;
}
/**
@@ -2510,8 +2510,8 @@
TrackerDBInterface *
tracker_db_manager_get_db_interfaces (gint num, ...)
{
- gint n_args;
- va_list args;
+ gint n_args;
+ va_list args;
TrackerDBInterface *connection = NULL;
g_return_val_if_fail (initialized != FALSE, NULL);
@@ -2577,8 +2577,8 @@
TrackerDBInterface *
tracker_db_manager_get_db_interface_by_service (const gchar *service)
{
- TrackerDBInterface *iface;
- TrackerDBType type;
+ TrackerDBInterface *iface;
+ TrackerDBType type;
g_return_val_if_fail (initialized != FALSE, NULL);
g_return_val_if_fail (service != NULL, NULL);
@@ -2632,7 +2632,7 @@
}
TrackerDBInterface *
-tracker_db_manager_get_db_interface_by_type (const gchar *service,
+tracker_db_manager_get_db_interface_by_type (const gchar *service,
TrackerDBContentType content_type)
{
TrackerDBType type;
@@ -2673,18 +2673,18 @@
{
const gchar *filename_const;
gboolean too_big;
- filename_const = tracker_db_manager_get_file (TRACKER_DB_FILE_METADATA);
+ 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");
+ if (too_big) {
+ g_critical ("File metadata database is too big, discontinuing indexing");
return TRUE;
}
- filename_const = tracker_db_manager_get_file (TRACKER_DB_EMAIL_METADATA);
+ 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) {
+ if (too_big) {
g_critical ("Email metadata database is too big, discontinuing indexing");
return TRUE;
}
Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.h (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.h Sat Sep 20 15:12:19 2008
@@ -31,12 +31,12 @@
typedef enum {
TRACKER_DB_UNKNOWN,
- TRACKER_DB_COMMON,
- TRACKER_DB_CACHE,
- TRACKER_DB_FILE_METADATA,
- TRACKER_DB_FILE_CONTENTS,
- TRACKER_DB_EMAIL_METADATA,
- TRACKER_DB_EMAIL_CONTENTS,
+ TRACKER_DB_COMMON,
+ TRACKER_DB_CACHE,
+ TRACKER_DB_FILE_METADATA,
+ TRACKER_DB_FILE_CONTENTS,
+ TRACKER_DB_EMAIL_METADATA,
+ TRACKER_DB_EMAIL_CONTENTS,
TRACKER_DB_XESAM,
} TrackerDB;
@@ -55,26 +55,26 @@
#define TRACKER_DB_FOR_EMAIL_SERVICE "Emails"
#define TRACKER_DB_FOR_XESAM_SERVICE "Xesam"
-GType tracker_db_get_type (void) G_GNUC_CONST;
+GType tracker_db_get_type (void) G_GNUC_CONST;
-void tracker_db_manager_init (TrackerDBManagerFlags flags,
- gboolean *first_time);
-void tracker_db_manager_shutdown (void);
+void tracker_db_manager_init (TrackerDBManagerFlags flags,
+ gboolean *first_time);
+void tracker_db_manager_shutdown (void);
-void tracker_db_manager_remove_all (void);
-void tracker_db_manager_close_all (void);
+void tracker_db_manager_remove_all (void);
+void tracker_db_manager_close_all (void);
-const gchar *tracker_db_manager_get_file (TrackerDB db);
+const gchar *tracker_db_manager_get_file (TrackerDB db);
TrackerDBInterface *
- tracker_db_manager_get_db_interface (TrackerDB db);
+ tracker_db_manager_get_db_interface (TrackerDB db);
TrackerDBInterface *
- tracker_db_manager_get_db_interfaces (gint num, ...);
+ tracker_db_manager_get_db_interfaces (gint num, ...);
TrackerDBInterface *
- tracker_db_manager_get_db_interface_by_service (const gchar *service);
+ tracker_db_manager_get_db_interface_by_service (const gchar *service);
TrackerDBInterface *
- tracker_db_manager_get_db_interface_by_type (const gchar *service,
+ tracker_db_manager_get_db_interface_by_type (const gchar *service,
TrackerDBContentType content_type);
-gboolean tracker_db_manager_are_db_too_big (void);
+gboolean tracker_db_manager_are_db_too_big (void);
G_END_DECLS
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 15:12:19 2008
@@ -74,7 +74,7 @@
}
static gboolean
-tracker_keyword_store_row_draggable (GtkTreeDragSource *drag_source,
+tracker_keyword_store_row_draggable (GtkTreeDragSource *drag_source,
GtkTreePath *path)
{
printf ("ROW DRAGGABLE\n");
@@ -82,9 +82,9 @@
}
static gboolean
-tracker_keyword_store_drag_data_get (GtkTreeDragSource *drag_source,
+tracker_keyword_store_drag_data_get (GtkTreeDragSource *drag_source,
GtkTreePath *path,
- GtkSelectionData *data)
+ GtkSelectionData *data)
{
gchar *keyword;
GtkTreeIter iter;
@@ -104,7 +104,7 @@
}
static gboolean
-tracker_keyword_store_drag_data_delete (GtkTreeDragSource *drag_source,
+tracker_keyword_store_drag_data_delete (GtkTreeDragSource *drag_source,
GtkTreePath *path)
{
printf ("DRAG DATA DELETE\n");
@@ -179,9 +179,9 @@
* returns true if successful
**/
gboolean
-tracker_keyword_store_insert ( GtkListStore *store,
- const char *keyword,
- const char *stock_id
+tracker_keyword_store_insert ( GtkListStore *store,
+ const char *keyword,
+ const char *stock_id
)
{
GtkTreeIter *iter;
@@ -213,8 +213,8 @@
* NULL of it cant be found
**/
GtkTreeIter *
-tracker_keyword_store_lookup ( GtkListStore *store,
- const char *keyword)
+tracker_keyword_store_lookup ( GtkListStore *store,
+ const char *keyword)
{
TrackerKeywordStore *self;
@@ -229,8 +229,8 @@
* O(1) removal of items by keyword
**/
gboolean
-tracker_keyword_store_remove ( GtkListStore *store,
- const char *keyword)
+tracker_keyword_store_remove ( GtkListStore *store,
+ const char *keyword)
{
GtkTreeIter *iter;
TrackerKeywordStore *self;
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 15:12:19 2008
@@ -39,10 +39,10 @@
} TrackerKeywordStoreColumns;
-#define TRACKER_TYPE_KEYWORD_STORE (tracker_keyword_store_get_type ())
-#define TRACKER_KEYWORD_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_KEYWORD_STORE, TrackerKeywordStore))
+#define TRACKER_TYPE_KEYWORD_STORE (tracker_keyword_store_get_type ())
+#define TRACKER_KEYWORD_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_KEYWORD_STORE, TrackerKeywordStore))
#define TRACKER_KEYWORD_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_KEYWORD_STORE, TrackerKeywordStoreClass))
-#define TRACKER_IS_KEYWORD_STORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_KEYWORD_STORE))
+#define TRACKER_IS_KEYWORD_STORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_KEYWORD_STORE))
#define TRACKER_IS_KEYWORD_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_KEYWORD_STORE))
#define TRACKER_KEYWORD_STORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_KEYWORD_STORE, TrackerKeywordStoreClass))
@@ -64,23 +64,23 @@
};
-GType tracker_keyword_store_get_type (void) G_GNUC_CONST;
+GType tracker_keyword_store_get_type (void) G_GNUC_CONST;
-GtkListStore * tracker_keyword_store_new (void);
+GtkListStore * tracker_keyword_store_new (void);
gboolean
-tracker_keyword_store_insert (GtkListStore *store,
- const char *keyword,
- const char *stock_id );
+tracker_keyword_store_insert (GtkListStore *store,
+ const char *keyword,
+ const char *stock_id );
GtkTreeIter *
-tracker_keyword_store_lookup (GtkListStore *store,
- const char *keyword);
+tracker_keyword_store_lookup (GtkListStore *store,
+ const char *keyword);
gboolean
-tracker_keyword_store_remove (GtkListStore *store,
- const char *keyword);
+tracker_keyword_store_remove (GtkListStore *store,
+ const char *keyword);
G_END_DECLS
-#endif /* TRACKER_KEYWORD_STORE_H */
+#endif /* TRACKER_KEYWORD_STORE_H */
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 15:12:19 2008
@@ -75,8 +75,8 @@
#define GIGABYTE_FACTOR (1024.0 * 1024.0 * 1024.0)
/* forward declerations */
-static void tracker_metadata_tile_class_init (TrackerMetadataTileClass *class);
-static void tracker_metadata_tile_init (TrackerMetadataTile *tile);
+static void tracker_metadata_tile_class_init (TrackerMetadataTileClass *class);
+static void tracker_metadata_tile_init (TrackerMetadataTile *tile);
static gboolean tracker_metadata_tile_expose_event(GtkWidget *widget, GdkEventExpose *event);
static void tracker_metadata_tile_show (TrackerMetadataTile *tile);
static void _property_to_label (GtkWidget *label, const char *prop, const char *string);
@@ -143,8 +143,8 @@
"Email:Sender",
"Email:Subject",
"Email:Date",
- "Email:SentTo",
- "Email:CC",
+ "Email:SentTo",
+ "Email:CC",
"Email:Attachments",
NULL
};
@@ -153,29 +153,29 @@
EMAIL_SENDER,
EMAIL_SUBJECT,
EMAIL_DATE,
- EMAIL_SENTTO,
- EMAIL_CC,
+ EMAIL_SENTTO,
+ EMAIL_CC,
EMAIL_ATTACHMENTS,
EMAIL_N_KEYS
};
static char *webhistory_keys[] =
{
- "Doc:URL",
- "Doc:Title",
- "File:Size",
- "File:Mime",
- "Doc:Keywords",
- NULL
+ "Doc:URL",
+ "Doc:Title",
+ "File:Size",
+ "File:Mime",
+ "Doc:Keywords",
+ NULL
};
enum {
- WEBHISTORY_URL,
- WEBHISTORY_TITLE,
- WEBHISTORY_SIZE,
- WEBHISTORY_MIME,
- WEBHISTORY_KEYWORDS,
- WEBHISTORY_N_KEYS
+ WEBHISTORY_URL,
+ WEBHISTORY_TITLE,
+ WEBHISTORY_SIZE,
+ WEBHISTORY_MIME,
+ WEBHISTORY_KEYWORDS,
+ WEBHISTORY_N_KEYS
};
@@ -568,11 +568,11 @@
}
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_MODEL], -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));
+ 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),
g_markup_escape_text (array[IMAGE_MODEL], -1));
@@ -666,30 +666,30 @@
static void
_tile_tracker_populate_webhistory(char **array, GError *error, TrackerMetadataTile *tile )
{
- if (error) {
- g_print ("METADATA_TILE_ERROR : %s", error->message);
- g_clear_error (&error);
- gtk_widget_hide (GTK_WIDGET(tile));
- return;
- }
-
- TrackerMetadataTilePrivate *priv;
-
- priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
-
- /* create title */
- _property_to_label ( priv->title, array[WEBHISTORY_URL] , "<span size='large'><b>%s</b></span>");
-
- /* then set the remaining properties */
- _property_to_label ( priv->info1, array[WEBHISTORY_TITLE] , _("Subject : <b>%s</b>"));
- _property_to_label ( priv->info2, array[WEBHISTORY_KEYWORDS] , "Keywords: <b>%s</b>");
-
- tracker_metadata_tile_show (tile);
- g_strfreev (array);
-
- _show_labels (tile, FALSE);
- gtk_widget_show (priv->info1);
- gtk_widget_show (priv->info2);
+ if (error) {
+ g_print ("METADATA_TILE_ERROR : %s", error->message);
+ g_clear_error (&error);
+ gtk_widget_hide (GTK_WIDGET(tile));
+ return;
+ }
+
+ TrackerMetadataTilePrivate *priv;
+
+ priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
+
+ /* create title */
+ _property_to_label ( priv->title, array[WEBHISTORY_URL] , "<span size='large'><b>%s</b></span>");
+
+ /* then set the remaining properties */
+ _property_to_label ( priv->info1, array[WEBHISTORY_TITLE] , _("Subject : <b>%s</b>"));
+ _property_to_label ( priv->info2, array[WEBHISTORY_KEYWORDS] , "Keywords: <b>%s</b>");
+
+ tracker_metadata_tile_show (tile);
+ g_strfreev (array);
+
+ _show_labels (tile, FALSE);
+ gtk_widget_show (priv->info1);
+ gtk_widget_show (priv->info2);
}
@@ -856,7 +856,7 @@
if (get_time_from_iso (iso, &val)) {
gchar buf[256];
g_date_strftime (buf, 256, "%a %d %b %Y", &val);
- temp = g_strdup_printf (string, buf);
+ temp = g_strdup_printf (string, buf);
}
}
@@ -879,7 +879,7 @@
if (get_time_from_iso (iso, &val)) {
gchar buf[32];
g_date_strftime (buf, 32, "%Y", &val);
- temp = g_strdup_printf (string, buf);
+ temp = g_strdup_printf (string, buf);
}
}
@@ -930,9 +930,9 @@
void
tracker_metadata_tile_set_uri (TrackerMetadataTile *tile, const gchar *uri,
- ServiceType service_type,
- const gchar *type,
- GdkPixbuf *icon)
+ ServiceType service_type,
+ const gchar *type,
+ GdkPixbuf *icon)
{
TrackerMetadataTilePrivate *priv;
@@ -969,7 +969,7 @@
break;
- case SERVICE_DOCUMENTS:
+ case SERVICE_DOCUMENTS:
tracker_metadata_get_async (priv->client, SERVICE_DOCUMENTS,
uri, doc_keys,
@@ -977,25 +977,25 @@
(gpointer)tile);
break;
- case SERVICE_WEBHISTORY:
+ case SERVICE_WEBHISTORY:
- tracker_metadata_get_async (priv->client, SERVICE_WEBHISTORY,
- uri, webhistory_keys,
- (TrackerArrayReply)_tile_tracker_populate_webhistory,
- (gpointer)tile);
- break;
+ tracker_metadata_get_async (priv->client, SERVICE_WEBHISTORY,
+ uri, webhistory_keys,
+ (TrackerArrayReply)_tile_tracker_populate_webhistory,
+ (gpointer)tile);
+ break;
- case SERVICE_IMAGES:
+ case SERVICE_IMAGES:
tracker_metadata_get_async (priv->client, SERVICE_IMAGES,
- uri, image_keys,
+ uri, image_keys,
(TrackerArrayReply)_tile_tracker_populate_image,
(gpointer)tile);
break;
- case SERVICE_VIDEOS:
+ case SERVICE_VIDEOS:
tracker_metadata_get_async (priv->client, SERVICE_VIDEOS,
uri, video_keys,
(TrackerArrayReply)_tile_tracker_populate_video,
@@ -1003,7 +1003,7 @@
break;
- case SERVICE_APPLICATIONS:
+ case SERVICE_APPLICATIONS:
tracker_metadata_get_async (priv->client, SERVICE_APPLICATIONS,
uri, app_keys,
@@ -1069,13 +1069,13 @@
gtk_widget_hide (priv->image);
gtk_widget_hide (priv->table);
gtk_arrow_set (GTK_ARROW (priv->arrow),
- GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ 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_DOWN, GTK_SHADOW_NONE);
+ GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_alignment_set_padding (GTK_ALIGNMENT (priv->align), 6, 6, 4, 4);
}
priv->expanded = !priv->expanded;
@@ -1120,9 +1120,9 @@
step2.blue/65535.0,
0.05);
cairo_pattern_add_color_stop_rgba ( pat, 1.0, step2.red/65535.0,
- step2.green/65535.0,
- step2.blue/65535.0,
- 0.5);
+ step2.green/65535.0,
+ step2.blue/65535.0,
+ 0.5);
cairo_rectangle (cr, 0, 0, width, height);
cairo_set_source(cr, pat);
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 15:12:19 2008
@@ -32,7 +32,7 @@
#define TRACKER_METADATA_TILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_METADATA_TILE, TrackerMetadataTileClass))
#define TRACKER_IS_METADATA_TILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_METADATA_TILE))
#define TRACKER_IS_METADATA_TILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_METADATA_TILE))
-#define TRACKER_METADATA_TILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_METADATA_TILE, TrackerMetadataTileClass))
+#define TRACKER_METADATA_TILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_METADATA_TILE, TrackerMetadataTileClass))
typedef struct TrackerMetadataTilePrivate TrackerMetadataTilePrivate;
@@ -46,14 +46,14 @@
} TrackerMetadataTileClass;
-GType tracker_metadata_tile_get_type (void);
+GType tracker_metadata_tile_get_type (void);
-GtkWidget* tracker_metadata_tile_new (void);
+GtkWidget* tracker_metadata_tile_new (void);
-void tracker_metadata_tile_set_uri (TrackerMetadataTile *tile,
- const gchar *uri,
- ServiceType service_type,
- const gchar *type,
- GdkPixbuf *icon);
+void tracker_metadata_tile_set_uri (TrackerMetadataTile *tile,
+ const gchar *uri,
+ ServiceType service_type,
+ const gchar *type,
+ GdkPixbuf *icon);
#endif /* TRACKER_METADATA_TILE_H */
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 15:12:19 2008
@@ -101,9 +101,9 @@
}
static gboolean
-_on_tag_button_press_event (GtkWidget *button,
+_on_tag_button_press_event (GtkWidget *button,
GdkEventButton *event,
- TrackerTagBar *bar)
+ TrackerTagBar *bar)
{
TrackerTagBarPrivate *priv;
GtkWidget *label;
@@ -304,7 +304,7 @@
tracker_set_atk_relationship(button, ATK_RELATION_LABELLED_BY,
label);
- tracker_set_atk_relationship(label, ATK_RELATION_LABEL_FOR,
+ tracker_set_atk_relationship(label, ATK_RELATION_LABEL_FOR,
button);
g_signal_connect (G_OBJECT (button), "button-press-event",
@@ -377,9 +377,9 @@
gtk_button_set_image (GTK_BUTTON (button), image);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
- tracker_set_atk_relationship(button, ATK_RELATION_LABELLED_BY,
+ tracker_set_atk_relationship(button, ATK_RELATION_LABELLED_BY,
label);
- tracker_set_atk_relationship(label, ATK_RELATION_LABEL_FOR,
+ tracker_set_atk_relationship(label, ATK_RELATION_LABEL_FOR,
button);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -421,9 +421,9 @@
TrackerTagBarPrivate *priv;
tag_bar = g_object_new (TRACKER_TYPE_TAG_BAR,
- "homogeneous", FALSE,
- "spacing", 0 ,
- NULL);
+ "homogeneous", FALSE,
+ "spacing", 0 ,
+ NULL);
priv = TRACKER_TAG_BAR_GET_PRIVATE (tag_bar);
client = tracker_connect (TRUE);
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 15:12:19 2008
@@ -54,9 +54,9 @@
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,
+void tracker_tag_bar_set_uri (TrackerTagBar *bar,
ServiceType type,
- const gchar *uri
+ const gchar *uri
);
GType tracker_tag_bar_get_type (void);
Modified: branches/indexer-split/src/libtracker-gtk/tracker-ui.c
==============================================================================
--- branches/indexer-split/src/libtracker-gtk/tracker-ui.c (original)
+++ branches/indexer-split/src/libtracker-gtk/tracker-ui.c Sat Sep 20 15:12:19 2008
@@ -35,11 +35,11 @@
*
**/
void
-tracker_render_emblem_pixbuf_cb (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gpointer icon_theme)
+tracker_render_emblem_pixbuf_cb (GtkCellLayout *cell_layout,
+ GtkCellRenderer *cell,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gpointer icon_theme)
{
char *stock_id;
GdkPixbuf *pixbuf;
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 15:12:19 2008
@@ -36,10 +36,10 @@
};
void
-tracker_render_emblem_pixbuf_cb (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gpointer user_data);
+tracker_render_emblem_pixbuf_cb (GtkCellLayout *cell_layout,
+ GtkCellRenderer *cell,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gpointer user_data);
#endif /* TRACKER_UI_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 15:12:19 2008
@@ -27,7 +27,7 @@
#include "tracker.h"
-#define TRACKER_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_SERVICE "org.freedesktop.Tracker"
#define TRACKER_OBJECT "/org/freedesktop/Tracker"
#define TRACKER_INTERFACE "org.freedesktop.Tracker"
#define TRACKER_INTERFACE_METADATA "org.freedesktop.Tracker.Metadata"
@@ -48,8 +48,8 @@
} GPtrArrayCallBackStruct;
typedef struct {
- TrackerHashTableReply callback;
- gpointer data;
+ TrackerHashTableReply callback;
+ gpointer data;
} HashTableCallBackStruct;
@@ -402,7 +402,7 @@
void
tracker_set_bool_option (TrackerClient *client, const char *option, gboolean value, GError **error)
{
- org_freedesktop_Tracker_set_bool_option (client->proxy, option, value, &*error);
+ org_freedesktop_Tracker_set_bool_option (client->proxy, option, value, &*error);
}
void
@@ -455,8 +455,8 @@
void
tracker_metadata_register_type (TrackerClient *client, const char *name, MetadataTypes type, GError **error)
{
- /* This does nothing now, this API has been removed */
- g_warning ("%s no longer does anything", __FUNCTION__);
+ /* This does nothing now, this API has been removed */
+ g_warning ("%s no longer does anything", __FUNCTION__);
}
MetaDataTypeDetails *
@@ -491,10 +491,10 @@
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__);
+ /* This does nothing now, this API has been removed */
+ g_warning ("%s no longer does anything", __FUNCTION__);
- return NULL;
+ return NULL;
}
@@ -515,56 +515,56 @@
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];
+ 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;
- }
+ 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;
+ return table;
}
int
tracker_metadata_get_sum (TrackerClient *client, ServiceType service, char *field, char *query, GError **error)
{
- int sum;
+ 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;
- }
+ if (!org_freedesktop_Tracker_Metadata_get_sum (client->proxy_metadata, service_str, field, query, &sum, &*error)) {
+ return -1;
+ }
- return sum;
+ return sum;
}
int
tracker_metadata_get_count (TrackerClient *client, ServiceType service, char *field, char *query, GError **error)
{
- int count;
+ 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;
- }
+ if (!org_freedesktop_Tracker_Metadata_get_count (client->proxy_metadata, service_str, field, query, &count, &*error)) {
+ return -1;
+ }
- return count;
+ return count;
}
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];
+ 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;
- }
+ 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;
+ return table;
}
@@ -889,12 +889,12 @@
char **
tracker_search_metadata_by_text_and_mime (TrackerClient *client, const char *query, const char **mimes, GError **error)
{
- char **strs;
+ 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;
+ if (!org_freedesktop_Tracker_Files_search_by_text_and_mime (client->proxy_files, query,(const char **) mimes, &strs, &*error)) {
+ return NULL;
+ }
+ return strs;
}
@@ -902,12 +902,12 @@
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;
+ 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;
+ 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;
}
@@ -916,12 +916,12 @@
char **
tracker_search_metadata_by_text_and_location (TrackerClient *client, const char *query, const char *location, GError **error)
{
- char **strs;
+ char **strs;
- if (!org_freedesktop_Tracker_Files_search_by_text_and_location (client->proxy_files, query, location, &strs, &*error)) {
- return NULL;
- }
- return strs;
+ if (!org_freedesktop_Tracker_Files_search_by_text_and_location (client->proxy_files, query, location, &strs, &*error)) {
+ return NULL;
+ }
+ return strs;
}
@@ -1034,7 +1034,7 @@
callback_struct->callback = callback;
callback_struct->data = user_data;
- client->last_pending_call = org_freedesktop_Tracker_prompt_index_signals_async (client->proxy, tracker_void_reply, callback_struct);
+ client->last_pending_call = org_freedesktop_Tracker_prompt_index_signals_async (client->proxy, tracker_void_reply, callback_struct);
}
@@ -1071,7 +1071,7 @@
char *service_str = tracker_service_types[service];
- client->last_pending_call = org_freedesktop_Tracker_Metadata_set_async (client->proxy_metadata, service_str, id, (const char **)keys, (const char **)values, tracker_void_reply, callback_struct);
+ client->last_pending_call = org_freedesktop_Tracker_Metadata_set_async (client->proxy_metadata, service_str, id, (const char **)keys, (const char **)values, tracker_void_reply, callback_struct);
}
@@ -1087,10 +1087,10 @@
callback_struct->callback = callback;
callback_struct->data = user_data;
- /* This does nothing now, this API has been removed */
- g_warning ("%s no longer does anything", __FUNCTION__);
+ /* This does nothing now, this API has been removed */
+ g_warning ("%s no longer does anything", __FUNCTION__);
- tracker_void_reply (client->proxy_metadata, NULL, callback_struct);
+ tracker_void_reply (client->proxy_metadata, NULL, callback_struct);
}
@@ -1122,10 +1122,10 @@
callback_struct->data = user_data;
- /* This does nothing now, this API has been removed */
- g_warning ("%s no longer does anything", __FUNCTION__);
+ /* This does nothing now, this API has been removed */
+ g_warning ("%s no longer does anything", __FUNCTION__);
- tracker_void_reply (client->proxy_metadata, NULL, callback_struct);
+ tracker_void_reply (client->proxy_metadata, NULL, callback_struct);
}
@@ -1149,14 +1149,14 @@
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;
+ 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;
+ 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);
+ 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);
}
@@ -1191,14 +1191,14 @@
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;
+ 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;
+ 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);
+ 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);
}
@@ -1415,7 +1415,7 @@
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);
+ 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);
}
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 15:12:19 2008
@@ -37,62 +37,62 @@
typedef enum {
- METADATA_STRING_INDEXABLE,
- METADATA_STRING,
- METADATA_NUMERIC,
- METADATA_DATE
+ METADATA_STRING_INDEXABLE,
+ METADATA_STRING,
+ METADATA_NUMERIC,
+ METADATA_DATE
} MetadataTypes;
typedef enum {
- SERVICE_FILES,
- SERVICE_FOLDERS,
- SERVICE_DOCUMENTS,
- SERVICE_IMAGES,
- SERVICE_MUSIC,
- SERVICE_VIDEOS,
- SERVICE_TEXT_FILES,
- SERVICE_DEVELOPMENT_FILES,
- SERVICE_OTHER_FILES,
- SERVICE_VFS_FILES,
- SERVICE_VFS_FOLDERS,
- SERVICE_VFS_DOCUMENTS,
- SERVICE_VFS_IMAGES,
- SERVICE_VFS_MUSIC,
- SERVICE_VFS_VIDEOS,
- SERVICE_VFS_TEXT_FILES,
- SERVICE_VFS_DEVELOPMENT_FILES,
- SERVICE_VFS_OTHER_FILES,
- SERVICE_CONVERSATIONS,
- SERVICE_PLAYLISTS,
- SERVICE_APPLICATIONS,
- SERVICE_CONTACTS,
- SERVICE_EMAILS,
- SERVICE_EMAILATTACHMENTS,
- SERVICE_APPOINTMENTS,
- SERVICE_TASKS,
- SERVICE_BOOKMARKS,
- SERVICE_WEBHISTORY,
- SERVICE_PROJECTS
+ SERVICE_FILES,
+ SERVICE_FOLDERS,
+ SERVICE_DOCUMENTS,
+ SERVICE_IMAGES,
+ SERVICE_MUSIC,
+ SERVICE_VIDEOS,
+ SERVICE_TEXT_FILES,
+ SERVICE_DEVELOPMENT_FILES,
+ SERVICE_OTHER_FILES,
+ SERVICE_VFS_FILES,
+ SERVICE_VFS_FOLDERS,
+ SERVICE_VFS_DOCUMENTS,
+ SERVICE_VFS_IMAGES,
+ SERVICE_VFS_MUSIC,
+ SERVICE_VFS_VIDEOS,
+ SERVICE_VFS_TEXT_FILES,
+ SERVICE_VFS_DEVELOPMENT_FILES,
+ SERVICE_VFS_OTHER_FILES,
+ SERVICE_CONVERSATIONS,
+ SERVICE_PLAYLISTS,
+ SERVICE_APPLICATIONS,
+ SERVICE_CONTACTS,
+ SERVICE_EMAILS,
+ SERVICE_EMAILATTACHMENTS,
+ SERVICE_APPOINTMENTS,
+ SERVICE_TASKS,
+ SERVICE_BOOKMARKS,
+ SERVICE_WEBHISTORY,
+ SERVICE_PROJECTS
} ServiceType;
typedef struct {
- char * type;
- gboolean is_embedded;
- gboolean is_writeable;
+ char * type;
+ gboolean is_embedded;
+ gboolean is_writeable;
} MetaDataTypeDetails;
typedef struct {
- DBusGProxy *proxy;
- DBusGProxy *proxy_metadata;
- DBusGProxy *proxy_keywords;
- DBusGProxy *proxy_search;
- DBusGProxy *proxy_files;
- DBusGProxyCall *last_pending_call;
+ DBusGProxy *proxy;
+ DBusGProxy *proxy_metadata;
+ DBusGProxy *proxy_keywords;
+ DBusGProxy *proxy_search;
+ DBusGProxy *proxy_files;
+ DBusGProxyCall *last_pending_call;
} TrackerClient;
@@ -103,7 +103,7 @@
void tracker_disconnect (TrackerClient *client);
-ServiceType tracker_service_name_to_type (const char *service);
+ServiceType tracker_service_name_to_type (const char *service);
char * tracker_type_to_service_name (ServiceType s);
@@ -127,10 +127,10 @@
char ** tracker_metadata_get_registered_types (TrackerClient *client, const char *classname, GError **error);
char ** tracker_metadata_get_writeable_types (TrackerClient *client, const char *classname, GError **error);
char ** tracker_metadata_get_registered_classes (TrackerClient *client, GError **error);
-GPtrArray * tracker_metadata_get_unique_values (TrackerClient *client, ServiceType service, char **meta_types, char *query, gboolean descending, int offset, int max_hits, GError **error);
-int tracker_metadata_get_sum (TrackerClient *client, ServiceType service, char *field, char *query, GError **error);
-int tracker_metadata_get_count (TrackerClient *client, ServiceType service, char *field, char *query, GError **error);
-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 * tracker_metadata_get_unique_values (TrackerClient *client, ServiceType service, char **meta_types, char *query, gboolean descending, int offset, int max_hits, GError **error);
+int tracker_metadata_get_sum (TrackerClient *client, ServiceType service, char *field, char *query, GError **error);
+int tracker_metadata_get_count (TrackerClient *client, ServiceType service, char *field, char *query, GError **error);
+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 * tracker_keywords_get_list (TrackerClient *client, ServiceType service, GError **error);
char ** tracker_keywords_get (TrackerClient *client, ServiceType service, const char *id, GError **error);
@@ -143,11 +143,11 @@
int tracker_search_get_hit_count (TrackerClient *client, ServiceType service, const char *search_text, GError **error);
GPtrArray * tracker_search_get_hit_count_all (TrackerClient *client, const char *search_text, GError **error);
char ** tracker_search_text (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error);
-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 * tracker_search_text_detailed (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error);
char * tracker_search_get_snippet (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, GError **error);
char ** tracker_search_metadata (TrackerClient *client, ServiceType service, const char *field, const char* search_text, int offset, int max_hits, GError **error);
-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);
-gchar * tracker_search_suggest (TrackerClient *client, const char *search_text, int maxdist, GError **error);
+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);
+gchar * tracker_search_suggest (TrackerClient *client, const char *search_text, int maxdist, GError **error);
void tracker_files_create (TrackerClient *client, const char *uri, gboolean is_directory, const char *mime, int size, int mtime, GError **error);
@@ -173,59 +173,59 @@
/* asynchronous calls */
-void tracker_get_version_async (TrackerClient *client, TrackerIntReply callback, gpointer user_data);
-void tracker_get_status_async (TrackerClient *client, TrackerStringReply callback, gpointer user_data);
-void tracker_get_services_async (TrackerClient *client, gboolean main_services_only, TrackerHashTableReply callback, gpointer user_data);
-void tracker_get_stats_async (TrackerClient *client, TrackerGPtrArrayReply callback, gpointer user_data);
+void tracker_get_version_async (TrackerClient *client, TrackerIntReply callback, gpointer user_data);
+void tracker_get_status_async (TrackerClient *client, TrackerStringReply callback, gpointer user_data);
+void tracker_get_services_async (TrackerClient *client, gboolean main_services_only, TrackerHashTableReply callback, gpointer user_data);
+void tracker_get_stats_async (TrackerClient *client, TrackerGPtrArrayReply callback, gpointer user_data);
void tracker_set_bool_option_async (TrackerClient *client, const char *option, gboolean value, TrackerVoidReply callback, gpointer user_data);
void tracker_set_int_option_async (TrackerClient *client, const char *option, int value, TrackerVoidReply callback, gpointer user_data);
void tracker_shutdown_async (TrackerClient *client, gboolean reindex, TrackerVoidReply callback, gpointer user_data);
void tracker_prompt_index_signals_async (TrackerClient *client, TrackerVoidReply callback, gpointer user_data);
-void tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, char **keys, TrackerArrayReply callback, gpointer user_data);
-void tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, TrackerVoidReply callback, gpointer user_data);
-void tracker_metadata_register_type_async (TrackerClient *client, const char *name, MetadataTypes type, TrackerVoidReply callback, gpointer user_data);
-void tracker_metadata_get_registered_types_async (TrackerClient *client, const char *classname, TrackerArrayReply callback, gpointer user_data);
-void tracker_metadata_get_writeable_types_async (TrackerClient *client, const char *classname, TrackerArrayReply callback, gpointer user_data);
-void tracker_metadata_get_registered_classes_async (TrackerClient *client, TrackerArrayReply callback, gpointer user_data);
-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);
-void tracker_metadata_get_sum_async (TrackerClient *client, ServiceType service, char *field, char *query, TrackerIntReply callback, gpointer user_data);
-void tracker_metadata_get_count_async (TrackerClient *client, ServiceType service, char *field, char *query, TrackerIntReply callback, gpointer user_data);
-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);
-
-void tracker_keywords_get_list_async (TrackerClient *client, ServiceType service, TrackerGPtrArrayReply callback, gpointer user_data);
-void tracker_keywords_get_async (TrackerClient *client, ServiceType service, const char *id, TrackerArrayReply callback, gpointer user_data);
-void tracker_keywords_add_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data);
-void tracker_keywords_remove_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data);
-void tracker_keywords_remove_all_async (TrackerClient *client, ServiceType service, const char *id, TrackerVoidReply callback, gpointer user_data);
-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);
+void tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, char **keys, TrackerArrayReply callback, gpointer user_data);
+void tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, TrackerVoidReply callback, gpointer user_data);
+void tracker_metadata_register_type_async (TrackerClient *client, const char *name, MetadataTypes type, TrackerVoidReply callback, gpointer user_data);
+void tracker_metadata_get_registered_types_async (TrackerClient *client, const char *classname, TrackerArrayReply callback, gpointer user_data);
+void tracker_metadata_get_writeable_types_async (TrackerClient *client, const char *classname, TrackerArrayReply callback, gpointer user_data);
+void tracker_metadata_get_registered_classes_async (TrackerClient *client, TrackerArrayReply callback, gpointer user_data);
+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);
+void tracker_metadata_get_sum_async (TrackerClient *client, ServiceType service, char *field, char *query, TrackerIntReply callback, gpointer user_data);
+void tracker_metadata_get_count_async (TrackerClient *client, ServiceType service, char *field, char *query, TrackerIntReply callback, gpointer user_data);
+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);
+
+void tracker_keywords_get_list_async (TrackerClient *client, ServiceType service, TrackerGPtrArrayReply callback, gpointer user_data);
+void tracker_keywords_get_async (TrackerClient *client, ServiceType service, const char *id, TrackerArrayReply callback, gpointer user_data);
+void tracker_keywords_add_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data);
+void tracker_keywords_remove_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data);
+void tracker_keywords_remove_all_async (TrackerClient *client, ServiceType service, const char *id, TrackerVoidReply callback, gpointer user_data);
+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);
void tracker_search_text_get_hit_count_async (TrackerClient *client, ServiceType service, const char *search_text, TrackerIntReply callback, gpointer user_data);
void tracker_search_text_get_hit_count_all_async (TrackerClient *client, const char *search_text, TrackerGPtrArrayReply callback, gpointer user_data);
-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);
-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);
+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);
+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);
void tracker_search_get_snippet_async (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, TrackerStringReply callback, gpointer user_data);
-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);
-void tracker_search_query_async (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, TrackerGPtrArrayReply callback, gpointer user_data);
+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);
+void tracker_search_query_async (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, TrackerGPtrArrayReply callback, gpointer user_data);
void tracker_search_suggest_async (TrackerClient *client, const char *search_text, int maxdist, TrackerStringReply callback, gpointer user_data);
-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);
-void tracker_files_delete_async (TrackerClient *client, const char *uri, TrackerVoidReply callback, gpointer user_data);
-void tracker_files_get_text_contents_async (TrackerClient *client, const char *uri, int offset, int max_length, TrackerStringReply callback, gpointer user_data);
-void tracker_files_search_text_contents_async (TrackerClient *client, const char *uri, const char *search_text, int length, TrackerStringReply callback, gpointer user_data);
-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);
-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);
-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);
+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);
+void tracker_files_delete_async (TrackerClient *client, const char *uri, TrackerVoidReply callback, gpointer user_data);
+void tracker_files_get_text_contents_async (TrackerClient *client, const char *uri, int offset, int max_length, TrackerStringReply callback, gpointer user_data);
+void tracker_files_search_text_contents_async (TrackerClient *client, const char *uri, const char *search_text, int length, TrackerStringReply callback, gpointer user_data);
+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);
+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);
+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);
-void tracker_files_get_mtime_async (TrackerClient *client, const char *uri, TrackerIntReply callback, gpointer user_data);
-void tracker_files_get_metadata_for_files_in_folder_async (TrackerClient *client, int live_query_id, const char *uri, char **fields, TrackerGPtrArrayReply callback, gpointer user_data);
+void tracker_files_get_mtime_async (TrackerClient *client, const char *uri, TrackerIntReply callback, gpointer user_data);
+void tracker_files_get_metadata_for_files_in_folder_async (TrackerClient *client, int live_query_id, const char *uri, char **fields, TrackerGPtrArrayReply callback, gpointer user_data);
/* Deprecated calls - API specific for nautilus search use only. New code should use tracker_search_metadata_matching_text_async instead */
-void tracker_search_metadata_by_text_async (TrackerClient *client, const char *query, TrackerArrayReply callback, gpointer user_data);
+void tracker_search_metadata_by_text_async (TrackerClient *client, const char *query, TrackerArrayReply callback, gpointer user_data);
void tracker_search_metadata_by_text_and_mime_async (TrackerClient *client, const char *query, const char **mimes, TrackerArrayReply callback, gpointer user_data);
void tracker_search_metadata_by_text_and_mime_and_location_async (TrackerClient *client, const char *query, const char **mimes, const char *location, TrackerArrayReply callback, gpointer user_data);
void tracker_search_metadata_by_text_and_location_async (TrackerClient *client, const char *query, const char *location, TrackerArrayReply callback, gpointer user_data);
Modified: branches/indexer-split/src/qdbm/depot.c
==============================================================================
--- branches/indexer-split/src/qdbm/depot.c (original)
+++ branches/indexer-split/src/qdbm/depot.c Sat Sep 20 15:12:19 2008
@@ -1,6 +1,6 @@
/*************************************************************************************************
* Implementation of Depot
- * Copyright (C) 2000-2006 Mikio Hirabayashi
+ * Copyright (C) 2000-2006 Mikio Hirabayashi
* This file is part of QDBM, Quick Database Manager.
* QDBM 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
@@ -19,26 +19,26 @@
#include "depot.h"
#include "myconf.h"
-#define DP_FILEMODE 00644 /* permission of a creating file */
-#define DP_MAGICNUMB "[DEPOT]\n\f" /* magic number on environments of big endian */
-#define DP_MAGICNUML "[depot]\n\f" /* magic number on environments of little endian */
-#define DP_HEADSIZ 48 /* size of the reagion of the header */
-#define DP_LIBVEROFF 12 /* offset of the region for the library version */
-#define DP_FLAGSOFF 16 /* offset of the region for flags */
-#define DP_FSIZOFF 24 /* offset of the region for the file size */
-#define DP_BNUMOFF 32 /* offset of the region for the bucket number */
-#define DP_RNUMOFF 40 /* offset of the region for the record number */
-#define DP_DEFBNUM 8191 /* default bucket number */
-#define DP_FBPOOLSIZ 16 /* size of free block pool */
-#define DP_ENTBUFSIZ 128 /* size of the entity buffer */
-#define DP_STKBUFSIZ 256 /* size of the stack key buffer */
-#define DP_WRTBUFSIZ 8192 /* size of the writing buffer */
-#define DP_FSBLKSIZ 4096 /* size of a block of the file system */
+#define DP_FILEMODE 00644 /* permission of a creating file */
+#define DP_MAGICNUMB "[DEPOT]\n\f" /* magic number on environments of big endian */
+#define DP_MAGICNUML "[depot]\n\f" /* magic number on environments of little endian */
+#define DP_HEADSIZ 48 /* size of the reagion of the header */
+#define DP_LIBVEROFF 12 /* offset of the region for the library version */
+#define DP_FLAGSOFF 16 /* offset of the region for flags */
+#define DP_FSIZOFF 24 /* offset of the region for the file size */
+#define DP_BNUMOFF 32 /* offset of the region for the bucket number */
+#define DP_RNUMOFF 40 /* offset of the region for the record number */
+#define DP_DEFBNUM 8191 /* default bucket number */
+#define DP_FBPOOLSIZ 16 /* size of free block pool */
+#define DP_ENTBUFSIZ 128 /* size of the entity buffer */
+#define DP_STKBUFSIZ 256 /* size of the stack key buffer */
+#define DP_WRTBUFSIZ 8192 /* size of the writing buffer */
+#define DP_FSBLKSIZ 4096 /* size of a block of the file system */
#define DP_TMPFSUF MYEXTSTR "dptmp" /* suffix of a temporary file */
-#define DP_OPTBLOAD 0.25 /* ratio of bucket loading at optimization */
-#define DP_OPTRUNIT 256 /* number of records in a process of optimization */
-#define DP_NUMBUFSIZ 32 /* size of a buffer for a number */
-#define DP_IOBUFSIZ 8192 /* size of an I/O buffer */
+#define DP_OPTBLOAD 0.25 /* ratio of bucket loading at optimization */
+#define DP_OPTRUNIT 256 /* number of records in a process of optimization */
+#define DP_NUMBUFSIZ 32 /* size of a buffer for a number */
+#define DP_IOBUFSIZ 8192 /* size of an I/O buffer */
/* get the first hash value */
#define DP_FIRSTHASH(DP_res, DP_kbuf, DP_ksiz) \
@@ -77,20 +77,20 @@
(DP_res) = ((DP_res) * 5157883) & 0x7FFFFFFF; \
} while(FALSE)
-enum { /* enumeration for a record header */
- DP_RHIFLAGS, /* offset of flags */
- DP_RHIHASH, /* offset of value of the second hash function */
- DP_RHIKSIZ, /* offset of the size of the key */
- DP_RHIVSIZ, /* offset of the size of the value */
- DP_RHIPSIZ, /* offset of the size of the padding bytes */
- DP_RHILEFT, /* offset of the offset of the left child */
- DP_RHIRIGHT, /* offset of the offset of the right child */
- DP_RHNUM /* number of elements of a header */
+enum { /* enumeration for a record header */
+ DP_RHIFLAGS, /* offset of flags */
+ DP_RHIHASH, /* offset of value of the second hash function */
+ DP_RHIKSIZ, /* offset of the size of the key */
+ DP_RHIVSIZ, /* offset of the size of the value */
+ DP_RHIPSIZ, /* offset of the size of the padding bytes */
+ DP_RHILEFT, /* offset of the offset of the left child */
+ DP_RHIRIGHT, /* offset of the offset of the right child */
+ DP_RHNUM /* number of elements of a header */
};
-enum { /* enumeration for the flag of a record */
- DP_RECFDEL = 1 << 0, /* deleted */
- DP_RECFREUSE = 1 << 1 /* reusable */
+enum { /* enumeration for the flag of a record */
+ DP_RECFDEL = 1 << 0, /* deleted */
+ DP_RECFREUSE = 1 << 1 /* reusable */
};
@@ -113,11 +113,11 @@
static int dprecvalwb(DEPOT *depot, int off, int *head, int start, int max, char *vbuf);
static int dpkeycmp(const char *abuf, int asiz, const char *bbuf, int bsiz);
static int dprecsearch(DEPOT *depot, const char *kbuf, int ksiz, int hash, int *bip, int *offp,
- int *entp, int *head, char *ebuf, int *eep, int delhit);
+ int *entp, int *head, char *ebuf, int *eep, int delhit);
static int dprecrewrite(DEPOT *depot, int off, int rsiz, const char *kbuf, int ksiz,
- const char *vbuf, int vsiz, int hash, int left, int right);
+ const char *vbuf, int vsiz, int hash, int left, int right);
static int dprecappend(DEPOT *depot, const char *kbuf, int ksiz, const char *vbuf, int vsiz,
- int hash, int left, int right);
+ int hash, int left, int right);
static int dprecover(DEPOT *depot, int off, int *head, const char *vbuf, int vsiz, int cat);
static int dprecdelete(DEPOT *depot, int off, int *head, int reusable);
static void dpfbpoolcoal(DEPOT *depot);
@@ -236,20 +236,20 @@
if(omode & DP_OSPARSE){
c = 0;
if(!dpseekwrite(fd, fsiz - 1, &c, 1)){
- close(fd);
- return NULL;
+ close(fd);
+ return NULL;
}
} else {
if(!(map = malloc(bnum * sizeof(int)))){
- close(fd);
- dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- return NULL;
+ close(fd);
+ dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ return NULL;
}
memset(map, 0, bnum * sizeof(int));
if(!dpseekwrite(fd, DP_HEADSIZ, map, bnum * sizeof(int))){
- free(map);
- close(fd);
- return NULL;
+ free(map);
+ close(fd);
+ return NULL;
}
free(map);
}
@@ -386,94 +386,94 @@
if(dmode == DP_DCAT) nsiz += head[DP_RHIVSIZ];
if(off + rsiz >= depot->fsiz){
if(rsiz < nsiz){
- head[DP_RHIPSIZ] += nsiz - rsiz;
- rsiz = nsiz;
- depot->fsiz = off + rsiz;
+ head[DP_RHIPSIZ] += nsiz - rsiz;
+ rsiz = nsiz;
+ depot->fsiz = off + rsiz;
}
} else {
while(nsiz > rsiz && off + rsiz < depot->fsiz){
- if(!dprechead(depot, off + rsiz, next, NULL, NULL)) return FALSE;
- if(!(next[DP_RHIFLAGS] & DP_RECFREUSE)) break;
- head[DP_RHIPSIZ] += dprecsize(next);
- rsiz += dprecsize(next);
+ if(!dprechead(depot, off + rsiz, next, NULL, NULL)) return FALSE;
+ if(!(next[DP_RHIFLAGS] & DP_RECFREUSE)) break;
+ head[DP_RHIPSIZ] += dprecsize(next);
+ rsiz += dprecsize(next);
}
for(i = 0; i < depot->fbpsiz; i += 2){
- if(depot->fbpool[i] >= off && depot->fbpool[i] < off + rsiz){
- depot->fbpool[i] = -1;
- depot->fbpool[i+1] = -1;
- }
+ if(depot->fbpool[i] >= off && depot->fbpool[i] < off + rsiz){
+ depot->fbpool[i] = -1;
+ depot->fbpool[i+1] = -1;
+ }
}
}
if(nsiz <= rsiz){
if(!dprecover(depot, off, head, vbuf, vsiz, dmode == DP_DCAT)){
- depot->fatal = TRUE;
- return FALSE;
+ depot->fatal = TRUE;
+ return FALSE;
}
} else {
tval = NULL;
if(dmode == DP_DCAT){
- if(ee && DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ] + head[DP_RHIVSIZ] <= DP_ENTBUFSIZ){
- if(!(tval = malloc(head[DP_RHIVSIZ] + vsiz + 1))){
- dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- depot->fatal = TRUE;
- return FALSE;
- }
- memcpy(tval, ebuf + (DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ]), head[DP_RHIVSIZ]);
- } else {
- if(!(tval = dprecval(depot, off, head, 0, -1))){
- depot->fatal = TRUE;
- return FALSE;
- }
- if(!(swap = realloc(tval, head[DP_RHIVSIZ] + vsiz + 1))){
- free(tval);
- dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- depot->fatal = TRUE;
- return FALSE;
- }
- tval = swap;
- }
- memcpy(tval + head[DP_RHIVSIZ], vbuf, vsiz);
- vsiz += head[DP_RHIVSIZ];
- vbuf = tval;
+ if(ee && DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ] + head[DP_RHIVSIZ] <= DP_ENTBUFSIZ){
+ if(!(tval = malloc(head[DP_RHIVSIZ] + vsiz + 1))){
+ dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ depot->fatal = TRUE;
+ return FALSE;
+ }
+ memcpy(tval, ebuf + (DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ]), head[DP_RHIVSIZ]);
+ } else {
+ if(!(tval = dprecval(depot, off, head, 0, -1))){
+ depot->fatal = TRUE;
+ return FALSE;
+ }
+ if(!(swap = realloc(tval, head[DP_RHIVSIZ] + vsiz + 1))){
+ free(tval);
+ dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ depot->fatal = TRUE;
+ return FALSE;
+ }
+ tval = swap;
+ }
+ memcpy(tval + head[DP_RHIVSIZ], vbuf, vsiz);
+ vsiz += head[DP_RHIVSIZ];
+ vbuf = tval;
}
mi = -1;
min = -1;
for(i = 0; i < depot->fbpsiz; i += 2){
- if(depot->fbpool[i+1] < nsiz) continue;
- if(mi == -1 || depot->fbpool[i+1] < min){
- mi = i;
- min = depot->fbpool[i+1];
- }
+ if(depot->fbpool[i+1] < nsiz) continue;
+ if(mi == -1 || depot->fbpool[i+1] < min){
+ mi = i;
+ min = depot->fbpool[i+1];
+ }
}
if(mi >= 0){
- mroff = depot->fbpool[mi];
- mrsiz = depot->fbpool[mi+1];
- depot->fbpool[mi] = -1;
- depot->fbpool[mi+1] = -1;
+ mroff = depot->fbpool[mi];
+ mrsiz = depot->fbpool[mi+1];
+ depot->fbpool[mi] = -1;
+ depot->fbpool[mi+1] = -1;
} else {
- mroff = -1;
- mrsiz = -1;
+ mroff = -1;
+ mrsiz = -1;
}
if(!dprecdelete(depot, off, head, TRUE)){
- free(tval);
- depot->fatal = TRUE;
- return FALSE;
+ free(tval);
+ depot->fatal = TRUE;
+ return FALSE;
}
if(mroff > 0 && nsiz <= mrsiz){
- if(!dprecrewrite(depot, mroff, mrsiz, kbuf, ksiz, vbuf, vsiz,
- hash, head[DP_RHILEFT], head[DP_RHIRIGHT])){
- free(tval);
- depot->fatal = TRUE;
- return FALSE;
- }
- newoff = mroff;
+ if(!dprecrewrite(depot, mroff, mrsiz, kbuf, ksiz, vbuf, vsiz,
+ hash, head[DP_RHILEFT], head[DP_RHIRIGHT])){
+ free(tval);
+ depot->fatal = TRUE;
+ return FALSE;
+ }
+ newoff = mroff;
} else {
- if((newoff = dprecappend(depot, kbuf, ksiz, vbuf, vsiz,
- hash, head[DP_RHILEFT], head[DP_RHIRIGHT])) == -1){
- free(tval);
- depot->fatal = TRUE;
- return FALSE;
- }
+ if((newoff = dprecappend(depot, kbuf, ksiz, vbuf, vsiz,
+ hash, head[DP_RHILEFT], head[DP_RHIRIGHT])) == -1){
+ free(tval);
+ depot->fatal = TRUE;
+ return FALSE;
+ }
}
free(tval);
}
@@ -490,8 +490,8 @@
if(newoff > 0){
if(entoff > 0){
if(!dpseekwritenum(depot->fd, entoff, newoff)){
- depot->fatal = TRUE;
- return FALSE;
+ depot->fatal = TRUE;
+ return FALSE;
}
} else {
depot->buckets[bi] = newoff;
@@ -687,18 +687,18 @@
off += dprecsize(head);
} else {
if(ee && DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ] <= DP_ENTBUFSIZ){
- if(!(kbuf = malloc(head[DP_RHIKSIZ] + 1))){
- dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- depot->fatal = TRUE;
- return NULL;
- }
- memcpy(kbuf, ebuf + (DP_RHNUM * sizeof(int)), head[DP_RHIKSIZ]);
- kbuf[head[DP_RHIKSIZ]] = '\0';
+ if(!(kbuf = malloc(head[DP_RHIKSIZ] + 1))){
+ dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ depot->fatal = TRUE;
+ return NULL;
+ }
+ memcpy(kbuf, ebuf + (DP_RHNUM * sizeof(int)), head[DP_RHIKSIZ]);
+ kbuf[head[DP_RHIKSIZ]] = '\0';
} else {
- if(!(kbuf = dpreckey(depot, off, head))){
- depot->fatal = TRUE;
- return NULL;
- }
+ if(!(kbuf = dpreckey(depot, off, head))){
+ depot->fatal = TRUE;
+ return NULL;
+ }
}
depot->ioff = off + dprecsize(head);
if(sp) *sp = head[DP_RHIKSIZ];
@@ -829,42 +829,42 @@
}
if(!(head[DP_RHIFLAGS] & DP_RECFDEL)){
if(ee && DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ] <= DP_ENTBUFSIZ){
- if(!(kbufs[unum] = malloc(head[DP_RHIKSIZ] + 1))){
- dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- err = TRUE;
- break;
- }
- memcpy(kbufs[unum], ebuf + (DP_RHNUM * sizeof(int)), head[DP_RHIKSIZ]);
- if(DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ] + head[DP_RHIVSIZ] <= DP_ENTBUFSIZ){
- if(!(vbufs[unum] = malloc(head[DP_RHIVSIZ] + 1))){
- dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- err = TRUE;
- break;
- }
- memcpy(vbufs[unum], ebuf + (DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ]),
- head[DP_RHIVSIZ]);
- } else {
- vbufs[unum] = dprecval(depot, off, head, 0, -1);
- }
+ if(!(kbufs[unum] = malloc(head[DP_RHIKSIZ] + 1))){
+ dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ err = TRUE;
+ break;
+ }
+ memcpy(kbufs[unum], ebuf + (DP_RHNUM * sizeof(int)), head[DP_RHIKSIZ]);
+ if(DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ] + head[DP_RHIVSIZ] <= DP_ENTBUFSIZ){
+ if(!(vbufs[unum] = malloc(head[DP_RHIVSIZ] + 1))){
+ dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ err = TRUE;
+ break;
+ }
+ memcpy(vbufs[unum], ebuf + (DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ]),
+ head[DP_RHIVSIZ]);
+ } else {
+ vbufs[unum] = dprecval(depot, off, head, 0, -1);
+ }
} else {
- kbufs[unum] = dpreckey(depot, off, head);
- vbufs[unum] = dprecval(depot, off, head, 0, -1);
+ kbufs[unum] = dpreckey(depot, off, head);
+ vbufs[unum] = dprecval(depot, off, head, 0, -1);
}
ksizs[unum] = head[DP_RHIKSIZ];
vsizs[unum] = head[DP_RHIVSIZ];
unum++;
if(unum >= DP_OPTRUNIT){
- for(i = 0; i < unum; i++){
- if(kbufs[i] && vbufs[i]){
- if(!dpput(tdepot, kbufs[i], ksizs[i], vbufs[i], vsizs[i], DP_DKEEP)) err = TRUE;
- } else {
- err = TRUE;
- }
- free(kbufs[i]);
- free(vbufs[i]);
- if(err) break;
- }
- unum = 0;
+ for(i = 0; i < unum; i++){
+ if(kbufs[i] && vbufs[i]){
+ if(!dpput(tdepot, kbufs[i], ksizs[i], vbufs[i], vsizs[i], DP_DKEEP)) err = TRUE;
+ } else {
+ err = TRUE;
+ }
+ free(kbufs[i]);
+ free(vbufs[i]);
+ if(err) break;
+ }
+ unum = 0;
}
}
off += dprecsize(head);
@@ -1113,15 +1113,15 @@
kbuf = malloc(ksiz + 1);
vbuf = malloc(vsiz + 1);
if(kbuf && vbuf){
- if(dpseekread(fd, off + DP_RHNUM * sizeof(int), kbuf, ksiz) &&
- dpseekread(fd, off + DP_RHNUM * sizeof(int) + ksiz, vbuf, vsiz)){
- if(!dpput(tdepot, kbuf, ksiz, vbuf, vsiz, DP_DKEEP)) err = TRUE;
- } else {
- err = TRUE;
- }
+ if(dpseekread(fd, off + DP_RHNUM * sizeof(int), kbuf, ksiz) &&
+ dpseekread(fd, off + DP_RHNUM * sizeof(int) + ksiz, vbuf, vsiz)){
+ if(!dpput(tdepot, kbuf, ksiz, vbuf, vsiz, DP_DKEEP)) err = TRUE;
+ } else {
+ err = TRUE;
+ }
} else {
- if(!err) dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- err = TRUE;
+ if(!err) dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ err = TRUE;
}
free(vbuf);
free(kbuf);
@@ -1167,22 +1167,22 @@
while(!err && (kbuf = dpiternext(depot, &ksiz)) != NULL){
if((vbuf = dpget(depot, kbuf, ksiz, 0, -1, &vsiz)) != NULL){
if((pbuf = malloc(ksiz + vsiz + DP_NUMBUFSIZ * 2)) != NULL){
- psiz = 0;
- psiz += sprintf(pbuf + psiz, "%X\n%X\n", ksiz, vsiz);
- memcpy(pbuf + psiz, kbuf, ksiz);
- psiz += ksiz;
- pbuf[psiz++] = '\n';
- memcpy(pbuf + psiz, vbuf, vsiz);
- psiz += vsiz;
- pbuf[psiz++] = '\n';
- if(!dpwrite(fd, pbuf, psiz)){
- dpecodeset(DP_EWRITE, __FILE__, __LINE__);
- err = TRUE;
- }
- free(pbuf);
+ psiz = 0;
+ psiz += sprintf(pbuf + psiz, "%X\n%X\n", ksiz, vsiz);
+ memcpy(pbuf + psiz, kbuf, ksiz);
+ psiz += ksiz;
+ pbuf[psiz++] = '\n';
+ memcpy(pbuf + psiz, vbuf, vsiz);
+ psiz += vsiz;
+ pbuf[psiz++] = '\n';
+ if(!dpwrite(fd, pbuf, psiz)){
+ dpecodeset(DP_EWRITE, __FILE__, __LINE__);
+ err = TRUE;
+ }
+ free(pbuf);
} else {
- dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- err = TRUE;
+ dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ err = TRUE;
}
free(vbuf);
} else {
@@ -1236,17 +1236,17 @@
vsiz = -1;
for(i = 0; i < msiz; i++){
if(mbuf[i] == '\n'){
- mbuf[i] = '\0';
- ksiz = strtol(mbuf, NULL, 16);
- for(j = i + 1; j < msiz; j++){
- if(mbuf[j] == '\n'){
- mbuf[j] = '\0';
- vsiz = strtol(mbuf + i + 1, NULL, 16);
- hlen = j + 1;
- break;
- }
- }
- break;
+ mbuf[i] = '\0';
+ ksiz = strtol(mbuf, NULL, 16);
+ for(j = i + 1; j < msiz; j++){
+ if(mbuf[j] == '\n'){
+ mbuf[j] = '\0';
+ vsiz = strtol(mbuf + i + 1, NULL, 16);
+ hlen = j + 1;
+ break;
+ }
+ }
+ break;
}
}
if(ksiz < 0 || vsiz < 0 || hlen < 4){
@@ -1258,15 +1258,15 @@
if(!dpput(depot, mbuf + hlen, ksiz, mbuf + hlen + ksiz + 1, vsiz, DP_DKEEP)) err = TRUE;
} else {
if((rbuf = malloc(ksiz + vsiz + 2)) != NULL){
- if(dpseekread(fd, off + hlen, rbuf, ksiz + vsiz + 2)){
- if(!dpput(depot, rbuf, ksiz, rbuf + ksiz + 1, vsiz, DP_DKEEP)) err = TRUE;
- } else {
- err = TRUE;
- }
- free(rbuf);
+ if(dpseekread(fd, off + hlen, rbuf, ksiz + vsiz + 2)){
+ if(!dpput(depot, rbuf, ksiz, rbuf + ksiz + 1, vsiz, DP_DKEEP)) err = TRUE;
+ } else {
+ err = TRUE;
+ }
+ free(rbuf);
} else {
- dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- err = TRUE;
+ dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ err = TRUE;
}
}
off += hlen + ksiz + vsiz + 2;
@@ -1346,39 +1346,39 @@
} else {
tksiz = head[DP_RHIKSIZ];
if(!(tkbuf = malloc(tksiz + 1))){
- dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- err = TRUE;
- break;
+ dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ err = TRUE;
+ break;
}
if(!dpseekread(fd, off + DP_RHNUM * sizeof(int), tkbuf, tksiz)){
- free(tkbuf);
- err = TRUE;
- break;
+ free(tkbuf);
+ err = TRUE;
+ break;
}
tkbuf[tksiz] = '\0';
kcmp = dpkeycmp(kbuf, ksiz, tkbuf, tksiz);
free(tkbuf);
if(kcmp > 0){
- off = head[DP_RHILEFT];
+ off = head[DP_RHILEFT];
} else if(kcmp < 0){
- off = head[DP_RHIRIGHT];
+ off = head[DP_RHIRIGHT];
} else if(head[DP_RHIFLAGS] & DP_RECFDEL){
- break;
+ break;
} else {
- vsiz = head[DP_RHIVSIZ];
- if(!(vbuf = malloc(vsiz + 1))){
- dpecodeset(DP_EALLOC, __FILE__, __LINE__);
- err = TRUE;
- break;
- }
- if(!dpseekread(fd, off + DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ], vbuf, vsiz)){
- free(vbuf);
- vbuf = NULL;
- err = TRUE;
- break;
- }
- vbuf[vsiz] = '\0';
- break;
+ vsiz = head[DP_RHIVSIZ];
+ if(!(vbuf = malloc(vsiz + 1))){
+ dpecodeset(DP_EALLOC, __FILE__, __LINE__);
+ err = TRUE;
+ break;
+ }
+ if(!dpseekread(fd, off + DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ], vbuf, vsiz)){
+ free(vbuf);
+ vbuf = NULL;
+ err = TRUE;
+ break;
+ }
+ vbuf[vsiz] = '\0';
+ break;
}
}
}
@@ -1769,11 +1769,11 @@
if(vsiz + pad >= DP_FSBLKSIZ){
if(vsiz <= DP_FSBLKSIZ) pad = 0;
if(depot->fsiz % DP_FSBLKSIZ == 0){
- return (pad / DP_FSBLKSIZ) * DP_FSBLKSIZ + DP_FSBLKSIZ -
- (depot->fsiz + DP_RHNUM * sizeof(int) + ksiz + vsiz) % DP_FSBLKSIZ;
+ return (pad / DP_FSBLKSIZ) * DP_FSBLKSIZ + DP_FSBLKSIZ -
+ (depot->fsiz + DP_RHNUM * sizeof(int) + ksiz + vsiz) % DP_FSBLKSIZ;
} else {
- return (pad / (DP_FSBLKSIZ / 2)) * (DP_FSBLKSIZ / 2) + (DP_FSBLKSIZ / 2) -
- (depot->fsiz + DP_RHNUM * sizeof(int) + ksiz + vsiz) % (DP_FSBLKSIZ / 2);
+ return (pad / (DP_FSBLKSIZ / 2)) * (DP_FSBLKSIZ / 2) + (DP_FSBLKSIZ / 2) -
+ (depot->fsiz + DP_RHNUM * sizeof(int) + ksiz + vsiz) % (DP_FSBLKSIZ / 2);
}
} else {
return pad >= DP_RHNUM * sizeof(int) ? pad : DP_RHNUM * sizeof(int);
@@ -1812,9 +1812,9 @@
if(!dpseekread(depot->fd, off, ebuf, DP_ENTBUFSIZ)) return FALSE;
memcpy(head, ebuf, DP_RHNUM * sizeof(int));
if(head[DP_RHIKSIZ] < 0 || head[DP_RHIVSIZ] < 0 || head[DP_RHIPSIZ] < 0 ||
- head[DP_RHILEFT] < 0 || head[DP_RHIRIGHT] < 0){
- dpecodeset(DP_EBROKEN, __FILE__, __LINE__);
- return FALSE;
+ head[DP_RHILEFT] < 0 || head[DP_RHIRIGHT] < 0){
+ dpecodeset(DP_EBROKEN, __FILE__, __LINE__);
+ return FALSE;
}
return TRUE;
}
@@ -1929,7 +1929,7 @@
`delhit' specifies whether a deleted record corresponds or not.
The return value is 0 if successful, 1 if there is no corresponding record, -1 on error. */
static int dprecsearch(DEPOT *depot, const char *kbuf, int ksiz, int hash, int *bip, int *offp,
- int *entp, int *head, char *ebuf, int *eep, int delhit){
+ int *entp, int *head, char *ebuf, int *eep, int delhit){
int off, entoff, thash, kcmp;
char stkey[DP_STKBUFSIZ], *tkey;
assert(depot && kbuf && ksiz >= 0 && hash >= 0 && bip && offp && entp && head && ebuf && eep);
@@ -1951,31 +1951,31 @@
off = head[DP_RHIRIGHT];
} else {
if(*eep && DP_RHNUM * sizeof(int) + head[DP_RHIKSIZ] <= DP_ENTBUFSIZ){
- kcmp = dpkeycmp(kbuf, ksiz, ebuf + (DP_RHNUM * sizeof(int)), head[DP_RHIKSIZ]);
+ kcmp = dpkeycmp(kbuf, ksiz, ebuf + (DP_RHNUM * sizeof(int)), head[DP_RHIKSIZ]);
} else if(head[DP_RHIKSIZ] > DP_STKBUFSIZ){
- if(!(tkey = dpreckey(depot, off, head))) return -1;
- kcmp = dpkeycmp(kbuf, ksiz, tkey, head[DP_RHIKSIZ]);
- free(tkey);
+ if(!(tkey = dpreckey(depot, off, head))) return -1;
+ kcmp = dpkeycmp(kbuf, ksiz, tkey, head[DP_RHIKSIZ]);
+ free(tkey);
} else {
- if(!dpseekread(depot->fd, off + DP_RHNUM * sizeof(int), stkey, head[DP_RHIKSIZ]))
- return -1;
- kcmp = dpkeycmp(kbuf, ksiz, stkey, head[DP_RHIKSIZ]);
+ if(!dpseekread(depot->fd, off + DP_RHNUM * sizeof(int), stkey, head[DP_RHIKSIZ]))
+ return -1;
+ kcmp = dpkeycmp(kbuf, ksiz, stkey, head[DP_RHIKSIZ]);
}
if(kcmp > 0){
- entoff = off + DP_RHILEFT * sizeof(int);
- off = head[DP_RHILEFT];
+ entoff = off + DP_RHILEFT * sizeof(int);
+ off = head[DP_RHILEFT];
} else if(kcmp < 0){
- entoff = off + DP_RHIRIGHT * sizeof(int);
- off = head[DP_RHIRIGHT];
+ entoff = off + DP_RHIRIGHT * sizeof(int);
+ off = head[DP_RHIRIGHT];
} else {
- if(!delhit && (head[DP_RHIFLAGS] & DP_RECFDEL)){
- entoff = off + DP_RHILEFT * sizeof(int);
- off = head[DP_RHILEFT];
- } else {
- *offp = off;
- *entp = entoff;
- return 0;
- }
+ if(!delhit && (head[DP_RHIFLAGS] & DP_RECFDEL)){
+ entoff = off + DP_RHILEFT * sizeof(int);
+ off = head[DP_RHILEFT];
+ } else {
+ *offp = off;
+ *entp = entoff;
+ return 0;
+ }
}
}
}
@@ -1998,7 +1998,7 @@
`right' specifies the offset of the right child.
The return value is true if successful, or, false on failure. */
static int dprecrewrite(DEPOT *depot, int off, int rsiz, const char *kbuf, int ksiz,
- const char *vbuf, int vsiz, int hash, int left, int right){
+ const char *vbuf, int vsiz, int hash, int left, int right){
char ebuf[DP_WRTBUFSIZ];
int i, head[DP_RHNUM], asiz, hoff, koff, voff, mi, min, size;
assert(depot && off >= 1 && rsiz > 0 && kbuf && ksiz >= 0 && vbuf && vsiz >= 0);
@@ -2044,15 +2044,15 @@
min = -1;
for(i = 0; i < depot->fbpsiz; i += 2){
if(depot->fbpool[i] == -1){
- depot->fbpool[i] = off;
- depot->fbpool[i+1] = size;
- dpfbpoolcoal(depot);
- mi = -1;
- break;
+ depot->fbpool[i] = off;
+ depot->fbpool[i+1] = size;
+ dpfbpoolcoal(depot);
+ mi = -1;
+ break;
}
if(mi == -1 || depot->fbpool[i+1] < min){
- mi = i;
- min = depot->fbpool[i+1];
+ mi = i;
+ min = depot->fbpool[i+1];
}
}
if(mi >= 0 && size > min){
@@ -2076,7 +2076,7 @@
`right' specifies the offset of the right child.
The return value is the offset of the record, or, -1 on failure. */
static int dprecappend(DEPOT *depot, const char *kbuf, int ksiz, const char *vbuf, int vsiz,
- int hash, int left, int right){
+ int hash, int left, int right){
char ebuf[DP_WRTBUFSIZ], *hbuf;
int head[DP_RHNUM], asiz, psiz, off;
assert(depot && kbuf && ksiz >= 0 && vbuf && vsiz >= 0);
@@ -2170,15 +2170,15 @@
min = -1;
for(i = 0; i < depot->fbpsiz; i += 2){
if(depot->fbpool[i] == -1){
- depot->fbpool[i] = off;
- depot->fbpool[i+1] = size;
- dpfbpoolcoal(depot);
- mi = -1;
- break;
+ depot->fbpool[i] = off;
+ depot->fbpool[i+1] = size;
+ dpfbpoolcoal(depot);
+ mi = -1;
+ break;
}
if(mi == -1 || depot->fbpool[i+1] < min){
- mi = i;
- min = depot->fbpool[i+1];
+ mi = i;
+ min = depot->fbpool[i+1];
}
}
if(mi >= 0 && size > min){
@@ -2188,7 +2188,7 @@
}
}
return dpseekwritenum(depot->fd, off + DP_RHIFLAGS * sizeof(int),
- DP_RECFDEL | (reusable ? DP_RECFREUSE : 0));
+ DP_RECFDEL | (reusable ? DP_RECFREUSE : 0));
}
Modified: branches/indexer-split/src/qdbm/depot.h
==============================================================================
--- branches/indexer-split/src/qdbm/depot.h (original)
+++ branches/indexer-split/src/qdbm/depot.h Sat Sep 20 15:12:19 2008
@@ -1,6 +1,6 @@
/*************************************************************************************************
* The basic API of QDBM
- * Copyright (C) 2000-2006 Mikio Hirabayashi
+ * Copyright (C) 2000-2006 Mikio Hirabayashi
* This file is part of QDBM, Quick Database Manager.
* QDBM 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
@@ -14,10 +14,10 @@
*************************************************************************************************/
-#ifndef _DEPOT_H /* duplication check */
+#ifndef _DEPOT_H /* duplication check */
#define _DEPOT_H
-#if defined(__cplusplus) /* export for C++ */
+#if defined(__cplusplus) /* export for C++ */
extern "C" {
#endif
@@ -39,64 +39,64 @@
*************************************************************************************************/
-typedef struct { /* type of structure for a database handle */
- char *name; /* name of the database file */
- int wmode; /* whether to be writable */
- int inode; /* inode of the database file */
- time_t mtime; /* last modified time of the database */
- int fd; /* file descriptor of the database file */
- int fsiz; /* size of the database file */
- char *map; /* pointer to the mapped memory */
- int msiz; /* size of the mapped memory */
- int *buckets; /* pointer to the bucket array */
- int bnum; /* number of the bucket array */
- int rnum; /* number of records */
- int fatal; /* whether a fatal error occured */
- int ioff; /* offset of the iterator */
- int *fbpool; /* free block pool */
- int fbpsiz; /* size of the free block pool */
- int fbpinc; /* incrementor of update of the free block pool */
- int align; /* basic size of alignment */
+typedef struct { /* type of structure for a database handle */
+ char *name; /* name of the database file */
+ int wmode; /* whether to be writable */
+ int inode; /* inode of the database file */
+ time_t mtime; /* last modified time of the database */
+ int fd; /* file descriptor of the database file */
+ int fsiz; /* size of the database file */
+ char *map; /* pointer to the mapped memory */
+ int msiz; /* size of the mapped memory */
+ int *buckets; /* pointer to the bucket array */
+ int bnum; /* number of the bucket array */
+ int rnum; /* number of records */
+ int fatal; /* whether a fatal error occured */
+ int ioff; /* offset of the iterator */
+ int *fbpool; /* free block pool */
+ int fbpsiz; /* size of the free block pool */
+ int fbpinc; /* incrementor of update of the free block pool */
+ int align; /* basic size of alignment */
} DEPOT;
-enum { /* enumeration for error codes */
- DP_ENOERR, /* no error */
- DP_EFATAL, /* with fatal error */
- DP_EMODE, /* invalid mode */
- DP_EBROKEN, /* broken database file */
- DP_EKEEP, /* existing record */
- DP_ENOITEM, /* no item found */
- DP_EALLOC, /* memory allocation error */
- DP_EMAP, /* memory mapping error */
- DP_EOPEN, /* open error */
- DP_ECLOSE, /* close error */
- DP_ETRUNC, /* trunc error */
- DP_ESYNC, /* sync error */
- DP_ESTAT, /* stat error */
- DP_ESEEK, /* seek error */
- DP_EREAD, /* read error */
- DP_EWRITE, /* write error */
- DP_ELOCK, /* lock error */
- DP_EUNLINK, /* unlink error */
- DP_EMKDIR, /* mkdir error */
- DP_ERMDIR, /* rmdir error */
- DP_EMISC /* miscellaneous error */
+enum { /* enumeration for error codes */
+ DP_ENOERR, /* no error */
+ DP_EFATAL, /* with fatal error */
+ DP_EMODE, /* invalid mode */
+ DP_EBROKEN, /* broken database file */
+ DP_EKEEP, /* existing record */
+ DP_ENOITEM, /* no item found */
+ DP_EALLOC, /* memory allocation error */
+ DP_EMAP, /* memory mapping error */
+ DP_EOPEN, /* open error */
+ DP_ECLOSE, /* close error */
+ DP_ETRUNC, /* trunc error */
+ DP_ESYNC, /* sync error */
+ DP_ESTAT, /* stat error */
+ DP_ESEEK, /* seek error */
+ DP_EREAD, /* read error */
+ DP_EWRITE, /* write error */
+ DP_ELOCK, /* lock error */
+ DP_EUNLINK, /* unlink error */
+ DP_EMKDIR, /* mkdir error */
+ DP_ERMDIR, /* rmdir error */
+ DP_EMISC /* miscellaneous error */
};
-enum { /* enumeration for open modes */
- DP_OREADER = 1 << 0, /* open as a reader */
- DP_OWRITER = 1 << 1, /* open as a writer */
- DP_OCREAT = 1 << 2, /* a writer creating */
- DP_OTRUNC = 1 << 3, /* a writer truncating */
- DP_ONOLCK = 1 << 4, /* open without locking */
- DP_OLCKNB = 1 << 5, /* lock without blocking */
- DP_OSPARSE = 1 << 6 /* create as a sparse file */
+enum { /* enumeration for open modes */
+ DP_OREADER = 1 << 0, /* open as a reader */
+ DP_OWRITER = 1 << 1, /* open as a writer */
+ DP_OCREAT = 1 << 2, /* a writer creating */
+ DP_OTRUNC = 1 << 3, /* a writer truncating */
+ DP_ONOLCK = 1 << 4, /* open without locking */
+ DP_OLCKNB = 1 << 5, /* lock without blocking */
+ DP_OSPARSE = 1 << 6 /* create as a sparse file */
};
-enum { /* enumeration for write modes */
- DP_DOVER, /* overwrite an existing value */
- DP_DKEEP, /* keep an existing value */
- DP_DCAT /* concatenate values */
+enum { /* enumeration for write modes */
+ DP_DOVER, /* overwrite an existing value */
+ DP_DKEEP, /* keep an existing value */
+ DP_DCAT /* concatenate values */
};
@@ -148,7 +148,7 @@
/* Store a record.
`depot' specifies a database handle connected as a writer.
`kbuf' specifies the pointer to the region of a key.
- `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
+ `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
with `strlen(kbuf)'.
`vbuf' specifies the pointer to the region of a value.
`vsiz' specifies the size of the region of the value. If it is negative, the size is
@@ -164,9 +164,9 @@
/* Delete a record.
`depot' specifies a database handle connected as a writer.
`kbuf' specifies the pointer to the region of a key.
- `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
+ `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
with `strlen(kbuf)'.
- If successful, the return value is true, else, it is false. False is returned when no
+ If successful, the return value is true, else, it is false. False is returned when no
record corresponds to the specified key. */
int dpout(DEPOT *depot, const char *kbuf, int ksiz);
@@ -174,7 +174,7 @@
/* Retrieve a record.
`depot' specifies a database handle.
`kbuf' specifies the pointer to the region of a key.
- `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
+ `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
with `strlen(kbuf)'.
`start' specifies the offset address of the beginning of the region of the value to be read.
`max' specifies the max size to be read. If it is negative, the size to read is unlimited.
@@ -193,7 +193,7 @@
/* Retrieve a record and write the value into a buffer.
`depot' specifies a database handle.
`kbuf' specifies the pointer to the region of a key.
- `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
+ `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
with `strlen(kbuf)'.
`start' specifies the offset address of the beginning of the region of the value to be read.
`max' specifies the max size to be read. It shuld be equal to or less than the size of the
@@ -210,7 +210,7 @@
/* Get the size of the value of a record.
`depot' specifies a database handle.
`kbuf' specifies the pointer to the region of a key.
- `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
+ `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
with `strlen(kbuf)'.
If successful, the return value is the size of the value of the corresponding record, else,
it is -1.
@@ -380,7 +380,7 @@
/* Retrieve a record directly from a database file.
`name' specifies the name of a database file.
`kbuf' specifies the pointer to the region of a key.
- `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
+ `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
with `strlen(kbuf)'.
`sp' specifies the pointer to a variable to which the size of the region of the return
value is assigned. If it is `NULL', it is not used.
@@ -397,7 +397,7 @@
/* Hash function used inside Depot.
`kbuf' specifies the pointer to the region of a key.
- `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
+ `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
with `strlen(kbuf)'.
The return value is the hash value of 31 bits length computed from the key.
This function is useful when an application calculates the state of the inside bucket array. */
@@ -406,7 +406,7 @@
/* Hash function which is independent from the hash functions used inside Depot.
`kbuf' specifies the pointer to the region of a key.
- `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
+ `ksiz' specifies the size of the region of the key. If it is negative, the size is assigned
with `strlen(kbuf)'.
The return value is the hash value of 31 bits length computed from the key.
This function is useful when an application uses its own hash algorithm outside Depot. */
@@ -482,11 +482,11 @@
#undef MYEXTERN
-#if defined(__cplusplus) /* export for C++ */
+#if defined(__cplusplus) /* export for C++ */
}
#endif
-#endif /* duplication check */
+#endif /* duplication check */
/* END OF FILE */
Modified: branches/indexer-split/src/qdbm/myconf.c
==============================================================================
--- branches/indexer-split/src/qdbm/myconf.c (original)
+++ branches/indexer-split/src/qdbm/myconf.c Sat Sep 20 15:12:19 2008
@@ -1,6 +1,6 @@
/*************************************************************************************************
* Emulation of system calls
- * Copyright (C) 2000-2006 Mikio Hirabayashi
+ * Copyright (C) 2000-2006 Mikio Hirabayashi
* This file is part of QDBM, Quick Database Manager.
* QDBM 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
@@ -111,12 +111,12 @@
for(i = 0; i < _qdbm_ptknum; i++){
if(_qdbm_ptkeys[i].ptr == ptr){
if(!(val = pthread_getspecific(_qdbm_ptkeys[i].key))){
- if(!(val = malloc(size))) return NULL;
- memcpy(val, initval, size);
- if(pthread_setspecific(_qdbm_ptkeys[i].key, val) != 0){
- free(val);
- return NULL;
- }
+ if(!(val = malloc(size))) return NULL;
+ memcpy(val, initval, size);
+ if(pthread_setspecific(_qdbm_ptkeys[i].key, val) != 0){
+ free(val);
+ return NULL;
+ }
}
return val;
}
@@ -163,10 +163,10 @@
}
if(fd < 0 || flags & MAP_FIXED) return MAP_FAILED;
if(!(handle = CreateFileMapping((HANDLE)_get_osfhandle(fd), NULL,
- (prot & PROT_WRITE) ? PAGE_READWRITE : PAGE_READONLY,
- 0, length, NULL))) return MAP_FAILED;
+ (prot & PROT_WRITE) ? PAGE_READWRITE : PAGE_READONLY,
+ 0, length, NULL))) return MAP_FAILED;
if(!(start = MapViewOfFile(handle, (prot & PROT_WRITE) ? FILE_MAP_WRITE : FILE_MAP_READ,
- 0, 0, length))){
+ 0, 0, length))){
CloseHandle(handle);
return MAP_FAILED;
}
@@ -278,9 +278,9 @@
while(wlen < (int)length){
rv = write(fd, rp + wlen, length - wlen);
if(rv == -1){
- if(errno == EINTR) continue;
- free(buf);
- return -1;
+ if(errno == EINTR) continue;
+ free(buf);
+ return -1;
}
wlen += rv;
}
@@ -307,8 +307,8 @@
while(wlen < (int)length){
rv = write(fd, rp + wlen, length - wlen);
if(rv == -1){
- if(errno == EINTR) continue;
- return -1;
+ if(errno == EINTR) continue;
+ return -1;
}
wlen += rv;
}
@@ -404,8 +404,8 @@
if(!LockFileEx(fh, opt, 0, 1, 0, &ol)){
if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED){
while(TRUE){
- if(LockFile(fh, 0, 0, 1, 0)) return 0;
- Sleep(WINLOCKWAIT);
+ if(LockFile(fh, 0, 0, 1, 0)) return 0;
+ Sleep(WINLOCKWAIT);
}
}
return -1;
@@ -491,8 +491,8 @@
rp = strchr(rp, ':') + 1;
avail = strtod(rp, NULL) * 1024.0;
if((rp = strstr(buf, "SwapFree:")) != NULL){
- rp = strchr(rp, ':') + 1;
- avail += strtod(rp, NULL) * 1024.0;
+ rp = strchr(rp, ':') + 1;
+ avail += strtod(rp, NULL) * 1024.0;
}
if(size >= avail) rv = FALSE;
}
@@ -587,9 +587,9 @@
if(bsiz + osiz > asiz){
asiz = asiz * 2 + osiz;
if(!(swap = realloc(buf, asiz))){
- free(buf);
- deflateEnd(&zs);
- return NULL;
+ free(buf);
+ deflateEnd(&zs);
+ return NULL;
}
buf = swap;
}
@@ -658,9 +658,9 @@
if(bsiz + osiz >= asiz){
asiz = asiz * 2 + osiz;
if(!(swap = realloc(buf, asiz))){
- free(buf);
- inflateEnd(&zs);
- return NULL;
+ free(buf);
+ inflateEnd(&zs);
+ return NULL;
}
buf = swap;
}
@@ -839,9 +839,9 @@
if(bsiz + osiz > asiz){
asiz = asiz * 2 + osiz;
if(!(swap = realloc(buf, asiz))){
- free(buf);
- BZ2_bzCompressEnd(&zs);
- return NULL;
+ free(buf);
+ BZ2_bzCompressEnd(&zs);
+ return NULL;
}
buf = swap;
}
@@ -898,9 +898,9 @@
if(bsiz + osiz >= asiz){
asiz = asiz * 2 + osiz;
if(!(swap = realloc(buf, asiz))){
- free(buf);
- BZ2_bzDecompressEnd(&zs);
- return NULL;
+ free(buf);
+ BZ2_bzDecompressEnd(&zs);
+ return NULL;
}
buf = swap;
}
@@ -960,18 +960,18 @@
static char *_qdbm_iconv_impl(const char *ptr, int size,
- const char *icode, const char *ocode, int *sp, int *mp);
+ const char *icode, const char *ocode, int *sp, int *mp);
static const char *_qdbm_encname_impl(const char *ptr, int size);
static int _qdbm_encmiss(const char *ptr, int size, const char *icode, const char *ocode);
char *(*_qdbm_iconv)(const char *, int, const char *, const char *,
- int *, int *) = _qdbm_iconv_impl;
+ int *, int *) = _qdbm_iconv_impl;
const char *(*_qdbm_encname)(const char *, int) = _qdbm_encname_impl;
static char *_qdbm_iconv_impl(const char *ptr, int size,
- const char *icode, const char *ocode, int *sp, int *mp){
+ const char *icode, const char *ocode, int *sp, int *mp){
iconv_t ic;
char *obuf, *wp, *rp;
size_t isiz, osiz;
@@ -990,16 +990,16 @@
while(isiz > 0){
if(iconv(ic, (void *)&rp, &isiz, &wp, &osiz) == -1){
if(errno == EILSEQ && (*rp == 0x5c || *rp == 0x7e)){
- *wp = *rp;
- wp++;
- rp++;
- isiz--;
+ *wp = *rp;
+ wp++;
+ rp++;
+ isiz--;
} else if(errno == EILSEQ || errno == EINVAL){
- rp++;
- isiz--;
- miss++;
+ rp++;
+ isiz--;
+ miss++;
} else {
- break;
+ break;
}
}
}
@@ -1074,12 +1074,12 @@
wp = obuf;
if(iconv(ic, (void *)&rp, &isiz, &wp, &osiz) == -1){
if(errno == EILSEQ || errno == EINVAL){
- rp++;
- isiz--;
- miss++;
- if(miss >= ICONVMISSMAX) break;
+ rp++;
+ isiz--;
+ miss++;
+ if(miss >= ICONVMISSMAX) break;
} else {
- break;
+ break;
}
}
}
Modified: branches/indexer-split/src/qdbm/myconf.h
==============================================================================
--- branches/indexer-split/src/qdbm/myconf.h (original)
+++ branches/indexer-split/src/qdbm/myconf.h Sat Sep 20 15:12:19 2008
@@ -1,6 +1,6 @@
/*************************************************************************************************
* System configurations for QDBM
- * Copyright (C) 2000-2006 Mikio Hirabayashi
+ * Copyright (C) 2000-2006 Mikio Hirabayashi
* This file is part of QDBM, Quick Database Manager.
* QDBM 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
@@ -14,10 +14,10 @@
*************************************************************************************************/
-#ifndef _MYCONF_H /* duplication check */
+#ifndef _MYCONF_H /* duplication check */
#define _MYCONF_H
-#if defined(__cplusplus) /* export for C++ */
+#if defined(__cplusplus) /* export for C++ */
extern "C" {
#endif
@@ -191,30 +191,30 @@
#if defined(_SYS_MSVC_) || defined(_SYS_MINGW_)
-#define MYPATHCHR '\\'
-#define MYPATHSTR "\\"
-#define MYEXTCHR '.'
-#define MYEXTSTR "."
-#define MYCDIRSTR "."
-#define MYPDIRSTR ".."
+#define MYPATHCHR '\\'
+#define MYPATHSTR "\\"
+#define MYEXTCHR '.'
+#define MYEXTSTR "."
+#define MYCDIRSTR "."
+#define MYPDIRSTR ".."
#elif defined(_SYS_RISCOS_)
-#define MYPATHCHR '.'
-#define MYPATHSTR "."
-#define MYEXTCHR '/'
-#define MYEXTSTR "/"
-#define MYCDIRSTR "@"
-#define MYPDIRSTR "^"
+#define MYPATHCHR '.'
+#define MYPATHSTR "."
+#define MYEXTCHR '/'
+#define MYEXTSTR "/"
+#define MYCDIRSTR "@"
+#define MYPDIRSTR "^"
#else
-#define MYPATHCHR '/'
-#define MYPATHSTR "/"
-#define MYEXTCHR '.'
-#define MYEXTSTR "."
-#define MYCDIRSTR "."
-#define MYPDIRSTR ".."
+#define MYPATHCHR '/'
+#define MYPATHSTR "/"
+#define MYEXTCHR '.'
+#define MYEXTSTR "."
+#define MYCDIRSTR "."
+#define MYPDIRSTR ".."
#endif
@@ -246,8 +246,8 @@
#undef O_TEXT
#undef setmode
-#define O_BINARY 0
-#define O_TEXT 1
+#define O_BINARY 0
+#define O_TEXT 1
#define \
setmode(fd, mode) \
@@ -264,13 +264,13 @@
#if defined(MYPTHREAD)
-#define _qdbm_ptsafe TRUE
+#define _qdbm_ptsafe TRUE
void *_qdbm_settsd(void *ptr, int size, const void *initval);
#else
-#define _qdbm_ptsafe FALSE
+#define _qdbm_ptsafe FALSE
#define \
_qdbm_settsd(ptr, size, initval) \
@@ -573,9 +573,9 @@
#undef TRUE
-#define TRUE 1
+#define TRUE 1
#undef FALSE
-#define FALSE 0
+#define FALSE 0
#define sizeof(a) ((int)sizeof(a))
@@ -583,11 +583,11 @@
-#if defined(__cplusplus) /* export for C++ */
+#if defined(__cplusplus) /* export for C++ */
}
#endif
-#endif /* duplication check */
+#endif /* duplication check */
/* END OF FILE */
Modified: branches/indexer-split/src/tracker-applet/tracker-applet-marshallers.c
==============================================================================
--- branches/indexer-split/src/tracker-applet/tracker-applet-marshallers.c (original)
+++ branches/indexer-split/src/tracker-applet/tracker-applet-marshallers.c Sat Sep 20 15:12:19 2008
@@ -4,67 +4,67 @@
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v) g_value_get_int (v)
-#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
-#define g_marshal_value_peek_long(v) g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
-#define g_marshal_value_peek_float(v) g_value_get_float (v)
-#define g_marshal_value_peek_double(v) g_value_get_double (v)
-#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v) g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
+#define g_marshal_value_peek_char(v) g_value_get_char (v)
+#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v) g_value_get_int (v)
+#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
+#define g_marshal_value_peek_long(v) g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
+#define g_marshal_value_peek_float(v) g_value_get_float (v)
+#define g_marshal_value_peek_double(v) g_value_get_double (v)
+#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v) g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v) g_value_get_object (v)
+#define g_marshal_value_peek_object(v) g_value_get_object (v)
#else /* !G_ENABLE_DEBUG */
/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- * Do not access GValues directly in your code. Instead, use the
- * g_value_get_*() functions
+ * Do not access GValues directly in your code. Instead, use the
+ * g_value_get_*() functions
*/
#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
-#define g_marshal_value_peek_char(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v) (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v) (v)->data[0].v_float
-#define g_marshal_value_peek_double(v) (v)->data[0].v_double
-#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_char(v) (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v) (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v) (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v) (v)->data[0].v_float
+#define g_marshal_value_peek_double(v) (v)->data[0].v_double
+#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
#endif /* !G_ENABLE_DEBUG */
/* VOID:STRING,BOOLEAN,BOOLEAN,BOOLEAN,BOOLEAN,BOOLEAN (/dev/stdin:1) */
void
-tracker_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+tracker_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
- typedef void (*GMarshalFunc_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN) (gpointer data1,
- gpointer arg_1,
- gboolean arg_2,
- gboolean arg_3,
- gboolean arg_4,
- gboolean arg_5,
- gboolean arg_6,
- gboolean arg_7,
- gpointer data2);
+ typedef void (*GMarshalFunc_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN) (gpointer data1,
+ gpointer arg_1,
+ gboolean arg_2,
+ gboolean arg_3,
+ gboolean arg_4,
+ gboolean arg_5,
+ gboolean arg_6,
+ gboolean arg_7,
+ gpointer data2);
register GMarshalFunc_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -84,14 +84,14 @@
callback = (GMarshalFunc_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
callback (data1,
- g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_boolean (param_values + 2),
- g_marshal_value_peek_boolean (param_values + 3),
- g_marshal_value_peek_boolean (param_values + 4),
- g_marshal_value_peek_boolean (param_values + 5),
- g_marshal_value_peek_boolean (param_values + 6),
- g_marshal_value_peek_boolean (param_values + 7),
- data2);
+ g_marshal_value_peek_string (param_values + 1),
+ g_marshal_value_peek_boolean (param_values + 2),
+ g_marshal_value_peek_boolean (param_values + 3),
+ g_marshal_value_peek_boolean (param_values + 4),
+ g_marshal_value_peek_boolean (param_values + 5),
+ g_marshal_value_peek_boolean (param_values + 6),
+ g_marshal_value_peek_boolean (param_values + 7),
+ data2);
}
/* VOID:INT (/dev/stdin:2) */
@@ -99,20 +99,20 @@
/* VOID:STRING,STRING,INT,INT,INT,DOUBLE (/dev/stdin:3) */
void
tracker_VOID__STRING_STRING_INT_INT_INT_DOUBLE (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__STRING_STRING_INT_INT_INT_DOUBLE) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gint arg_3,
- gint arg_4,
- gint arg_5,
- gdouble arg_6,
- gpointer data2);
+ gpointer arg_1,
+ gpointer arg_2,
+ gint arg_3,
+ gint arg_4,
+ gint arg_5,
+ gdouble arg_6,
+ gpointer data2);
register GMarshalFunc_VOID__STRING_STRING_INT_INT_INT_DOUBLE callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -132,12 +132,12 @@
callback = (GMarshalFunc_VOID__STRING_STRING_INT_INT_INT_DOUBLE) (marshal_data ? marshal_data : cc->callback);
callback (data1,
- g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_int (param_values + 3),
- g_marshal_value_peek_int (param_values + 4),
- g_marshal_value_peek_int (param_values + 5),
- g_marshal_value_peek_double (param_values + 6),
- data2);
+ g_marshal_value_peek_string (param_values + 1),
+ g_marshal_value_peek_string (param_values + 2),
+ g_marshal_value_peek_int (param_values + 3),
+ g_marshal_value_peek_int (param_values + 4),
+ g_marshal_value_peek_int (param_values + 5),
+ g_marshal_value_peek_double (param_values + 6),
+ data2);
}
Modified: branches/indexer-split/src/tracker-applet/tracker-applet-marshallers.h
==============================================================================
--- branches/indexer-split/src/tracker-applet/tracker-applet-marshallers.h (original)
+++ branches/indexer-split/src/tracker-applet/tracker-applet-marshallers.h Sat Sep 20 15:12:19 2008
@@ -7,22 +7,22 @@
/* VOID:STRING,BOOLEAN,BOOLEAN,BOOLEAN,BOOLEAN,BOOLEAN (/dev/stdin:1) */
extern void tracker_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
/* VOID:INT (/dev/stdin:2) */
#define tracker_VOID__INT g_cclosure_marshal_VOID__INT
/* VOID:STRING,STRING,INT,INT,INT (/dev/stdin:3) */
-extern void tracker_VOID__STRING_STRING_INT_INT_INT_DOUBLE (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+extern void tracker_VOID__STRING_STRING_INT_INT_INT_DOUBLE (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
G_END_DECLS
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 15:12:19 2008
@@ -54,15 +54,15 @@
#include "tracker-applet.h"
#include "tracker-applet-marshallers.h"
-#define PROGRAM "tracker-applet"
-#define PROGRAM_NAME N_("Tracker Applet")
+#define PROGRAM "tracker-applet"
+#define PROGRAM_NAME N_("Tracker Applet")
-#define HOMEPAGE "http://www.tracker-project.org/";
-#define DESCRIPTION "An applet for tracker"
+#define HOMEPAGE "http://www.tracker-project.org/";
+#define DESCRIPTION "An applet for tracker"
-#define DBUS_SERVICE_TRACKER "org.freedesktop.Tracker"
-#define DBUS_PATH_TRACKER "/org/freedesktop/tracker"
-#define DBUS_INTERFACE_TRACKER "org.freedesktop.Tracker"
+#define DBUS_SERVICE_TRACKER "org.freedesktop.Tracker"
+#define DBUS_PATH_TRACKER "/org/freedesktop/tracker"
+#define DBUS_INTERFACE_TRACKER "org.freedesktop.Tracker"
#define TRAY_ICON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_TRAY_ICON, TrayIconPrivate))
@@ -156,7 +156,7 @@
} TrayIconPrivate;
static void set_auto_pause (TrayIcon *icon,
- gboolean pause);
+ gboolean pause);
static TrayIcon *main_icon;
@@ -164,10 +164,10 @@
static gchar *initial_index_2;
static gchar *index_icons[4] = {
- "tracker-applet-default.png",
- "tracker-applet-paused.png",
- "tracker-applet-indexing1.png",
- "tracker-applet-indexing2.png"
+ "tracker-applet-default.png",
+ "tracker-applet-paused.png",
+ "tracker-applet-indexing1.png",
+ "tracker-applet-indexing2.png"
};
static Stat_Info stat_info[13] = {
@@ -190,9 +190,9 @@
static GOptionEntry entries[] = {
{ "disable-daemon-start", 'd', 0, G_OPTION_ARG_NONE, &disable_daemon_start,
- NULL,
- NULL
- },
+ NULL,
+ NULL
+ },
{ NULL }
};
@@ -225,9 +225,9 @@
const char *status = NULL;
GString *hint;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
- hint = g_string_new ("Tracker");
+ hint = g_string_new ("Tracker");
switch (priv->index_state) {
case INDEX_INITIALIZING:
@@ -244,10 +244,10 @@
break;
}
- if (status) {
- g_string_append (hint, " : ");
- g_string_append (hint, status);
- }
+ if (status) {
+ g_string_append (hint, " : ");
+ g_string_append (hint, status);
+ }
if (priv->user_pause) {
status = _("paused by user");
@@ -260,58 +260,58 @@
break;
#if 0
case PAUSE_BATTERY:
- /* FIXME: We need to check if we are on the
- * battery first, this state purely means we
- * WILL pause on battery.
- */
+ /* FIXME: We need to check if we are on the
+ * battery first, this state purely means we
+ * WILL pause on battery.
+ */
status = _("paused by battery");
break;
#endif
- default:
+ default:
case PAUSE_NONE:
status = NULL;
break;
}
}
- if (status) {
- g_string_append_printf (hint, " (%s)", status);
- }
+ if (status) {
+ g_string_append_printf (hint, " (%s)", status);
+ }
if (priv->index_state == INDEX_BUSY) {
- gchar *str1;
- gchar *str2;
+ gchar *str1;
+ gchar *str2;
+
+ str1 = tracker_seconds_estimate_to_string (priv->seconds_elapsed,
+ FALSE,
+ priv->items_done,
+ priv->items_remaining);
+ str2 = tracker_seconds_to_string (priv->seconds_elapsed, FALSE);
+
+ if (str1) {
+ str1[0] = g_ascii_toupper (str1[0]);
+ }
- str1 = tracker_seconds_estimate_to_string (priv->seconds_elapsed,
- FALSE,
- priv->items_done,
- priv->items_remaining);
- str2 = tracker_seconds_to_string (priv->seconds_elapsed, FALSE);
-
- if (str1) {
- str1[0] = g_ascii_toupper (str1[0]);
- }
-
- if (str2) {
- str2[0] = g_ascii_toupper (str2[0]);
- }
-
- g_string_append_printf (hint,
- "\n"
- "\n"
- "%s : %d of %d\n"
- "%s : %s\n"
- "%s : %s",
- _("Done"),
- priv->items_done,
- priv->items_total,
- _("Estimated"),
- str1,
- _("Elapsed"),
- str2);
+ if (str2) {
+ str2[0] = g_ascii_toupper (str2[0]);
+ }
- g_free (str2);
- g_free (str1);
+ g_string_append_printf (hint,
+ "\n"
+ "\n"
+ "%s : %d of %d\n"
+ "%s : %s\n"
+ "%s : %s",
+ _("Done"),
+ priv->items_done,
+ priv->items_total,
+ _("Estimated"),
+ str1,
+ _("Elapsed"),
+ str2);
+
+ g_free (str2);
+ g_free (str1);
}
if (priv->index_state == INDEX_MERGING) {
@@ -330,14 +330,14 @@
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
if (priv->user_pause ||
- priv->pause_state == PAUSE_BATTERY ||
+ priv->pause_state == PAUSE_BATTERY ||
priv->disabled ||
- priv->indexer_stopped) {
+ priv->indexer_stopped) {
return FALSE;
- }
+ }
switch (priv->auto_pause_setting) {
case AUTO_PAUSE_NONE:
@@ -359,16 +359,16 @@
name = index_icons[priv->index_icon];
path = g_build_filename (SHAREDIR,
- "tracker",
- "icons",
- name,
- NULL);
+ "tracker",
+ "icons",
+ name,
+ NULL);
if (g_file_test (path, G_FILE_TEST_EXISTS)) {
- gtk_status_icon_set_from_file (priv->icon, path);
+ gtk_status_icon_set_from_file (priv->icon, path);
} else {
- g_critical ("Could not find icon:'%s'", path);
- }
+ g_critical ("Could not find icon:'%s'", path);
+ }
g_free (path);
}
@@ -378,7 +378,7 @@
{
if (!priv->user_pause) {
if (priv->index_state == INDEX_INITIALIZING ||
- priv->index_state == INDEX_IDLE) {
+ priv->index_state == INDEX_IDLE) {
priv->animated = FALSE;
priv->animated_timer_active = FALSE;
@@ -392,8 +392,8 @@
}
if (priv->user_pause ||
- priv->auto_pause ||
- priv->pause_state != PAUSE_NONE) {
+ priv->auto_pause ||
+ priv->pause_state != PAUSE_NONE) {
if (priv->index_icon != ICON_PAUSED) {
priv->index_icon = ICON_PAUSED;
set_tracker_icon (priv);
@@ -406,7 +406,7 @@
}
if (priv->index_state != INDEX_INITIALIZING &&
- priv->index_state != INDEX_IDLE) {
+ priv->index_state != INDEX_IDLE) {
if (priv->index_icon == ICON_INDEX2 || !priv->show_animation) {
priv->index_icon = ICON_DEFAULT;
} else if (priv->index_icon != ICON_INDEX1) {
@@ -426,18 +426,18 @@
static gboolean
auto_pause_timeout (gpointer data)
{
- TrayIcon *icon;
+ TrayIcon *icon;
TrayIconPrivate *priv;
- time_t t;
+ time_t t;
- icon = data;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ icon = data;
+ priv = TRAY_ICON_GET_PRIVATE (icon);
t = time (NULL);
if (priv->indexer_stopped) {
return FALSE;
- }
+ }
if (t >= priv->auto_pause_last_time_event + 2) {
set_auto_pause (icon, FALSE);
@@ -445,22 +445,22 @@
}
dbus_g_proxy_begin_call (priv->tracker->proxy,
- "PromptIndexSignals",
+ "PromptIndexSignals",
NULL,
- NULL,
- NULL,
- G_TYPE_INVALID);
+ NULL,
+ NULL,
+ G_TYPE_INVALID);
return TRUE;
}
static void
set_auto_pause (TrayIcon *icon,
- gboolean pause)
+ gboolean pause)
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
/* Do not pause/unpause if in user pause */
if (priv->user_pause) {
@@ -497,11 +497,11 @@
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
if (!can_auto_pause (icon)) {
return;
- }
+ }
priv->auto_pause_last_time_event = time (NULL);
@@ -513,20 +513,20 @@
static void
set_user_pause (TrayIcon *icon,
- gboolean pause)
+ gboolean pause)
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
priv->user_pause = pause;
- tracker_set_bool_option (priv->tracker, "Pause", pause, NULL);
+ tracker_set_bool_option (priv->tracker, "Pause", pause, NULL);
}
static void
notice_events_inner (Window window,
- gboolean enable,
- gboolean top)
+ gboolean enable,
+ gboolean top)
{
XWindowAttributes attrs;
unsigned long events;
@@ -545,10 +545,10 @@
kids = NULL;
status = XQueryTree (GDK_DISPLAY (),
- window,
- &root,
- &parent,
- &kids,
+ window,
+ &root,
+ &parent,
+ &kids,
&nkids);
if (status == 0) {
@@ -635,8 +635,8 @@
}
static void
-notice_events (Window window,
- gboolean enable)
+notice_events (Window window,
+ gboolean enable)
{
gdk_error_trap_push ();
@@ -654,13 +654,13 @@
static GdkFilterReturn
filter_x_events (GdkXEvent *xevent,
- GdkEvent *event,
- gpointer data)
+ GdkEvent *event,
+ gpointer data)
{
XEvent *ev;
TrayIcon *icon;
- icon = data;
+ icon = data;
ev = xevent;
switch (ev->xany.type) {
@@ -678,13 +678,13 @@
break;
case CreateNotify: {
- Window window;
+ Window window;
- window = ev->xcreatewindow.window;
- start_notice_events (window);
+ window = ev->xcreatewindow.window;
+ start_notice_events (window);
break;
- }
+ }
case MotionNotify:
if (ev->xmotion.is_hint) {
@@ -715,11 +715,11 @@
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
if (priv->is_watching_events) {
return;
- }
+ }
gdk_window_add_filter (NULL, (GdkFilterFunc) filter_x_events, icon);
start_notice_events (DefaultRootWindow (GDK_DISPLAY ()));
@@ -731,11 +731,11 @@
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
if (!priv->is_watching_events) {
return;
- }
+ }
stop_notice_events (DefaultRootWindow (GDK_DISPLAY ()));
gdk_window_remove_filter (NULL, (GdkFilterFunc) filter_x_events, icon);
@@ -750,35 +750,35 @@
static void
activate_icon (GtkStatusIcon *icon,
- gpointer data)
+ gpointer data)
{
- GError *error = NULL;
+ GError *error = NULL;
const gchar *command = "tracker-search-tool";
- g_print ("Spawning command:'%s'\n", command);
+ g_print ("Spawning command:'%s'\n", command);
- if (!g_spawn_command_line_async (command, &error)) {
- g_warning ("Unable to execute command:'%s', %s",
- command,
- error->message);
- g_error_free (error);
- }
+ if (!g_spawn_command_line_async (command, &error)) {
+ g_warning ("Unable to execute command:'%s', %s",
+ command,
+ error->message);
+ g_error_free (error);
+ }
}
static void
search_menu_activated (GtkMenuItem *item,
- gpointer data)
+ gpointer data)
{
activate_icon (NULL, NULL);
}
static void
pause_menu_toggled (GtkCheckMenuItem *item,
- gpointer data)
+ gpointer data)
{
TrayIcon *icon;
- icon = TRAY_ICON (data);
+ icon = TRAY_ICON (data);
set_user_pause (icon,
gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item)));
@@ -786,11 +786,11 @@
static inline void
set_auto_pause_setting (TrayIcon *icon,
- AutoPauseEnum auto_pause)
+ AutoPauseEnum auto_pause)
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
priv->auto_pause_setting = auto_pause;
}
@@ -803,18 +803,18 @@
guint length;
gchar *contents;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
g_key_file_set_boolean (priv->keyfile,
- "Applet", "AnimateWhenIndexing",
+ "Applet", "AnimateWhenIndexing",
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->chk_animate)));
g_key_file_set_boolean (priv->keyfile,
- "Applet", "AutoHideIcon",
+ "Applet", "AutoHideIcon",
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->chk_show_icon)));
g_key_file_set_integer (priv->keyfile, "Applet", "SmartPause",
priv->auto_pause_setting);
- contents = g_key_file_to_data (priv->keyfile, &length, &error);
+ contents = g_key_file_to_data (priv->keyfile, &length, &error);
if (error) {
g_error ("failed: g_key_file_to_data(): %s\n",
@@ -828,11 +828,11 @@
static void
prefs_closed (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (data);
+ priv = TRAY_ICON_GET_PRIVATE (data);
save_options (data);
@@ -841,7 +841,7 @@
static void
opt_pause_off_group_changed_cb (GtkToggleButton *check_button,
- gpointer user_data)
+ gpointer user_data)
{
TrayIcon *icon;
TrayIconPrivate *priv;
@@ -849,7 +849,7 @@
if (!gtk_toggle_button_get_active (check_button)) {
return;
- }
+ }
icon = user_data;
priv = TRAY_ICON_GET_PRIVATE (icon);
@@ -889,26 +889,26 @@
static void
chk_animate_toggled_cb (GtkToggleButton *check_button,
- gpointer user_data)
+ gpointer user_data)
{
TrayIcon *icon;
TrayIconPrivate *priv;
- icon = user_data;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ icon = user_data;
+ priv = TRAY_ICON_GET_PRIVATE (icon);
priv->show_animation = gtk_toggle_button_get_active (check_button);
}
static void
chk_show_icon_toggled_cb (GtkToggleButton *check_button,
- gpointer user_data)
+ gpointer user_data)
{
TrayIcon *icon;
TrayIconPrivate *priv;
- icon = user_data;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ icon = user_data;
+ priv = TRAY_ICON_GET_PRIVATE (icon);
if (gtk_toggle_button_get_active (check_button)) {
priv->auto_hide = TRUE;
@@ -917,7 +917,7 @@
priv->auto_hide = FALSE;
if (!priv->disabled) {
gtk_status_icon_set_visible (priv->icon, TRUE);
- }
+ }
}
}
@@ -926,23 +926,23 @@
{
TrayIconPrivate *priv;
GladeXML *glade;
- gchar *filename;
+ gchar *filename;
- priv = TRAY_ICON_GET_PRIVATE (icon);
- filename = g_build_filename (SHAREDIR,
- "tracker",
- "tracker-applet-prefs.glade",
- NULL);
- glade = glade_xml_new (filename, NULL, NULL);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
+ filename = g_build_filename (SHAREDIR,
+ "tracker",
+ "tracker-applet-prefs.glade",
+ NULL);
+ glade = glade_xml_new (filename, NULL, NULL);
if (!glade) {
g_error ("Unable to find locate '%s'", filename);
- g_free (filename);
+ g_free (filename);
priv->prefs_window = NULL;
return;
}
- g_free (filename);
+ g_free (filename);
priv->prefs_window = glade_xml_get_widget (glade, "wnd_prefs");
gtk_widget_hide (priv->prefs_window);
@@ -971,12 +971,12 @@
case AUTO_PAUSE_INDEXING:
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(priv->opt_pause_index), TRUE);
- break;
+ break;
case AUTO_PAUSE_MERGING:
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(priv->opt_pause_merge), TRUE);
- break;
+ break;
}
/* connect signal handlers */
@@ -1001,8 +1001,8 @@
static void
restart_tracker (GtkDialog *dialog,
- gint response,
- TrayIcon *icon)
+ gint response,
+ TrayIcon *icon)
{
gtk_widget_destroy (GTK_WIDGET (dialog));
@@ -1011,7 +1011,7 @@
g_print ("Attempting to restart tracker\n");
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
priv->reindex = TRUE;
dbus_g_proxy_begin_call (priv->tracker->proxy,
@@ -1021,21 +1021,21 @@
NULL,
G_TYPE_BOOLEAN,
TRUE, G_TYPE_INVALID);
- }
+ }
}
static void
reindex (GtkMenuItem *item,
- TrayIcon *icon)
+ TrayIcon *icon)
{
GtkWidget *dialog;
- gchar *primary;
- gchar *secondary;
+ gchar *primary;
+ gchar *secondary;
primary = g_strdup (_("Re-index your system?"));
secondary =
g_strdup (_("Indexing can take a long time. "
- "Are you sure you want to re-index?"));
+ "Are you sure you want to re-index?"));
dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
@@ -1060,11 +1060,11 @@
static void
applet_preferences_menu_activated (GtkMenuItem *item,
- gpointer data)
+ gpointer data)
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (data);
+ priv = TRAY_ICON_GET_PRIVATE (data);
create_prefs (data);
@@ -1073,31 +1073,31 @@
static void
preferences_menu_activated (GtkMenuItem *item,
- gpointer data)
+ gpointer data)
{
- GError *error = NULL;
+ GError *error = NULL;
const gchar *command = "tracker-preferences";
- g_print ("Spawning command:'%s'\n", command);
+ g_print ("Spawning command:'%s'\n", command);
- if (!g_spawn_command_line_async (command, &error)) {
- g_warning ("Unable to execute command:'%s', %s",
- command,
- error->message);
- g_error_free (error);
- }
+ if (!g_spawn_command_line_async (command, &error)) {
+ g_warning ("Unable to execute command:'%s', %s",
+ command,
+ error->message);
+ g_error_free (error);
+ }
}
static void
stat_window_free (GtkWidget *widget,
- gint arg,
- gpointer data)
+ gint arg,
+ gpointer data)
{
TrayIcon *icon;
TrayIconPrivate *priv;
- icon = data;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ icon = data;
+ priv = TRAY_ICON_GET_PRIVATE (icon);
priv->stat_window_active = FALSE;
@@ -1105,8 +1105,8 @@
}
static gchar *
-get_stat_value (gchar ***stat_array,
- const gchar *stat)
+get_stat_value (gchar ***stat_array,
+ const gchar *stat)
{
gchar **array;
gint i = 0;
@@ -1126,20 +1126,20 @@
static void
update_stats (GPtrArray *array,
- GError *error,
- gpointer data)
+ GError *error,
+ gpointer data)
{
TrayIcon *icon;
TrayIconPrivate *priv;
- gchar ***pdata;
- guint i;
+ gchar ***pdata;
+ guint i;
- icon = data;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ icon = data;
+ priv = TRAY_ICON_GET_PRIVATE (icon);
if (error) {
g_warning ("Could not update statistics, %s",
- error->message);
+ error->message);
g_error_free (error);
priv->stat_request_pending = FALSE;
return;
@@ -1173,7 +1173,7 @@
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
if (!priv->stat_window_active || priv->stat_request_pending) {
return;
@@ -1183,34 +1183,34 @@
tracker_get_stats_async (priv->tracker,
(TrackerGPtrArrayReply) update_stats,
- icon);
+ icon);
}
static void
statistics_menu_activated (GtkMenuItem *item,
- gpointer data)
+ gpointer data)
{
TrayIcon *icon;
TrayIconPrivate *priv;
GtkWidget *dialog;
- GtkWidget *table;
- GtkWidget *title_label;
- GtkWidget *label_to_add;
- GtkWidget *dialog_hbox;
- GtkWidget *info_icon;
+ GtkWidget *table;
+ GtkWidget *title_label;
+ GtkWidget *label_to_add;
+ GtkWidget *dialog_hbox;
+ GtkWidget *info_icon;
gint i;
- icon = data;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ icon = data;
+ priv = TRAY_ICON_GET_PRIVATE (icon);
- dialog = gtk_dialog_new_with_buttons (_("Statistics"),
- NULL,
- GTK_DIALOG_NO_SEPARATOR
- |
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE,
- GTK_RESPONSE_CLOSE,
- NULL);
+ dialog = gtk_dialog_new_with_buttons (_("Statistics"),
+ NULL,
+ GTK_DIALOG_NO_SEPARATOR
+ |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CLOSE,
+ GTK_RESPONSE_CLOSE,
+ NULL);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
@@ -1256,7 +1256,7 @@
dialog_hbox = gtk_hbox_new (FALSE, 12);
info_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO,
- GTK_ICON_SIZE_DIALOG);
+ GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (info_icon), 0, 0);
gtk_container_add (GTK_CONTAINER (dialog_hbox), info_icon);
gtk_container_add (GTK_CONTAINER (dialog_hbox), table);
@@ -1265,15 +1265,15 @@
dialog_hbox);
g_signal_connect (G_OBJECT (dialog), "response",
- G_CALLBACK (stat_window_free),
- icon);
+ G_CALLBACK (stat_window_free),
+ icon);
gtk_widget_show_all (dialog);
}
static void
open_uri (GtkWindow *parent,
- const char *uri)
+ const char *uri)
{
GtkWidget *dialog;
GdkScreen *screen;
@@ -1300,16 +1300,16 @@
static void
about_url_hook (GtkAboutDialog *dialog,
- const gchar *url,
- gpointer data)
+ const gchar *url,
+ gpointer data)
{
open_uri (GTK_WINDOW (dialog), url);
}
static void
about_email_hook (GtkAboutDialog *dialog,
- const gchar *email,
- gpointer data)
+ const gchar *email,
+ gpointer data)
{
gchar *uri;
@@ -1379,9 +1379,9 @@
license_trans, "wrap-license", TRUE, "authors",
authors, "documenters", documenters,
/* Translators should localize the following string
- * which will be displayed at the bottom of the about
- * box to give credit to the translator(s).
- */
+ * which will be displayed at the bottom of the about
+ * box to give credit to the translator(s).
+ */
"translator-credits", _("translator-credits"),
"logo-icon-name", "tracker",
"website", "http://www.tracker-project.org/";,
@@ -1392,7 +1392,7 @@
static void
quit_menu_activated (GtkMenuItem *item,
- gpointer data)
+ gpointer data)
{
gtk_main_quit ();
}
@@ -1403,7 +1403,7 @@
TrayIconPrivate *priv;
GtkWidget *item, *image;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
priv->menu = (GtkMenu *) gtk_menu_new ();
item = gtk_check_menu_item_new_with_mnemonic (_("_Pause All Indexing"));
@@ -1482,19 +1482,19 @@
static void
index_finished (DBusGProxy *proxy,
- gdouble seconds_elapsed,
- TrayIcon *icon)
+ gdouble seconds_elapsed,
+ TrayIcon *icon)
{
- gchar *str;
+ gchar *str;
str = tracker_seconds_to_string (seconds_elapsed, FALSE);
tray_icon_show_message (icon,
- "%s in %s.\n"
- "\n"
- "%s",
- _("Tracker has finished indexing your system"),
+ "%s in %s.\n"
+ "\n"
+ "%s",
+ _("Tracker has finished indexing your system"),
str,
- _("You can now perform searches by clicking here"));
+ _("You can now perform searches by clicking here"));
g_free (str);
stop_watching_events (icon);
@@ -1502,23 +1502,23 @@
static void
index_state_changed (DBusGProxy *proxy,
- const gchar *state,
- gboolean initial_index,
- gboolean in_merge,
- gboolean is_manual_paused,
- gboolean is_battery_paused,
- gboolean is_io_paused,
- gboolean is_indexing_enabled,
- TrayIcon *icon)
+ const gchar *state,
+ gboolean initial_index,
+ gboolean in_merge,
+ gboolean is_manual_paused,
+ gboolean is_battery_paused,
+ gboolean is_io_paused,
+ gboolean is_indexing_enabled,
+ TrayIcon *icon)
{
TrayIconPrivate *priv;
- gboolean paused;
+ gboolean paused;
if (!state) {
return;
- }
+ }
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
priv->indexer_stopped = FALSE;
paused = FALSE;
@@ -1538,10 +1538,10 @@
priv->initial_index_msg_shown = TRUE;
g_usleep (G_USEC_PER_SEC / 10);
tray_icon_show_message (icon,
- "%s\n"
- "\n"
- "%s\n",
- initial_index_1,
+ "%s\n"
+ "\n"
+ "%s\n",
+ initial_index_1,
initial_index_2);
}
@@ -1597,17 +1597,17 @@
static void
index_progress_changed (DBusGProxy *proxy,
- const gchar *service,
+ const gchar *service,
const gchar *uri,
- gint items_done,
- gint items_remaining,
- gint items_total,
- gdouble seconds_elapsed,
+ gint items_done,
+ gint items_remaining,
+ gint items_total,
+ gdouble seconds_elapsed,
TrayIcon *icon)
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
priv->items_done = items_done;
priv->items_remaining = items_remaining;
@@ -1616,10 +1616,10 @@
priv->email_indexing = strcmp (service, "Emails") == 0;
- g_print ("Indexed %d/%d, seconds elapsed:%f\n",
- items_done,
- items_total,
- seconds_elapsed);
+ g_print ("Indexed %d/%d, seconds elapsed:%f\n",
+ items_done,
+ items_total,
+ seconds_elapsed);
set_status_hint (icon);
set_icon (priv);
@@ -1633,7 +1633,7 @@
{
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
priv->index_state = INDEX_INITIALIZING;
priv->pause_state = PAUSE_NONE;
@@ -1657,33 +1657,33 @@
}
static void
-name_owner_changed (DBusGProxy *proxy,
- const gchar *name,
+name_owner_changed (DBusGProxy *proxy,
+ const gchar *name,
const gchar *prev_owner,
- const gchar *new_owner,
- gpointer data)
+ const gchar *new_owner,
+ gpointer data)
{
if (!g_str_equal (name, DBUS_SERVICE_TRACKER)) {
return;
- }
+ }
if (g_str_equal (new_owner, "")) {
TrayIconPrivate *priv;
- priv = TRAY_ICON_GET_PRIVATE (data);
+ priv = TRAY_ICON_GET_PRIVATE (data);
/* Tracker has exited so reset status and make
- * invisible until trackerd relaunched.
- */
+ * invisible until trackerd relaunched.
+ */
index_state_changed (proxy,
- "Idle",
- FALSE,
- FALSE,
- FALSE,
+ "Idle",
+ FALSE,
+ FALSE,
FALSE,
- FALSE,
- FALSE,
- data);
+ FALSE,
+ FALSE,
+ FALSE,
+ data);
init_settings (data);
gtk_status_icon_set_visible (priv->icon, FALSE);
@@ -1693,22 +1693,22 @@
priv->reindex ? "reindexing" : "not reindexing");
if (priv->reindex) {
- GError *error = NULL;
+ GError *error = NULL;
const gchar *command = "trackerd";
priv->reindex = FALSE;
- g_print ("Restarting Tracker daemon in 1 second\n");
+ g_print ("Restarting Tracker daemon in 1 second\n");
g_usleep (G_USEC_PER_SEC);
- g_print ("Spawning command:'%s'\n", command);
+ g_print ("Spawning command:'%s'\n", command);
if (!g_spawn_command_line_async (command, &error)) {
g_warning ("Unable to execute command:'%s', %s",
command,
- error->message);
- g_error_free (error);
- }
+ error->message);
+ g_error_free (error);
+ }
}
}
}
@@ -1720,7 +1720,7 @@
DBusGConnection *connection;
DBusGProxy *dbus_proxy;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
priv->tracker = tracker_connect (FALSE);
@@ -1731,25 +1731,25 @@
/* 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_BOOLEAN,
- G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN,
- G_TYPE_INVALID);
+ 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_INVALID);
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_INT,
- G_TYPE_INT,
- G_TYPE_DOUBLE,
- G_TYPE_INVALID);
+ G_TYPE_NONE,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_INT,
+ G_TYPE_INT,
+ G_TYPE_INT,
+ G_TYPE_DOUBLE,
+ G_TYPE_INVALID);
dbus_g_proxy_add_signal (priv->tracker->proxy,
"IndexStateChange",
@@ -1760,7 +1760,7 @@
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
- G_TYPE_INVALID);
+ G_TYPE_INVALID);
dbus_g_proxy_add_signal (priv->tracker->proxy,
"IndexProgress",
@@ -1768,32 +1768,32 @@
G_TYPE_STRING,
G_TYPE_INT,
G_TYPE_INT,
- G_TYPE_INT,
- G_TYPE_DOUBLE,
- G_TYPE_INVALID);
+ G_TYPE_INT,
+ G_TYPE_DOUBLE,
+ G_TYPE_INVALID);
dbus_g_proxy_add_signal (priv->tracker->proxy,
"IndexFinished",
- G_TYPE_DOUBLE,
- G_TYPE_INVALID);
+ G_TYPE_DOUBLE,
+ G_TYPE_INVALID);
dbus_g_proxy_connect_signal (priv->tracker->proxy,
"IndexStateChange",
G_CALLBACK (index_state_changed),
icon,
- NULL);
+ NULL);
dbus_g_proxy_connect_signal (priv->tracker->proxy,
"IndexProgress",
G_CALLBACK (index_progress_changed),
icon,
- NULL);
+ NULL);
dbus_g_proxy_connect_signal (priv->tracker->proxy,
"IndexFinished",
G_CALLBACK (index_finished),
- icon,
- NULL);
+ icon,
+ NULL);
connection = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
dbus_proxy = dbus_g_proxy_new_for_name (connection,
@@ -1814,20 +1814,20 @@
/* Prompt for updated signals */
dbus_g_proxy_begin_call (priv->tracker->proxy,
- "PromptIndexSignals",
+ "PromptIndexSignals",
+ NULL,
NULL,
- NULL,
- NULL,
- G_TYPE_INVALID);
+ NULL,
+ G_TYPE_INVALID);
return FALSE;
}
static void
tray_icon_clicked (GtkStatusIcon *status_icon,
- guint button,
- guint timestamp,
- gpointer data)
+ guint button,
+ guint timestamp,
+ gpointer data)
{
TrayIcon *icon;
TrayIconPrivate *priv;
@@ -1836,16 +1836,16 @@
priv = TRAY_ICON_GET_PRIVATE (icon);
gtk_menu_popup (GTK_MENU (priv->menu),
- NULL, NULL,
+ NULL, NULL,
gtk_status_icon_position_menu,
- status_icon,
- button,
+ status_icon,
+ button,
timestamp);
}
static void
tray_icon_init (GTypeInstance *instance,
- gpointer klass)
+ gpointer klass)
{
TrayIcon *icon;
TrayIconPrivate *priv;
@@ -1861,10 +1861,10 @@
g_signal_connect (G_OBJECT (priv->icon), "activate",
G_CALLBACK (activate_icon),
- instance);
+ instance);
g_signal_connect (G_OBJECT (priv->icon), "popup-menu",
G_CALLBACK (tray_icon_clicked),
- instance);
+ instance);
/* Build context menu */
create_context_menu (icon);
@@ -1876,14 +1876,14 @@
void
tray_icon_set_tooltip (TrayIcon *icon,
- const gchar *format,
- ...)
+ const gchar *format,
+ ...)
{
TrayIconPrivate *priv;
gchar *tooltip = NULL;
va_list args;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
va_start (args, format);
tooltip = g_strdup_vprintf (format, args);
@@ -1896,15 +1896,15 @@
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);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
va_start (args, message);
msg = g_strdup_vprintf (message, args);
@@ -1912,17 +1912,17 @@
if (priv->disabled) {
return;
- }
+ }
if (!priv->auto_hide && !gtk_status_icon_get_visible (priv->icon)) {
gtk_status_icon_set_visible (priv->icon, TRUE);
- }
+ }
notification =
notify_notification_new_with_status_icon ("Tracker",
- msg,
+ msg,
NULL,
- priv->icon);
+ priv->icon);
notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
notify_notification_show (notification, NULL);
@@ -1951,9 +1951,9 @@
};
type = g_type_register_static (G_TYPE_OBJECT,
- "TrayIconType",
+ "TrayIconType",
&info,
- 0);
+ 0);
}
return type;
@@ -1965,7 +1965,7 @@
TrayIconPrivate *priv;
GError *error = NULL;
- priv = TRAY_ICON_GET_PRIVATE (icon);
+ priv = TRAY_ICON_GET_PRIVATE (icon);
if (!priv->keyfile) {
priv->keyfile = g_key_file_new ();
@@ -1973,11 +1973,11 @@
if (!g_file_test (priv->filename, G_FILE_TEST_EXISTS)) {
gchar *tracker_dir;
- gchar *contents;
+ gchar *contents;
- tracker_dir = g_build_path (g_get_user_config_dir (),
- "tracker",
- NULL);
+ tracker_dir = g_build_path (g_get_user_config_dir (),
+ "tracker",
+ NULL);
if (!g_file_test (tracker_dir, G_FILE_TEST_EXISTS)) {
g_mkdir_with_parents (tracker_dir, 0700);
@@ -1986,29 +1986,29 @@
g_free (tracker_dir);
contents = g_strconcat ("[Applet]\n",
- "AnimateWhenIndexing=true\n"
- "\n",
- "AutoHideIcon=false\n"
- "\n",
- "SmartPause=2\n",
- NULL);
+ "AnimateWhenIndexing=true\n"
+ "\n",
+ "AutoHideIcon=false\n"
+ "\n",
+ "SmartPause=2\n",
+ NULL);
g_file_set_contents (priv->filename,
- contents,
+ contents,
strlen (contents),
- NULL);
+ NULL);
g_free (contents);
}
if (!g_key_file_load_from_file (priv->keyfile,
- priv->filename,
- G_KEY_FILE_KEEP_COMMENTS,
- &error) || error) {
+ 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",
- priv->filename,
- error->message);
- }
+ priv->filename,
+ error->message);
+ }
priv->show_animation = TRUE;
priv->auto_hide = FALSE;
@@ -2018,37 +2018,37 @@
}
if (g_key_file_has_key (priv->keyfile,
- "Applet",
- "AnimateWhenIndexing",
- NULL)) {
+ "Applet",
+ "AnimateWhenIndexing",
+ NULL)) {
priv->show_animation = g_key_file_get_boolean (priv->keyfile,
- "Applet",
- "AnimateWhenIndexing",
- NULL);
+ "Applet",
+ "AnimateWhenIndexing",
+ NULL);
} else {
priv->show_animation = TRUE;
}
if (g_key_file_has_key (priv->keyfile,
- "Applet",
- "AutoHideIcon",
- NULL)) {
+ "Applet",
+ "AutoHideIcon",
+ NULL)) {
priv->auto_hide = g_key_file_get_boolean (priv->keyfile,
- "Applet",
- "AutoHideIcon",
- NULL);
+ "Applet",
+ "AutoHideIcon",
+ NULL);
} else {
priv->auto_hide = FALSE;
}
if (g_key_file_has_key (priv->keyfile,
- "Applet",
- "SmartPause",
- NULL)) {
+ "Applet",
+ "SmartPause",
+ NULL)) {
priv->auto_pause_setting = g_key_file_get_integer (priv->keyfile,
- "Applet",
- "SmartPause",
- NULL);
+ "Applet",
+ "SmartPause",
+ NULL);
} else {
priv->auto_pause_setting = AUTO_PAUSE_MERGING;
}
@@ -2075,49 +2075,49 @@
break;
}
- return TRUE;
+ return TRUE;
}
int
main (int argc, char *argv[])
{
- TrayIconPrivate *priv;
- GOptionContext *context;
+ TrayIconPrivate *priv;
+ GOptionContext *context;
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
context = g_option_context_new (_("- Tracker applet for quick control of "
- "your desktop search tools"));
+ "your desktop search tools"));
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
- g_print ("Initializing GTK+\n");
+ g_print ("Initializing GTK+\n");
gtk_init (&argc, &argv);
- g_print ("Initializing libnotify\n");
+ g_print ("Initializing libnotify\n");
if (!notify_is_initted () &&
- !notify_init (PROGRAM_NAME)) {
+ !notify_init (PROGRAM_NAME)) {
g_warning ("Call to notify_init() failed\n");
return EXIT_FAILURE;
}
- g_print ("Initializing strings\n");
+ g_print ("Initializing strings\n");
gtk_window_set_default_icon_name ("tracker");
g_set_application_name (_("Tracker"));
initial_index_1 =
- _("Your computer is about to be indexed so "
- "you can perform fast searches of your files and emails");
+ _("Your computer is about to be indexed so "
+ "you can perform fast searches of your files and emails");
initial_index_2 =
- _("You can pause indexing at any time and "
- "configure index settings by right clicking here");
+ _("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:");
@@ -2132,29 +2132,29 @@
stat_info[10].label = _("Conversations:");
stat_info[11].label = _("Emails:");
- g_print ("Initializing tray icon\n");
+ g_print ("Initializing tray icon\n");
main_icon = g_object_new (TYPE_TRAY_ICON, NULL);
priv = TRAY_ICON_GET_PRIVATE (main_icon);
- g_print ("Initializing config\n");
+ g_print ("Initializing config\n");
priv->keyfile = NULL;
priv->filename = g_build_filename (g_get_user_config_dir (),
- "tracker"
- "tracker-applet.cfg",
- NULL);
+ "tracker"
+ "tracker-applet.cfg",
+ NULL);
if (!load_options (main_icon)) {
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
- g_print ("Starting main loop\n");
+ g_print ("Starting main loop\n");
gtk_main ();
- g_print ("Shutting down\n");
+ g_print ("Shutting down\n");
notify_uninit ();
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 15:12:19 2008
@@ -31,10 +31,10 @@
#include <gtk/gtkimagemenuitem.h>
#include <gtk/gtkseparatormenuitem.h>
-#define TYPE_TRAY_ICON (tray_icon_get_type())
-#define TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_TRAY_ICON, TrayIcon))
-#define TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_TRAY_ICON, TrayIconClass))
-#define IS_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), TYPE_TRAY_ICON))
+#define TYPE_TRAY_ICON (tray_icon_get_type())
+#define TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_TRAY_ICON, TrayIcon))
+#define TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_TRAY_ICON, TrayIconClass))
+#define IS_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), TYPE_TRAY_ICON))
#define IS_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), TYPE_TRAY_ICON))
#define TRAY_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), TYPE_TRAY_ICON, TrayIconClass))
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 15:12:19 2008
@@ -37,7 +37,7 @@
#include "tracker-extract.h"
static void extract_abw (const gchar *filename,
- GHashTable *metadata);
+ GHashTable *metadata);
static TrackerExtractorData data[] = {
{ "application/x-abiword", extract_abw },
@@ -46,70 +46,70 @@
static void
extract_abw (const gchar *filename,
- GHashTable *metadata)
+ GHashTable *metadata)
{
- gint fd;
+ gint fd;
FILE *f;
#if defined(__linux__)
- if ((fd = g_open (filename, (O_RDONLY | O_NOATIME))) == -1) {
+ if ((fd = g_open (filename, (O_RDONLY | O_NOATIME))) == -1) {
#else
- if ((fd = g_open (filename, O_RDONLY)) == -1) {
+ if ((fd = g_open (filename, O_RDONLY)) == -1) {
#endif
- return;
- }
+ return;
+ }
- if ((f = fdopen (fd, "r"))) {
- gchar *line;
- gsize length;
- gssize read_char;
+ if ((f = fdopen (fd, "r"))) {
+ gchar *line;
+ gsize length;
+ gssize read_char;
line = NULL;
- length = 0;
+ length = 0;
- while ((read_char = getline (&line, &length, f)) != -1) {
+ while ((read_char = getline (&line, &length, f)) != -1) {
if (g_str_has_suffix (line, "</m>\n")) {
line[read_char - 5] = '\0';
}
if (g_str_has_prefix (line, "<m key=\"dc.title\">")) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Title"),
- g_strdup (line + 18));
+ g_strdup ("Doc:Title"),
+ g_strdup (line + 18));
}
else if (g_str_has_prefix (line, "<m key=\"dc.subject\">")) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Subject"),
- g_strdup (line + 20));
+ 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 (line + 20));
+ 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 (line + 26));
+ 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 (line + 24));
+ g_strdup ("Doc:Comments"),
+ g_strdup (line + 24));
}
g_free (line);
line = NULL;
- length = 0;
+ length = 0;
}
- if (line) {
- g_free (line);
- }
-
- fclose (f);
- } else {
- close (fd);
- }
+ if (line) {
+ g_free (line);
+ }
+
+ fclose (f);
+ } else {
+ close (fd);
+ }
}
TrackerExtractorData *
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 15:12:19 2008
@@ -30,11 +30,11 @@
static gchar *
date_to_iso8601 (gchar *exif_date)
{
- /* ex; date "2007:04:15 15:35:58"
- To
- ex. "2007-04-15T17:35:58+0200 where +0200 is localtime
- */
- return tracker_generic_date_to_iso8601 (exif_date, EXIF_DATE_FORMAT);
+ /* ex; date "2007:04:15 15:35:58"
+ To
+ ex. "2007-04-15T17:35:58+0200 where +0200 is localtime
+ */
+ return tracker_generic_date_to_iso8601 (exif_date, EXIF_DATE_FORMAT);
}
@@ -48,11 +48,11 @@
static gchar *
fix_flash (gchar *flash)
{
- if (g_str_has_prefix (flash, "No")) {
- return g_strdup ("0");
- } else {
+ if (g_str_has_prefix (flash, "No")) {
+ return g_strdup ("0");
+ } else {
return g_strdup ("1");
- }
+ }
}
@@ -96,7 +96,7 @@
typedef struct {
ExifTag tag;
- gchar *name;
+ gchar *name;
PostProcessor post;
} TagType;
@@ -138,20 +138,20 @@
exif = exif_data_new_from_file (filename);
for (p = tags; p->name; ++p) {
- ExifEntry *entry = exif_data_get_entry (exif, p->tag);
+ ExifEntry *entry = exif_data_get_entry (exif, p->tag);
if (entry) {
- gchar buffer[1024];
+ gchar buffer[1024];
exif_entry_get_value (entry, buffer, 1024);
if (p->post) {
g_hash_table_insert (metadata, g_strdup (p->name),
- g_strdup ((*p->post) (buffer)));
- } else {
+ g_strdup ((*p->post) (buffer)));
+ } else {
g_hash_table_insert (metadata, g_strdup (p->name),
- g_strdup (buffer));
- }
+ g_strdup (buffer));
+ }
}
}
}
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 15:12:19 2008
@@ -25,9 +25,9 @@
* from Totem:
*
* Copyright (C) 2003-2006 the GStreamer project
- * Julien Moutte <julien moutte net>
- * Ronald Bultje <rbultje ronald bitfreak net>
- * Tim-Philipp MÃller <tim centricular net>
+ * Julien Moutte <julien moutte net>
+ * Ronald Bultje <rbultje ronald bitfreak net>
+ * Tim-Philipp MÃller <tim centricular net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -81,7 +81,7 @@
gboolean has_audio;
gboolean has_video;
- ExtractMime mime;
+ ExtractMime mime;
gint video_height;
gint video_width;
@@ -103,9 +103,9 @@
};
static void
-caps_set (GObject *object,
+caps_set (GObject *object,
MetadataExtractor *extractor,
- const gchar *type)
+ const gchar *type)
{
GstPad *pad;
GstStructure *s;
@@ -146,21 +146,21 @@
}
static void
-caps_set_audio (GObject *object,
+caps_set_audio (GObject *object,
MetadataExtractor *extractor)
{
- g_return_if_fail (object);
- g_return_if_fail (extractor);
+ g_return_if_fail (object);
+ g_return_if_fail (extractor);
caps_set (object, extractor, "audio");
}
static void
-caps_set_video (GObject *object,
+caps_set_video (GObject *object,
MetadataExtractor *extractor)
{
- g_return_if_fail (object);
- g_return_if_fail (extractor);
+ g_return_if_fail (object);
+ g_return_if_fail (extractor);
caps_set (object, extractor, "video");
}
@@ -192,7 +192,7 @@
continue;
}
- type = -1;
+ type = -1;
g_object_get (info, "type", &type, NULL);
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (info), "type");
@@ -234,15 +234,15 @@
}
static void
-gst_bus_cb (GstBus *bus,
- GstMessage *message,
+gst_bus_cb (GstBus *bus,
+ GstMessage *message,
MetadataExtractor *extractor)
{
GstMessageType msg_type;
g_return_if_fail (bus);
- g_return_if_fail (message);
- g_return_if_fail (extractor);
+ g_return_if_fail (message);
+ g_return_if_fail (extractor);
msg_type = GST_MESSAGE_TYPE (message);
@@ -263,8 +263,8 @@
switch (msg_type) {
case GST_MESSAGE_ERROR: {
GstMessage *message = NULL;
- GError *gsterror = NULL;
- gchar *debug = NULL;
+ GError *gsterror = NULL;
+ gchar *debug = NULL;
gst_message_parse_error (message, &gsterror, &debug);
g_warning ("Error: %s (%s)", gsterror->message, debug);
@@ -278,7 +278,7 @@
case GST_MESSAGE_STATE_CHANGED: {
GstState old_state, new_state;
- old_state = new_state = GST_STATE_NULL;
+ old_state = new_state = GST_STATE_NULL;
gst_message_parse_state_changed (message,
&old_state,
@@ -328,7 +328,7 @@
GstTagList *tag_list, *result;
GstElementFactory *f;
- tag_list = NULL;
+ tag_list = NULL;
gst_message_parse_tag (message, &tag_list);
@@ -351,7 +351,7 @@
GstTagList **cache;
const gchar *klass;
- cache = NULL;
+ cache = NULL;
klass = gst_element_factory_get_klass (f);
if (g_strrstr (klass, "Audio")) {
@@ -384,8 +384,8 @@
static void
add_int64_info (GHashTable *metadata,
- gchar *key,
- gint64 info)
+ gchar *key,
+ gint64 info)
{
gchar *str_info;
@@ -395,8 +395,8 @@
static void
add_uint_info (GHashTable *metadata,
- gchar *key,
- guint info)
+ gchar *key,
+ guint info)
{
gchar *str_info;
@@ -405,9 +405,9 @@
}
static void
-add_string_gst_tag (GHashTable *metadata,
+add_string_gst_tag (GHashTable *metadata,
const gchar *key,
- GstTagList *tag_list,
+ GstTagList *tag_list,
const gchar *tag)
{
gchar *s;
@@ -446,9 +446,9 @@
}
static void
-add_double_gst_tag (GHashTable *metadata,
+add_double_gst_tag (GHashTable *metadata,
const gchar *key,
- GstTagList *tag_list,
+ GstTagList *tag_list,
const gchar *tag)
{
gboolean ret;
@@ -515,10 +515,10 @@
static void
extract_metadata (MetadataExtractor *extractor,
- GHashTable *metadata)
+ GHashTable *metadata)
{
- g_return_if_fail (extractor);
- g_return_if_fail (metadata);
+ g_return_if_fail (extractor);
+ g_return_if_fail (metadata);
if (extractor->audio_channels >= 0) {
add_uint_info (metadata,
@@ -629,10 +629,10 @@
static gboolean
poll_for_state_change (MetadataExtractor *extractor,
- GstState state)
+ GstState state)
{
- GstBus *bus;
- GstMessageType events, saved_events;
+ GstBus *bus;
+ GstMessageType events, saved_events;
g_return_val_if_fail (extractor, FALSE);
g_return_val_if_fail (extractor->playbin, FALSE);
@@ -670,7 +670,7 @@
case GST_MESSAGE_STATE_CHANGED: {
GstState old, new, pending;
- old = new = pending = GST_STATE_NULL;
+ old = new = pending = GST_STATE_NULL;
if (src == extractor->playbin) {
gst_message_parse_state_changed (message, &old, &new, &pending);
@@ -685,7 +685,7 @@
}
case GST_MESSAGE_ERROR: {
- gchar *debug = NULL;
+ gchar *debug = NULL;
GError *gsterror = NULL;
gst_message_parse_error (message, &gsterror, &debug);
@@ -742,7 +742,7 @@
static void
tracker_extract_gstreamer (const gchar *uri,
GHashTable *metadata,
- ExtractMime type)
+ ExtractMime type)
{
MetadataExtractor *extractor;
gchar *mrl;
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 15:12:19 2008
@@ -38,18 +38,18 @@
} HTMLParseInfo;
static void extract_html (const gchar *filename,
- GHashTable *metadata);
+ GHashTable *metadata);
static TrackerExtractorData data[] = {
- { "text/html", extract_html },
- { "application/xhtml+xml", extract_html },
+ { "text/html", extract_html },
+ { "application/xhtml+xml", extract_html },
{ NULL, NULL }
};
static gboolean
has_attribute (const xmlChar **atts,
- const gchar *attr,
- const gchar *val)
+ const gchar *attr,
+ const gchar *val)
{
gint i;
@@ -70,7 +70,7 @@
static const xmlChar *
lookup_attribute (const xmlChar **atts,
- const gchar *attr)
+ const gchar *attr)
{
gint i;
@@ -88,9 +88,9 @@
}
void
-startElement (void *info,
- const xmlChar *name,
- const xmlChar **atts)
+startElement (void *info,
+ const xmlChar *name,
+ const xmlChar **atts)
{
if (!(info && name)) {
return;
@@ -99,75 +99,75 @@
/* Look for RDFa triple describing the license */
if (strcasecmp ((gchar*) name, "a") == 0) {
/* This tag is a license. Ignore, however, if it is
- * referring to another document.
- */
+ * referring to another document.
+ */
if (has_attribute (atts, "rel", "license") &&
- has_attribute (atts, "about", NULL) == FALSE) {
+ has_attribute (atts, "about", NULL) == FALSE) {
const xmlChar *href;
- href = lookup_attribute (atts, "href");
+ href = lookup_attribute (atts, "href");
if (href) {
g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
- g_strdup ("File:License"),
- g_strdup ((gchar*) href));
+ g_strdup ("File:License"),
+ g_strdup ((gchar*) href));
}
}
- } else if (strcasecmp ((gchar*)name, "title") == 0) {
+ } else if (strcasecmp ((gchar*)name, "title") == 0) {
((HTMLParseInfo*) info)->current = READ_TITLE;
} else if (strcasecmp ((gchar*)name, "meta") == 0) {
if (has_attribute (atts, "name", "Author")) {
const xmlChar *author;
- author = lookup_attribute (atts, "content");
+ author = lookup_attribute (atts, "content");
if (author) {
g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
- g_strdup ("Doc:Author"),
- g_strdup ((gchar*) author));
+ g_strdup ("Doc:Author"),
+ g_strdup ((gchar*) author));
}
}
if (has_attribute (atts, "name", "DC.Description")) {
const xmlChar *desc;
- desc = lookup_attribute (atts,"content");
+ desc = lookup_attribute (atts,"content");
if (desc) {
g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
- g_strdup ("Doc:Comments"),
- g_strdup ((gchar*) desc));
+ g_strdup ("Doc:Comments"),
+ g_strdup ((gchar*) desc));
}
}
- 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_strdup ("Doc:Keywords"),
- g_strdup ((gchar*) 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_strdup ("Doc:Keywords"),
+ g_strdup ((gchar*) keywords));
+ }
+ }
}
}
void
-characters (void *info,
- const xmlChar *ch,
- int len)
+characters (void *info,
+ const xmlChar *ch,
+ int len)
{
switch (((HTMLParseInfo*) info)->current) {
- case READ_TITLE:
- g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
- g_strdup ("Doc:Title"),
- g_strdup ((gchar*) ch));
- break;
- default:
- break;
+ case READ_TITLE:
+ g_hash_table_insert (((HTMLParseInfo*) info)->metadata,
+ g_strdup ("Doc:Title"),
+ g_strdup ((gchar*) ch));
+ break;
+ default:
+ break;
}
((HTMLParseInfo*) info)->current = -1;
@@ -175,7 +175,7 @@
static void
extract_html (const gchar *filename,
- GHashTable *metadata)
+ GHashTable *metadata)
{
xmlSAXHandler SAXHandlerStruct = {
NULL, /* internalSubset */
@@ -212,7 +212,7 @@
NULL /* xmlStructuredErrorFunc */
};
- HTMLParseInfo info = { metadata, -1 };
+ HTMLParseInfo info = { metadata, -1 };
htmlDocPtr doc;
doc = htmlSAXParseFile (filename, NULL, &SAXHandlerStruct, &info);
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 15:12:19 2008
@@ -46,7 +46,7 @@
};
#ifdef HAVE_EXEMPI
-#define XMP_NAMESPACE "http://ns.adobe.com/xap/1.0/\x00";
+#define XMP_NAMESPACE "http://ns.adobe.com/xap/1.0/\x00";
#define XMP_NAMESPACE_LENGTH 29
#endif /* HAVE_EXEMPI */
@@ -60,14 +60,14 @@
typedef struct {
ExifTag tag;
- gchar *name;
+ gchar *name;
PostProcessor post;
} TagType;
-static gchar *date_to_iso8601 (const gchar *exif_date);
-static gchar *fix_focal_length (const gchar *fl);
-static gchar *fix_flash (const gchar *flash);
-static gchar *fix_fnumber (const gchar *fn);
+static gchar *date_to_iso8601 (const gchar *exif_date);
+static gchar *fix_focal_length (const gchar *fl);
+static gchar *fix_flash (const gchar *flash);
+static gchar *fix_fnumber (const gchar *fn);
static gchar *fix_exposure_time (const gchar *et);
static TagType tags[] = {
@@ -100,10 +100,10 @@
static gchar *
date_to_iso8601 (const gchar *exif_date)
{
- /* From: ex; date "2007:04:15 15:35:58"
- * To : ex. "2007-04-15T17:35:58+0200 where +0200 is localtime
+ /* From: ex; date "2007:04:15 15:35:58"
+ * To : ex. "2007-04-15T17:35:58+0200 where +0200 is localtime
*/
- return tracker_generic_date_to_iso8601 (exif_date, EXIF_DATE_FORMAT);
+ return tracker_generic_date_to_iso8601 (exif_date, EXIF_DATE_FORMAT);
}
static gchar *
@@ -115,11 +115,11 @@
static gchar *
fix_flash (const gchar *flash)
{
- if (g_str_has_prefix (flash, "No")) {
- return g_strdup ("0");
- } else {
+ if (g_str_has_prefix (flash, "No")) {
+ return g_strdup ("0");
+ } else {
return g_strdup ("1");
- }
+ }
}
static gchar *
@@ -156,7 +156,7 @@
if (fraction > 0.0) {
gdouble val;
- gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
+ gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
val = 1.0f / fraction;
g_ascii_dtostr (buf, sizeof(buf), val);
@@ -172,8 +172,8 @@
static void
read_exif (const unsigned char *buffer,
- size_t len,
- GHashTable *metadata)
+ size_t len,
+ GHashTable *metadata)
{
#ifdef HAVE_LIBEXIF
ExifData *exif;
@@ -182,24 +182,24 @@
exif = exif_data_new_from_data ((unsigned char *) buffer, len);
for (p = tags; p->name; ++p) {
- ExifEntry *entry;
+ ExifEntry *entry;
entry = exif_data_get_entry (exif, p->tag);
if (entry) {
- gchar buffer[1024];
+ gchar buffer[1024];
exif_entry_get_value (entry, buffer, 1024);
if (p->post) {
g_hash_table_insert (metadata,
g_strdup (p->name),
- (*p->post) (buffer));
- } else {
+ (*p->post) (buffer));
+ } else {
g_hash_table_insert (metadata,
g_strdup (p->name),
- g_strdup (buffer));
- }
+ g_strdup (buffer));
+ }
}
}
#endif /* HAVE_LIBEXIF */
@@ -210,10 +210,10 @@
GHashTable *metadata)
{
struct jpeg_decompress_struct cinfo;
- struct jpeg_error_mgr jerr;
+ struct jpeg_error_mgr jerr;
struct jpeg_marker_struct *marker;
- FILE *jpeg;
- gint fd_jpeg;
+ FILE *jpeg;
+ gint fd_jpeg;
if ((fd_jpeg = g_open (filename, O_RDONLY)) == -1) {
return;
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 15:12:19 2008
@@ -41,7 +41,7 @@
#include "tracker-extract.h"
-#define MAX_FILE_READ 1024 * 1024 * 10
+#define MAX_FILE_READ 1024 * 1024 * 10
#define MAX_MP3_SCAN_DEEP 16768
typedef struct {
@@ -237,7 +237,7 @@
static const guint pad_mask = 0x20000;
static guint bitrate_table[16][6] = {
- {0 , 0 , 0 , 0 , 0 , 0},
+ {0 , 0 , 0 , 0 , 0 , 0},
{32 , 32 , 32 , 32 , 32 , 8},
{64 , 48 , 40 , 64 , 48 , 16},
{96 , 56 , 48 , 96 , 56 , 24},
@@ -252,7 +252,7 @@
{384, 256, 224, 384, 256, 128},
{416, 320, 256, 416, 320, 256},
{448, 384, 320, 448, 384, 320},
- {-1, -1, -1, -1, -1, -1}
+ {-1, -1, -1, -1, -1, -1}
};
static gint freq_table[4][3] = {
@@ -269,7 +269,7 @@
static gchar *
get_utf8 (const gchar *txt,
- gint size,
+ gint size,
gpointer p1,
gpointer p2,
gpointer p3)
@@ -294,7 +294,7 @@
pos = &data[size - 128];
- if (strncmp ("TAG", pos, 3) != 0) {
+ if (strncmp ("TAG", pos, 3) != 0) {
return FALSE;
}
@@ -305,16 +305,16 @@
id3->artist = get_utf8 (pos, 30, NULL, NULL, NULL);
pos += 30;
id3->album = get_utf8 (pos, 30, NULL, NULL, NULL);
- pos += 30;
- id3->year = get_utf8 (pos, 4, NULL, NULL, NULL);
+ pos += 30;
+ id3->year = get_utf8 (pos, 4, NULL, NULL, NULL);
- pos += 4;
- id3->comment = get_utf8 (pos, 30, NULL, NULL, NULL);
- pos += 30;
- id3->genre = "";
+ pos += 4;
+ id3->comment = get_utf8 (pos, 30, NULL, NULL, NULL);
+ pos += 30;
+ id3->genre = "";
- if ((guint) pos[0] < G_N_ELEMENTS (genre_names)) {
- id3->genre = g_strdup (genre_names[(unsigned) pos[0]]);
+ if ((guint) pos[0] < G_N_ELEMENTS (genre_names)) {
+ id3->genre = g_strdup (genre_names[(unsigned) pos[0]]);
}
return TRUE;
@@ -322,7 +322,7 @@
static void
mp3_parse (const gchar *data,
- size_t size,
+ size_t size,
GHashTable *metadata)
{
guint header;
@@ -500,14 +500,14 @@
size_t size,
GHashTable *metadata)
{
- gint unsync;
- gint extendedHdr;
- gint experimental;
- gint footer;
- guint tsize;
- guint pos;
- guint ehdrSize;
- guint padding;
+ gint unsync;
+ gint extendedHdr;
+ gint experimental;
+ gint footer;
+ guint tsize;
+ guint pos;
+ guint ehdrSize;
+ guint padding;
Matches tmap[] = {
{"COMM", "Audio:Comment"},
{"TCOP", "File:Copyright"},
@@ -674,14 +674,14 @@
size_t size,
GHashTable *metadata)
{
- gint unsync;
- gint extendedHdr;
- gint experimental;
- guint tsize;
- guint pos;
- guint ehdrSize;
- guint padding;
- Matches tmap[] = {
+ gint unsync;
+ gint extendedHdr;
+ gint experimental;
+ guint tsize;
+ guint pos;
+ guint ehdrSize;
+ guint padding;
+ Matches tmap[] = {
{"COMM", "Audio:Comment"},
{"TCOP", "File:Copyright"},
{"TDAT", "Audio:ReleaseDate"},
@@ -843,12 +843,12 @@
static void
get_id3v2_tags (const gchar *data,
- size_t size,
+ size_t size,
GHashTable *metadata)
{
- gint unsync;
- guint tsize;
- guint pos;
+ gint unsync;
+ guint tsize;
+ guint pos;
Matches tmap[] = {
{"TAL", "Audio:Title"},
{"TT1", "Audio:Artist"},
@@ -893,7 +893,7 @@
((data[8] & 0x7F) << 07) |
((data[9] & 0x7F) << 00));
- if (tsize + 10 > size) {
+ if (tsize + 10 > size) {
return;
}
@@ -975,11 +975,11 @@
extract_mp3 (const gchar *filename,
GHashTable *metadata)
{
- gint file;
- void *buffer;
+ gint file;
+ void *buffer;
struct stat fstatbuf;
- size_t size;
- id3tag info;
+ size_t size;
+ id3tag info;
info.title = NULL;
info.artist = NULL;
@@ -1006,17 +1006,17 @@
}
if (size > MAX_FILE_READ) {
- size = MAX_FILE_READ;
+ size = MAX_FILE_READ;
}
#ifndef OS_WIN32
buffer = mmap (NULL, size, PROT_READ, MAP_PRIVATE, file, 0);
#endif
- if (buffer == NULL || buffer == (void*) -1) {
+ if (buffer == NULL || buffer == (void*) -1) {
close(file);
return;
- }
+ }
if (!get_id3 (buffer, size, &info)) {
/* Do nothing? */
@@ -1098,9 +1098,9 @@
}
#ifndef OS_WIN32
- munmap (buffer, size);
+ munmap (buffer, size);
#endif
- close(file);
+ close(file);
}
TrackerExtractorData *
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 15:12:19 2008
@@ -31,7 +31,7 @@
#include "tracker-extract.h"
static void extract_mplayer (const gchar *filename,
- GHashTable *metadata);
+ GHashTable *metadata);
static TrackerExtractorData data[] = {
{ "audio/*", extract_mplayer },
@@ -76,17 +76,17 @@
static void
copy_hash_table_entry (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
g_hash_table_insert (user_data,
- g_strdup (key),
- g_strdup (value));
+ g_strdup (key),
+ g_strdup (value));
}
static void
extract_mplayer (const gchar *filename,
- GHashTable *metadata)
+ GHashTable *metadata)
{
gchar *argv[10];
gchar *mplayer;
@@ -104,14 +104,14 @@
if (tracker_spawn (argv, 10, &mplayer, NULL)) {
GPatternSpec *pattern_ID_AUDIO_ID;
- GPatternSpec *pattern_ID_VIDEO_ID;
+ GPatternSpec *pattern_ID_VIDEO_ID;
GPatternSpec *pattern_ID_AUDIO;
- GPatternSpec *pattern_ID_VIDEO;
- GPatternSpec *pattern_ID_CLIP_INFO_NAME;
- GPatternSpec *pattern_ID_CLIP_INFO_VALUE;
- GPatternSpec *pattern_ID_LENGTH;
+ GPatternSpec *pattern_ID_VIDEO;
+ GPatternSpec *pattern_ID_CLIP_INFO_NAME;
+ GPatternSpec *pattern_ID_CLIP_INFO_VALUE;
+ GPatternSpec *pattern_ID_LENGTH;
GHashTable *tmp_metadata_audio;
- GHashTable *tmp_metadata_video;
+ GHashTable *tmp_metadata_video;
gboolean has_audio, has_video;
gchar *duration;
gchar **lines, **line;
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 15:12:19 2008
@@ -39,21 +39,21 @@
#include "tracker-extract.h"
static void extract_msoffice (const gchar *filename,
- GHashTable *metadata);
+ GHashTable *metadata);
static TrackerExtractorData data[] = {
- { "application/msword", extract_msoffice },
- { "application/vnd.ms-*", extract_msoffice },
+ { "application/msword", extract_msoffice },
+ { "application/vnd.ms-*", extract_msoffice },
{ NULL, NULL }
};
static void
add_gvalue_in_hash_table (GHashTable *table,
- const gchar *key,
- GValue const *val)
+ const gchar *key,
+ GValue const *val)
{
g_return_if_fail (table != NULL);
- g_return_if_fail (key != NULL);
+ g_return_if_fail (key != NULL);
if (val) {
gchar *s = g_strdup_value_contents (val);
@@ -63,9 +63,9 @@
gchar *str_val;
/* Some fun: strings are always
- * written "str" with double quotes
- * around, but not numbers!
- */
+ * written "str" with double quotes
+ * around, but not numbers!
+ */
if (s[0] == '"') {
size_t len;
@@ -75,14 +75,14 @@
str_val = (len > 2 ? g_strndup (s + 1, len - 2) : NULL);
} else {
/* We have a string
- * that begins with a
- * double quote but
- * which finishes by
- * something different...
- * We copy the string
- * from the
- * beginning.
- */
+ * that begins with a
+ * double quote but
+ * which finishes by
+ * something different...
+ * We copy the string
+ * from the
+ * beginning.
+ */
str_val = g_strdup (s);
}
} else {
@@ -102,15 +102,15 @@
static void
metadata_cb (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
- gchar *name;
+ gchar *name;
GsfDocProp *property;
GHashTable *metadata;
GValue const *val;
- name = key;
+ name = key;
property = value;
metadata = user_data;
val = gsf_doc_prop_get_val (property);
@@ -138,15 +138,15 @@
static void
doc_metadata_cb (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
- gchar *name;
+ gchar *name;
GsfDocProp *property;
GHashTable *metadata;
GValue const *val;
- name = key;
+ name = key;
property = value;
metadata = user_data;
val = gsf_doc_prop_get_val (property);
@@ -158,7 +158,7 @@
static void
extract_msoffice (const gchar *filename,
- GHashTable *metadata)
+ GHashTable *metadata)
{
GsfInput *input;
GsfInfile *infile;
@@ -183,7 +183,7 @@
stream = gsf_infile_child_by_name (infile, "\05SummaryInformation");
if (stream) {
- GsfDocMetaData *md;
+ GsfDocMetaData *md;
md = gsf_doc_meta_data_new ();
@@ -200,7 +200,7 @@
stream = gsf_infile_child_by_name (infile, "\05DocumentSummaryInformation");
if (stream) {
- GsfDocMetaData *md;
+ GsfDocMetaData *md;
md = gsf_doc_meta_data_new ();
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 15:12:19 2008
@@ -29,14 +29,14 @@
#include "tracker-extract.h"
typedef enum {
- READ_TITLE,
- READ_SUBJECT,
- READ_AUTHOR,
- READ_KEYWORDS,
- READ_COMMENTS,
- READ_STATS,
- READ_CREATED,
- READ_FILE_OTHER
+ READ_TITLE,
+ READ_SUBJECT,
+ READ_AUTHOR,
+ READ_KEYWORDS,
+ READ_COMMENTS,
+ READ_STATS,
+ READ_CREATED,
+ READ_FILE_OTHER
} tag_type;
typedef struct {
@@ -44,23 +44,23 @@
tag_type current;
} ODTParseInfo;
-static void start_element_handler (GMarkupParseContext *context,
- const gchar *element_name,
- const gchar **attribute_names,
- const gchar **attribute_values,
- gpointer user_data,
- GError **error);
-static void end_element_handler (GMarkupParseContext *context,
- const gchar *element_name,
- gpointer user_data,
- GError **error);
-static void text_handler (GMarkupParseContext *context,
- const gchar *text,
- gsize text_len,
- gpointer user_data,
- GError **error);
-static void extract_oasis (const gchar *filename,
- GHashTable *metadata);
+static void start_element_handler (GMarkupParseContext *context,
+ const gchar *element_name,
+ const gchar **attribute_names,
+ const gchar **attribute_values,
+ gpointer user_data,
+ GError **error);
+static void end_element_handler (GMarkupParseContext *context,
+ const gchar *element_name,
+ gpointer user_data,
+ GError **error);
+static void text_handler (GMarkupParseContext *context,
+ const gchar *text,
+ gsize text_len,
+ gpointer user_data,
+ GError **error);
+static void extract_oasis (const gchar *filename,
+ GHashTable *metadata);
static TrackerExtractorData data[] = {
{ "application/vnd.oasis.opendocument.*", extract_oasis },
@@ -69,14 +69,14 @@
static void
extract_oasis (const gchar *filename,
- GHashTable *metadata)
+ GHashTable *metadata)
{
- gchar *argv[5];
- gchar *xml;
+ gchar *argv[5];
+ gchar *xml;
ODTParseInfo info = {
- metadata,
- -1
- };
+ metadata,
+ -1
+ };
argv[0] = g_strdup ("unzip");
argv[1] = g_strdup ("-p");
@@ -86,13 +86,13 @@
if (tracker_spawn (argv, 10, &xml, NULL)) {
GMarkupParseContext *context;
- GMarkupParser parser = {
- start_element_handler,
- end_element_handler,
- text_handler,
- NULL,
- NULL
- };
+ GMarkupParser parser = {
+ start_element_handler,
+ end_element_handler,
+ text_handler,
+ NULL,
+ NULL
+ };
context = g_markup_parse_context_new (&parser, 0, &info, NULL);
g_markup_parse_context_parse (context, xml, -1, NULL);
@@ -109,13 +109,13 @@
void
start_element_handler (GMarkupParseContext *context,
- const gchar *element_name,
- const gchar **attribute_names,
- const gchar **attribute_values,
- gpointer user_data,
- GError **error)
+ const gchar *element_name,
+ const gchar **attribute_names,
+ const gchar **attribute_values,
+ gpointer user_data,
+ GError **error)
{
- ODTParseInfo *data = user_data;
+ ODTParseInfo *data = user_data;
if (strcmp (element_name, "dc:title") == 0) {
data->current = READ_TITLE;
@@ -136,18 +136,18 @@
GHashTable *metadata;
const gchar **a, **v;
- metadata = data->metadata;
+ metadata = data->metadata;
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 (*v));
+ 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 (*v));
+ g_strdup ("Doc:PageCount"),
+ g_strdup (*v));
}
}
@@ -166,74 +166,74 @@
void
end_element_handler (GMarkupParseContext *context,
- const gchar *element_name,
- gpointer user_data,
- GError **error)
+ const gchar *element_name,
+ gpointer user_data,
+ GError **error)
{
((ODTParseInfo*) user_data)->current = -1;
}
void
text_handler (GMarkupParseContext *context,
- const gchar *text,
- gsize text_len,
- gpointer user_data,
- GError **error)
+ const gchar *text,
+ gsize text_len,
+ gpointer user_data,
+ GError **error)
{
- ODTParseInfo *data;
+ ODTParseInfo *data;
GHashTable *metadata;
- data = user_data;
- metadata = data->metadata;
+ data = user_data;
+ metadata = data->metadata;
switch (data->current) {
- case READ_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_strdup (text));
- break;
- case READ_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_strdup ("Doc:Keywords"),
- g_strconcat (keywords, ",", text, NULL));
- } else {
- 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_strdup (text));
- break;
- case READ_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_strdup (text));
- break;
+ case READ_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_strdup (text));
+ break;
+ case READ_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_strdup ("Doc:Keywords"),
+ g_strconcat (keywords, ",", text, NULL));
+ } else {
+ 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_strdup (text));
+ break;
+ case READ_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_strdup (text));
+ break;
- default:
- 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 15:12:19 2008
@@ -32,26 +32,26 @@
#include <libtracker-common/tracker-utils.h>
static void extract_pdf (const gchar *filename,
- GHashTable *metadata);
+ GHashTable *metadata);
static TrackerExtractorData data[] = {
- { "application/pdf", extract_pdf },
+ { "application/pdf", extract_pdf },
{ NULL, NULL }
};
static void
extract_pdf (const gchar *filename,
- GHashTable *metadata)
+ GHashTable *metadata)
{
PopplerDocument *document;
- gchar *tmp;
- gchar *title = NULL;
- gchar *author = NULL;
- gchar *subject = NULL;
- gchar *keywords = NULL;
- gchar *metadata_xml = NULL;
- GTime creation_date;
- GError *error = NULL;
+ gchar *tmp;
+ gchar *title = NULL;
+ gchar *author = NULL;
+ gchar *subject = NULL;
+ gchar *keywords = NULL;
+ gchar *metadata_xml = NULL;
+ GTime creation_date;
+ GError *error = NULL;
g_type_init ();
@@ -61,45 +61,45 @@
if (document == NULL || error) {
return;
- }
+ }
g_object_get (document,
- "title", &title,
- "author", &author,
- "subject", &subject,
- "keywords", &keywords,
- "creation-date", &creation_date,
- NULL);
+ "title", &title,
+ "author", &author,
+ "subject", &subject,
+ "keywords", &keywords,
+ "creation-date", &creation_date,
+ NULL);
/* metadata property not present in older poppler versions */
if (g_object_class_find_property (G_OBJECT_GET_CLASS (document), "metadata")) {
g_object_get (document, "metadata", &metadata_xml, NULL);
- }
+ }
if (!tracker_is_empty_string (title)) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Title"),
- g_strdup (title));
- }
+ g_strdup ("Doc:Title"),
+ g_strdup (title));
+ }
if (!tracker_is_empty_string (author)) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Author"),
- g_strdup (author));
- }
+ g_strdup ("Doc:Author"),
+ g_strdup (author));
+ }
if (!tracker_is_empty_string (subject)) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Subject"),
- g_strdup (subject));
- }
+ g_strdup ("Doc:Subject"),
+ g_strdup (subject));
+ }
if (!tracker_is_empty_string (keywords)) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Keywords"),
- g_strdup (keywords));
- }
+ g_strdup ("Doc:Keywords"),
+ g_strdup (keywords));
+ }
g_hash_table_insert (metadata,
- g_strdup ("Doc:PageCount"),
- g_strdup_printf ("%d", poppler_document_get_n_pages (document)));
+ g_strdup ("Doc:PageCount"),
+ g_strdup_printf ("%d", poppler_document_get_n_pages (document)));
if ( metadata_xml ) {
tracker_read_xmp (metadata_xml, strlen (metadata_xml), metadata);
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 15:12:19 2008
@@ -44,26 +44,26 @@
typedef gchar * (*PostProcessor) (gchar *);
typedef struct {
- gchar *name;
- gchar *type;
- PostProcessor post;
+ gchar *name;
+ gchar *type;
+ PostProcessor post;
} TagProcessors;
-static gchar *rfc1123_to_iso8601_date (gchar *rfc_date);
-static void extract_png (const gchar *filename,
- GHashTable *metadata);
+static gchar *rfc1123_to_iso8601_date (gchar *rfc_date);
+static void extract_png (const gchar *filename,
+ GHashTable *metadata);
static TagProcessors tag_processors[] = {
- { "Author", "Image:Creator", NULL},
- { "Creator", "Image:Creator", NULL},
- { "Description", "Image:Description", NULL},
- { "Comment", "Image:Comments", NULL},
- { "Copyright", "File:Copyright", NULL},
- { "Creation Time", "Image:Date", rfc1123_to_iso8601_date},
- { "Title", "Image:Title", NULL},
- { "Software", "Image:Software", NULL},
- { "Disclaimer", "File:License", NULL},
- { NULL, NULL, NULL},
+ { "Author", "Image:Creator", NULL},
+ { "Creator", "Image:Creator", NULL},
+ { "Description", "Image:Description", NULL},
+ { "Comment", "Image:Comments", NULL},
+ { "Copyright", "File:Copyright", NULL},
+ { "Creation Time", "Image:Date", rfc1123_to_iso8601_date},
+ { "Title", "Image:Title", NULL},
+ { "Software", "Image:Software", NULL},
+ { "Disclaimer", "File:License", NULL},
+ { NULL, NULL, NULL},
};
static TrackerExtractorData data[] = {
@@ -74,39 +74,39 @@
static gchar *
rfc1123_to_iso8601_date (gchar *rfc_date)
{
- /* From: ex. RFC1123 date: "22 May 1997 18:07:10 -0600"
- * To : ex. ISO8601 date: "2007-05-22T18:07:10-0600"
- */
- return tracker_generic_date_to_iso8601 (rfc_date, RFC1123_DATE_FORMAT);
+ /* From: ex. RFC1123 date: "22 May 1997 18:07:10 -0600"
+ * To : ex. ISO8601 date: "2007-05-22T18:07:10-0600"
+ */
+ return tracker_generic_date_to_iso8601 (rfc_date, RFC1123_DATE_FORMAT);
}
static void
extract_png (const gchar *filename,
- GHashTable *metadata)
+ GHashTable *metadata)
{
- gint fd_png;
- FILE *png;
+ gint fd_png;
+ FILE *png;
png_structp png_ptr;
png_infop info_ptr;
png_uint_32 width, height;
- gint num_text;
+ gint num_text;
png_textp text_ptr;
- gint bit_depth, color_type;
- gint interlace_type, compression_type, filter_type;
+ gint bit_depth, color_type;
+ gint interlace_type, compression_type, filter_type;
#if defined(__linux__)
- if ((fd_png = g_open (filename, (O_RDONLY | O_NOATIME))) == -1) {
+ if ((fd_png = g_open (filename, (O_RDONLY | O_NOATIME))) == -1) {
#else
- if ((fd_png = g_open (filename, O_RDONLY)) == -1) {
+ if ((fd_png = g_open (filename, O_RDONLY)) == -1) {
#endif
- return;
- }
+ return;
+ }
if ((png = fdopen (fd_png, "r"))) {
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
- NULL,
- NULL,
- NULL);
+ NULL,
+ NULL,
+ NULL);
if (!png_ptr) {
fclose (png);
return;
@@ -123,75 +123,75 @@
png_read_info (png_ptr, info_ptr);
if (png_get_text (png_ptr, info_ptr, &text_ptr, &num_text) > 0) {
- gint i;
- gint j;
+ gint i;
+ gint j;
for (i = 0; i < num_text; i++) {
if (!text_ptr[i].key) {
- continue;
- }
+ continue;
+ }
#if defined(HAVE_EXEMPI) && defined(PNG_iTXt_SUPPORTED)
- if (strcmp ("XML:com.adobe.xmp", text_ptr[i].key) == 0) {
- tracker_read_xmp (text_ptr[i].text,
- text_ptr[i].itxt_length,
- metadata);
- continue;
- }
+ if (strcmp ("XML:com.adobe.xmp", text_ptr[i].key) == 0) {
+ tracker_read_xmp (text_ptr[i].text,
+ text_ptr[i].itxt_length,
+ metadata);
+ continue;
+ }
#endif
- for (j = 0; tag_processors[j].type; j++) {
- if (strcasecmp (tag_processors[j].name, text_ptr[i].key) != 0) {
- continue;
- }
-
- if (text_ptr[i].text && text_ptr[i].text[0] != '\0') {
- if (tag_processors[j].post) {
- gchar *str;
-
- str = (*tag_processors[j].post) (text_ptr[i].text);
- if (str) {
- g_hash_table_insert (metadata,
- g_strdup (tag_processors[j].type),
- str);
- }
- } else {
- g_hash_table_insert (metadata,
- g_strdup (tag_processors[j].type),
- g_strdup (text_ptr[i].text));
- }
-
- break;
- }
- }
- }
+ for (j = 0; tag_processors[j].type; j++) {
+ if (strcasecmp (tag_processors[j].name, text_ptr[i].key) != 0) {
+ continue;
+ }
+
+ if (text_ptr[i].text && text_ptr[i].text[0] != '\0') {
+ if (tag_processors[j].post) {
+ gchar *str;
+
+ str = (*tag_processors[j].post) (text_ptr[i].text);
+ if (str) {
+ g_hash_table_insert (metadata,
+ g_strdup (tag_processors[j].type),
+ str);
+ }
+ } else {
+ g_hash_table_insert (metadata,
+ g_strdup (tag_processors[j].type),
+ g_strdup (text_ptr[i].text));
+ }
+
+ break;
+ }
+ }
+ }
}
/* Read size from header. We want native have higher
- * priority than EXIF etc.
- */
+ * priority than EXIF etc.
+ */
if (png_get_IHDR (png_ptr,
- info_ptr,
- &width,
- &height,
- &bit_depth,
- &color_type,
- &interlace_type,
- &compression_type,
- &filter_type)) {
+ info_ptr,
+ &width,
+ &height,
+ &bit_depth,
+ &color_type,
+ &interlace_type,
+ &compression_type,
+ &filter_type)) {
g_hash_table_insert (metadata,
- g_strdup ("Image:Width"),
- g_strdup_printf ("%ld", width));
+ g_strdup ("Image:Width"),
+ g_strdup_printf ("%ld", width));
g_hash_table_insert (metadata,
- g_strdup ("Image:Height"),
- g_strdup_printf ("%ld", height));
+ g_strdup ("Image:Height"),
+ g_strdup_printf ("%ld", height));
}
png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
fclose (png);
- } else {
- close (fd_png);
- }
+ } else {
+ close (fd_png);
+ }
}
TrackerExtractorData *
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 15:12:19 2008
@@ -39,9 +39,9 @@
#include "tracker-extract.h"
static void extract_ps_gz (const gchar *filename,
- GHashTable *metadata);
-static void extract_ps (const gchar *filename,
- GHashTable *metadata);
+ GHashTable *metadata);
+static void extract_ps (const gchar *filename,
+ GHashTable *metadata);
static TrackerExtractorData data[] = {
{ "application/x-gzpostscript", extract_ps_gz },
@@ -63,16 +63,16 @@
static ssize_t
igetdelim (gchar **linebuf,
- size_t *linebufsz,
- gint delimiter,
- FILE *file)
+ size_t *linebufsz,
+ gint delimiter,
+ FILE *file)
{
gint ch;
gint idx;
if ((file == NULL || linebuf == NULL || *linebuf == NULL || *linebufsz == 0) &&
- !(*linebuf == NULL && *linebufsz == 0)) {
- errno = EINVAL;
+ !(*linebuf == NULL && *linebufsz == 0)) {
+ errno = EINVAL;
return -1;
}
@@ -87,9 +87,9 @@
*linebufsz += GROWBY;
}
- idx = 0;
+ idx = 0;
- while ((ch = fgetc (file)) != EOF) {
+ while ((ch = fgetc (file)) != EOF) {
/* Grow the line buffer as necessary */
while (idx > *linebufsz - 2) {
*linebuf = g_realloc (*linebuf, *linebufsz += GROWBY);
@@ -103,22 +103,22 @@
if ((gchar) ch == delimiter) {
break;
- }
+ }
}
if (idx != 0) {
(*linebuf)[idx] = 0;
} else if ( ch == EOF ) {
return -1;
- }
+ }
return idx;
}
static gint
getline (gchar **s,
- guint *lim,
- FILE *stream)
+ guint *lim,
+ FILE *stream)
{
return igetdelim (s, lim, '\n', stream);
}
@@ -128,168 +128,168 @@
static gchar *
hour_day_str_day (const gchar *date)
{
- /* From: ex. date: "(18:07 Tuesday 22 May 2007)"
- * To : ex. ISO8601 date: "2007-05-22T18:07:10-0600"
- */
- return tracker_generic_date_to_iso8601 (date, "(%H:%M %A %d %B %Y)");
+ /* From: ex. date: "(18:07 Tuesday 22 May 2007)"
+ * To : ex. ISO8601 date: "2007-05-22T18:07:10-0600"
+ */
+ return tracker_generic_date_to_iso8601 (date, "(%H:%M %A %d %B %Y)");
}
static gchar *
day_str_month_day (const gchar *date)
{
- /* From: ex. date: "Tue May 22 18:07:10 2007"
- * To : ex. ISO8601 date: "2007-05-22T18:07:10-0600"
- */
- return tracker_generic_date_to_iso8601 (date, "%A %B %d %H:%M:%S %Y");
+ /* From: ex. date: "Tue May 22 18:07:10 2007"
+ * To : ex. ISO8601 date: "2007-05-22T18:07:10-0600"
+ */
+ return tracker_generic_date_to_iso8601 (date, "%A %B %d %H:%M:%S %Y");
}
static gchar *
day_month_year_date (const gchar *date)
{
- /* From: ex. date: "22 May 1997 18:07:10 -0600"
- * To : ex. ISO8601 date: "2007-05-22T18:07:10-0600"
- */
- return tracker_generic_date_to_iso8601 (date, "%d %B %Y %H:%M:%S %z");
+ /* From: ex. date: "22 May 1997 18:07:10 -0600"
+ * To : ex. ISO8601 date: "2007-05-22T18:07:10-0600"
+ */
+ return tracker_generic_date_to_iso8601 (date, "%d %B %Y %H:%M:%S %z");
}
static gchar *
hour_month_day_date (const gchar *date)
{
- /* From: ex. date: "6:07 PM May 22, 2007"
- * To : ex. ISO8601 date: "2007-05-22T18:07:10-0600"
- */
- return tracker_generic_date_to_iso8601 (date, "%I:%M %p %B %d, %Y");
+ /* From: ex. date: "6:07 PM May 22, 2007"
+ * To : ex. ISO8601 date: "2007-05-22T18:07:10-0600"
+ */
+ return tracker_generic_date_to_iso8601 (date, "%I:%M %p %B %d, %Y");
}
static gchar *
date_to_iso8601 (const gchar *date)
{
- if (date && date[1] && date[2]) {
- if (date[0] == '(') {
- /* we have probably a date like
- "(18:07 Tuesday 22 May 2007)" */
- return hour_day_str_day (date);
- } else if (g_ascii_isalpha (date[0])) {
- /* we have probably a date like
- "Tue May 22 18:07:10 2007" */
- return day_str_month_day (date);
-
- } else if (date[1] == ' ' || date[2] == ' ') {
- /* we have probably a date like
- "22 May 1997 18:07:10 -0600" */
- return day_month_year_date (date);
-
- } else if (date[1] == ':' || date[2] == ':') {
- /* we have probably a date like
- "6:07 PM May 22, 2007" */
- return hour_month_day_date (date);
- }
- }
+ if (date && date[1] && date[2]) {
+ if (date[0] == '(') {
+ /* we have probably a date like
+ "(18:07 Tuesday 22 May 2007)" */
+ return hour_day_str_day (date);
+ } else if (g_ascii_isalpha (date[0])) {
+ /* we have probably a date like
+ "Tue May 22 18:07:10 2007" */
+ return day_str_month_day (date);
+
+ } else if (date[1] == ' ' || date[2] == ' ') {
+ /* we have probably a date like
+ "22 May 1997 18:07:10 -0600" */
+ return day_month_year_date (date);
+
+ } else if (date[1] == ':' || date[2] == ':') {
+ /* we have probably a date like
+ "6:07 PM May 22, 2007" */
+ return hour_month_day_date (date);
+ }
+ }
- return NULL;
+ return NULL;
}
static void
extract_ps (const gchar *filename,
- GHashTable *metadata)
+ GHashTable *metadata)
{
- gint fd;
+ gint fd;
FILE *f;
#if defined(__linux__)
- if ((fd = g_open (filename, (O_RDONLY | O_NOATIME))) == -1) {
+ if ((fd = g_open (filename, (O_RDONLY | O_NOATIME))) == -1) {
#else
- if ((fd = g_open (filename, O_RDONLY)) == -1) {
+ if ((fd = g_open (filename, O_RDONLY)) == -1) {
#endif
- return;
- }
+ return;
+ }
if ((f = fdopen (fd, "r"))) {
- gchar *line;
- gsize length;
- gssize read_char;
+ gchar *line;
+ gsize length;
+ gssize read_char;
line = NULL;
- length = 0;
+ length = 0;
- while ((read_char = getline (&line, &length, f)) != -1) {
- gboolean pageno_atend = FALSE;
- gboolean header_finished = FALSE;
+ while ((read_char = getline (&line, &length, f)) != -1) {
+ gboolean pageno_atend = FALSE;
+ gboolean header_finished = FALSE;
line[read_char - 1] = '\0'; /* overwrite '\n' char */
if (!header_finished && strncmp (line, "%%Copyright:", 12) == 0) {
- g_hash_table_insert (metadata,
- g_strdup ("File:Other"),
- g_strdup (line + 13));
+ g_hash_table_insert (metadata,
+ 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 (line + 9));
+ g_strdup ("Doc:Title"),
+ g_strdup (line + 9));
} else if (!header_finished && strncmp (line, "%%Creator:", 10) == 0) {
g_hash_table_insert (metadata,
- g_strdup ("Doc:Author"),
- g_strdup (line + 11));
+ g_strdup ("Doc:Author"),
+ g_strdup (line + 11));
} else if (!header_finished && strncmp (line, "%%CreationDate:", 15) == 0) {
- gchar *date;
+ gchar *date;
- date = date_to_iso8601 (line + 16);
+ date = date_to_iso8601 (line + 16);
- if (date) {
- g_hash_table_insert (metadata,
- g_strdup ("Doc:Created"),
- date);
- }
+ if (date) {
+ g_hash_table_insert (metadata,
+ g_strdup ("Doc:Created"),
+ date);
+ }
} else if (strncmp (line, "%%Pages:", 8) == 0) {
- if (strcmp (line + 9, "(atend)") == 0) {
+ if (strcmp (line + 9, "(atend)") == 0) {
pageno_atend = TRUE;
} else {
g_hash_table_insert (metadata,
- g_strdup ("Doc:PageCount"),
- g_strdup (line + 9));
- }
+ g_strdup ("Doc:PageCount"),
+ g_strdup (line + 9));
+ }
} else if (strncmp (line, "%%EndComments", 14) == 0) {
header_finished = TRUE;
if (!pageno_atend) {
break;
- }
+ }
}
g_free (line);
line = NULL;
- length = 0;
+ length = 0;
}
- if (line) {
- g_free (line);
- }
+ if (line) {
+ g_free (line);
+ }
- fclose (f);
+ fclose (f);
} else {
- close (fd);
- }
+ close (fd);
+ }
}
static void
extract_ps_gz (const gchar *filename,
- GHashTable *metadata)
+ GHashTable *metadata)
{
- FILE *fz;
- GError *error = NULL;
- gchar *gunzipped;
- gint fdz;
- gint fd;
- gboolean stat;
+ FILE *fz;
+ GError *error = NULL;
+ gchar *gunzipped;
+ gint fdz;
+ gint fd;
+ gboolean stat;
const gchar *argv[4];
fd = g_file_open_tmp ("tracker-extract-ps-gunzipped.XXXXXX",
- &gunzipped,
- &error);
+ &gunzipped,
+ &error);
if (error) {
g_error_free (error);
@@ -302,20 +302,20 @@
argv[3] = NULL;
stat = g_spawn_async_with_pipes (g_get_tmp_dir (),
- (gchar **) argv,
- NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
- tracker_spawn_child_func,
- GINT_TO_POINTER (10),
- NULL,
- NULL,
- &fdz,
- NULL,
- &error);
+ (gchar **) argv,
+ NULL,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
+ tracker_spawn_child_func,
+ GINT_TO_POINTER (10),
+ NULL,
+ NULL,
+ &fdz,
+ NULL,
+ &error);
if (!stat) {
g_unlink (gunzipped);
- g_clear_error (&error);
+ g_clear_error (&error);
return;
}
@@ -327,9 +327,9 @@
size_t b, accum;
size_t max;
- /* 20 MiB should be enough! */
- accum = 0;
- max = 20u << 20;
+ /* 20 MiB should be enough! */
+ accum = 0;
+ 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 15:12:19 2008
@@ -43,8 +43,8 @@
} TagType;
typedef struct {
- guint tag;
- gchar *name;
+ guint tag;
+ gchar *name;
TagType type;
PostProcessor post;
} TiffTag;
@@ -54,11 +54,11 @@
static gchar *
date_to_iso8601 (gchar *exif_date)
{
- /* ex; date "2007:04:15 15:35:58"
- To
- ex. "2007-04-15T17:35:58+0200 where +0200 is localtime
- */
- return tracker_generic_date_to_iso8601 (exif_date, EXIF_DATE_FORMAT);
+ /* ex; date "2007:04:15 15:35:58"
+ To
+ ex. "2007-04-15T17:35:58+0200 where +0200 is localtime
+ */
+ return tracker_generic_date_to_iso8601 (exif_date, EXIF_DATE_FORMAT);
}
@@ -97,8 +97,8 @@
static void
tracker_extract_tiff (const gchar *filename, GHashTable *metadata)
{
- TIFF *image;
- long exifOffset;
+ TIFF *image;
+ long exifOffset;
TiffTag *tag;
@@ -108,8 +108,8 @@
float vardouble;
#ifdef HAVE_EXEMPI
- gchar *xmpOffset;
- uint32 size;
+ gchar *xmpOffset;
+ uint32 size;
#endif /* HAVE_EXEMPI */
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 15:12:19 2008
@@ -43,7 +43,7 @@
};
static void extract_totem (const gchar *filename,
- GHashTable *metadata);
+ GHashTable *metadata);
static TrackerExtractorData data[] = {
{ "audio/*", extract_totem },
@@ -53,7 +53,7 @@
static void
extract_totem (const gchar *filename,
- GHashTable *metadata)
+ GHashTable *metadata)
{
gchar *argv[3];
gchar *totem;
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 15:12:19 2008
@@ -120,23 +120,23 @@
void
tracker_extract_vorbis (const char *filename, GHashTable *metadata)
{
- gint fd;
- FILE *oggFile;
+ gint fd;
+ FILE *oggFile;
OggVorbis_File vf;
- gint i;
+ gint i;
#if defined(__linux__)
- if ((fd = g_open (filename, (O_RDONLY | O_NOATIME))) == -1) {
+ if ((fd = g_open (filename, (O_RDONLY | O_NOATIME))) == -1) {
#else
- if ((fd = g_open (filename, O_RDONLY)) == -1) {
+ if ((fd = g_open (filename, O_RDONLY)) == -1) {
#endif
- return;
- }
+ return;
+ }
oggFile = fdopen (fd, "r");
if (!oggFile) {
- close (fd);
+ close (fd);
return;
}
@@ -201,4 +201,4 @@
#else
#warning "Not building ogg/vorbis metadata extractor"
-#endif /* HAVE_VORBIS */
+#endif /* HAVE_VORBIS */
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 15:12:19 2008
@@ -79,22 +79,22 @@
gchar *
tracker_generic_date_to_iso8601 (const gchar *date,
- const gchar *format)
+ const gchar *format)
{
- gchar *result;
- struct tm date_tm;
+ gchar *result;
+ struct tm date_tm;
- memset (&date_tm, 0, sizeof (struct tm));
+ memset (&date_tm, 0, sizeof (struct tm));
- if (strptime (date, format, &date_tm) == NULL) {
- return NULL;
- }
+ if (strptime (date, format, &date_tm) == NULL) {
+ return NULL;
+ }
- result = g_malloc (sizeof (char)*25);
+ result = g_malloc (sizeof (char)*25);
- strftime (result, 25, ISO8601_FORMAT , &date_tm);
+ strftime (result, 25, ISO8601_FORMAT , &date_tm);
- return result;
+ return result;
}
#ifndef DISABLE_DEBUG
@@ -102,13 +102,13 @@
static void
debug_impl (const gchar *msg, ...)
{
- va_list args;
+ va_list args;
- va_start (args, msg);
- g_vfprintf (stderr, msg, args);
- va_end (args);
+ va_start (args, msg);
+ g_vfprintf (stderr, msg, args);
+ va_end (args);
- g_fprintf (stderr, "\n");
+ g_fprintf (stderr, "\n");
}
#endif /* DISABLE_DEBUG */
@@ -116,24 +116,24 @@
static void
initialize_extractors (void)
{
- GDir *dir;
- GError *error;
+ GDir *dir;
+ GError *error;
const gchar *name;
- GArray *generic_extractors;
+ GArray *generic_extractors;
if (extractors != NULL) {
return;
- }
+ }
if (!g_module_supported ()) {
g_error ("Modules are not supported for this platform");
return;
}
- error = NULL;
+ error = NULL;
extractors = g_array_sized_new (FALSE,
- TRUE,
+ TRUE,
sizeof (TrackerExtractorData),
10);
@@ -141,7 +141,7 @@
* temporarily extractors with mimetypes such as "audio / *"
*/
generic_extractors = g_array_sized_new (FALSE,
- TRUE,
+ TRUE,
sizeof (TrackerExtractorData),
10);
@@ -150,17 +150,17 @@
if (!dir) {
g_error ("Error opening modules directory: %s", error->message);
g_error_free (error);
- g_array_free (extractors, TRUE);
- extractors = NULL;
- g_array_free (generic_extractors, TRUE);
+ g_array_free (extractors, TRUE);
+ extractors = NULL;
+ g_array_free (generic_extractors, TRUE);
return;
}
while ((name = g_dir_read_name (dir)) != NULL) {
- GModule *module;
- gchar *module_path;
+ GModule *module;
+ gchar *module_path;
TrackerExtractorDataFunc func;
- TrackerExtractorData *data;
+ TrackerExtractorData *data;
if (!g_str_has_suffix (name, "." G_MODULE_SUFFIX)) {
continue;
@@ -199,14 +199,14 @@
* the list, so the specific ones are used first
*/
g_array_append_vals (extractors,
- generic_extractors->data,
- generic_extractors->len);
+ generic_extractors->data,
+ generic_extractors->len);
g_array_free (generic_extractors, TRUE);
}
static GHashTable *
tracker_get_file_metadata (const gchar *uri,
- const gchar *mime)
+ const gchar *mime)
{
GHashTable *meta_table;
gchar *uri_in_locale;
@@ -215,27 +215,27 @@
return NULL;
}
- debug ("Extractor - Getting metadata from file:'%s' with mime:'%s'",
- uri,
- mime);
+ debug ("Extractor - Getting metadata from file:'%s' with mime:'%s'",
+ uri,
+ mime);
uri_in_locale = g_filename_from_utf8 (uri, -1, NULL, NULL, NULL);
if (!uri_in_locale) {
- g_warning ("Could not convert uri:'%s' from UTF-8 to locale", uri);
+ g_warning ("Could not convert uri:'%s' from UTF-8 to locale", uri);
return NULL;
}
if (!g_file_test (uri_in_locale, G_FILE_TEST_EXISTS)) {
- g_warning ("File does not exist '%s'", uri_in_locale);
+ g_warning ("File does not exist '%s'", uri_in_locale);
g_free (uri_in_locale);
return NULL;
}
meta_table = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
- g_free);
+ g_str_equal,
+ g_free,
+ g_free);
if (mime) {
guint i;
@@ -253,17 +253,17 @@
g_free (uri_in_locale);
- debug ("Extractor - Found %d metadata items",
- g_hash_table_size (meta_table));
+ debug ("Extractor - Found %d metadata items",
+ g_hash_table_size (meta_table));
return meta_table;
}
}
- debug ("Extractor - Could not find any extractors to handle metadata type.");
+ debug ("Extractor - Could not find any extractors to handle metadata type.");
} else {
- debug ("Extractor - No mime available, not extracting data");
- }
+ debug ("Extractor - No mime available, not extracting data");
+ }
g_free (uri_in_locale);
@@ -272,8 +272,8 @@
static void
print_meta_table_data (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
gchar *value_utf8;
@@ -290,10 +290,10 @@
value_utf8 = g_strstrip (value_utf8);
debug ("Extractor - Found '%s' = '%s'",
- (gchar*) key,
- value_utf8);
+ (gchar*) key,
+ value_utf8);
- g_print ("%s=%s;\n", (gchar*) key, value_utf8);
+ g_print ("%s=%s;\n", (gchar*) key, value_utf8);
}
g_free (value_utf8);
@@ -305,7 +305,7 @@
{
GMainLoop *main_loop;
- debug ("Extractor - Timed out, shutting down");
+ debug ("Extractor - Timed out, shutting down");
main_loop = (GMainLoop *) user_data;
g_main_loop_quit (main_loop);
@@ -316,7 +316,7 @@
static void
reset_shutdown_timeout (GMainLoop *main_loop)
{
- debug ("Extractor - Resetting timeout");
+ debug ("Extractor - Resetting timeout");
if (shutdown_timeout_id != 0) {
g_source_remove (shutdown_timeout_id);
@@ -327,13 +327,13 @@
static gboolean
process_input_cb (GIOChannel *channel,
- GIOCondition condition,
- gpointer user_data)
+ GIOCondition condition,
+ gpointer user_data)
{
GHashTable *meta;
gchar *filename, *mimetype;
- debug ("Extractor - Processing input");
+ debug ("Extractor - Processing input");
reset_shutdown_timeout ((GMainLoop *) user_data);
@@ -371,12 +371,12 @@
GMainLoop *main_loop;
GIOChannel *input;
- debug ("Extractor - Initializing...");
+ debug ("Extractor - Initializing...");
tracker_memory_setrlimits ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
- }
+ }
g_set_application_name ("tracker-extract");
@@ -390,10 +390,10 @@
reset_shutdown_timeout (main_loop);
- debug ("Extractor - Waiting for work");
+ debug ("Extractor - Waiting for work");
g_main_loop_run (main_loop);
- debug ("Extractor - Finished");
+ debug ("Extractor - Finished");
return EXIT_SUCCESS;
}
Modified: branches/indexer-split/src/tracker-extract/tracker-extract.h
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract.h (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract.h Sat Sep 20 15:12:19 2008
@@ -34,11 +34,11 @@
const gchar *mime;
void (* extractor) (const gchar *filename,
- GHashTable *metadata);
+ GHashTable *metadata);
};
-gchar * tracker_generic_date_to_iso8601 (const gchar *date,
- const gchar *format);
+gchar * tracker_generic_date_to_iso8601 (const gchar *date,
+ const gchar *format);
TrackerExtractorData *tracker_get_extractor_data (void);
G_END_DECLS
Modified: branches/indexer-split/src/tracker-extract/tracker-xmp.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-xmp.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-xmp.c Sat Sep 20 15:12:19 2008
@@ -29,16 +29,16 @@
#include <exempi/xmp.h>
#include <exempi/xmpconsts.h>
-static void tracker_xmp_iter (XmpPtr xmp,
+static void tracker_xmp_iter (XmpPtr xmp,
XmpIteratorPtr iter,
GHashTable *metadata,
- gboolean append);
+ gboolean append);
static void tracker_xmp_iter_simple (GHashTable *metadata,
const gchar *schema,
const gchar *path,
const gchar *value,
- gboolean append);
+ gboolean append);
static void
@@ -85,7 +85,7 @@
/* We have a simple element, but need to iterate over the qualifiers */
static void
tracker_xmp_iter_simple_qual (XmpPtr xmp, GHashTable *metadata,
- const gchar *schema, const gchar *path, const gchar *value, gboolean append)
+ const gchar *schema, const gchar *path, const gchar *value, gboolean append)
{
XmpIteratorPtr iter = xmp_iterator_new (xmp, schema, path, XMP_ITER_JUSTCHILDREN | XMP_ITER_JUSTLEAFNAME);
@@ -131,7 +131,7 @@
/* We have a simple element. Add any metadata we know about to the hash table */
static void
tracker_xmp_iter_simple (GHashTable *metadata,
- const gchar *schema, const gchar *path, const gchar *value, gboolean append)
+ const gchar *schema, const gchar *path, const gchar *value, gboolean append)
{
gchar *name = g_strdup (strchr (path, ':') + 1);
const gchar *index = strrchr (name, '[');
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 15:12:19 2008
@@ -1,7 +1,7 @@
/*
** 2001 September 22
**
-** The author disclaims copyright to this source code. In place of
+** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
@@ -18,10 +18,10 @@
** The code in this file is only compiled if:
**
** * The FTS3 module is being built as an extension
-** (in which case SQLITE_CORE is not defined), or
+** (in which case SQLITE_CORE is not defined), or
**
** * The FTS3 module is being built into the core of
-** SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
+** SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
*/
#include <assert.h>
@@ -71,7 +71,7 @@
** to the empty state.
*/
void sqlite3Fts3HashClear(fts3Hash *pH){
- fts3HashElem *elem; /* For looping over all elements of the table */
+ fts3HashElem *elem; /* For looping over all elements of the table */
assert( pH!=0 );
elem = pH->first;
@@ -163,17 +163,17 @@
/* Link an element into the hash table
*/
static void fts3HashInsertElement(
- fts3Hash *pH, /* The complete hash table */
+ fts3Hash *pH, /* The complete hash table */
struct _fts3ht *pEntry, /* The entry into which pNew is inserted */
- fts3HashElem *pNew /* The element to be inserted */
+ fts3HashElem *pNew /* The element to be inserted */
){
- fts3HashElem *pHead; /* First element already in pEntry */
+ fts3HashElem *pHead; /* First element already in pEntry */
pHead = pEntry->chain;
if( pHead ){
pNew->next = pHead;
pNew->prev = pHead->prev;
if( pHead->prev ){ pHead->prev->next = pNew; }
- else { pH->first = pNew; }
+ else { pH->first = pNew; }
pHead->prev = pNew;
}else{
pNew->next = pH->first;
@@ -191,7 +191,7 @@
** to resize if sqliteMalloc() fails.
*/
static void fts3Rehash(fts3Hash *pH, int new_size){
- struct _fts3ht *new_ht; /* The new hash table */
+ struct _fts3ht *new_ht; /* The new hash table */
fts3HashElem *elem, *next_elem; /* For looping over existing elements */
int (*xHash)(const void*,int); /* The hash function */
@@ -217,10 +217,10 @@
const fts3Hash *pH, /* The pH to be searched */
const void *pKey, /* The key we are searching for */
int nKey,
- int h /* The hash for this key. */
+ int h /* The hash for this key. */
){
- fts3HashElem *elem; /* Used to loop thru the element list */
- int count; /* Number of elements left to test */
+ fts3HashElem *elem; /* Used to loop thru the element list */
+ int count; /* Number of elements left to test */
int (*xCompare)(const void*,int,const void*,int); /* comparison function */
if( pH->ht ){
@@ -230,7 +230,7 @@
xCompare = ftsCompareFunction(pH->keyClass);
while( count-- && elem ){
if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
- return elem;
+ return elem;
}
elem = elem->next;
}
@@ -242,9 +242,9 @@
** element and a hash on the element's key.
*/
static void fts3RemoveElementByHash(
- fts3Hash *pH, /* The pH containing "elem" */
- fts3HashElem* elem, /* The element to be removed from the pH */
- int h /* Hash value for the element */
+ fts3Hash *pH, /* The pH containing "elem" */
+ fts3HashElem* elem, /* The element to be removed from the pH */
+ int h /* Hash value for the element */
){
struct _fts3ht *pEntry;
if( elem->prev ){
@@ -280,8 +280,8 @@
** found, or NULL if there is no match.
*/
void *sqlite3Fts3HashFind(const fts3Hash *pH, const void *pKey, int nKey){
- int h; /* A hash on key */
- fts3HashElem *elem; /* The element that matches key */
+ int h; /* A hash on key */
+ fts3HashElem *elem; /* The element that matches key */
int (*xHash)(const void*,int); /* The hash function */
if( pH==0 || pH->ht==0 ) return 0;
@@ -297,7 +297,7 @@
** and the data is "data".
**
** If no element exists with a matching key, then a new
-** element is created. A copy of the key is made if the copyKey
+** element is created. A copy of the key is made if the copyKey
** flag is set. NULL is returned.
**
** If another element already exists with the same key, then the
@@ -311,12 +311,12 @@
void *sqlite3Fts3HashInsert(
fts3Hash *pH, /* The hash table to insert into */
const void *pKey, /* The key */
- int nKey, /* Number of bytes in the key */
- void *data /* The data */
+ int nKey, /* Number of bytes in the key */
+ void *data /* The data */
){
- int hraw; /* Raw hash value of the key */
- int h; /* the hash of the key modulo hash table size */
- fts3HashElem *elem; /* Used to loop thru the element list */
+ int hraw; /* Raw hash value of the key */
+ int h; /* the hash of the key modulo hash table size */
+ fts3HashElem *elem; /* Used to loop thru the element list */
fts3HashElem *new_elem; /* New element added to the pH */
int (*xHash)(const void*,int); /* The hash function */
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 15:12:19 2008
@@ -1,7 +1,7 @@
/*
** 2001 September 22
**
-** The author disclaims copyright to this source code. In place of
+** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
@@ -30,13 +30,13 @@
** this structure opaque.
*/
struct fts3Hash {
- char keyClass; /* HASH_INT, _POINTER, _STRING, _BINARY */
- char copyKey; /* True if copy of key made on insert */
- int count; /* Number of entries in this table */
- fts3HashElem *first; /* The first element of the array */
- int htsize; /* Number of buckets in the hash table */
- struct _fts3ht { /* the hash table */
- int count; /* Number of entries with this hash */
+ char keyClass; /* HASH_INT, _POINTER, _STRING, _BINARY */
+ char copyKey; /* True if copy of key made on insert */
+ int count; /* Number of entries in this table */
+ fts3HashElem *first; /* The first element of the array */
+ int htsize; /* Number of buckets in the hash table */
+ struct _fts3ht { /* the hash table */
+ int count; /* Number of entries with this hash */
fts3HashElem *chain; /* Pointer to first entry with this hash */
} *ht;
};
@@ -49,19 +49,19 @@
*/
struct fts3HashElem {
fts3HashElem *next, *prev; /* Next and previous elements in the table */
- void *data; /* Data associated with this element */
+ void *data; /* Data associated with this element */
void *pKey; int nKey; /* Key associated with this element */
};
/*
** There are 2 different modes of operation for a hash table:
**
-** FTS3_HASH_STRING pKey points to a string that is nKey bytes long
-** (including the null-terminator, if any). Case
-** is respected in comparisons.
+** FTS3_HASH_STRING pKey points to a string that is nKey bytes long
+** (including the null-terminator, if any). Case
+** is respected in comparisons.
**
-** FTS3_HASH_BINARY pKey points to binary data nKey bytes long.
-** memcmp() is used to compare keys.
+** 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.
*/
@@ -99,7 +99,7 @@
#define fts3HashFirst(H) ((H)->first)
#define fts3HashNext(E) ((E)->next)
#define fts3HashData(E) ((E)->data)
-#define fts3HashKey(E) ((E)->pKey)
+#define fts3HashKey(E) ((E)->pKey)
#define fts3HashKeysize(E) ((E)->nKey)
/*
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 15:12:19 2008
@@ -1,7 +1,7 @@
/*
** 2006 Oct 10
**
-** The author disclaims copyright to this source code. In place of
+** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
@@ -14,19 +14,19 @@
*/
-// gcc -shared -o tracker-fts *.c
+// gcc -shared -o tracker-fts *.c
//gcc -Wall -fPIC -c *.c
-//gcc -shared -Wl,-soname,libtracker-fts.so.1 -o libtracker-fts.so.1.0 *.o
+//gcc -shared -Wl,-soname,libtracker-fts.so.1 -o libtracker-fts.so.1.0 *.o
/*
** The code in this file is only compiled if:
**
** * The FTS3 module is being built as an extension
-** (in which case SQLITE_CORE is not defined), or
+** (in which case SQLITE_CORE is not defined), or
**
** * The FTS3 module is being built into the core of
-** SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
+** SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
*/
/* TODO(shess) Consider exporting this comment to an HTML file or the
@@ -35,7 +35,7 @@
/* The full-text index is stored in a series of b+tree (-like)
** structures called segments which map terms to doclists. The
** structures are like b+trees in layout, but are constructed from the
-** bottom up in optimal fashion and are not updatable. Since trees
+** bottom up in optimal fashion and are not updatable. Since trees
** are built from the bottom up, things will be described from the
** bottom up.
**
@@ -46,8 +46,8 @@
** using seven bits * per byte as follows:
**
** KEY:
-** A = 0xxxxxxx 7 bits of data and one flag bit
-** B = 1xxxxxxx 7 bits of data and one flag bit
+** A = 0xxxxxxx 7 bits of data and one flag bit
+** B = 1xxxxxxx 7 bits of data and one flag bit
**
** 7 bits - A
** 14 bits - BA
@@ -59,28 +59,28 @@
**
**** Document lists ****
** A doclist (document list) holds a docid-sorted list of hits for a
-** given term. Doclists hold docids, and can optionally associate
+** given term. Doclists hold docids, and can optionally associate
** token positions and offsets with docids.
**
** A DL_POSITIONS_OFFSETS doclist is stored like this:
**
** array {
** varint docid;
-** array { (position list for column 0)
+** array { (position list for column 0)
** varint position; (delta from previous position plus POS_BASE)
** varint startOffset; (delta from previous startOffset)
** varint endOffset; (delta from startOffset)
** }
** array {
** varint POS_COLUMN; (marks start of position list for new column)
-** varint column; (index of new column)
+** varint column; (index of new column)
** array {
-** varint position; (delta from previous position plus POS_BASE)
-** varint startOffset;(delta from previous startOffset)
-** varint endOffset; (delta from startOffset)
+** varint position; (delta from previous position plus POS_BASE)
+** varint startOffset;(delta from previous startOffset)
+** varint endOffset; (delta from startOffset)
** }
** }
-** varint POS_END; (marks end of positions for this document.
+** varint POS_END; (marks end of positions for this document.
** }
**
** Here, array { X } means zero or more occurrences of X, adjacent in
@@ -106,17 +106,17 @@
** iterate through a segment's entire leaf layer). Leaf nodes have
** the format:
**
-** varint iHeight; (height from leaf level, always 0)
-** varint nTerm; (length of first term)
-** char pTerm[nTerm]; (content of first term)
-** varint nDoclist; (length of term's associated doclist)
+** varint iHeight; (height from leaf level, always 0)
+** varint nTerm; (length of first term)
+** char pTerm[nTerm]; (content of first term)
+** varint nDoclist; (length of term's associated doclist)
** char pDoclist[nDoclist]; (content of doclist)
** array {
-** (further terms are delta-encoded)
-** varint nPrefix; (length of prefix shared with previous term)
-** varint nSuffix; (length of unshared suffix)
+** (further terms are delta-encoded)
+** varint nPrefix; (length of prefix shared with previous term)
+** varint nSuffix; (length of unshared suffix)
** char pTermSuffix[nSuffix];(unshared suffix of next term)
-** varint nDoclist; (length of term's associated doclist)
+** varint nDoclist; (length of term's associated doclist)
** char pDoclist[nDoclist]; (content of doclist)
** }
**
@@ -152,15 +152,15 @@
** itself grows too big and must be split. The format of interior
** nodes:
**
-** varint iHeight; (height from leaf level, always >0)
-** varint iBlockid; (block id of node's leftmost subtree)
+** varint iHeight; (height from leaf level, always >0)
+** varint iBlockid; (block id of node's leftmost subtree)
** optional {
-** varint nTerm; (length of first term)
+** varint nTerm; (length of first term)
** char pTerm[nTerm]; (content of first term)
** array {
-** (further terms are delta-encoded)
-** varint nPrefix; (length of shared prefix with previous term)
-** varint nSuffix; (length of unshared suffix)
+** (further terms are delta-encoded)
+** varint nPrefix; (length of shared prefix with previous term)
+** varint nSuffix; (length of unshared suffix)
** char pTermSuffix[nSuffix]; (unshared suffix of next term)
** }
** }
@@ -170,11 +170,11 @@
**
** An interior node encodes n terms separating n+1 subtrees. The
** subtree blocks are contiguous, so only the first subtree's blockid
-** is encoded. The subtree at iBlockid will contain all terms less
+** is encoded. The subtree at iBlockid will contain all terms less
** than the first term encoded (or all terms if no term is encoded).
** Otherwise, for terms greater than or equal to pTerm[i] but less
** than pTerm[i+1], the subtree for that term will be rooted at
-** iBlockid+i. Interior nodes only store enough term data to
+** iBlockid+i. Interior nodes only store enough term data to
** distinguish adjacent children (if the rightmost term of the left
** child is "something", and the leftmost term of the right child is
** "wicked", only "w" is stored).
@@ -201,13 +201,13 @@
** height and the blockid of the previous root).
**
** The meta-information in the segment directory is:
-** level - segment level (see below)
-** idx - index within level
-** - (level,idx uniquely identify a segment)
-** start_block - first leaf node
-** leaves_end_block - last leaf node
-** end_block - last block (including interior nodes)
-** root - contents of root node
+** level - segment level (see below)
+** idx - index within level
+** - (level,idx uniquely identify a segment)
+** start_block - first leaf node
+** leaves_end_block - last leaf node
+** end_block - last block (including interior nodes)
+** root - contents of root node
**
** If the root node is a leaf node, then start_block,
** leaves_end_block, and end_block are all 0.
@@ -234,7 +234,7 @@
** deleted.
**
** MERGE_COUNT controls how often we merge segments. 16 seems to be
-** somewhat of a sweet spot for insertion performance. 32 and 64 show
+** somewhat of a sweet spot for insertion performance. 32 and 64 show
** very similar performance numbers to 16 on insertion, though they're
** a tiny bit slower (perhaps due to more overhead in merge-time
** sorting). 8 is about 20% slower than 16, 4 about 50% slower than
@@ -245,10 +245,10 @@
** inserted:
**
** MERGE_COUNT segments
-** 16 25
-** 8 12
-** 4 10
-** 2 6
+** 16 25
+** 8 12
+** 4 10
+** 2 6
**
** This appears to have only a moderate impact on queries for very
** frequent terms (which are somewhat dominated by segment merge
@@ -269,12 +269,12 @@
** write an empty doclist (varint(docid) varint(POS_END)), for updates
** we simply write the new doclist. Segment merges overwrite older
** data for a particular docid with newer data, so deletes or updates
-** will eventually overtake the earlier data and knock it out. The
+** will eventually overtake the earlier data and knock it out. The
** query logic likewise merges doclists so that newer data knocks out
** older data.
**
** TODO(shess) Provide a VACUUM type operation to clear out all
-** deletions and duplications. This would basically be a forced merge
+** deletions and duplications. This would basically be a forced merge
** into a single segment.
*/
@@ -297,7 +297,7 @@
-/* TODO(shess) MAN, this thing needs some refactoring. At minimum, it
+/* TODO(shess) MAN, this thing needs some refactoring. At minimum, it
** would be nice to order the file better, perhaps something along the
** lines of:
**
@@ -348,16 +348,16 @@
typedef enum DocListType {
- DL_DOCIDS, /* docids only */
- DL_POSITIONS, /* docids + positions */
- DL_POSITIONS_OFFSETS /* docids + positions + offsets */
+ DL_DOCIDS, /* docids only */
+ DL_POSITIONS, /* docids + positions */
+ DL_POSITIONS_OFFSETS /* docids + positions + offsets */
} DocListType;
/*
** By default, only positions and not offsets are stored in the doclists.
** To change this so that offsets are stored too, compile with
**
-** -DDL_DEFAULT=DL_POSITIONS_OFFSETS
+** -DDL_DEFAULT=DL_POSITIONS_OFFSETS
**
** If DL_DEFAULT is set to DL_DOCIDS, your table can only be inserted
** into (no deletes or updates).
@@ -367,8 +367,8 @@
#endif
enum {
- POS_END = 0, /* end of this position list */
- POS_COLUMN, /* followed by new column number */
+ POS_END = 0, /* end of this position list */
+ POS_COLUMN, /* followed by new column number */
POS_BASE
};
@@ -455,9 +455,9 @@
** dataBufferReplace - replace buffer's data.
*/
typedef struct DataBuffer {
- char *pData; /* Pointer to malloc'ed buffer. */
- int nCapacity; /* Size of pData buffer. */
- int nData; /* End of data loaded into pData. */
+ char *pData; /* Pointer to malloc'ed buffer. */
+ int nCapacity; /* Size of pData buffer. */
+ int nData; /* End of data loaded into pData. */
} DataBuffer;
static void dataBufferInit(DataBuffer *pBuffer, int nCapacity){
@@ -480,7 +480,7 @@
}
static void dataBufferExpand(DataBuffer *pBuffer, int nAddCapacity){
assert( nAddCapacity>0 );
- /* TODO(shess) Consider expanding more aggressively. Note that the
+ /* TODO(shess) Consider expanding more aggressively. Note that the
** underlying malloc implementation may take care of such things for
** us already.
*/
@@ -490,15 +490,15 @@
}
}
static void dataBufferAppend(DataBuffer *pBuffer,
- const char *pSource, int nSource){
+ const char *pSource, int nSource){
assert( nSource>0 && pSource!=NULL );
dataBufferExpand(pBuffer, nSource);
memcpy(pBuffer->pData+pBuffer->nData, pSource, nSource);
pBuffer->nData += nSource;
}
static void dataBufferAppend2(DataBuffer *pBuffer,
- const char *pSource1, int nSource1,
- const char *pSource2, int nSource2){
+ const char *pSource1, int nSource1,
+ const char *pSource2, int nSource2){
assert( nSource1>0 && pSource1!=NULL );
assert( nSource2>0 && pSource2!=NULL );
dataBufferExpand(pBuffer, nSource1+nSource2);
@@ -507,14 +507,14 @@
pBuffer->nData += nSource1+nSource2;
}
static void dataBufferReplace(DataBuffer *pBuffer,
- const char *pSource, int nSource){
+ const char *pSource, int nSource){
dataBufferReset(pBuffer);
dataBufferAppend(pBuffer, pSource, nSource);
}
/* StringBuffer is a null-terminated version of DataBuffer. */
typedef struct StringBuffer {
- DataBuffer b; /* Includes null terminator. */
+ DataBuffer b; /* Includes null terminator. */
} StringBuffer;
static void initStringBuffer(StringBuffer *sb){
@@ -627,7 +627,7 @@
return pReader->nData;
}
/* TODO(shess) Consider adding a field to track iDocid varint length
-** to make these two functions faster. This might matter (a tiny bit)
+** to make these two functions faster. This might matter (a tiny bit)
** for queries.
*/
static const char *dlrPosData(DLReader *pReader){
@@ -658,17 +658,17 @@
if( pReader->iType>=DL_POSITIONS ){
assert( n<pReader->nData );
while( 1 ){
- n += fts3GetVarint32(pReader->pData+n, &iDummy);
- assert( n<=pReader->nData );
- if( iDummy==POS_END ) break;
- if( iDummy==POS_COLUMN ){
- n += fts3GetVarint32(pReader->pData+n, &iDummy);
- assert( n<pReader->nData );
- }else if( pReader->iType==DL_POSITIONS_OFFSETS ){
- n += fts3GetVarint32(pReader->pData+n, &iDummy);
- n += fts3GetVarint32(pReader->pData+n, &iDummy);
- assert( n<pReader->nData );
- }
+ n += fts3GetVarint32(pReader->pData+n, &iDummy);
+ assert( n<=pReader->nData );
+ if( iDummy==POS_END ) break;
+ if( iDummy==POS_COLUMN ){
+ n += fts3GetVarint32(pReader->pData+n, &iDummy);
+ assert( n<pReader->nData );
+ }else if( pReader->iType==DL_POSITIONS_OFFSETS ){
+ n += fts3GetVarint32(pReader->pData+n, &iDummy);
+ n += fts3GetVarint32(pReader->pData+n, &iDummy);
+ assert( n<pReader->nData );
+ }
}
}
pReader->nElement = n;
@@ -676,7 +676,7 @@
}
}
static void dlrInit(DLReader *pReader, DocListType iType,
- const char *pData, int nData){
+ const char *pData, int nData){
assert( pData!=NULL && nData!=0 );
pReader->iType = iType;
pReader->pData = pData;
@@ -697,7 +697,7 @@
** DLWriter.
*/
static void docListValidate(DocListType iType, const char *pData, int nData,
- sqlite_int64 *pLastDocid){
+ sqlite_int64 *pLastDocid){
sqlite_int64 iPrevDocid = 0;
assert( nData>0 );
assert( pData!=0 );
@@ -709,15 +709,15 @@
if( iType>DL_DOCIDS ){
int iDummy;
while( 1 ){
- n += fts3GetVarint32(pData+n, &iDummy);
- if( iDummy==POS_END ) break;
- if( iDummy==POS_COLUMN ){
- n += fts3GetVarint32(pData+n, &iDummy);
- }else if( iType>DL_POSITIONS ){
- n += fts3GetVarint32(pData+n, &iDummy);
- n += fts3GetVarint32(pData+n, &iDummy);
- }
- assert( n<=nData );
+ n += fts3GetVarint32(pData+n, &iDummy);
+ if( iDummy==POS_END ) break;
+ if( iDummy==POS_COLUMN ){
+ n += fts3GetVarint32(pData+n, &iDummy);
+ }else if( iType>DL_POSITIONS ){
+ n += fts3GetVarint32(pData+n, &iDummy);
+ n += fts3GetVarint32(pData+n, &iDummy);
+ }
+ assert( n<=nData );
}
}
assert( n<=nData );
@@ -776,11 +776,11 @@
** Consider a refactor to make this cleaner.
*/
static void dlwAppend(DLWriter *pWriter,
- const char *pData, int nData,
- sqlite_int64 iFirstDocid, sqlite_int64 iLastDocid){
+ const char *pData, int nData,
+ sqlite_int64 iFirstDocid, sqlite_int64 iLastDocid){
sqlite_int64 iDocid = 0;
char c[VARINT_MAX];
- int nFirstOld, nFirstNew; /* Old and new varint len of first docid. */
+ int nFirstOld, nFirstNew; /* Old and new varint len of first docid. */
#ifndef NDEBUG
sqlite_int64 iLastDocidDelta;
#endif
@@ -797,12 +797,12 @@
ASSERT_VALID_DOCLIST(pWriter->iType, pData, nData, &iLastDocidDelta);
assert( iLastDocid==iFirstDocid-iDocid+iLastDocidDelta );
- /* Append recoded initial docid and everything else. Rest of docids
+ /* Append recoded initial docid and everything else. Rest of docids
** should have been delta-encoded from previous initial docid.
*/
if( nFirstOld<nData ){
dataBufferAppend2(pWriter->b, c, nFirstNew,
- pData+nFirstOld, nData-nFirstOld);
+ pData+nFirstOld, nData-nFirstOld);
}else{
dataBufferAppend(pWriter->b, c, nFirstNew);
}
@@ -810,7 +810,7 @@
}
static void dlwCopy(DLWriter *pWriter, DLReader *pReader){
dlwAppend(pWriter, dlrDocData(pReader), dlrDocDataBytes(pReader),
- dlrDocid(pReader), dlrDocid(pReader));
+ dlrDocid(pReader), dlrDocid(pReader));
}
static void dlwAdd(DLWriter *pWriter, sqlite_int64 iDocid){
char c[VARINT_MAX];
@@ -846,7 +846,7 @@
int nData;
DocListType iType;
- int iColumn; /* the last column read */
+ int iColumn; /* the last column read */
int iPosition; /* the last position read */
int iStartOffset; /* the last start offset read */
int iEndOffset; /* the last end offset read */
@@ -950,9 +950,9 @@
typedef struct PLWriter {
DLWriter *dlw;
- int iColumn; /* the last column written */
- int iPos; /* the last position written */
- int iOffset; /* the last start offset written */
+ int iColumn; /* the last column written */
+ int iPos; /* the last position written */
+ int iOffset; /* the last start offset written */
} PLWriter;
/* TODO(shess) In the case where the parent is reading these values
@@ -960,7 +960,7 @@
** the same type as pWriter.
*/
static void plwAdd(PLWriter *pWriter, int iColumn, int iPos,
- int iStartOffset, int iEndOffset){
+ int iStartOffset, int iEndOffset){
/* Worst-case space for POS_COLUMN, iColumn, iPosDelta,
** iStartOffsetDelta, and iEndOffsetDelta.
*/
@@ -993,7 +993,7 @@
}
static void plwCopy(PLWriter *pWriter, PLReader *pReader){
plwAdd(pWriter, plrColumn(pReader), plrPosition(pReader),
- plrStartOffset(pReader), plrEndOffset(pReader));
+ plrStartOffset(pReader), plrEndOffset(pReader));
}
static void plwInit(PLWriter *pWriter, DLWriter *dlw, sqlite_int64 iDocid){
char c[VARINT_MAX];
@@ -1014,7 +1014,7 @@
pWriter->iPos = 0;
pWriter->iOffset = 0;
}
-/* TODO(shess) Should plwDestroy() also terminate the doclist? But
+/* TODO(shess) Should plwDestroy() also terminate the doclist? But
** then plwDestroy() would no longer be just a destructor, it would
** also be doing work, which isn't consistent with the overall idiom.
** Another option would be for plwAdd() to always append any necessary
@@ -1054,7 +1054,7 @@
} DLCollector;
/* TODO(shess) This could also be done by calling plwTerminate() and
-** dataBufferAppend(). I tried that, expecting nominal performance
+** dataBufferAppend(). I tried that, expecting nominal performance
** differences, but it seemed to pretty reliably be worth 1% to code
** it this way. I suspect it is the incremental malloc overhead (some
** percentage of the plwTerminate() calls will cause a realloc), so
@@ -1076,7 +1076,7 @@
plwInit(&pCollector->plw, &pCollector->dlw, iDocid);
}
static void dlcAddPos(DLCollector *pCollector, int iColumn, int iPos,
- int iStartOffset, int iEndOffset){
+ int iStartOffset, int iEndOffset){
plwAdd(&pCollector->plw, iColumn, iPos, iStartOffset, iEndOffset);
}
@@ -1107,7 +1107,7 @@
** during the merge.
*/
static void docListTrim(DocListType iType, const char *pData, int nData,
- int iColumn, DocListType iOutType, DataBuffer *out){
+ int iColumn, DocListType iOutType, DataBuffer *out){
DLReader dlReader;
DLWriter dlWriter;
@@ -1125,12 +1125,12 @@
while( !plrAtEnd(&plReader) ){
if( iColumn==-1 || plrColumn(&plReader)==iColumn ){
- if( !match ){
- plwInit(&plWriter, &dlWriter, dlrDocid(&dlReader));
- match = 1;
- }
- plwAdd(&plWriter, plrColumn(&plReader), plrPosition(&plReader),
- plrStartOffset(&plReader), plrEndOffset(&plReader));
+ if( !match ){
+ plwInit(&plWriter, &dlWriter, dlrDocid(&dlReader));
+ match = 1;
+ }
+ plwAdd(&plWriter, plrColumn(&plReader), plrPosition(&plReader),
+ plrStartOffset(&plReader), plrEndOffset(&plReader));
}
plrStep(&plReader);
}
@@ -1163,7 +1163,7 @@
static int orderedDLReaderCmp(OrderedDLReader *r1, OrderedDLReader *r2){
if( dlrAtEnd(r1->pReader) ){
if( dlrAtEnd(r2->pReader) ) return 0; /* Both atEnd(). */
- return 1; /* Only r1 atEnd(). */
+ return 1; /* Only r1 atEnd(). */
}
if( dlrAtEnd(r2->pReader) ) return -1; /* Only r2 atEnd(). */
@@ -1201,7 +1201,7 @@
** be fixed.
*/
static void docListMerge(DataBuffer *out,
- DLReader *pReaders, int nReaders){
+ DLReader *pReaders, int nReaders){
OrderedDLReader readers[MERGE_COUNT];
DLWriter writer;
int i, n;
@@ -1245,7 +1245,7 @@
nStart += dlrDocDataBytes(readers[0].pReader);
}else{
if( pStart!=0 ){
- dlwAppend(&writer, pStart, nStart, iFirstDocid, iLastDocid);
+ dlwAppend(&writer, pStart, nStart, iFirstDocid, iLastDocid);
}
pStart = dlrDocData(readers[0].pReader);
nStart = dlrDocDataBytes(readers[0].pReader);
@@ -1256,8 +1256,8 @@
/* Drop all of the older elements with the same docid. */
for(i=1; i<nReaders &&
- !dlrAtEnd(readers[i].pReader) &&
- dlrDocid(readers[i].pReader)==iDocid; i++){
+ !dlrAtEnd(readers[i].pReader) &&
+ dlrDocid(readers[i].pReader)==iDocid; i++){
dlrStep(readers[i].pReader);
}
@@ -1272,9 +1272,9 @@
dlwDestroy(&writer);
}
-/* Helper function for posListUnion(). Compares the current position
+/* Helper function for posListUnion(). Compares the current position
** between left and right, returning as standard C idiom of <0 if
-** left<right, >0 if left>right, and 0 if left==right. "End" always
+** left<right, >0 if left>right, and 0 if left==right. "End" always
** compares greater.
*/
static int posListCmp(PLReader *pLeft, PLReader *pRight){
@@ -1345,7 +1345,7 @@
static void docListUnion(
const char *pLeft, int nLeft,
const char *pRight, int nRight,
- DataBuffer *pOut /* Write the combined doclist here */
+ DataBuffer *pOut /* Write the combined doclist here */
){
DLReader left, right;
DLWriter writer;
@@ -1435,18 +1435,18 @@
plrStep(&right);
}else{
if( (plrPosition(&right)-plrPosition(&left))<=(nNear+1) ){
- if( !match ){
- plwInit(&writer, pOut, dlrDocid(pLeft));
- match = 1;
- }
- if( !isSaveLeft ){
- plwAdd(&writer, plrColumn(&right), plrPosition(&right), 0, 0);
- }else{
- plwAdd(&writer, plrColumn(&left), plrPosition(&left), 0, 0);
- }
- plrStep(&right);
+ if( !match ){
+ plwInit(&writer, pOut, dlrDocid(pLeft));
+ match = 1;
+ }
+ if( !isSaveLeft ){
+ plwAdd(&writer, plrColumn(&right), plrPosition(&right), 0, 0);
+ }else{
+ plwAdd(&writer, plrColumn(&left), plrPosition(&left), 0, 0);
+ }
+ plrStep(&right);
}else{
- plrStep(&left);
+ plrStep(&left);
}
}
}
@@ -1503,10 +1503,10 @@
** be passed the number of tokens in the two operands to the NEAR operator
** combined. For example:
**
-** Query syntax nPhrase
-** ------------------------------------
-** "A B C" NEAR "D E" 5
-** A NEAR B 2
+** Query syntax nPhrase
+** ------------------------------------
+** "A B C" NEAR "D E" 5
+** A NEAR B 2
**
** iType controls the type of data written to pOut. If iType is
** DL_POSITIONS, the positions are those from pRight.
@@ -1514,10 +1514,10 @@
static void docListPhraseMerge(
const char *pLeft, int nLeft,
const char *pRight, int nRight,
- int nNear, /* 0 for a phrase merge, non-zero for a NEAR merge */
- int nPhrase, /* Number of tokens in left+right operands to NEAR */
- DocListType iType, /* Type of doclist to write to pOut */
- DataBuffer *pOut /* Write the combined doclist here */
+ int nNear, /* 0 for a phrase merge, non-zero for a NEAR merge */
+ int nPhrase, /* Number of tokens in left+right operands to NEAR */
+ DocListType iType, /* Type of doclist to write to pOut */
+ DataBuffer *pOut /* Write the combined doclist here */
){
DLReader left, right;
DLWriter writer;
@@ -1537,59 +1537,59 @@
dlrStep(&right);
}else{
if( nNear==0 ){
- posListPhraseMerge(&left, &right, 0, 0, &writer);
+ posListPhraseMerge(&left, &right, 0, 0, &writer);
}else{
- /* This case occurs when two terms (simple terms or phrases) are
- * connected by a NEAR operator, span (nNear+1). i.e.
- *
- * '"terrible company" NEAR widget'
- */
- DataBuffer one = {0, 0, 0};
- DataBuffer two = {0, 0, 0};
-
- DLWriter dlwriter2;
- DLReader dr1 = {0, 0, 0, 0, 0};
- DLReader dr2 = {0, 0, 0, 0, 0};
-
- dlwInit(&dlwriter2, iType, &one);
- posListPhraseMerge(&right, &left, nNear-3+nPhrase, 1, &dlwriter2);
- dlwInit(&dlwriter2, iType, &two);
- posListPhraseMerge(&left, &right, nNear-1, 0, &dlwriter2);
-
- if( one.nData) dlrInit(&dr1, iType, one.pData, one.nData);
- if( two.nData) dlrInit(&dr2, iType, two.pData, two.nData);
-
- if( !dlrAtEnd(&dr1) || !dlrAtEnd(&dr2) ){
- PLReader pr1 = {0};
- PLReader pr2 = {0};
-
- PLWriter plwriter;
- plwInit(&plwriter, &writer, dlrDocid(dlrAtEnd(&dr1)?&dr2:&dr1));
-
- if( one.nData ) plrInit(&pr1, &dr1);
- if( two.nData ) plrInit(&pr2, &dr2);
- while( !plrAtEnd(&pr1) || !plrAtEnd(&pr2) ){
- int iCompare = plrCompare(&pr1, &pr2);
- switch( iCompare ){
- case -1:
- plwCopy(&plwriter, &pr1);
- plrStep(&pr1);
- break;
- case 1:
- plwCopy(&plwriter, &pr2);
- plrStep(&pr2);
- break;
- case 0:
- plwCopy(&plwriter, &pr1);
- plrStep(&pr1);
- plrStep(&pr2);
- break;
- }
- }
- plwTerminate(&plwriter);
- }
- dataBufferDestroy(&one);
- dataBufferDestroy(&two);
+ /* This case occurs when two terms (simple terms or phrases) are
+ * connected by a NEAR operator, span (nNear+1). i.e.
+ *
+ * '"terrible company" NEAR widget'
+ */
+ DataBuffer one = {0, 0, 0};
+ DataBuffer two = {0, 0, 0};
+
+ DLWriter dlwriter2;
+ DLReader dr1 = {0, 0, 0, 0, 0};
+ DLReader dr2 = {0, 0, 0, 0, 0};
+
+ dlwInit(&dlwriter2, iType, &one);
+ posListPhraseMerge(&right, &left, nNear-3+nPhrase, 1, &dlwriter2);
+ dlwInit(&dlwriter2, iType, &two);
+ posListPhraseMerge(&left, &right, nNear-1, 0, &dlwriter2);
+
+ if( one.nData) dlrInit(&dr1, iType, one.pData, one.nData);
+ if( two.nData) dlrInit(&dr2, iType, two.pData, two.nData);
+
+ if( !dlrAtEnd(&dr1) || !dlrAtEnd(&dr2) ){
+ PLReader pr1 = {0};
+ PLReader pr2 = {0};
+
+ PLWriter plwriter;
+ plwInit(&plwriter, &writer, dlrDocid(dlrAtEnd(&dr1)?&dr2:&dr1));
+
+ if( one.nData ) plrInit(&pr1, &dr1);
+ if( two.nData ) plrInit(&pr2, &dr2);
+ while( !plrAtEnd(&pr1) || !plrAtEnd(&pr2) ){
+ int iCompare = plrCompare(&pr1, &pr2);
+ switch( iCompare ){
+ case -1:
+ plwCopy(&plwriter, &pr1);
+ plrStep(&pr1);
+ break;
+ case 1:
+ plwCopy(&plwriter, &pr2);
+ plrStep(&pr2);
+ break;
+ case 0:
+ plwCopy(&plwriter, &pr1);
+ plrStep(&pr1);
+ plrStep(&pr2);
+ break;
+ }
+ }
+ plwTerminate(&plwriter);
+ }
+ dataBufferDestroy(&one);
+ dataBufferDestroy(&two);
}
dlrStep(&left);
dlrStep(&right);
@@ -1608,7 +1608,7 @@
static void docListAndMerge(
const char *pLeft, int nLeft,
const char *pRight, int nRight,
- DataBuffer *pOut /* Write the combined doclist here */
+ DataBuffer *pOut /* Write the combined doclist here */
){
DLReader left, right;
DLWriter writer;
@@ -1643,7 +1643,7 @@
static void docListOrMerge(
const char *pLeft, int nLeft,
const char *pRight, int nRight,
- DataBuffer *pOut /* Write the combined doclist here */
+ DataBuffer *pOut /* Write the combined doclist here */
){
DLReader left, right;
DLWriter writer;
@@ -1693,7 +1693,7 @@
static void docListExceptMerge(
const char *pLeft, int nLeft,
const char *pRight, int nRight,
- DataBuffer *pOut /* Write the combined doclist here */
+ DataBuffer *pOut /* Write the combined doclist here */
){
DLReader left, right;
DLWriter writer;
@@ -1742,7 +1742,7 @@
* when one string is used repeatedly in a format string.
* The caller must free() the returned string. */
static char *string_format(const char *zFormat,
- const char *zDb, const char *zName){
+ const char *zDb, const char *zName){
const char *p;
size_t len = 0;
size_t nDb = strlen(zDb);
@@ -1775,7 +1775,7 @@
}
static int sql_exec(sqlite3 *db, const char *zDb, const char *zName,
- const char *zFormat){
+ const char *zFormat){
char *zCommand = string_format(zFormat, zDb, zName);
int rc;
FTSTRACE(("FTS3 sql: %s\n", zCommand));
@@ -1785,7 +1785,7 @@
}
static int sql_prepare(sqlite3 *db, const char *zDb, const char *zName,
- sqlite3_stmt **ppStmt, const char *zFormat){
+ sqlite3_stmt **ppStmt, const char *zFormat){
char *zCommand = string_format(zFormat, zDb, zName);
int rc;
FTSTRACE(("FTS3 prepare: %s\n", zCommand));
@@ -1839,8 +1839,8 @@
signed char isOr; /* this term is preceded by "OR" */
signed char isNot; /* this term is preceded by "-" */
signed char isPrefix; /* this term is followed by "*" */
- char *pTerm; /* text of the term. '\000' terminated. malloced */
- int nTerm; /* Number of bytes in pTerm[] */
+ char *pTerm; /* text of the term. '\000' terminated. malloced */
+ int nTerm; /* Number of bytes in pTerm[] */
} QueryTerm;
@@ -1869,17 +1869,17 @@
* A NOT term cannot be the right-hand operand of an OR. If this
* occurs in the query string, the NOT is ignored:
*
- * [one OR -two] ==> one OR two
+ * [one OR -two] ==> one OR two
*
*/
typedef struct Query {
- fulltext_vtab *pFts; /* The full text index */
- int nTerms; /* Number of terms in the query */
- QueryTerm *pTerms; /* Array of terms. Space obtained from malloc() */
- int nextIsOr; /* Set the isOr flag on the next inserted term */
- int nextIsNear; /* Set the isOr flag on the next inserted term */
- int nextColumn; /* Next word parsed must be in this column */
- int dfltColumn; /* The default column */
+ fulltext_vtab *pFts; /* The full text index */
+ int nTerms; /* Number of terms in the query */
+ QueryTerm *pTerms; /* Array of terms. Space obtained from malloc() */
+ int nextIsOr; /* Set the isOr flag on the next inserted term */
+ int nextIsNear; /* Set the isOr flag on the next inserted term */
+ int nextColumn; /* Next word parsed must be in this column */
+ int dfltColumn; /* The default column */
} Query;
@@ -1888,18 +1888,18 @@
** matching-word offset information and snippets.
*/
typedef struct Snippet {
- int nMatch; /* Total number of matches */
- int nAlloc; /* Space allocated for aMatch[] */
+ int nMatch; /* Total number of matches */
+ int nAlloc; /* Space allocated for aMatch[] */
struct snippetMatch { /* One entry for each matching term */
- char snStatus; /* Status flag for use while constructing snippets */
- short int iCol; /* The column that contains the match */
- short int iTerm; /* The index in Query.pTerms[] of the matching term */
- int iToken; /* The index of the matching document token */
- short int nByte; /* Number of bytes in the term */
- int iStart; /* The offset to the first character of the term */
- } *aMatch; /* Points to space obtained from malloc */
+ char snStatus; /* Status flag for use while constructing snippets */
+ short int iCol; /* The column that contains the match */
+ short int iTerm; /* The index in Query.pTerms[] of the matching term */
+ int iToken; /* The index of the matching document token */
+ short int nByte; /* Number of bytes in the term */
+ int iStart; /* The offset to the first character of the term */
+ } *aMatch; /* Points to space obtained from malloc */
char *zOffset; /* Text rendering of aMatch[] */
- int nOffset; /* strlen(zOffset) */
+ int nOffset; /* strlen(zOffset) */
char *zSnippet; /* Snippet text */
int nSnippet; /* strlen(zSnippet) */
} Snippet;
@@ -1907,7 +1907,7 @@
typedef enum QueryType {
QUERY_GENERIC, /* table scan */
- QUERY_DOCID, /* lookup by docid */
+ QUERY_DOCID, /* lookup by docid */
QUERY_FULLTEXT /* QUERY_FULLTEXT + [i] is a full-text search for column i*/
} QueryType;
@@ -1933,7 +1933,7 @@
SEGDIR_DELETE_ALL_STMT,
SEGDIR_COUNT_STMT,
- MAX_STMT /* Always at end! */
+ MAX_STMT /* Always at end! */
} fulltext_statement;
/* These must exactly match the enum above. */
@@ -1985,13 +1985,13 @@
** arguments.
*/
struct fulltext_vtab {
- sqlite3_vtab base; /* Base class used by SQLite core */
- sqlite3 *db; /* The database connection */
- const char *zDb; /* logical database name */
- const char *zName; /* virtual table name */
- int nColumn; /* number of columns in virtual table */
- char **azColumn; /* column names. malloced */
- char **azContentColumn; /* column names in content table; malloced */
+ sqlite3_vtab base; /* Base class used by SQLite core */
+ sqlite3 *db; /* The database connection */
+ const char *zDb; /* logical database name */
+ const char *zName; /* virtual table name */
+ int nColumn; /* number of columns in virtual table */
+ char **azColumn; /* column names. malloced */
+ char **azContentColumn; /* column names in content table; malloced */
TrackerParser *parser; /* tokenizer for inserts and queries */
int max_words;
@@ -2011,7 +2011,7 @@
/* These buffer pending index updates during transactions.
** nPendingData estimates the memory size of the pending data. It
** doesn't include the hash-bucket overhead, nor any malloc
- ** overhead. When nPendingData exceeds kPendingThreshold, the
+ ** overhead. When nPendingData exceeds kPendingThreshold, the
** buffer is flushed even before the transaction closes.
** pendingTerms stores the data, and is only valid when nPendingData
** is >=0 (nPendingData<0 means pendingTerms has not been
@@ -2030,15 +2030,15 @@
** is destroyed by xClose.
*/
typedef struct fulltext_cursor {
- sqlite3_vtab_cursor base; /* Base class used by SQLite core */
- QueryType iCursorType; /* Copy of sqlite3_index_info.idxNum */
- sqlite3_stmt *pStmt; /* Prepared statement in use by the cursor */
- int eof; /* True if at End Of Results */
- Query q; /* Parsed query string */
- Snippet snippet; /* Cached snippet for the current row */
- int iColumn; /* Column being searched */
- DataBuffer result; /* Doclist results from fulltextQuery */
- DLReader reader; /* Result reader if result not empty */
+ sqlite3_vtab_cursor base; /* Base class used by SQLite core */
+ QueryType iCursorType; /* Copy of sqlite3_index_info.idxNum */
+ sqlite3_stmt *pStmt; /* Prepared statement in use by the cursor */
+ int eof; /* True if at End Of Results */
+ Query q; /* Parsed query string */
+ Snippet snippet; /* Cached snippet for the current row */
+ int iColumn; /* Column being searched */
+ DataBuffer result; /* Doclist results from fulltextQuery */
+ DLReader reader; /* Result reader if result not empty */
} fulltext_cursor;
static struct fulltext_vtab *cursor_vtab(fulltext_cursor *c){
@@ -2078,7 +2078,7 @@
/* Return a dynamically generated statement of the form
* update %_content set [col_0] = ?, [col_1] = ?, ...
- * where docid = ?
+ * where docid = ?
*/
static const char *contentUpdateStatement(fulltext_vtab *v){
StringBuffer sb;
@@ -2102,23 +2102,23 @@
** and cached, otherwise the cached version is reset.
*/
static int sql_get_statement(fulltext_vtab *v, fulltext_statement iStmt,
- sqlite3_stmt **ppStmt){
+ sqlite3_stmt **ppStmt){
assert( iStmt<MAX_STMT );
if( v->pFulltextStatements[iStmt]==NULL ){
const char *zStmt;
int rc;
switch( iStmt ){
case CONTENT_INSERT_STMT:
- zStmt = contentInsertStatement(v); break;
+ zStmt = contentInsertStatement(v); break;
case CONTENT_SELECT_STMT:
- zStmt = contentSelectStatement(v); break;
+ zStmt = contentSelectStatement(v); break;
case CONTENT_UPDATE_STMT:
- zStmt = contentUpdateStatement(v); break;
+ zStmt = contentUpdateStatement(v); break;
default:
- zStmt = fulltext_zStatement[iStmt];
+ zStmt = fulltext_zStatement[iStmt];
}
rc = sql_prepare(v->db, v->zDb, v->zName, &v->pFulltextStatements[iStmt],
- zStmt);
+ zStmt);
if( zStmt != fulltext_zStatement[iStmt]) sqlite3_free((void *) zStmt);
if( rc!=SQLITE_OK ) return rc;
} else {
@@ -2131,7 +2131,7 @@
}
/* Like sqlite3_step(), but convert SQLITE_DONE to SQLITE_OK and
-** SQLITE_ROW to SQLITE_ERROR. Useful for statements like UPDATE,
+** SQLITE_ROW to SQLITE_ERROR. Useful for statements like UPDATE,
** where we expect no results.
*/
static int sql_single_step(sqlite3_stmt *s){
@@ -2140,20 +2140,20 @@
}
/* Like sql_get_statement(), but for special replicated LEAF_SELECT
-** statements. idx -1 is a special case for an uncached version of
+** statements. idx -1 is a special case for an uncached version of
** the statement (used in the optimize implementation).
*/
/* TODO(shess) Write version for generic statements and then share
** that between the cached-statement functions.
*/
static int sql_get_leaf_statement(fulltext_vtab *v, int idx,
- sqlite3_stmt **ppStmt){
+ sqlite3_stmt **ppStmt){
assert( idx>=-1 && idx<MERGE_COUNT );
if( idx==-1 ){
return sql_prepare(v->db, v->zDb, v->zName, ppStmt, LEAF_SELECT);
}else if( v->pLeafSelectStmts[idx]==NULL ){
int rc = sql_prepare(v->db, v->zDb, v->zName, &v->pLeafSelectStmts[idx],
- LEAF_SELECT);
+ LEAF_SELECT);
if( rc!=SQLITE_OK ) return rc;
}else{
int rc = sqlite3_reset(v->pLeafSelectStmts[idx]);
@@ -2169,7 +2169,7 @@
** generated.
*/
static int content_insert(fulltext_vtab *v, sqlite3_value *docid,
- sqlite3_value **pValues){
+ sqlite3_value **pValues){
sqlite3_stmt *s;
int i;
int rc = sql_get_statement(v, CONTENT_INSERT_STMT, &s);
@@ -2187,9 +2187,9 @@
}
/* update %_content set col0 = pValues[0], col1 = pValues[1], ...
- * where docid = [iDocid] */
+ * where docid = [iDocid] */
static int content_update(fulltext_vtab *v, sqlite3_value **pValues,
- sqlite_int64 iDocid){
+ sqlite_int64 iDocid){
sqlite3_stmt *s;
int i;
int rc = sql_get_statement(v, CONTENT_UPDATE_STMT, &s);
@@ -2222,7 +2222,7 @@
* TODO: Perhaps we should return pointer/length strings here for consistency
* with other code which uses pointer/length. */
static int content_select(fulltext_vtab *v, sqlite_int64 iDocid,
- const char ***pValues){
+ const char ***pValues){
sqlite3_stmt *s;
const char **values;
int i;
@@ -2295,7 +2295,7 @@
** returns assigned blockid in *piBlockid
*/
static int block_insert(fulltext_vtab *v, const char *pData, int nData,
- sqlite_int64 *piBlockid){
+ sqlite_int64 *piBlockid){
sqlite3_stmt *s;
int rc = sql_get_statement(v, BLOCK_INSERT_STMT, &s);
if( rc!=SQLITE_OK ) return rc;
@@ -2319,7 +2319,7 @@
** which form a segment.
*/
static int block_delete(fulltext_vtab *v,
- sqlite_int64 iStartBlockid, sqlite_int64 iEndBlockid){
+ sqlite_int64 iStartBlockid, sqlite_int64 iEndBlockid){
sqlite3_stmt *s;
int rc = sql_get_statement(v, BLOCK_DELETE_STMT, &s);
if( rc!=SQLITE_OK ) return rc;
@@ -2374,10 +2374,10 @@
** )
*/
static int segdir_set(fulltext_vtab *v, int iLevel, int idx,
- sqlite_int64 iStartBlockid,
- sqlite_int64 iLeavesEndBlockid,
- sqlite_int64 iEndBlockid,
- const char *pRootData, int nRootData){
+ sqlite_int64 iStartBlockid,
+ sqlite_int64 iLeavesEndBlockid,
+ sqlite_int64 iEndBlockid,
+ const char *pRootData, int nRootData){
sqlite3_stmt *s;
int rc = sql_get_statement(v, SEGDIR_SET_STMT, &s);
if( rc!=SQLITE_OK ) return rc;
@@ -2408,8 +2408,8 @@
** SQLITE_ROW if there are blocks, else an error.
*/
static int segdir_span(fulltext_vtab *v, int iLevel,
- sqlite_int64 *piStartBlockid,
- sqlite_int64 *piEndBlockid){
+ sqlite_int64 *piStartBlockid,
+ sqlite_int64 *piEndBlockid){
sqlite3_stmt *s;
int rc = sql_get_statement(v, SEGDIR_SPAN_STMT, &s);
if( rc!=SQLITE_OK ) return rc;
@@ -2423,7 +2423,7 @@
/* This happens if all segments at this level are entirely inline. */
if( SQLITE_NULL==sqlite3_column_type(s, 0) ){
- /* We expect only one row. We must execute another sqlite3_step()
+ /* We expect only one row. We must execute another sqlite3_step()
* to complete the iteration; otherwise the table will remain locked. */
int rc2 = sqlite3_step(s);
if( rc2==SQLITE_ROW ) return SQLITE_ERROR;
@@ -2560,11 +2560,11 @@
/*
** Token types for parsing the arguments to xConnect or xCreate.
*/
-#define TOKEN_EOF 0 /* End of file */
-#define TOKEN_SPACE 1 /* Any kind of whitespace */
-#define TOKEN_ID 2 /* An identifier */
-#define TOKEN_STRING 3 /* A string literal */
-#define TOKEN_PUNCT 4 /* A single punctuation character */
+#define TOKEN_EOF 0 /* End of file */
+#define TOKEN_SPACE 1 /* Any kind of whitespace */
+#define TOKEN_ID 2 /* An identifier */
+#define TOKEN_STRING 3 /* A string literal */
+#define TOKEN_PUNCT 4 /* A single punctuation character */
/*
** If X is a character that can be used in an identifier then
@@ -2612,13 +2612,13 @@
case '"': {
int delim = z[0];
for(i=1; (c=z[i])!=0; i++){
- if( c==delim ){
- if( z[i+1]==delim ){
- i++;
- }else{
- break;
- }
- }
+ if( c==delim ){
+ if( z[i+1]==delim ){
+ i++;
+ }else{
+ break;
+ }
+ }
}
*tokenType = TOKEN_STRING;
return i + (c!=0);
@@ -2630,7 +2630,7 @@
}
default: {
if( !ftsIdChar(*z) ){
- break;
+ break;
}
for(i=1; ftsIdChar(z[i]); i++){}
*tokenType = TOKEN_ID;
@@ -2647,7 +2647,7 @@
*/
typedef struct FtsToken {
const char *z; /* Pointer to token text. Not '\000' terminated */
- short int n; /* Length of the token text in bytes. */
+ short int n; /* Length of the token text in bytes. */
} FtsToken;
/*
@@ -2705,10 +2705,10 @@
**
** Examples:
**
-** "abc" becomes abc
-** 'xyz' becomes xyz
-** [pqr] becomes pqr
-** `mno` becomes mno
+** "abc" becomes abc
+** 'xyz' becomes xyz
+** [pqr] becomes pqr
+** `mno` becomes mno
*/
static void dequoteString(char *z){
int quote;
@@ -2716,20 +2716,20 @@
if( z==0 ) return;
quote = z[0];
switch( quote ){
- case '\'': break;
- case '"': break;
- case '`': break; /* For MySQL compatibility */
- case '[': quote = ']'; break; /* For MS SqlServer compatibility */
- default: return;
+ case '\'': break;
+ case '"': break;
+ case '`': break; /* For MySQL compatibility */
+ case '[': quote = ']'; break; /* For MS SqlServer compatibility */
+ default: return;
}
for(i=1, j=0; z[i]; i++){
if( z[i]==quote ){
if( z[i+1]==quote ){
- z[j++] = quote;
- i++;
+ z[j++] = quote;
+ i++;
}else{
- z[j++] = 0;
- break;
+ z[j++] = 0;
+ break;
}
}else{
z[j++] = z[i];
@@ -2738,30 +2738,30 @@
}
/*
-** The input azIn is a NULL-terminated list of tokens. Remove the first
+** The input azIn is a NULL-terminated list of tokens. Remove the first
** token and all punctuation tokens. Remove the quotes from
** around string literal tokens.
**
** Example:
**
-** input: tokenize chinese ( 'simplifed' , 'mixed' )
-** output: chinese simplifed mixed
+** input: tokenize chinese ( 'simplifed' , 'mixed' )
+** output: chinese simplifed mixed
**
** Another example:
**
-** input: delimiters ( '[' , ']' , '...' )
-** output: [ ] ...
+** input: delimiters ( '[' , ']' , '...' )
+** output: [ ] ...
*/
static void tokenListToIdList(char **azIn){
int i, j;
if( azIn ){
for(i=0, j=-1; azIn[i]; i++){
if( safe_isalnum(azIn[i][0]) || azIn[i][1] ){
- dequoteString(azIn[i]);
- if( j>=0 ){
- azIn[j] = azIn[i];
- }
- j++;
+ dequoteString(azIn[i]);
+ if( j>=0 ){
+ azIn[j] = azIn[i];
+ }
+ j++;
}
}
azIn[j] = 0;
@@ -2771,7 +2771,7 @@
/*
** Find the first alphanumeric token in the string zIn. Null-terminate
-** this token. Remove any quotation marks. And return a pointer to
+** this token. Remove any quotation marks. And return a pointer to
** the result.
*/
static char *firstToken(char *zIn, char **pzTail){
@@ -2795,9 +2795,9 @@
/* Return true if...
**
-** * s begins with the string t, ignoring case
-** * s is longer than t
-** * The first character of s beyond t is not a alphanumeric
+** * 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.
**
@@ -2818,12 +2818,12 @@
** and use by fulltextConnect and fulltextCreate.
*/
typedef struct TableSpec {
- const char *zDb; /* Logical database name */
- const char *zName; /* Name of the full-text index */
- int nColumn; /* Number of columns to be indexed */
- char **azColumn; /* Original names of columns to be indexed */
+ const char *zDb; /* Logical database name */
+ const char *zName; /* Name of the full-text index */
+ int nColumn; /* Number of columns to be indexed */
+ char **azColumn; /* Original names of columns to be indexed */
char **azContentColumn; /* Column names for %_content */
- char **azTokenizer; /* Name of tokenizer and its arguments */
+ char **azTokenizer; /* Name of tokenizer and its arguments */
} TableSpec;
/*
@@ -2838,17 +2838,17 @@
/* Parse a CREATE VIRTUAL TABLE statement, which looks like this:
*
* CREATE VIRTUAL TABLE email
- * USING fts3(subject, body, tokenize mytokenizer(myarg))
+ * 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){
+ char**pzErr){
int i, n;
char *z, *zDummy;
char **azArg;
- const char *zTokenizer = 0; /* argv[] entry describing the tokenizer */
+ const char *zTokenizer = 0; /* argv[] entry describing the tokenizer */
assert( argc>=3 );
/* Current interface:
@@ -2856,7 +2856,7 @@
** argv[1] - database name
** argv[2] - table name
** argv[3..] - columns, optionally followed by tokenizer specification
- ** and snippet delimiters specification.
+ ** and snippet delimiters specification.
*/
/* Make a copy of the complete argv[][] array in a single allocation.
@@ -2905,7 +2905,7 @@
** Each content column name will be of the form cNNAAAA
** where NN is the column number and AAAA is the sanitized
** column name. "sanitized" means that special characters are
- ** converted to "_". The cNN prefix guarantees that all column
+ ** converted to "_". The cNN prefix guarantees that all column
** names are unique.
**
** The AAAA suffix is not strictly necessary. It is included
@@ -2942,9 +2942,9 @@
** using sqlite3_free().
*/
static char *fulltextSchema(
- int nColumn, /* Number of columns */
- const char *const* azColumn, /* List of columns */
- const char *zTableName /* Name of the table */
+ int nColumn, /* Number of columns */
+ const char *const* azColumn, /* List of columns */
+ const char *zTableName /* Name of the table */
){
int i;
char *zSchema, *zNext;
@@ -2969,10 +2969,10 @@
** fulltext index defined by spec.
*/
static int constructVtab(
- sqlite3 *db, /* The SQLite database connection */
- TableSpec *spec, /* Parsed spec information from parseSpec() */
+ sqlite3 *db, /* The SQLite database connection */
+ TableSpec *spec, /* Parsed spec information from parseSpec() */
sqlite3_vtab **ppVTab, /* Write the resulting vtab structure here */
- char **pzErr /* Write any error message here */
+ char **pzErr /* Write any error message here */
){
int rc;
fulltext_vtab *v = 0;
@@ -2984,7 +2984,7 @@
CLEAR(v);
/* sqlite will initialize v->base */
v->db = db;
- v->zDb = spec->zDb; /* Freed when azColumn is freed */
+ v->zDb = spec->zDb; /* Freed when azColumn is freed */
v->zName = spec->zName; /* Freed when azColumn is freed */
v->nColumn = spec->nColumn;
v->azContentColumn = spec->azContentColumn;
@@ -3013,7 +3013,7 @@
for(n=0; spec->azTokenizer[n]; n++){}
if( n ){
rc = m->xCreate(n-1, (const char*const*)&spec->azTokenizer[1],
- &v->pTokenizer);
+ &v->pTokenizer);
}else{
rc = m->xCreate(0, 0, &v->pTokenizer);
}
@@ -3031,7 +3031,7 @@
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);
+ v->parser = tracker_parser_new (language, max_len, min_len);
g_object_unref (language);
@@ -3039,7 +3039,7 @@
/* TODO: verify the existence of backing tables foo_content, foo_term */
schema = fulltextSchema(v->nColumn, (const char*const*)v->azColumn,
- spec->zName);
+ spec->zName);
rc = sqlite3_declare_vtab(db, schema);
sqlite3_free(schema);
if( rc!=SQLITE_OK ) goto err;
@@ -3082,8 +3082,8 @@
** code. Work it into the top-of-file comment at that time.
*/
static int fulltextCreate(sqlite3 *db, void *pAux,
- int argc, const char * const *argv,
- sqlite3_vtab **ppVTab, char **pzErr){
+ int argc, const char * const *argv,
+ sqlite3_vtab **ppVTab, char **pzErr){
int rc;
TableSpec spec;
StringBuffer schema;
@@ -3102,23 +3102,23 @@
if( rc!=SQLITE_OK ) goto out;
rc = sql_exec(db, spec.zDb, spec.zName,
- "create table %_segments("
- " blockid INTEGER PRIMARY KEY,"
- " block blob"
- ");"
- );
+ "create table %_segments("
+ " blockid INTEGER PRIMARY KEY,"
+ " block blob"
+ ");"
+ );
if( rc!=SQLITE_OK ) goto out;
rc = sql_exec(db, spec.zDb, spec.zName,
- "create table %_segdir("
- " level integer,"
- " idx integer,"
- " start_block integer,"
- " leaves_end_block integer,"
- " end_block integer,"
- " root blob,"
- " primary key(level, idx)"
- ");");
+ "create table %_segdir("
+ " level integer,"
+ " idx integer,"
+ " start_block integer,"
+ " leaves_end_block integer,"
+ " end_block integer,"
+ " root blob,"
+ " primary key(level, idx)"
+ ");");
if( rc!=SQLITE_OK ) goto out;
rc = constructVtab(db, &spec, ppVTab, pzErr);
@@ -3139,14 +3139,14 @@
pConstraint = &pInfo->aConstraint[i];
if( pConstraint->usable ) {
if( (pConstraint->iColumn==-1 || pConstraint->iColumn==v->nColumn+1) &&
- pConstraint->op==SQLITE_INDEX_CONSTRAINT_EQ ){
- pInfo->idxNum = QUERY_DOCID; /* lookup by docid */
- FTSTRACE(("FTS3 QUERY_DOCID\n"));
+ pConstraint->op==SQLITE_INDEX_CONSTRAINT_EQ ){
+ pInfo->idxNum = QUERY_DOCID; /* lookup by docid */
+ FTSTRACE(("FTS3 QUERY_DOCID\n"));
} else if( pConstraint->iColumn>=0 && pConstraint->iColumn<=v->nColumn &&
- pConstraint->op==SQLITE_INDEX_CONSTRAINT_MATCH ){
- /* full-text search */
- pInfo->idxNum = QUERY_FULLTEXT + pConstraint->iColumn;
- FTSTRACE(("FTS3 QUERY_FULLTEXT %d\n", pConstraint->iColumn));
+ pConstraint->op==SQLITE_INDEX_CONSTRAINT_MATCH ){
+ /* full-text search */
+ pInfo->idxNum = QUERY_FULLTEXT + pConstraint->iColumn;
+ FTSTRACE(("FTS3 QUERY_FULLTEXT %d\n", pConstraint->iColumn));
} else continue;
pInfo->aConstraintUsage[i].argvIndex = 1;
@@ -3176,10 +3176,10 @@
FTSTRACE(("FTS3 Destroy %p\n", pVTab));
rc = sql_exec(v->db, v->zDb, v->zName,
- "drop table if exists %_content;"
- "drop table if exists %_segments;"
- "drop table if exists %_segdir;"
- );
+ "drop table if exists %_content;"
+ "drop table if exists %_segments;"
+ "drop table if exists %_segdir;"
+ );
if( rc!=SQLITE_OK ) return rc;
fulltext_vtab_destroy((fulltext_vtab *)pVTab);
@@ -3226,9 +3226,9 @@
** Append a single entry to the p->aMatch[] log.
*/
static void snippetAppendMatch(
- Snippet *p, /* Append the entry to this snippet */
- int iCol, int iTerm, /* The column and query term */
- int iToken, /* Matching token in document */
+ Snippet *p, /* Append the entry to this snippet */
+ int iCol, int iTerm, /* The column and query term */
+ int iToken, /* Matching token in document */
int iStart, int nByte /* Offset and size of the match */
){
int i;
@@ -3254,7 +3254,7 @@
/*
** Sizing information for the circular buffer used in snippetOffsetsOfColumn()
*/
-#define FTS3_ROTOR_SZ (32)
+#define FTS3_ROTOR_SZ (32)
#define FTS3_ROTOR_MASK (FTS3_ROTOR_SZ-1)
/*
@@ -3269,20 +3269,20 @@
int nDoc
){
- 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 i, j; /* Loop counters */
+ 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 i, j; /* Loop counters */
unsigned int match, prevMatch; /* Phrase search bitmasks */
- const char *zToken; /* Next token from the tokenizer */
- int nToken; /* Size of zToken */
- int iBegin, iEnd, iPos; /* Offsets of beginning and end */
+ const char *zToken; /* Next token from the tokenizer */
+ int nToken; /* Size of zToken */
+ int iBegin, iEnd, iPos; /* Offsets of beginning and end */
gboolean new_paragraph, stop_word;
/* The following variables keep a circular buffer of the last
** few tokens */
- unsigned int iRotor = 0; /* Index of current token */
+ unsigned int iRotor = 0; /* Index of current token */
int iRotorBegin[FTS3_ROTOR_SZ]; /* Beginning offset of token */
int iRotorLen[FTS3_ROTOR_SZ]; /* Length of token */
@@ -3304,7 +3304,7 @@
// rc = pTModule->xNext(pTCursor, &zToken, &nToken, &iBegin, &iEnd, &iPos);
zToken = tracker_parser_next (pVtab->parser,
- &iPos,
+ &iPos,
&iBegin,
&iEnd,
&new_paragraph,
@@ -3331,11 +3331,11 @@
if( aTerm[i].iPhrase>1 && (prevMatch & (1<<i))==0 ) continue;
match |= 1<<i;
if( i==nTerm-1 || aTerm[i+1].iPhrase==1 ){
- for(j=aTerm[i].iPhrase-1; j>=0; j--){
- int k = (iRotor-j) & FTS3_ROTOR_MASK;
- snippetAppendMatch(pSnippet, iColumn, i-j, iPos-j,
- iRotorBegin[k], iRotorLen[k]);
- }
+ for(j=aTerm[i].iPhrase-1; j>=0; j--){
+ int k = (iRotor-j) & FTS3_ROTOR_MASK;
+ snippetAppendMatch(pSnippet, iColumn, i-j, iPos-j,
+ iRotorBegin[k], iRotorLen[k]);
+ }
}
}
prevMatch = match<<1;
@@ -3377,66 +3377,66 @@
if( (pMatch->iTerm+iDir)<0
|| (pMatch->iTerm+iDir)>=pQuery->nTerms
){
- continue;
+ continue;
}
nNear = pQueryTerm->nNear;
if( iDir<0 ){
- nNear = pQueryTerm[-1].nNear;
+ nNear = pQueryTerm[-1].nNear;
}
if( pMatch->iTerm>=0 && nNear ){
- int isOk = 0;
- int iNextTerm = pMatch->iTerm+iDir;
- int iPrevTerm = iNextTerm;
-
- int iEndToken;
- int iStartToken;
-
- if( iDir<0 ){
- int nPhrase = 1;
- iStartToken = pMatch->iToken;
- while( (pMatch->iTerm+nPhrase)<pQuery->nTerms
- && pQuery->pTerms[pMatch->iTerm+nPhrase].iPhrase>1
- ){
- nPhrase++;
- }
- iEndToken = iStartToken + nPhrase - 1;
- }else{
- iEndToken = pMatch->iToken;
- iStartToken = pMatch->iToken+1-pQueryTerm->iPhrase;
- }
-
- while( pQuery->pTerms[iNextTerm].iPhrase>1 ){
- iNextTerm--;
- }
- 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->iToken<=iEndToken+nNear
- ) || (
- p->iTerm==iPrevTerm &&
- p->iToken<iStartToken &&
- p->iToken>=iStartToken-nNear
- ))){
- isOk = 1;
- }
- }
- if( !isOk ){
- for(jj=1-pQueryTerm->iPhrase; jj<=0; jj++){
- pMatch[jj].iTerm = -1;
- }
- ii = -1;
- iDir = 1;
- }
+ int isOk = 0;
+ int iNextTerm = pMatch->iTerm+iDir;
+ int iPrevTerm = iNextTerm;
+
+ int iEndToken;
+ int iStartToken;
+
+ if( iDir<0 ){
+ int nPhrase = 1;
+ iStartToken = pMatch->iToken;
+ while( (pMatch->iTerm+nPhrase)<pQuery->nTerms
+ && pQuery->pTerms[pMatch->iTerm+nPhrase].iPhrase>1
+ ){
+ nPhrase++;
+ }
+ iEndToken = iStartToken + nPhrase - 1;
+ }else{
+ iEndToken = pMatch->iToken;
+ iStartToken = pMatch->iToken+1-pQueryTerm->iPhrase;
+ }
+
+ while( pQuery->pTerms[iNextTerm].iPhrase>1 ){
+ iNextTerm--;
+ }
+ 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->iToken<=iEndToken+nNear
+ ) || (
+ p->iTerm==iPrevTerm &&
+ p->iToken<iStartToken &&
+ p->iToken>=iStartToken-nNear
+ ))){
+ isOk = 1;
+ }
+ }
+ if( !isOk ){
+ for(jj=1-pQueryTerm->iPhrase; jj<=0; jj++){
+ pMatch[jj].iTerm = -1;
+ }
+ ii = -1;
+ iDir = 1;
+ }
}
}
iDir -= 2;
@@ -3497,7 +3497,7 @@
*/
zBuf[0] = ' ';
sqlite3_snprintf(sizeof(zBuf)-1, &zBuf[cnt>0], "%d %d %d %d",
- pMatch->iCol, pMatch->iTerm, pMatch->iStart, pMatch->nByte);
+ pMatch->iCol, pMatch->iTerm, pMatch->iStart, pMatch->nByte);
append(&sb, zBuf);
cnt++;
}
@@ -3516,12 +3516,12 @@
** to be a little left or right so that the break point is better.
*/
static int wordBoundary(
- int iBreak, /* The suggested break point */
- const char *zDoc, /* Document text */
- int nDoc, /* Number of bytes in zDoc[] */
- struct snippetMatch *aMatch, /* Matching words */
- int nMatch, /* Number of entries in aMatch[] */
- int iCol /* The column number for zDoc[] */
+ int iBreak, /* The suggested break point */
+ const char *zDoc, /* Document text */
+ int nDoc, /* Number of bytes in zDoc[] */
+ struct snippetMatch *aMatch, /* Matching words */
+ int nMatch, /* Number of entries in aMatch[] */
+ int iCol /* The column number for zDoc[] */
){
int i;
if( iBreak<=10 ){
@@ -3556,7 +3556,7 @@
/*
** Allowed values for Snippet.aMatch[].snStatus
*/
-#define SNIPPET_IGNORE 0 /* It is ok to omit this match from the snippet */
+#define SNIPPET_IGNORE 0 /* It is ok to omit this match from the snippet */
#define SNIPPET_DESIRED 1 /* We want to include this match in the snippet */
/*
@@ -3596,9 +3596,9 @@
for(i=0; i<pCursor->q.nTerms; i++){
for(j=0; j<nMatch; j++){
if( aMatch[j].iTerm==i ){
- aMatch[j].snStatus = SNIPPET_DESIRED;
- nDesired++;
- break;
+ aMatch[j].snStatus = SNIPPET_DESIRED;
+ nDesired++;
+ break;
}
}
}
@@ -3637,27 +3637,27 @@
while( iMatch<nMatch && aMatch[iMatch].iCol<iCol ){ iMatch++; }
while( iStart<iEnd ){
while( iMatch<nMatch && aMatch[iMatch].iStart<iStart
- && aMatch[iMatch].iCol<=iCol ){
- iMatch++;
+ && aMatch[iMatch].iCol<=iCol ){
+ iMatch++;
}
if( iMatch<nMatch && aMatch[iMatch].iStart<iEnd
- && aMatch[iMatch].iCol==iCol ){
- nappend(&sb, &zDoc[iStart], aMatch[iMatch].iStart - iStart);
- iStart = aMatch[iMatch].iStart;
- append(&sb, zStartMark);
- nappend(&sb, &zDoc[iStart], aMatch[iMatch].nByte);
- append(&sb, zEndMark);
- iStart += aMatch[iMatch].nByte;
- for(j=iMatch+1; j<nMatch; j++){
- if( aMatch[j].iTerm==aMatch[iMatch].iTerm
- && aMatch[j].snStatus==SNIPPET_DESIRED ){
- nDesired--;
- aMatch[j].snStatus = SNIPPET_IGNORE;
- }
- }
+ && aMatch[iMatch].iCol==iCol ){
+ nappend(&sb, &zDoc[iStart], aMatch[iMatch].iStart - iStart);
+ iStart = aMatch[iMatch].iStart;
+ append(&sb, zStartMark);
+ nappend(&sb, &zDoc[iStart], aMatch[iMatch].nByte);
+ append(&sb, zEndMark);
+ iStart += aMatch[iMatch].nByte;
+ for(j=iMatch+1; j<nMatch; j++){
+ if( aMatch[j].iTerm==aMatch[iMatch].iTerm
+ && aMatch[j].snStatus==SNIPPET_DESIRED ){
+ nDesired--;
+ aMatch[j].snStatus = SNIPPET_IGNORE;
+ }
+ }
}else{
- nappend(&sb, &zDoc[iStart], iEnd - iStart);
- iStart = iEnd;
+ nappend(&sb, &zDoc[iStart], iEnd - iStart);
+ iStart = iEnd;
}
}
tailCol = iCol;
@@ -3700,14 +3700,14 @@
rc = sqlite3_step(c->pStmt);
switch( rc ){
case SQLITE_ROW:
- c->eof = 0;
- return SQLITE_OK;
+ c->eof = 0;
+ return SQLITE_OK;
case SQLITE_DONE:
- c->eof = 1;
- return SQLITE_OK;
+ c->eof = 1;
+ return SQLITE_OK;
default:
- c->eof = 1;
- return rc;
+ c->eof = 1;
+ return rc;
}
} else { /* full-text query */
rc = sqlite3_reset(c->pStmt);
@@ -3737,8 +3737,8 @@
** docListOfTerm().
*/
static int termSelect(fulltext_vtab *v, int iColumn,
- const char *pTerm, int nTerm, int isPrefix,
- DocListType iType, DataBuffer *out);
+ const char *pTerm, int nTerm, int isPrefix,
+ DocListType iType, DataBuffer *out);
/* Return a DocList corresponding to the query term *pTerm. If *pTerm
** is the first term of a phrase query, go ahead and evaluate the phrase
@@ -3749,7 +3749,7 @@
*/
static int docListOfTerm(
fulltext_vtab *v, /* The full text index */
- int iColumn, /* column to restrict to. No restriction if >=nColumn */
+ int iColumn, /* column to restrict to. No restriction if >=nColumn */
QueryTerm *pQTerm, /* Term we are looking for, or 1st term of a phrase */
DataBuffer *pResult /* Write the result here */
){
@@ -3764,7 +3764,7 @@
dataBufferInit(&left, 0);
rc = termSelect(v, iColumn, pQTerm->pTerm, pQTerm->nTerm, pQTerm->isPrefix,
- (0<pQTerm->nPhrase ? DL_POSITIONS : DL_DOCIDS), &left);
+ (0<pQTerm->nPhrase ? DL_POSITIONS : DL_DOCIDS), &left);
if( rc ) return rc;
for(i=1; i<=pQTerm->nPhrase && left.nData>0; i++){
/* If this token is connected to the next by a NEAR operator, and
@@ -3773,23 +3773,23 @@
*/
int nPhraseRight = 1;
while( (i+nPhraseRight)<=pQTerm->nPhrase
- && pQTerm[i+nPhraseRight].nNear==0
+ && pQTerm[i+nPhraseRight].nNear==0
){
nPhraseRight++;
}
dataBufferInit(&right, 0);
rc = termSelect(v, iColumn, pQTerm[i].pTerm, pQTerm[i].nTerm,
- pQTerm[i].isPrefix, DL_POSITIONS, &right);
+ pQTerm[i].isPrefix, DL_POSITIONS, &right);
if( rc ){
dataBufferDestroy(&left);
return rc;
}
dataBufferInit(&new, 0);
docListPhraseMerge(left.pData, left.nData, right.pData, right.nData,
- pQTerm[i-1].nNear, pQTerm[i-1].iPhrase + nPhraseRight,
- ((i<pQTerm->nPhrase) ? DL_POSITIONS : DL_DOCIDS),
- &new);
+ pQTerm[i-1].nNear, pQTerm[i-1].iPhrase + nPhraseRight,
+ ((i<pQTerm->nPhrase) ? DL_POSITIONS : DL_DOCIDS),
+ &new);
dataBufferDestroy(&left);
dataBufferDestroy(&right);
left = new;
@@ -3828,13 +3828,13 @@
*/
static int checkColumnSpecifier(
fulltext_vtab *pVtab, /* The virtual table */
- const char *zToken, /* Text of the token */
- int nToken /* Number of characters in the token */
+ const char *zToken, /* Text of the token */
+ int nToken /* Number of characters in the token */
){
int i;
for(i=0; i<pVtab->nColumn; i++){
if( memcmp(pVtab->azColumn[i], zToken, nToken)==0
- && pVtab->azColumn[i][nToken]==0 ){
+ && pVtab->azColumn[i][nToken]==0 ){
return i;
}
}
@@ -3852,10 +3852,10 @@
** term found is marked with nPhrase=0 and OR and "-" syntax is significant.
*/
static int tokenizeSegment(
- TrackerParser *parser, /* The tokenizer to use */
- const char *pSegment, int nSegment, /* Query expression being parsed */
- int inPhrase, /* True if within "..." */
- Query *pQuery /* Append results here */
+ TrackerParser *parser, /* The tokenizer to use */
+ const char *pSegment, int nSegment, /* Query expression being parsed */
+ int inPhrase, /* True if within "..." */
+ Query *pQuery /* Append results here */
){
int firstIndex = pQuery->nTerms;
int iCol;
@@ -3881,18 +3881,18 @@
// 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]==':') {
+ pSegment[iEnd]==':') {
- int len = iEnd - iBegin;
- char *field = g_strndup (pSegment + iBegin, len);
+ int len = iEnd - iBegin;
+ char *field = g_strndup (pSegment + iBegin, len);
- // printf ("field is %s\n", field);
+ // printf ("field is %s\n", field);
- if ((iCol = checkColumnSpecifier(pQuery->pFts, field, len))>=0 ){
- pQuery->nextColumn = iCol;
- g_free (field);
- continue;
- }
+ 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'
@@ -3911,32 +3911,32 @@
&& pSegment[iBegin+4] == '/'
&& pSegment[iBegin+5]>='0' && pSegment[iBegin+5]<='9'
){
- pTerm->nNear = (pSegment[iBegin+5] - '0');
- nToken += 2;
- if( pSegment[iBegin+6]>='0' && pSegment[iBegin+6]<=9 ){
- pTerm->nNear = pTerm->nNear * 10 + (pSegment[iBegin+6] - '0');
- iEnd++;
- }
- pToken = tracker_parser_next (parser, &iPos,
+ pTerm->nNear = (pSegment[iBegin+5] - '0');
+ nToken += 2;
+ if( pSegment[iBegin+6]>='0' && pSegment[iBegin+6]<=9 ){
+ pTerm->nNear = pTerm->nNear * 10 + (pSegment[iBegin+6] - '0');
+ iEnd++;
+ }
+ pToken = tracker_parser_next (parser, &iPos,
&iBegin,
&iEnd,
&new_paragraph,
&stop_word,
&nToken);
- if (!pToken) {
- break;
- }
+ if (!pToken) {
+ break;
+ }
} else {
- pTerm->nNear = SQLITE_FTS3_DEFAULT_NEAR_PARAM;
+ pTerm->nNear = SQLITE_FTS3_DEFAULT_NEAR_PARAM;
}
pTerm->nNear++;
continue;
}
if (stop_word != 0) {
- continue;
+ continue;
}
queryAdd(pQuery, pToken, nToken);
@@ -3945,7 +3945,7 @@
// 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;
+ pQuery->pTerms[pQuery->nTerms-1].isNot = 1;
}
}
if( iEnd<nSegment && pSegment[iEnd]=='*' ){
@@ -3970,11 +3970,11 @@
** the dynamically allocated memory held by pQuery.
*/
static int parseQuery(
- fulltext_vtab *v, /* The fulltext index */
- const char *zInput, /* Input text of the query string */
- int nInput, /* Size of the input text */
- int dfltColumn, /* Default column of the index to match against */
- Query *pQuery /* Write the parse results here. */
+ fulltext_vtab *v, /* The fulltext index */
+ const char *zInput, /* Input text of the query string */
+ int nInput, /* Size of the input text */
+ int dfltColumn, /* Default column of the index to match against */
+ Query *pQuery /* Write the parse results here. */
){
int iInput, inPhrase = 0;
int ii;
@@ -3994,7 +3994,7 @@
for(i=iInput; i<nInput && zInput[i]!='"'; ++i){}
if( i>iInput ){
tokenizeSegment(v->parser, zInput+iInput, i-iInput, inPhrase,
- pQuery);
+ pQuery);
}
iInput = i;
if( i<nInput ){
@@ -4018,7 +4018,7 @@
for(ii=0; ii<pQuery->nTerms; ii++){
if( aTerm[ii].nNear || aTerm[ii].nPhrase ){
while (aTerm[ii+aTerm[ii].nPhrase].nNear) {
- aTerm[ii].nPhrase += (1 + aTerm[ii+aTerm[ii].nPhrase+1].nPhrase);
+ aTerm[ii].nPhrase += (1 + aTerm[ii+aTerm[ii].nPhrase+1].nPhrase);
}
}
}
@@ -4037,12 +4037,12 @@
** they are allowed to match against any column.
*/
static int fulltextQuery(
- fulltext_vtab *v, /* The full text index */
- int iColumn, /* Match against this column by default */
- const char *zInput, /* The query string */
- int nInput, /* Number of bytes in zInput[] */
- DataBuffer *pResult, /* Write the result doclist here */
- Query *pQuery /* Put parsed query string here */
+ fulltext_vtab *v, /* The full text index */
+ int iColumn, /* Match against this column by default */
+ const char *zInput, /* The query string */
+ int nInput, /* Number of bytes in zInput[] */
+ DataBuffer *pResult, /* Write the result doclist here */
+ Query *pQuery /* Put parsed query string here */
){
int i, iNext, rc;
DataBuffer left, right, or, new;
@@ -4094,10 +4094,10 @@
rc = docListOfTerm(v, aTerm[iNext].iColumn, &aTerm[iNext], &or);
iNext += aTerm[iNext].nPhrase + 1;
if( rc ){
- if( i!=nNot ) dataBufferDestroy(&left);
- dataBufferDestroy(&right);
- queryClear(pQuery);
- return rc;
+ if( i!=nNot ) dataBufferDestroy(&left);
+ dataBufferDestroy(&right);
+ queryClear(pQuery);
+ return rc;
}
dataBufferInit(&new, 0);
docListOrMerge(right.pData, right.nData, or.pData, or.nData, &new);
@@ -4105,7 +4105,7 @@
dataBufferDestroy(&or);
right = new;
}
- if( i==nNot ){ /* first term processed. */
+ if( i==nNot ){ /* first term processed. */
left = right;
}else{
dataBufferInit(&new, 0);
@@ -4159,7 +4159,7 @@
*/
/* TODO(shess) Upgrade the cursor initialization and destruction to
** account for fulltextFilter() being called multiple times on the
-** same cursor. The current solution is very fragile. Apply fix to
+** same cursor. The current solution is very fragile. Apply fix to
** fts3 as appropriate.
*/
static int fulltextFilter(
@@ -4201,16 +4201,16 @@
assert( argc==1 );
queryClear(&c->q);
if( c->result.nData!=0 ){
- /* This case happens if the same cursor is used repeatedly. */
- dlrDestroy(&c->reader);
- dataBufferReset(&c->result);
+ /* This case happens if the same cursor is used repeatedly. */
+ dlrDestroy(&c->reader);
+ dataBufferReset(&c->result);
}else{
- dataBufferInit(&c->result, 0);
+ dataBufferInit(&c->result, 0);
}
rc = fulltextQuery(v, idxNum-QUERY_FULLTEXT, zQuery, -1, &c->result, &c->q);
if( rc!=SQLITE_OK ) return rc;
if( c->result.nData!=0 ){
- dlrInit(&c->reader, DL_DOCIDS, c->result.pData, c->result.nData);
+ dlrInit(&c->reader, DL_DOCIDS, c->result.pData, c->result.nData);
}
break;
}
@@ -4230,12 +4230,12 @@
/* This is the xColumn method of the virtual table. The SQLite
** core calls this method during a query when it needs the value
-** of a column from the virtual table. This method needs to use
+** of a column from the virtual table. This method needs to use
** one of the sqlite3_result_*() routines to store the requested
** value back in the pContext.
*/
static int fulltextColumn(sqlite3_vtab_cursor *pCursor,
- sqlite3_context *pContext, int idxCol){
+ sqlite3_context *pContext, int idxCol){
fulltext_cursor *c = (fulltext_cursor *) pCursor;
fulltext_vtab *v = cursor_vtab(c);
@@ -4257,7 +4257,7 @@
/* This is the xRowid method. The SQLite core calls this routine to
** retrieve the rowid for the current row of the result set. fts3
-** exposes %_content.docid as the rowid for the virtual table. The
+** exposes %_content.docid as the rowid for the virtual table. The
** rowid should be written to *pRowid.
*/
static int fulltextRowid(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){
@@ -4272,7 +4272,7 @@
** column number.
*/
static int buildTerms(fulltext_vtab *v, sqlite_int64 iDocid,
- const char *zText, int iColumn){
+ const char *zText, int iColumn){
const char *pToken;
int nTokenBytes;
int iStartOffset, iEndOffset, iPosition, stop_word, new_paragraph;
@@ -4292,20 +4292,20 @@
&stop_word,
&nTokenBytes);
if (!pToken) {
- break;
+ break;
}
// 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;
+ continue;
}
DLCollector *p;
- int nData; /* Size of doclist before our update. */
+ int nData; /* Size of doclist before our update. */
/* Positions can't be negative; we use -1 as a terminator
* internally. Token can't be NULL or empty. */
@@ -4334,7 +4334,7 @@
v->nPendingData += p->b.nData-nData;
}
- /* TODO(shess) Check return? Should this be able to cause errors at
+ /* TODO(shess) Check return? Should this be able to cause errors at
** this point? Actually, same question about sqlite3_finalize(),
** though one could argue that failure there means that the data is
** not durable. *ponder*
@@ -4346,7 +4346,7 @@
/* Add doclists for all terms in [pValues] to pendingTerms table. */
static int insertTerms(fulltext_vtab *v, sqlite_int64 iDocid,
- sqlite3_value **pValues){
+ sqlite3_value **pValues){
int i;
for(i = 0; i < v->nColumn ; ++i){
char *zText = (char*)sqlite3_value_text(pValues[i]);
@@ -4385,7 +4385,7 @@
** new row. Add doclists for terms to pendingTerms.
*/
static int index_insert(fulltext_vtab *v, sqlite3_value *pRequestDocid,
- sqlite3_value **pValues, sqlite_int64 *piDocid){
+ sqlite3_value **pValues, sqlite_int64 *piDocid){
int rc;
rc = content_insert(v, pRequestDocid, pValues); /* execute an SQL INSERT */
@@ -4417,7 +4417,7 @@
** to pendingTerms for terms in the new data.
*/
static int index_update(fulltext_vtab *v, sqlite_int64 iRow,
- sqlite3_value **pValues){
+ sqlite3_value **pValues){
int rc = initPendingTerms(v, iRow);
if( rc!=SQLITE_OK ) return rc;
@@ -4469,13 +4469,13 @@
** layer is being constructed.
*/
typedef struct InteriorBlock {
- DataBuffer term; /* Leftmost term in block's subtree. */
- DataBuffer data; /* Accumulated data for the block. */
+ DataBuffer term; /* Leftmost term in block's subtree. */
+ DataBuffer data; /* Accumulated data for the block. */
struct InteriorBlock *next;
} InteriorBlock;
static InteriorBlock *interiorBlockNew(int iHeight, sqlite_int64 iChildBlock,
- const char *pTerm, int nTerm){
+ const char *pTerm, int nTerm){
InteriorBlock *block = sqlite3_malloc(sizeof(InteriorBlock));
char c[VARINT_MAX+VARINT_MAX];
int n;
@@ -4558,11 +4558,11 @@
#endif
typedef struct InteriorWriter {
- int iHeight; /* from 0 at leaves. */
+ int iHeight; /* from 0 at leaves. */
InteriorBlock *first, *last;
struct InteriorWriter *parentWriter;
- DataBuffer term; /* Last term written to block "last". */
+ DataBuffer term; /* Last term written to block "last". */
sqlite_int64 iOpeningChildBlock; /* First child block in block "last". */
#ifndef NDEBUG
sqlite_int64 iLastChildBlock; /* for consistency checks. */
@@ -4574,8 +4574,8 @@
** next level down the tree.
*/
static void interiorWriterInit(int iHeight, const char *pTerm, int nTerm,
- sqlite_int64 iChildBlock,
- InteriorWriter *pWriter){
+ sqlite_int64 iChildBlock,
+ InteriorWriter *pWriter){
InteriorBlock *block;
assert( iHeight>0 );
CLEAR(pWriter);
@@ -4595,8 +4595,8 @@
** with pTerm[nTerm] as the leftmost term in iChildBlock's subtree.
*/
static void interiorWriterAppend(InteriorWriter *pWriter,
- const char *pTerm, int nTerm,
- sqlite_int64 iChildBlock){
+ const char *pTerm, int nTerm,
+ sqlite_int64 iChildBlock){
char c[VARINT_MAX+VARINT_MAX];
int n, nPrefix = 0;
@@ -4612,7 +4612,7 @@
n = fts3PutVarint(c, nTerm);
}else{
while( nPrefix<pWriter->term.nData &&
- pTerm[nPrefix]==pWriter->term.pData[nPrefix] ){
+ pTerm[nPrefix]==pWriter->term.pData[nPrefix] ){
nPrefix++;
}
@@ -4631,13 +4631,13 @@
if( pWriter->last->data.nData+n+nTerm-nPrefix>INTERIOR_MAX &&
iChildBlock-pWriter->iOpeningChildBlock>INTERIOR_MIN_TERMS ){
pWriter->last->next = interiorBlockNew(pWriter->iHeight, iChildBlock,
- pTerm, nTerm);
+ pTerm, nTerm);
pWriter->last = pWriter->last->next;
pWriter->iOpeningChildBlock = iChildBlock;
dataBufferReset(&pWriter->term);
}else{
dataBufferAppend2(&pWriter->last->data, c, n,
- pTerm+nPrefix, nTerm-nPrefix);
+ pTerm+nPrefix, nTerm-nPrefix);
dataBufferReplace(&pWriter->term, pTerm, nTerm);
}
ASSERT_VALID_INTERIOR_BLOCK(pWriter->last);
@@ -4671,8 +4671,8 @@
** recursively ask for their root into.
*/
static int interiorWriterRootInfo(fulltext_vtab *v, InteriorWriter *pWriter,
- char **ppRootInfo, int *pnRootInfo,
- sqlite_int64 *piEndBlockid){
+ char **ppRootInfo, int *pnRootInfo,
+ sqlite_int64 *piEndBlockid){
InteriorBlock *block = pWriter->first;
sqlite_int64 iBlockid = 0;
int rc;
@@ -4694,8 +4694,8 @@
pWriter->parentWriter = sqlite3_malloc(sizeof(*pWriter->parentWriter));
interiorWriterInit(pWriter->iHeight+1,
- block->term.pData, block->term.nData,
- iBlockid, pWriter->parentWriter);
+ block->term.pData, block->term.nData,
+ iBlockid, pWriter->parentWriter);
/* Flush additional blocks and append to the higher interior
** node.
@@ -4707,12 +4707,12 @@
*piEndBlockid = iBlockid;
interiorWriterAppend(pWriter->parentWriter,
- block->term.pData, block->term.nData, iBlockid);
+ block->term.pData, block->term.nData, iBlockid);
}
/* Parent node gets the chance to be the root. */
return interiorWriterRootInfo(v, pWriter->parentWriter,
- ppRootInfo, pnRootInfo, piEndBlockid);
+ ppRootInfo, pnRootInfo, piEndBlockid);
}
/****************************************************************/
@@ -4723,7 +4723,7 @@
const char *pData;
int nData;
- DataBuffer term; /* previous term, for decoding term delta. */
+ DataBuffer term; /* previous term, for decoding term delta. */
sqlite_int64 iBlockid;
} InteriorReader;
@@ -4737,7 +4737,7 @@
** and the blob is empty or otherwise contains suspect data?
*/
static void interiorReaderInit(const char *pData, int nData,
- InteriorReader *pReader){
+ InteriorReader *pReader){
int n, nTerm;
/* Require at least the leading flag byte */
@@ -4815,7 +4815,7 @@
** results. If isPrefix, equality means equal through nTerm bytes.
*/
static int interiorReaderTermCmp(InteriorReader *pReader,
- const char *pTerm, int nTerm, int isPrefix){
+ const char *pTerm, int nTerm, int isPrefix){
const char *pReaderTerm = interiorReaderTerm(pReader);
int nReaderTerm = interiorReaderTermBytes(pReader);
int c, n = nReaderTerm<nTerm ? nReaderTerm : nTerm;
@@ -4866,18 +4866,18 @@
typedef struct LeafWriter {
int iLevel;
int idx;
- sqlite_int64 iStartBlockid; /* needed to create the root info */
- sqlite_int64 iEndBlockid; /* when we're done writing. */
+ sqlite_int64 iStartBlockid; /* needed to create the root info */
+ sqlite_int64 iEndBlockid; /* when we're done writing. */
- DataBuffer term; /* previous encoded term */
- DataBuffer data; /* encoding buffer */
+ DataBuffer term; /* previous encoded term */
+ DataBuffer data; /* encoding buffer */
/* bytes of first term in the current node which distinguishes that
** term from the last term of the previous node.
*/
int nTermDistinct;
- InteriorWriter parentWriter; /* if we overflow */
+ InteriorWriter parentWriter; /* if we overflow */
int has_parent;
} LeafWriter;
@@ -4965,7 +4965,7 @@
** contain it.
*/
static int leafWriterInternalFlush(fulltext_vtab *v, LeafWriter *pWriter,
- int iData, int nData){
+ int iData, int nData){
sqlite_int64 iBlockid = 0;
const char *pStartingTerm;
int nStartingTerm, rc, n;
@@ -4994,10 +4994,10 @@
if( pWriter->has_parent ){
interiorWriterAppend(&pWriter->parentWriter,
- pStartingTerm, nStartingTerm, iBlockid);
+ pStartingTerm, nStartingTerm, iBlockid);
}else{
interiorWriterInit(1, pStartingTerm, nStartingTerm, iBlockid,
- &pWriter->parentWriter);
+ &pWriter->parentWriter);
pWriter->has_parent = 1;
}
@@ -5029,8 +5029,8 @@
** all).
*/
static int leafWriterRootInfo(fulltext_vtab *v, LeafWriter *pWriter,
- char **ppRootInfo, int *pnRootInfo,
- sqlite_int64 *piEndBlockid){
+ char **ppRootInfo, int *pnRootInfo,
+ sqlite_int64 *piEndBlockid){
/* we can fit the segment entirely inline */
if( !pWriter->has_parent && pWriter->data.nData<ROOT_MAX ){
*ppRootInfo = pWriter->data.pData;
@@ -5056,7 +5056,7 @@
*piEndBlockid = pWriter->iEndBlockid;
return interiorWriterRootInfo(v, &pWriter->parentWriter,
- ppRootInfo, pnRootInfo, piEndBlockid);
+ ppRootInfo, pnRootInfo, piEndBlockid);
}
/* Collect the rootInfo data and store it into the segment directory.
@@ -5075,8 +5075,8 @@
if( iEndBlockid==0 && nRootInfo==0 ) return SQLITE_OK;
return segdir_set(v, pWriter->iLevel, pWriter->idx,
- pWriter->iStartBlockid, pWriter->iEndBlockid,
- iEndBlockid, pRootInfo, nRootInfo);
+ pWriter->iStartBlockid, pWriter->iEndBlockid,
+ iEndBlockid, pRootInfo, nRootInfo);
}
static void leafWriterDestroy(LeafWriter *pWriter){
@@ -5091,13 +5091,13 @@
** boundary is crossed.
*/
static int leafWriterEncodeTerm(LeafWriter *pWriter,
- const char *pTerm, int nTerm){
+ const char *pTerm, int nTerm){
char c[VARINT_MAX+VARINT_MAX];
int n, nPrefix = 0;
assert( nTerm>0 );
while( nPrefix<pWriter->term.nData &&
- pTerm[nPrefix]==pWriter->term.pData[nPrefix] ){
+ pTerm[nPrefix]==pWriter->term.pData[nPrefix] ){
nPrefix++;
/* Failing this implies that the terms weren't in order. */
assert( nPrefix<nTerm );
@@ -5105,18 +5105,18 @@
if( pWriter->data.nData==0 ){
/* Encode the node header and leading term as:
- ** varint(0)
- ** varint(nTerm)
- ** char pTerm[nTerm]
+ ** varint(0)
+ ** varint(nTerm)
+ ** char pTerm[nTerm]
*/
n = fts3PutVarint(c, '\0');
n += fts3PutVarint(c+n, nTerm);
dataBufferAppend2(&pWriter->data, c, n, pTerm, nTerm);
}else{
/* Delta-encode the term as:
- ** varint(nPrefix)
- ** varint(nSuffix)
- ** char pTermSuffix[nSuffix]
+ ** varint(nPrefix)
+ ** varint(nSuffix)
+ ** char pTermSuffix[nSuffix]
*/
n = fts3PutVarint(c, nPrefix);
n += fts3PutVarint(c+n, nTerm-nPrefix);
@@ -5128,13 +5128,13 @@
}
/* Used to avoid a memmove when a large amount of doclist data is in
-** the buffer. This constructs a node and term header before
+** the buffer. This constructs a node and term header before
** iDoclistData and flushes the resulting complete node using
** leafWriterInternalFlush().
*/
static int leafWriterInlineFlush(fulltext_vtab *v, LeafWriter *pWriter,
- const char *pTerm, int nTerm,
- int iDoclistData){
+ const char *pTerm, int nTerm,
+ int iDoclistData){
char c[VARINT_MAX+VARINT_MAX];
int iData, n = fts3PutVarint(c, 0);
n += fts3PutVarint(c+n, nTerm);
@@ -5157,8 +5157,8 @@
** %_segments.
*/
static int leafWriterStepMerge(fulltext_vtab *v, LeafWriter *pWriter,
- const char *pTerm, int nTerm,
- DLReader *pReaders, int nReaders){
+ const char *pTerm, int nTerm,
+ DLReader *pReaders, int nReaders){
char c[VARINT_MAX+VARINT_MAX];
int iTermData = pWriter->data.nData, iDoclistData;
int i, nData, n, nActualData, nActual, rc, nTermDistinct;
@@ -5182,8 +5182,8 @@
docListMerge(&pWriter->data, pReaders, nReaders);
ASSERT_VALID_DOCLIST(DL_DEFAULT,
- pWriter->data.pData+iDoclistData+n,
- pWriter->data.nData-iDoclistData-n, NULL);
+ pWriter->data.pData+iDoclistData+n,
+ pWriter->data.nData-iDoclistData-n, NULL);
/* The actual amount of doclist data at this point could be smaller
** than the length we encoded. Additionally, the space required to
@@ -5232,8 +5232,8 @@
*/
if( nActual<n ){
memmove(pWriter->data.pData+iDoclistData+nActual,
- pWriter->data.pData+iDoclistData+n,
- pWriter->data.nData-(iDoclistData+n));
+ pWriter->data.pData+iDoclistData+n,
+ pWriter->data.nData-(iDoclistData+n));
pWriter->data.nData -= n-nActual;
}
@@ -5269,8 +5269,8 @@
assert( 2*STANDALONE_MIN<=LEAF_MAX );
assert( n+pWriter->data.nData-iDoclistData<iDoclistData );
memcpy(pWriter->data.pData+n,
- pWriter->data.pData+iDoclistData,
- pWriter->data.nData-iDoclistData);
+ pWriter->data.pData+iDoclistData,
+ pWriter->data.nData-iDoclistData);
pWriter->data.nData -= iDoclistData-n;
}
ASSERT_VALID_LEAF_NODE(pWriter->data.pData, pWriter->data.nData);
@@ -5285,8 +5285,8 @@
** constructed directly in pWriter->data.
*/
static int leafWriterStep(fulltext_vtab *v, LeafWriter *pWriter,
- const char *pTerm, int nTerm,
- const char *pData, int nData){
+ const char *pTerm, int nTerm,
+ const char *pData, int nData){
int rc;
DLReader reader;
@@ -5301,9 +5301,9 @@
/****************************************************************/
/* LeafReader is used to iterate over an individual leaf node. */
typedef struct LeafReader {
- DataBuffer term; /* copy of current term. */
+ DataBuffer term; /* copy of current term. */
- const char *pData; /* data for current term. */
+ const char *pData; /* data for current term. */
int nData;
} LeafReader;
@@ -5340,7 +5340,7 @@
}
static void leafReaderInit(const char *pData, int nData,
- LeafReader *pReader){
+ LeafReader *pReader){
int nTerm, n;
assert( nData>0 );
@@ -5389,7 +5389,7 @@
** If isPrefix, equality means equal through nTerm bytes.
*/
static int leafReaderTermCmp(LeafReader *pReader,
- const char *pTerm, int nTerm, int isPrefix){
+ const char *pTerm, int nTerm, int isPrefix){
int c, n = pReader->term.nData<nTerm ? pReader->term.nData : nTerm;
if( n==0 ){
if( pReader->term.nData>0 ) return -1;
@@ -5409,13 +5409,13 @@
** leaf layer of the tree.
*/
typedef struct LeavesReader {
- int idx; /* Index within the segment. */
+ int idx; /* Index within the segment. */
- sqlite3_stmt *pStmt; /* Statement we're streaming leaves from. */
- int eof; /* we've seen SQLITE_DONE from pStmt. */
+ sqlite3_stmt *pStmt; /* Statement we're streaming leaves from. */
+ int eof; /* we've seen SQLITE_DONE from pStmt. */
LeafReader leafReader; /* reader for the current leaf. */
- DataBuffer rootData; /* root data for inline. */
+ DataBuffer rootData; /* root data for inline. */
} LeavesReader;
/* Access the current term. */
@@ -5476,11 +5476,11 @@
** stream of blocks between iStartBlockid and iEndBlockid, inclusive.
*/
static int leavesReaderInit(fulltext_vtab *v,
- int idx,
- sqlite_int64 iStartBlockid,
- sqlite_int64 iEndBlockid,
- const char *pRootData, int nRootData,
- LeavesReader *pReader){
+ int idx,
+ sqlite_int64 iStartBlockid,
+ sqlite_int64 iEndBlockid,
+ const char *pRootData, int nRootData,
+ LeavesReader *pReader){
CLEAR(pReader);
pReader->idx = idx;
@@ -5489,7 +5489,7 @@
/* Entire leaf level fit in root data. */
dataBufferReplace(&pReader->rootData, pRootData, nRootData);
leafReaderInit(pReader->rootData.pData, pReader->rootData.nData,
- &pReader->leafReader);
+ &pReader->leafReader);
}else{
sqlite3_stmt *s;
int rc = sql_get_leaf_statement(v, idx, &s);
@@ -5510,8 +5510,8 @@
pReader->pStmt = s;
leafReaderInit(sqlite3_column_blob(pReader->pStmt, 0),
- sqlite3_column_bytes(pReader->pStmt, 0),
- &pReader->leafReader);
+ sqlite3_column_bytes(pReader->pStmt, 0),
+ &pReader->leafReader);
}
return SQLITE_OK;
}
@@ -5536,8 +5536,8 @@
}
leafReaderDestroy(&pReader->leafReader);
leafReaderInit(sqlite3_column_blob(pReader->pStmt, 0),
- sqlite3_column_bytes(pReader->pStmt, 0),
- &pReader->leafReader);
+ sqlite3_column_bytes(pReader->pStmt, 0),
+ &pReader->leafReader);
}
return SQLITE_OK;
}
@@ -5553,8 +5553,8 @@
if( leavesReaderAtEnd(lr2) ) return -1;
return leafReaderTermCmp(&lr1->leafReader,
- leavesReaderTerm(lr2), leavesReaderTermBytes(lr2),
- 0);
+ leavesReaderTerm(lr2), leavesReaderTermBytes(lr2),
+ 0);
}
/* Similar to leavesReaderTermCmp(), with additional ordering by idx
@@ -5584,7 +5584,7 @@
** order.
*/
static int leavesReadersInit(fulltext_vtab *v, int iLevel,
- LeavesReader *pReaders, int *piReaders){
+ LeavesReader *pReaders, int *piReaders){
sqlite3_stmt *s;
int i, rc = sql_get_statement(v, SEGDIR_SELECT_LEVEL_STMT, &s);
if( rc!=SQLITE_OK ) return rc;
@@ -5601,7 +5601,7 @@
assert( i<MERGE_COUNT );
rc = leavesReaderInit(v, i, iStart, iEnd, pRootData, nRootData,
- &pReaders[i]);
+ &pReaders[i]);
if( rc!=SQLITE_OK ) break;
i++;
@@ -5628,8 +5628,8 @@
*/
/* TODO(shess) Consider putting this inline in segmentMerge(). */
static int leavesReadersMerge(fulltext_vtab *v,
- LeavesReader *pReaders, int nReaders,
- LeafWriter *pWriter){
+ LeavesReader *pReaders, int nReaders,
+ LeafWriter *pWriter){
DLReader dlReaders[MERGE_COUNT];
const char *pTerm = leavesReaderTerm(pReaders);
int i, nTerm = leavesReaderTermBytes(pReaders);
@@ -5638,8 +5638,8 @@
for(i=0; i<nReaders; i++){
dlrInit(&dlReaders[i], DL_DEFAULT,
- leavesReaderData(pReaders+i),
- leavesReaderDataBytes(pReaders+i));
+ leavesReaderData(pReaders+i),
+ leavesReaderDataBytes(pReaders+i));
}
return leafWriterStepMerge(v, pWriter, pTerm, nTerm, dlReaders, nReaders);
@@ -5654,7 +5654,7 @@
*/
static int segdirNextIndex(fulltext_vtab *v, int iLevel, int *pidx){
int rc = segdir_max_index(v, iLevel, pidx);
- if( rc==SQLITE_DONE ){ /* No segments at iLevel. */
+ if( rc==SQLITE_DONE ){ /* No segments at iLevel. */
*pidx = 0;
}else if( rc==SQLITE_ROW ){
if( *pidx==(MERGE_COUNT-1) ){
@@ -5740,7 +5740,7 @@
/* Accumulate the union of *acc and *pData into *acc. */
static void docListAccumulateUnion(DataBuffer *acc,
- const char *pData, int nData) {
+ const char *pData, int nData) {
DataBuffer tmp = *acc;
dataBufferInit(acc, tmp.nData+nData);
docListUnion(tmp.pData, tmp.nData, pData, nData, acc);
@@ -5763,8 +5763,8 @@
** Internal function for loadSegmentLeaf().
*/
static int loadSegmentLeavesInt(fulltext_vtab *v, LeavesReader *pReader,
- const char *pTerm, int nTerm, int isPrefix,
- DataBuffer *out){
+ const char *pTerm, int nTerm, int isPrefix,
+ DataBuffer *out){
/* doclist data is accumulated into pBuffers similar to how one does
** increment in binary arithmetic. If index 0 is empty, the data is
** stored there. If there is data there, it is merged and the
@@ -5784,38 +5784,38 @@
** use a confusing name.]
*/
int c = leafReaderTermCmp(&pReader->leafReader, pTerm, nTerm, isPrefix);
- if( c>0 ) break; /* Past any possible matches. */
+ if( c>0 ) break; /* Past any possible matches. */
if( c==0 ){
const char *pData = leavesReaderData(pReader);
int iBuffer, nData = leavesReaderDataBytes(pReader);
/* Find the first empty buffer. */
for(iBuffer=0; iBuffer<nBuffers; ++iBuffer){
- if( 0==pBuffers[iBuffer].nData ) break;
+ if( 0==pBuffers[iBuffer].nData ) break;
}
/* Out of buffers, add an empty one. */
if( iBuffer==nBuffers ){
- if( nBuffers==nMaxBuffers ){
- DataBuffer *p;
- nMaxBuffers += 20;
-
- /* Manual realloc so we can handle NULL appropriately. */
- p = sqlite3_malloc(nMaxBuffers*sizeof(*pBuffers));
- if( p==NULL ){
- rc = SQLITE_NOMEM;
- break;
- }
-
- if( nBuffers>0 ){
- assert(pBuffers!=NULL);
- memcpy(p, pBuffers, nBuffers*sizeof(*pBuffers));
- sqlite3_free(pBuffers);
- }
- pBuffers = p;
- }
- dataBufferInit(&(pBuffers[nBuffers]), 0);
- nBuffers++;
+ if( nBuffers==nMaxBuffers ){
+ DataBuffer *p;
+ nMaxBuffers += 20;
+
+ /* Manual realloc so we can handle NULL appropriately. */
+ p = sqlite3_malloc(nMaxBuffers*sizeof(*pBuffers));
+ if( p==NULL ){
+ rc = SQLITE_NOMEM;
+ break;
+ }
+
+ if( nBuffers>0 ){
+ assert(pBuffers!=NULL);
+ memcpy(p, pBuffers, nBuffers*sizeof(*pBuffers));
+ sqlite3_free(pBuffers);
+ }
+ pBuffers = p;
+ }
+ dataBufferInit(&(pBuffers[nBuffers]), 0);
+ nBuffers++;
}
/* At this point, must have an empty at iBuffer. */
@@ -5823,32 +5823,32 @@
/* If empty was first buffer, no need for merge logic. */
if( iBuffer==0 ){
- dataBufferReplace(&(pBuffers[0]), pData, nData);
+ dataBufferReplace(&(pBuffers[0]), pData, nData);
}else{
- /* pAcc is the empty buffer the merged data will end up in. */
- DataBuffer *pAcc = &(pBuffers[iBuffer]);
- DataBuffer *p = &(pBuffers[0]);
-
- /* Handle position 0 specially to avoid need to prime pAcc
- ** with pData/nData.
- */
- dataBufferSwap(p, pAcc);
- docListAccumulateUnion(pAcc, pData, nData);
-
- /* Accumulate remaining doclists into pAcc. */
- for(++p; p<pAcc; ++p){
- docListAccumulateUnion(pAcc, p->pData, p->nData);
-
- /* dataBufferReset() could allow a large doclist to blow up
- ** our memory requirements.
- */
- if( p->nCapacity<1024 ){
- dataBufferReset(p);
- }else{
- dataBufferDestroy(p);
- dataBufferInit(p, 0);
- }
- }
+ /* pAcc is the empty buffer the merged data will end up in. */
+ DataBuffer *pAcc = &(pBuffers[iBuffer]);
+ DataBuffer *p = &(pBuffers[0]);
+
+ /* Handle position 0 specially to avoid need to prime pAcc
+ ** with pData/nData.
+ */
+ dataBufferSwap(p, pAcc);
+ docListAccumulateUnion(pAcc, pData, nData);
+
+ /* Accumulate remaining doclists into pAcc. */
+ for(++p; p<pAcc; ++p){
+ docListAccumulateUnion(pAcc, p->pData, p->nData);
+
+ /* dataBufferReset() could allow a large doclist to blow up
+ ** our memory requirements.
+ */
+ if( p->nCapacity<1024 ){
+ dataBufferReset(p);
+ }else{
+ dataBufferDestroy(p);
+ dataBufferInit(p, 0);
+ }
+ }
}
}
}
@@ -5859,12 +5859,12 @@
int iBuffer;
for(iBuffer=0; iBuffer<nBuffers; ++iBuffer){
if( pBuffers[iBuffer].nData>0 ){
- if( out->nData==0 ){
- dataBufferSwap(out, &(pBuffers[iBuffer]));
- }else{
- docListAccumulateUnion(out, pBuffers[iBuffer].pData,
- pBuffers[iBuffer].nData);
- }
+ if( out->nData==0 ){
+ dataBufferSwap(out, &(pBuffers[iBuffer]));
+ }else{
+ docListAccumulateUnion(out, pBuffers[iBuffer].pData,
+ pBuffers[iBuffer].nData);
+ }
}
}
}
@@ -5879,8 +5879,8 @@
/* Call loadSegmentLeavesInt() with pData/nData as input. */
static int loadSegmentLeaf(fulltext_vtab *v, const char *pData, int nData,
- const char *pTerm, int nTerm, int isPrefix,
- DataBuffer *out){
+ const char *pTerm, int nTerm, int isPrefix,
+ DataBuffer *out){
LeavesReader reader;
int rc;
@@ -5900,9 +5900,9 @@
** out.
*/
static int loadSegmentLeaves(fulltext_vtab *v,
- sqlite_int64 iStartLeaf, sqlite_int64 iEndLeaf,
- const char *pTerm, int nTerm, int isPrefix,
- DataBuffer *out){
+ sqlite_int64 iStartLeaf, sqlite_int64 iEndLeaf,
+ const char *pTerm, int nTerm, int isPrefix,
+ DataBuffer *out){
int rc;
LeavesReader reader;
@@ -5928,9 +5928,9 @@
** it is not worthwhile.
*/
static void getChildrenContaining(const char *pData, int nData,
- const char *pTerm, int nTerm, int isPrefix,
- sqlite_int64 *piStartChild,
- sqlite_int64 *piEndChild){
+ const char *pTerm, int nTerm, int isPrefix,
+ sqlite_int64 *piStartChild,
+ sqlite_int64 *piEndChild){
InteriorReader reader;
assert( nData>1 );
@@ -5975,7 +5975,7 @@
assert( iBlockid!=0 );
assert( pTerm!=NULL );
- assert( nTerm!=0 ); /* TODO(shess) Why not allow this? */
+ assert( nTerm!=0 ); /* TODO(shess) Why not allow this? */
assert( piStartChild!=NULL );
assert( piEndChild!=NULL );
@@ -5990,7 +5990,7 @@
if( rc!=SQLITE_ROW ) return rc;
getChildrenContaining(sqlite3_column_blob(s, 0), sqlite3_column_bytes(s, 0),
- pTerm, nTerm, isPrefix, piStartChild, piEndChild);
+ pTerm, nTerm, isPrefix, piStartChild, piEndChild);
/* We expect only one row. We must execute another sqlite3_step()
* to complete the iteration; otherwise the table will remain
@@ -6007,9 +6007,9 @@
** loadSegment() to make error-handling cleaner.
*/
static int loadSegmentInt(fulltext_vtab *v, const char *pData, int nData,
- sqlite_int64 iLeavesEnd,
- const char *pTerm, int nTerm, int isPrefix,
- DataBuffer *out){
+ sqlite_int64 iLeavesEnd,
+ const char *pTerm, int nTerm, int isPrefix,
+ DataBuffer *out){
/* Special case where root is a leaf. */
if( *pData=='\0' ){
return loadSegmentLeaf(v, pData, nData, pTerm, nTerm, isPrefix, out);
@@ -6021,19 +6021,19 @@
** until we find the set of leaf nodes to scan for the term.
*/
getChildrenContaining(pData, nData, pTerm, nTerm, isPrefix,
- &iStartChild, &iEndChild);
+ &iStartChild, &iEndChild);
while( iStartChild>iLeavesEnd ){
sqlite_int64 iNextStart, iNextEnd;
rc = loadAndGetChildrenContaining(v, iStartChild, pTerm, nTerm, isPrefix,
- &iNextStart, &iNextEnd);
+ &iNextStart, &iNextEnd);
if( rc!=SQLITE_OK ) return rc;
/* If we've branched, follow the end branch, too. */
if( iStartChild!=iEndChild ){
- sqlite_int64 iDummy;
- rc = loadAndGetChildrenContaining(v, iEndChild, pTerm, nTerm, isPrefix,
- &iDummy, &iNextEnd);
- if( rc!=SQLITE_OK ) return rc;
+ sqlite_int64 iDummy;
+ rc = loadAndGetChildrenContaining(v, iEndChild, pTerm, nTerm, isPrefix,
+ &iDummy, &iNextEnd);
+ if( rc!=SQLITE_OK ) return rc;
}
assert( iNextStart<=iNextEnd );
@@ -6045,7 +6045,7 @@
/* Scan through the leaf segments for doclists. */
return loadSegmentLeaves(v, iStartChild, iEndChild,
- pTerm, nTerm, isPrefix, out);
+ pTerm, nTerm, isPrefix, out);
}
}
@@ -6061,15 +6061,15 @@
*/
/* TODO(shess) The current merge is likely to be slow for large
** doclists (though it should process from newest/smallest to
-** oldest/largest, so it may not be that bad). It might be useful to
+** oldest/largest, so it may not be that bad). It might be useful to
** modify things to allow for N-way merging. This could either be
** within a segment, with pairwise merges across segments, or across
** all segments at once.
*/
static int loadSegment(fulltext_vtab *v, const char *pData, int nData,
- sqlite_int64 iLeavesEnd,
- const char *pTerm, int nTerm, int isPrefix,
- DataBuffer *out){
+ sqlite_int64 iLeavesEnd,
+ const char *pTerm, int nTerm, int isPrefix,
+ DataBuffer *out){
DataBuffer result;
int rc;
@@ -6080,7 +6080,7 @@
dataBufferInit(&result, 0);
rc = loadSegmentInt(v, pData, nData, iLeavesEnd,
- pTerm, nTerm, isPrefix, &result);
+ pTerm, nTerm, isPrefix, &result);
if( rc==SQLITE_OK && result.nData>0 ){
if( out->nData==0 ){
DataBuffer tmp = *out;
@@ -6108,8 +6108,8 @@
** into *out.
*/
static int termSelect(fulltext_vtab *v, int iColumn,
- const char *pTerm, int nTerm, int isPrefix,
- DocListType iType, DataBuffer *out){
+ const char *pTerm, int nTerm, int isPrefix,
+ DocListType iType, DataBuffer *out){
DataBuffer doclist;
sqlite3_stmt *s;
int rc = sql_get_statement(v, SEGDIR_SELECT_ALL_STMT, &s);
@@ -6128,7 +6128,7 @@
const int nData = sqlite3_column_bytes(s, 2);
const sqlite_int64 iLeavesEnd = sqlite3_column_int64(s, 1);
rc = loadSegment(v, pData, nData, iLeavesEnd, pTerm, nTerm, isPrefix,
- &doclist);
+ &doclist);
if( rc!=SQLITE_OK ) goto err;
}
if( rc==SQLITE_DONE ){
@@ -6140,7 +6140,7 @@
*/
if( iColumn==v->nColumn) iColumn = -1;
docListTrim(DL_DEFAULT, doclist.pData, doclist.nData,
- iColumn, iType, out);
+ iColumn, iType, out);
}
rc = SQLITE_OK;
}
@@ -6209,7 +6209,7 @@
dataBufferReset(&dl);
dlcAddDoclist(pData[i].pCollector, &dl);
rc = leafWriterStep(v, &writer,
- pData[i].pTerm, pData[i].nTerm, dl.pData, dl.nData);
+ pData[i].pTerm, pData[i].nTerm, dl.pData, dl.nData);
if( rc!=SQLITE_OK ) goto err;
}
rc = leafWriterFinalize(v, &writer);
@@ -6271,7 +6271,7 @@
/* This function implements the xUpdate callback; it is the top-level entry
* point for inserting, deleting or updating a row in a full-text table. */
static int fulltextUpdate(sqlite3_vtab *pVtab, int nArg, sqlite3_value **ppArg,
- sqlite_int64 *pRowid){
+ sqlite_int64 *pRowid){
fulltext_vtab *v = (fulltext_vtab *) pVtab;
int rc;
@@ -6285,15 +6285,15 @@
*/
rc = content_exists(v);
if( rc==SQLITE_ROW ){
- rc = SQLITE_OK;
+ rc = SQLITE_OK;
}else if( rc==SQLITE_DONE ){
- /* Clear the pending terms so we don't flush a useless level-0
- ** segment when the transaction closes.
- */
- rc = clearPendingTerms(v);
- if( rc==SQLITE_OK ){
- rc = segdir_delete_all(v);
- }
+ /* Clear the pending terms so we don't flush a useless level-0
+ ** segment when the transaction closes.
+ */
+ rc = clearPendingTerms(v);
+ if( rc==SQLITE_OK ){
+ rc = segdir_delete_all(v);
+ }
}
}
} else if( sqlite3_value_type(ppArg[0]) != SQLITE_NULL ){
@@ -6306,10 +6306,10 @@
*/
sqlite_int64 rowid = sqlite3_value_int64(ppArg[0]);
if( sqlite3_value_type(ppArg[1]) != SQLITE_INTEGER ||
- sqlite3_value_int64(ppArg[1]) != rowid ){
+ sqlite3_value_int64(ppArg[1]) != rowid ){
rc = SQLITE_ERROR; /* we don't allow changing the rowid */
}else if( sqlite3_value_type(ppArg[2+v->nColumn+1]) != SQLITE_INTEGER ||
- sqlite3_value_int64(ppArg[2+v->nColumn+1]) != rowid ){
+ sqlite3_value_int64(ppArg[2+v->nColumn+1]) != rowid ){
rc = SQLITE_ERROR; /* we don't allow changing the docid */
}else{
assert( nArg==2+v->nColumn+2);
@@ -6325,7 +6325,7 @@
sqlite3_value *pRequestDocid = ppArg[2+v->nColumn+1];
assert( nArg==2+v->nColumn+2);
if( SQLITE_NULL != sqlite3_value_type(pRequestDocid) &&
- SQLITE_NULL != sqlite3_value_type(ppArg[1]) ){
+ SQLITE_NULL != sqlite3_value_type(ppArg[1]) ){
/* TODO(shess) Consider allowing this to work if the values are
** identical. I'm inclined to discourage that usage, though,
** given that both rowid and docid are special columns. Better
@@ -6336,7 +6336,7 @@
rc = SQLITE_ERROR;
}else{
if( SQLITE_NULL == sqlite3_value_type(pRequestDocid) ){
- pRequestDocid = ppArg[1];
+ pRequestDocid = ppArg[1];
}
rc = index_insert(v, pRequestDocid, &ppArg[2], pRowid);
}
@@ -6396,16 +6396,16 @@
if( argc>=2 ){
zStart = (const char*)sqlite3_value_text(argv[1]);
if( argc>=3 ){
- zEnd = (const char*)sqlite3_value_text(argv[2]);
- if( argc>=4 ){
- zEllipsis = (const char*)sqlite3_value_text(argv[3]);
- }
+ zEnd = (const char*)sqlite3_value_text(argv[2]);
+ if( argc>=4 ){
+ zEllipsis = (const char*)sqlite3_value_text(argv[3]);
+ }
}
}
snippetAllOffsets(pCursor);
snippetText(pCursor, zStart, zEnd, zEllipsis);
sqlite3_result_text(pContext, pCursor->snippet.zSnippet,
- pCursor->snippet.nSnippet, SQLITE_STATIC);
+ pCursor->snippet.nSnippet, SQLITE_STATIC);
}
}
@@ -6427,8 +6427,8 @@
snippetAllOffsets(pCursor);
snippetOffsetText(&pCursor->snippet);
sqlite3_result_text(pContext,
- pCursor->snippet.zOffset, pCursor->snippet.nOffset,
- SQLITE_STATIC);
+ pCursor->snippet.zOffset, pCursor->snippet.nOffset,
+ SQLITE_STATIC);
}
}
@@ -6498,14 +6498,14 @@
}
}
-/* optimize() helper function. Put the readers in order and iterate
+/* optimize() helper function. Put the readers in order and iterate
** through them, merging doclists for matching terms into pWriter.
** Returns SQLITE_OK on success, or the SQLite error code which
** prevented success.
*/
static int optimizeInternal(fulltext_vtab *v,
- OptLeavesReader *readers, int nReaders,
- LeafWriter *pWriter){
+ OptLeavesReader *readers, int nReaders,
+ LeafWriter *pWriter){
int i, rc = SQLITE_OK;
DataBuffer doclist, merged, tmp;
@@ -6533,9 +6533,9 @@
/* Trim deletions from the doclist. */
dataBufferReset(&merged);
docListTrim(DL_DEFAULT,
- optLeavesReaderData(&readers[0]),
- optLeavesReaderDataBytes(&readers[0]),
- -1, DL_DEFAULT, &merged);
+ optLeavesReaderData(&readers[0]),
+ optLeavesReaderDataBytes(&readers[0]),
+ -1, DL_DEFAULT, &merged);
}else{
DLReader dlReaders[MERGE_COUNT];
int iReader, nReaders;
@@ -6544,33 +6544,33 @@
** one pass index 0 will reference the accumulated doclist.
*/
dlrInit(&dlReaders[0], DL_DEFAULT,
- optLeavesReaderData(&readers[0]),
- optLeavesReaderDataBytes(&readers[0]));
+ optLeavesReaderData(&readers[0]),
+ optLeavesReaderDataBytes(&readers[0]));
iReader = 1;
assert( iReader<i ); /* Must execute the loop at least once. */
while( iReader<i ){
- /* Merge 16 inputs per pass. */
- for( nReaders=1; iReader<i && nReaders<MERGE_COUNT;
- iReader++, nReaders++ ){
- dlrInit(&dlReaders[nReaders], DL_DEFAULT,
- optLeavesReaderData(&readers[iReader]),
- optLeavesReaderDataBytes(&readers[iReader]));
- }
-
- /* Merge doclists and swap result into accumulator. */
- dataBufferReset(&merged);
- docListMerge(&merged, dlReaders, nReaders);
- tmp = merged;
- merged = doclist;
- doclist = tmp;
-
- while( nReaders-- > 0 ){
- dlrDestroy(&dlReaders[nReaders]);
- }
+ /* Merge 16 inputs per pass. */
+ for( nReaders=1; iReader<i && nReaders<MERGE_COUNT;
+ iReader++, nReaders++ ){
+ dlrInit(&dlReaders[nReaders], DL_DEFAULT,
+ optLeavesReaderData(&readers[iReader]),
+ optLeavesReaderDataBytes(&readers[iReader]));
+ }
+
+ /* Merge doclists and swap result into accumulator. */
+ dataBufferReset(&merged);
+ docListMerge(&merged, dlReaders, nReaders);
+ tmp = merged;
+ merged = doclist;
+ doclist = tmp;
+
+ while( nReaders-- > 0 ){
+ dlrDestroy(&dlReaders[nReaders]);
+ }
- /* Accumulated doclist to reader 0 for next pass. */
- dlrInit(&dlReaders[0], DL_DEFAULT, doclist.pData, doclist.nData);
+ /* Accumulated doclist to reader 0 for next pass. */
+ dlrInit(&dlReaders[0], DL_DEFAULT, doclist.pData, doclist.nData);
}
/* Destroy reader that was left in the pipeline. */
@@ -6579,15 +6579,15 @@
/* Trim deletions from the doclist. */
dataBufferReset(&merged);
docListTrim(DL_DEFAULT, doclist.pData, doclist.nData,
- -1, DL_DEFAULT, &merged);
+ -1, DL_DEFAULT, &merged);
}
/* Only pass doclists with hits (skip if all hits deleted). */
if( merged.nData>0 ){
rc = leafWriterStep(v, pWriter,
- optLeavesReaderTerm(&readers[0]),
- optLeavesReaderTermBytes(&readers[0]),
- merged.pData, merged.nData);
+ optLeavesReaderTerm(&readers[0]),
+ optLeavesReaderTermBytes(&readers[0]),
+ merged.pData, merged.nData);
if( rc!=SQLITE_OK ) goto err;
}
@@ -6611,12 +6611,12 @@
** table-named column.
*/
static void optimizeFunc(sqlite3_context *pContext,
- int argc, sqlite3_value **argv){
+ int argc, sqlite3_value **argv){
fulltext_cursor *pCursor;
if( argc>1 ){
sqlite3_result_error(pContext, "excess arguments to optimize()",-1);
}else if( sqlite3_value_type(argv[0])!=SQLITE_BLOB ||
- sqlite3_value_bytes(argv[0])!=sizeof(pCursor) ){
+ sqlite3_value_bytes(argv[0])!=sizeof(pCursor) ){
sqlite3_result_error(pContext, "illegal first argument to optimize",-1);
}else{
fulltext_vtab *v;
@@ -6637,7 +6637,7 @@
if( rc!=SQLITE_OK ) goto err;
if( nReaders==0 || nReaders==1 ){
sqlite3_result_text(pContext, "Index already optimal", -1,
- SQLITE_STATIC);
+ SQLITE_STATIC);
return;
}
@@ -6661,7 +6661,7 @@
assert( i<nReaders );
rc = leavesReaderInit(v, -1, iStart, iEnd, pRootData, nRootData,
- &readers[i].reader);
+ &readers[i].reader);
if( rc!=SQLITE_OK ) break;
readers[i].segment = i;
@@ -6684,8 +6684,8 @@
*/
if( rc==SQLITE_OK ){
for( i=0; i<=iMaxLevel; i++ ){
- rc = segdir_delete(v, i);
- if( rc!=SQLITE_OK ) break;
+ rc = segdir_delete(v, i);
+ if( rc!=SQLITE_OK ) break;
}
if( rc==SQLITE_OK ) rc = leafWriterFinalize(v, &writer);
@@ -6705,7 +6705,7 @@
{
char buf[512];
sqlite3_snprintf(sizeof(buf), buf, "Error in optimize: %s",
- sqlite3_errmsg(sqlite3_context_db_handle(pContext)));
+ sqlite3_errmsg(sqlite3_context_db_handle(pContext)));
sqlite3_result_error(pContext, buf, -1);
}
}
@@ -6716,7 +6716,7 @@
** pull the error from the context's db handle.
*/
static void generateError(sqlite3_context *pContext,
- const char *prefix, const char *msg){
+ const char *prefix, const char *msg){
char buf[512];
if( msg==NULL ) msg = sqlite3_errmsg(sqlite3_context_db_handle(pContext));
sqlite3_snprintf(sizeof(buf), buf, "%s: %s", prefix, msg);
@@ -6730,14 +6730,14 @@
** fit in a leaf).
*/
static int collectSegmentTerms(fulltext_vtab *v, sqlite3_stmt *s,
- fts3Hash *pTerms){
+ fts3Hash *pTerms){
const sqlite_int64 iStartBlockid = sqlite3_column_int64(s, 0);
const sqlite_int64 iEndBlockid = sqlite3_column_int64(s, 1);
const char *pRootData = sqlite3_column_blob(s, 2);
const int nRootData = sqlite3_column_bytes(s, 2);
LeavesReader reader;
int rc = leavesReaderInit(v, 0, iStartBlockid, iEndBlockid,
- pRootData, nRootData, &reader);
+ pRootData, nRootData, &reader);
if( rc!=SQLITE_OK ) return rc;
while( rc==SQLITE_OK && !leavesReaderAtEnd(&reader) ){
@@ -6781,7 +6781,7 @@
assert( iTerm<nTerms );
pData[iTerm].pTerm = fts3HashKey(e);
pData[iTerm].nTerm = fts3HashKeysize(e);
- pData[iTerm].pCollector = fts3HashData(e); /* unused */
+ pData[iTerm].pCollector = fts3HashData(e); /* unused */
}
assert( iTerm==nTerms );
@@ -6826,7 +6826,7 @@
if( argc!=3 && argc!=1 ){
generateError(pContext, "dump_terms", "incorrect arguments");
}else if( sqlite3_value_type(argv[0])!=SQLITE_BLOB ||
- sqlite3_value_bytes(argv[0])!=sizeof(pCursor) ){
+ sqlite3_value_bytes(argv[0])!=sizeof(pCursor) ){
generateError(pContext, "dump_terms", "illegal first argument");
}else{
fulltext_vtab *v;
@@ -6845,10 +6845,10 @@
}else{
rc = sql_get_statement(v, SEGDIR_SELECT_SEGMENT_STMT, &s);
if( rc==SQLITE_OK ){
- rc = sqlite3_bind_int(s, 1, sqlite3_value_int(argv[1]));
- if( rc==SQLITE_OK ){
- rc = sqlite3_bind_int(s, 2, sqlite3_value_int(argv[2]));
- }
+ rc = sqlite3_bind_int(s, 1, sqlite3_value_int(argv[1]));
+ if( rc==SQLITE_OK ){
+ rc = sqlite3_bind_int(s, 2, sqlite3_value_int(argv[2]));
+ }
}
}
@@ -6870,22 +6870,22 @@
}else{
const int nTerms = fts3HashCount(&terms);
if( nTerms>0 ){
- rc = generateTermsResult(pContext, &terms);
- if( rc==SQLITE_NOMEM ){
- generateError(pContext, "dump_terms", "out of memory");
- }else{
- assert( rc==SQLITE_OK );
- }
+ rc = generateTermsResult(pContext, &terms);
+ if( rc==SQLITE_NOMEM ){
+ generateError(pContext, "dump_terms", "out of memory");
+ }else{
+ assert( rc==SQLITE_OK );
+ }
}else if( argc==3 ){
- /* The specific segment asked for could not be found. */
- generateError(pContext, "dump_terms", "segment not found");
+ /* The specific segment asked for could not be found. */
+ generateError(pContext, "dump_terms", "segment not found");
}else{
- /* No segments found. */
- /* TODO(shess): It should be impossible to reach this. This
- ** case can only happen for an empty table, in which case
- ** SQLite has no rows to call this function on.
- */
- sqlite3_result_null(pContext);
+ /* No segments found. */
+ /* TODO(shess): It should be impossible to reach this. This
+ ** case can only happen for an empty table, in which case
+ ** SQLite has no rows to call this function on.
+ */
+ sqlite3_result_null(pContext);
}
}
sqlite3Fts3HashClear(&terms);
@@ -6896,7 +6896,7 @@
** pContext.
*/
static void createDoclistResult(sqlite3_context *pContext,
- const char *pData, int nData){
+ const char *pData, int nData){
DataBuffer dump;
DLReader dlReader;
@@ -6916,33 +6916,33 @@
int iColumn = plrColumn(&plReader);
sqlite3_snprintf(sizeof(buf), buf, "[%lld %d[",
- dlrDocid(&dlReader), iColumn);
+ dlrDocid(&dlReader), iColumn);
dataBufferAppend(&dump, buf, strlen(buf));
for( ; !plrAtEnd(&plReader); plrStep(&plReader) ){
- if( plrColumn(&plReader)!=iColumn ){
- iColumn = plrColumn(&plReader);
- sqlite3_snprintf(sizeof(buf), buf, "] %d[", iColumn);
- assert( dump.nData>0 );
- dump.nData--; /* Overwrite trailing space. */
- assert( dump.pData[dump.nData]==' ');
- dataBufferAppend(&dump, buf, strlen(buf));
- }
- if( DL_DEFAULT==DL_POSITIONS_OFFSETS ){
- sqlite3_snprintf(sizeof(buf), buf, "%d,%d,%d ",
- plrPosition(&plReader),
- plrStartOffset(&plReader), plrEndOffset(&plReader));
- }else if( DL_DEFAULT==DL_POSITIONS ){
- sqlite3_snprintf(sizeof(buf), buf, "%d ", plrPosition(&plReader));
- }else{
- assert( NULL=="Unhandled DL_DEFAULT value");
- }
- dataBufferAppend(&dump, buf, strlen(buf));
+ if( plrColumn(&plReader)!=iColumn ){
+ iColumn = plrColumn(&plReader);
+ sqlite3_snprintf(sizeof(buf), buf, "] %d[", iColumn);
+ assert( dump.nData>0 );
+ dump.nData--; /* Overwrite trailing space. */
+ assert( dump.pData[dump.nData]==' ');
+ dataBufferAppend(&dump, buf, strlen(buf));
+ }
+ if( DL_DEFAULT==DL_POSITIONS_OFFSETS ){
+ sqlite3_snprintf(sizeof(buf), buf, "%d,%d,%d ",
+ plrPosition(&plReader),
+ plrStartOffset(&plReader), plrEndOffset(&plReader));
+ }else if( DL_DEFAULT==DL_POSITIONS ){
+ sqlite3_snprintf(sizeof(buf), buf, "%d ", plrPosition(&plReader));
+ }else{
+ assert( NULL=="Unhandled DL_DEFAULT value");
+ }
+ dataBufferAppend(&dump, buf, strlen(buf));
}
plrDestroy(&plReader);
assert( dump.nData>0 );
- dump.nData--; /* Overwrite trailing space. */
+ dump.nData--; /* Overwrite trailing space. */
assert( dump.pData[dump.nData]==' ');
dataBufferAppend(&dump, "]] ", 3);
}
@@ -6950,7 +6950,7 @@
dlrDestroy(&dlReader);
assert( dump.nData>0 );
- dump.nData--; /* Overwrite trailing space. */
+ dump.nData--; /* Overwrite trailing space. */
assert( dump.pData[dump.nData]==' ');
dump.pData[dump.nData] = '\0';
assert( dump.nData>0 );
@@ -6990,10 +6990,10 @@
if( argc!=2 && argc!=4 ){
generateError(pContext, "dump_doclist", "incorrect arguments");
}else if( sqlite3_value_type(argv[0])!=SQLITE_BLOB ||
- sqlite3_value_bytes(argv[0])!=sizeof(pCursor) ){
+ sqlite3_value_bytes(argv[0])!=sizeof(pCursor) ){
generateError(pContext, "dump_doclist", "illegal first argument");
}else if( sqlite3_value_text(argv[1])==NULL ||
- sqlite3_value_text(argv[1])[0]=='\0' ){
+ sqlite3_value_text(argv[1])[0]=='\0' ){
generateError(pContext, "dump_doclist", "empty second argument");
}else{
const char *pTerm = (const char *)sqlite3_value_text(argv[1]);
@@ -7018,45 +7018,45 @@
/* Get our specific segment's information. */
rc = sql_get_statement(v, SEGDIR_SELECT_SEGMENT_STMT, &s);
if( rc==SQLITE_OK ){
- rc = sqlite3_bind_int(s, 1, sqlite3_value_int(argv[2]));
- if( rc==SQLITE_OK ){
- rc = sqlite3_bind_int(s, 2, sqlite3_value_int(argv[3]));
- }
+ rc = sqlite3_bind_int(s, 1, sqlite3_value_int(argv[2]));
+ if( rc==SQLITE_OK ){
+ rc = sqlite3_bind_int(s, 2, sqlite3_value_int(argv[3]));
+ }
}
if( rc==SQLITE_OK ){
- rc = sqlite3_step(s);
+ rc = sqlite3_step(s);
- if( rc==SQLITE_DONE ){
- dataBufferDestroy(&doclist);
- generateError(pContext, "dump_doclist", "segment not found");
- return;
- }
-
- /* Found a segment, load it into doclist. */
- if( rc==SQLITE_ROW ){
- const sqlite_int64 iLeavesEnd = sqlite3_column_int64(s, 1);
- const char *pData = sqlite3_column_blob(s, 2);
- const int nData = sqlite3_column_bytes(s, 2);
-
- /* loadSegment() is used by termSelect() to load each
- ** segment's data.
- */
- rc = loadSegment(v, pData, nData, iLeavesEnd, pTerm, nTerm, 0,
- &doclist);
- if( rc==SQLITE_OK ){
- rc = sqlite3_step(s);
-
- /* Should not have more than one matching segment. */
- if( rc!=SQLITE_DONE ){
- sqlite3_reset(s);
- dataBufferDestroy(&doclist);
- generateError(pContext, "dump_doclist", "invalid segdir");
- return;
- }
- rc = SQLITE_OK;
- }
- }
+ if( rc==SQLITE_DONE ){
+ dataBufferDestroy(&doclist);
+ generateError(pContext, "dump_doclist", "segment not found");
+ return;
+ }
+
+ /* Found a segment, load it into doclist. */
+ if( rc==SQLITE_ROW ){
+ const sqlite_int64 iLeavesEnd = sqlite3_column_int64(s, 1);
+ const char *pData = sqlite3_column_blob(s, 2);
+ const int nData = sqlite3_column_bytes(s, 2);
+
+ /* loadSegment() is used by termSelect() to load each
+ ** segment's data.
+ */
+ rc = loadSegment(v, pData, nData, iLeavesEnd, pTerm, nTerm, 0,
+ &doclist);
+ if( rc==SQLITE_OK ){
+ rc = sqlite3_step(s);
+
+ /* Should not have more than one matching segment. */
+ if( rc!=SQLITE_DONE ){
+ sqlite3_reset(s);
+ dataBufferDestroy(&doclist);
+ generateError(pContext, "dump_doclist", "invalid segdir");
+ return;
+ }
+ rc = SQLITE_OK;
+ }
+ }
}
sqlite3_reset(s);
@@ -7064,14 +7064,14 @@
if( rc==SQLITE_OK ){
if( doclist.nData>0 ){
- createDoclistResult(pContext, doclist.pData, doclist.nData);
+ createDoclistResult(pContext, doclist.pData, doclist.nData);
}else{
- /* TODO(shess): This can happen if the term is not present, or
- ** if all instances of the term have been deleted and this is
- ** an all-index dump. It may be interesting to distinguish
- ** these cases.
- */
- sqlite3_result_text(pContext, "", 0, SQLITE_STATIC);
+ /* TODO(shess): This can happen if the term is not present, or
+ ** if all instances of the term have been deleted and this is
+ ** an all-index dump. It may be interesting to distinguish
+ ** these cases.
+ */
+ sqlite3_result_text(pContext, "", 0, SQLITE_STATIC);
}
}else if( rc==SQLITE_NOMEM ){
/* Handle out-of-memory cases specially because if they are
@@ -7154,24 +7154,24 @@
}
static const sqlite3_module fts3Module = {
- /* iVersion */ 0,
- /* xCreate */ fulltextCreate,
- /* xConnect */ fulltextConnect,
+ /* iVersion */ 0,
+ /* xCreate */ fulltextCreate,
+ /* xConnect */ fulltextConnect,
/* xBestIndex */ fulltextBestIndex,
/* xDisconnect */ fulltextDisconnect,
- /* xDestroy */ fulltextDestroy,
- /* xOpen */ fulltextOpen,
- /* xClose */ fulltextClose,
- /* xFilter */ fulltextFilter,
- /* xNext */ fulltextNext,
- /* xEof */ fulltextEof,
- /* xColumn */ fulltextColumn,
- /* xRowid */ fulltextRowid,
- /* xUpdate */ fulltextUpdate,
- /* xBegin */ fulltextBegin,
- /* xSync */ fulltextSync,
- /* xCommit */ fulltextCommit,
- /* xRollback */ fulltextRollback,
+ /* xDestroy */ fulltextDestroy,
+ /* xOpen */ fulltextOpen,
+ /* xClose */ fulltextClose,
+ /* xFilter */ fulltextFilter,
+ /* xNext */ fulltextNext,
+ /* xEof */ fulltextEof,
+ /* xColumn */ fulltextColumn,
+ /* xRowid */ fulltextRowid,
+ /* xUpdate */ fulltextUpdate,
+ /* xBegin */ fulltextBegin,
+ /* xSync */ fulltextSync,
+ /* xCommit */ fulltextCommit,
+ /* xRollback */ fulltextRollback,
/* xFindFunction */ fulltextFindFunction,
/* xRename */ fulltextRename,
};
@@ -7208,7 +7208,7 @@
#endif
){
return sqlite3_create_module_v2(
- db, "trackerfts", &fts3Module, 0, 0
+ db, "trackerfts", &fts3Module, 0, 0
);
}
Modified: branches/indexer-split/src/tracker-fts/tracker-fts.h
==============================================================================
--- branches/indexer-split/src/tracker-fts/tracker-fts.h (original)
+++ branches/indexer-split/src/tracker-fts/tracker-fts.h Sat Sep 20 15:12:19 2008
@@ -1,7 +1,7 @@
/*
** 2006 Oct 10
**
-** The author disclaims copyright to this source code. In place of
+** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
@@ -17,10 +17,10 @@
#ifdef __cplusplus
extern "C" {
-#endif /* __cplusplus */
+#endif /* __cplusplus */
int sqlite3Fts3Init(sqlite3 *db);
#ifdef __cplusplus
} /* extern "C" */
-#endif /* __cplusplus */
+#endif /* __cplusplus */
Modified: branches/indexer-split/src/tracker-indexer/modules/applications.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/applications.c (original)
+++ branches/indexer-split/src/tracker-indexer/modules/applications.c Sat Sep 20 15:12:19 2008
@@ -23,24 +23,24 @@
#include <tracker-indexer/tracker-metadata.h>
#define GROUP_DESKTOP_ENTRY "Desktop Entry"
-#define KEY_TYPE "Type"
-#define KEY_HIDDEN "Hidden"
-#define KEY_NAME "Name"
+#define KEY_TYPE "Type"
+#define KEY_HIDDEN "Hidden"
+#define KEY_NAME "Name"
#define KEY_GENERIC_NAME "GenericName"
-#define KEY_COMMENT "Comment"
-#define KEY_EXECUTABLE "Exec"
-#define KEY_ICON "Icon"
-#define KEY_MIMETYPE "MimeType"
-#define KEY_CATEGORIES "Categories"
+#define KEY_COMMENT "Comment"
+#define KEY_EXECUTABLE "Exec"
+#define KEY_ICON "Icon"
+#define KEY_MIMETYPE "MimeType"
+#define KEY_CATEGORIES "Categories"
-#define METADATA_FILE_NAME "File:Name"
-#define METADATA_APP_NAME "App:Name"
+#define METADATA_FILE_NAME "File:Name"
+#define METADATA_APP_NAME "App:Name"
#define METADATA_APP_DISPLAY_NAME "App:DisplayName"
#define METADATA_APP_GENERIC_NAME "App:GenericName"
-#define METADATA_APP_COMMENT "App:Comment"
+#define METADATA_APP_COMMENT "App:Comment"
#define METADATA_APP_EXECUTABLE "App:Exec"
-#define METADATA_APP_ICON "App:Icon"
-#define METADATA_APP_MIMETYPE "App:MimeType"
+#define METADATA_APP_ICON "App:Icon"
+#define METADATA_APP_MIMETYPE "App:MimeType"
#define METADATA_APP_CATEGORIES "App:Categories"
G_CONST_RETURN gchar *
@@ -55,7 +55,7 @@
const gchar *metadata_key,
GKeyFile *desktop_file,
const gchar *key,
- gboolean use_locale)
+ gboolean use_locale)
{
gchar *str;
@@ -66,44 +66,44 @@
}
if (str) {
- tracker_metadata_insert (metadata, metadata_key, str);
+ tracker_metadata_insert (metadata, metadata_key, str);
}
}
static void
insert_list_from_desktop_file (TrackerMetadata *metadata,
- const gchar *metadata_key,
- GKeyFile *desktop_file,
- const gchar *key,
- gboolean use_locale)
+ const gchar *metadata_key,
+ GKeyFile *desktop_file,
+ const gchar *key,
+ gboolean use_locale)
{
- gchar **arr;
+ gchar **arr;
- if (use_locale) {
- arr = g_key_file_get_locale_string_list (desktop_file, GROUP_DESKTOP_ENTRY, key, NULL, NULL, NULL);
- } else {
- arr = g_key_file_get_string_list (desktop_file, GROUP_DESKTOP_ENTRY, key, NULL, NULL);
- }
-
- if (arr) {
- GList *list = NULL;
- gint i;
-
- for (i = 0; arr[i]; i++) {
- list = g_list_prepend (list, arr[i]);
- }
+ if (use_locale) {
+ arr = g_key_file_get_locale_string_list (desktop_file, GROUP_DESKTOP_ENTRY, key, NULL, NULL, NULL);
+ } else {
+ arr = g_key_file_get_string_list (desktop_file, GROUP_DESKTOP_ENTRY, key, NULL, NULL);
+ }
+
+ if (arr) {
+ GList *list = NULL;
+ gint i;
- list = g_list_reverse (list);
- g_free (arr);
+ for (i = 0; arr[i]; i++) {
+ list = g_list_prepend (list, arr[i]);
+ }
- tracker_metadata_insert_multiple_values (metadata, metadata_key, list);
- }
+ list = g_list_reverse (list);
+ g_free (arr);
+
+ tracker_metadata_insert_multiple_values (metadata, metadata_key, list);
+ }
}
TrackerMetadata *
tracker_module_file_get_metadata (TrackerFile *file)
{
- TrackerMetadata *metadata;
+ TrackerMetadata *metadata;
GKeyFile *key_file;
gchar *type, *filename;
@@ -133,7 +133,7 @@
}
/* Begin collecting data */
- metadata = tracker_metadata_new ();
+ metadata = tracker_metadata_new ();
insert_data_from_desktop_file (metadata, METADATA_APP_NAME, key_file, KEY_NAME, FALSE);
insert_data_from_desktop_file (metadata, METADATA_APP_DISPLAY_NAME, key_file, KEY_NAME, TRUE);
@@ -142,11 +142,11 @@
insert_data_from_desktop_file (metadata, METADATA_APP_EXECUTABLE, key_file, KEY_EXECUTABLE, FALSE);
insert_data_from_desktop_file (metadata, METADATA_APP_ICON, key_file, KEY_ICON, FALSE);
- insert_list_from_desktop_file (metadata, METADATA_APP_MIMETYPE, key_file, KEY_MIMETYPE, FALSE);
- insert_list_from_desktop_file (metadata, METADATA_APP_CATEGORIES, key_file, KEY_CATEGORIES, FALSE);
+ insert_list_from_desktop_file (metadata, METADATA_APP_MIMETYPE, key_file, KEY_MIMETYPE, FALSE);
+ insert_list_from_desktop_file (metadata, METADATA_APP_CATEGORIES, key_file, KEY_CATEGORIES, FALSE);
filename = g_filename_display_basename (file->path);
- tracker_metadata_insert (metadata, METADATA_FILE_NAME, filename);
+ tracker_metadata_insert (metadata, METADATA_FILE_NAME, filename);
g_key_file_free (key_file);
g_free (type);
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 15:12:19 2008
@@ -23,19 +23,19 @@
void
tracker_module_init (void)
{
- /* Implementing this function is optional.
- *
- * Allocate here all static resources for the module.
- */
+ /* Implementing this function is optional.
+ *
+ * Allocate here all static resources for the module.
+ */
}
void
tracker_module_shutdown (void)
{
- /* Implementing this function is optional.
- *
- * Free here all resources allocated in tracker_module_init()
- */
+ /* Implementing this function is optional.
+ *
+ * Free here all resources allocated in tracker_module_init()
+ */
}
G_CONST_RETURN gchar *
@@ -48,91 +48,91 @@
gpointer
tracker_module_file_get_data (const gchar *path)
{
- /* Implementing this function is optional.
- *
- * Return here private, module specific data for path.
- * Given this data is attached to the file until it isn't
- * needed anymore. This is usually used for files that
- * contain sets of data that should be considered as separate
- * entities (for example, mboxes), so the module can internally
- * keep the state. Also see tracker_module_file_iter_contents().
- */
- return NULL;
+ /* Implementing this function is optional.
+ *
+ * Return here private, module specific data for path.
+ * Given this data is attached to the file until it isn't
+ * needed anymore. This is usually used for files that
+ * contain sets of data that should be considered as separate
+ * entities (for example, mboxes), so the module can internally
+ * keep the state. Also see tracker_module_file_iter_contents().
+ */
+ return NULL;
}
gchar *
tracker_module_file_get_service_type (TrackerFile *file)
{
- /* Implementing this function is optional.
- *
- * 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.
- *
- */
- return NULL;
+ /* Implementing this function is optional.
+ *
+ * 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.
+ *
+ */
+ return NULL;
}
void
tracker_module_file_free_data (gpointer file_data)
{
- /* Implementing this function is optional
- *
- * Free the data created previously
- * through tracker_module_file_get_data()
- */
+ /* Implementing this function is optional
+ *
+ * Free the data created previously
+ * through tracker_module_file_get_data()
+ */
}
void
tracker_module_file_get_uri (TrackerFile *file,
- gchar **dirname,
- gchar **basename)
+ gchar **dirname,
+ gchar **basename)
{
- /* Implementing this function is optional
- *
- * Return dirname/basename for the current item, with this
- * method modules can specify different URIs for different
- * elements contained in the file. Also see
- * tracker_module_file_iter_contents()
- */
- *dirname = g_path_get_dirname (file->path);
- *basename = g_path_get_basename (file->path);
+ /* Implementing this function is optional
+ *
+ * Return dirname/basename for the current item, with this
+ * method modules can specify different URIs for different
+ * elements contained in the file. Also see
+ * tracker_module_file_iter_contents()
+ */
+ *dirname = g_path_get_dirname (file->path);
+ *basename = g_path_get_basename (file->path);
}
TrackerMetadata *
tracker_module_file_get_metadata (TrackerFile *file)
{
/* Return a hashtable filled with metadata for file, given the
- * current state. Also see tracker_module_file_iter_contents()
- */
+ * current state. Also see tracker_module_file_iter_contents()
+ */
return NULL;
}
gchar *
tracker_module_file_get_text (TrackerFile *file)
{
- /* Implementing this function is optional
- *
- * Return here full text for file, given the current state,
- * also see tracker_module_file_iter_contents()
- */
- return NULL;
+ /* Implementing this function is optional
+ *
+ * Return here full text for file, given the current state,
+ * also see tracker_module_file_iter_contents()
+ */
+ return NULL;
}
gboolean
tracker_module_file_iter_contents (TrackerFile *file)
{
- /* Implementing this function is optional
- *
- * This function is meant to iterate the internal state,
- * so it points to the next entity inside the file.
- * In case there is such next entity, this function must
- * return TRUE, else, returning FALSE will make the indexer
- * think it is done with this file and move on to the next one.
- *
- * What an "entity" is considered is left to the module
- * implementation.
- */
- return FALSE;
+ /* Implementing this function is optional
+ *
+ * This function is meant to iterate the internal state,
+ * so it points to the next entity inside the file.
+ * In case there is such next entity, this function must
+ * return TRUE, else, returning FALSE will make the indexer
+ * think it is done with this file and move on to the next one.
+ *
+ * What an "entity" is considered is left to the module
+ * implementation.
+ */
+ return FALSE;
}
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 15:12:19 2008
@@ -33,14 +33,14 @@
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-common/tracker-type-utils.h>
-#define METADATA_FILE_PATH "File:Path"
-#define METADATA_FILE_NAME "File:Name"
+#define METADATA_FILE_PATH "File:Path"
+#define METADATA_FILE_NAME "File:Name"
#define METADATA_EMAIL_RECIPIENT "Email:Recipient"
-#define METADATA_EMAIL_DATE "Email:Date"
-#define METADATA_EMAIL_SENDER "Email:Sender"
-#define METADATA_EMAIL_SUBJECT "Email:Subject"
-#define METADATA_EMAIL_SENT_TO "Email:SentTo"
-#define METADATA_EMAIL_CC "Email:CC"
+#define METADATA_EMAIL_DATE "Email:Date"
+#define METADATA_EMAIL_SENDER "Email:Sender"
+#define METADATA_EMAIL_SUBJECT "Email:Subject"
+#define METADATA_EMAIL_SENT_TO "Email:SentTo"
+#define METADATA_EMAIL_CC "Email:CC"
typedef union EvolutionFileData EvolutionFileData;
typedef struct EvolutionLocalData EvolutionLocalData;
@@ -49,50 +49,50 @@
typedef enum MailStorageType MailStorageType;
enum MailStorageType {
- MAIL_STORAGE_NONE,
- MAIL_STORAGE_LOCAL,
- MAIL_STORAGE_IMAP
+ MAIL_STORAGE_NONE,
+ MAIL_STORAGE_LOCAL,
+ MAIL_STORAGE_IMAP
};
struct EvolutionLocalData {
- MailStorageType type;
- GMimeStream *stream;
- GMimeParser *parser;
- GMimeMessage *message;
+ MailStorageType type;
+ GMimeStream *stream;
+ GMimeParser *parser;
+ GMimeMessage *message;
- GList *mime_parts;
- GList *current_mime_part;
+ GList *mime_parts;
+ GList *current_mime_part;
};
struct EvolutionImapData {
- MailStorageType type;
- gint fd;
- FILE *summary;
- guint n_messages;
- guint cur_message;
- gchar *cur_message_uid;
+ MailStorageType type;
+ gint fd;
+ FILE *summary;
+ guint n_messages;
+ guint cur_message;
+ gchar *cur_message_uid;
- GList *mime_parts;
- GList *current_mime_part;
+ GList *mime_parts;
+ GList *current_mime_part;
};
union EvolutionFileData {
- MailStorageType type;
- EvolutionLocalData mbox;
- EvolutionImapData imap;
+ MailStorageType type;
+ EvolutionLocalData mbox;
+ EvolutionImapData imap;
};
enum SummaryDataType {
- SUMMARY_TYPE_INT32,
- SUMMARY_TYPE_UINT32,
- SUMMARY_TYPE_STRING,
- SUMMARY_TYPE_TOKEN,
- SUMMARY_TYPE_TIME_T
+ SUMMARY_TYPE_INT32,
+ SUMMARY_TYPE_UINT32,
+ SUMMARY_TYPE_STRING,
+ SUMMARY_TYPE_TOKEN,
+ SUMMARY_TYPE_TIME_T
};
struct EvolutionAccountContext {
- gchar *account;
- gchar *uid;
+ gchar *account;
+ gchar *uid;
};
enum EvolutionFlags {
@@ -100,10 +100,10 @@
EVOLUTION_MESSAGE_DELETED = 1 << 1,
EVOLUTION_MESSAGE_DRAFT = 1 << 2,
EVOLUTION_MESSAGE_FLAGGED = 1 << 3,
- EVOLUTION_MESSAGE_SEEN = 1 << 4,
+ EVOLUTION_MESSAGE_SEEN = 1 << 4,
EVOLUTION_MESSAGE_ATTACHMENTS = 1 << 5,
EVOLUTION_MESSAGE_ANSWERED_ALL = 1 << 6,
- EVOLUTION_MESSAGE_JUNK = 1 << 7,
+ EVOLUTION_MESSAGE_JUNK = 1 << 7,
EVOLUTION_MESSAGE_SECURE = 1 << 8
};
@@ -118,1437 +118,1437 @@
static gboolean
read_summary (FILE *summary,
- ...)
+ ...)
{
- va_list args;
- gint value_type;
+ va_list args;
+ gint value_type;
- if (!summary) {
- return FALSE;
- }
-
- va_start (args, summary);
-
- while ((value_type = va_arg (args, gint)) != -1) {
- switch (value_type) {
- case SUMMARY_TYPE_TIME_T:
- case SUMMARY_TYPE_INT32: {
- gint32 value, *dest;
-
- if (fread (&value, sizeof (gint32), 1, summary) != 1) {
- return FALSE;
- }
-
- dest = va_arg (args, gint32*);
-
- if (dest) {
- *dest = g_ntohl (value);
- }
- break;
- }
- case SUMMARY_TYPE_UINT32: {
- guint32 *dest, value = 0;
- gint c;
-
- while (((c = fgetc (summary)) & 0x80) == 0 && c != EOF) {
- value |= c;
- value <<= 7;
- }
-
- if (c == EOF) {
- return FALSE;
- } else {
- value |= (c & 0x7f);
- }
-
- dest = va_arg (args, guint32*);
-
- if (dest) {
- *dest = value;
- }
- break;
- }
- case SUMMARY_TYPE_STRING:
- case SUMMARY_TYPE_TOKEN: {
- guint32 len;
- gchar *str, **dest;
-
- /* read string length */
- read_summary (summary, SUMMARY_TYPE_UINT32, &len, -1);
- dest = va_arg (args, gchar **);
-
- if (dest) {
- *dest = NULL;
- }
-
- if (value_type == SUMMARY_TYPE_TOKEN) {
- if (len < 32) {
- continue;
- } else {
- len -= 31;
- }
- }
-
- if (len <= 1) {
- continue;
- }
-
- str = g_try_malloc0 (len);
- if (!str) {
- return FALSE;
- }
-
- if (fread (str, len - 1, 1, summary) != 1) {
- g_free (str);
- return FALSE;
- }
-
- if (dest) {
- *dest = str;
- } else {
- g_free (str);
- }
-
- break;
- }
- default:
- break;
- }
- }
+ if (!summary) {
+ return FALSE;
+ }
+
+ va_start (args, summary);
- va_end (args);
+ while ((value_type = va_arg (args, gint)) != -1) {
+ switch (value_type) {
+ case SUMMARY_TYPE_TIME_T:
+ case SUMMARY_TYPE_INT32: {
+ gint32 value, *dest;
+
+ if (fread (&value, sizeof (gint32), 1, summary) != 1) {
+ return FALSE;
+ }
+
+ dest = va_arg (args, gint32*);
+
+ if (dest) {
+ *dest = g_ntohl (value);
+ }
+ break;
+ }
+ case SUMMARY_TYPE_UINT32: {
+ guint32 *dest, value = 0;
+ gint c;
+
+ while (((c = fgetc (summary)) & 0x80) == 0 && c != EOF) {
+ value |= c;
+ value <<= 7;
+ }
+
+ if (c == EOF) {
+ return FALSE;
+ } else {
+ value |= (c & 0x7f);
+ }
+
+ dest = va_arg (args, guint32*);
+
+ if (dest) {
+ *dest = value;
+ }
+ break;
+ }
+ case SUMMARY_TYPE_STRING:
+ case SUMMARY_TYPE_TOKEN: {
+ guint32 len;
+ gchar *str, **dest;
+
+ /* read string length */
+ read_summary (summary, SUMMARY_TYPE_UINT32, &len, -1);
+ dest = va_arg (args, gchar **);
+
+ if (dest) {
+ *dest = NULL;
+ }
+
+ if (value_type == SUMMARY_TYPE_TOKEN) {
+ if (len < 32) {
+ continue;
+ } else {
+ len -= 31;
+ }
+ }
+
+ if (len <= 1) {
+ continue;
+ }
+
+ str = g_try_malloc0 (len);
+ if (!str) {
+ return FALSE;
+ }
+
+ if (fread (str, len - 1, 1, summary) != 1) {
+ g_free (str);
+ return FALSE;
+ }
+
+ if (dest) {
+ *dest = str;
+ } else {
+ g_free (str);
+ }
+
+ break;
+ }
+ default:
+ break;
+ }
+ }
+
+ va_end (args);
- return TRUE;
+ return TRUE;
}
void
tracker_module_init (void)
{
- g_mime_init (0);
- get_imap_accounts ();
+ g_mime_init (0);
+ get_imap_accounts ();
- local_dir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", G_DIR_SEPARATOR_S, NULL);
- imap_dir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "imap", G_DIR_SEPARATOR_S, NULL);
+ local_dir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", G_DIR_SEPARATOR_S, NULL);
+ imap_dir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "imap", G_DIR_SEPARATOR_S, NULL);
}
void
tracker_module_shutdown (void)
{
- g_mime_shutdown ();
+ g_mime_shutdown ();
- g_hash_table_destroy (accounts);
- g_free (local_dir);
- g_free (imap_dir);
+ g_hash_table_destroy (accounts);
+ g_free (local_dir);
+ g_free (imap_dir);
}
G_CONST_RETURN gchar *
tracker_module_get_name (void)
{
- /* Return module name here */
- return "EvolutionEmails";
+ /* Return module name here */
+ return "EvolutionEmails";
}
static void
account_start_element_handler (GMarkupParseContext *context,
- const gchar *element_name,
- const gchar **attr_names,
- const gchar **attr_values,
- gpointer user_data,
- GError **error)
-{
- EvolutionAccountContext *account_context;
- gint i = 0;
-
- if (strcmp (element_name, "account") != 0) {
- return;
- }
-
- account_context = (EvolutionAccountContext *) user_data;
-
- while (attr_names[i]) {
- if (strcmp (attr_names[i], "uid") == 0) {
- account_context->uid = g_strdup (attr_values[i]);
- return;
- }
+ const gchar *element_name,
+ const gchar **attr_names,
+ const gchar **attr_values,
+ gpointer user_data,
+ GError **error)
+{
+ EvolutionAccountContext *account_context;
+ gint i = 0;
- i++;
- }
+ if (strcmp (element_name, "account") != 0) {
+ return;
+ }
+
+ account_context = (EvolutionAccountContext *) user_data;
+
+ while (attr_names[i]) {
+ if (strcmp (attr_names[i], "uid") == 0) {
+ account_context->uid = g_strdup (attr_values[i]);
+ return;
+ }
+
+ i++;
+ }
}
static gchar *
get_account_name_from_imap_uri (const gchar *imap_uri)
{
- const gchar *start, *at, *semic;
- gchar *user_name, *at_host_name, *account_name;
+ const gchar *start, *at, *semic;
+ gchar *user_name, *at_host_name, *account_name;
- /* Assume url schema is:
- * imap://foo imap free fr/;etc
- * or
- * imap://foo;auth=DIGEST-MD5 imap bar com/;etc
- *
- * We try to get "foo imap free fr".
- */
-
- if (!g_str_has_prefix (imap_uri, "imap://")) {
- return NULL;
- }
-
- user_name = at_host_name = account_name = NULL;
-
- /* check for embedded @ and then look for first colon after that */
- start = imap_uri + 7;
- at = strchr (start, '@');
- semic = strchr (start, ';');
-
- if ( strlen (imap_uri) < 7 || at == NULL ) {
- return g_strdup ("Unknown");
- }
-
- if (semic < at) {
- /* we have a ";auth=FOO host" schema
- Set semic to the next semicolon, which ends the hostname. */
- user_name = g_strndup (start, semic - start);
- /* look for ';' at the end of the domain name */
- semic = strchr (at, ';');
- } else {
- user_name = g_strndup (start, at - start);
- }
+ /* Assume url schema is:
+ * imap://foo imap free fr/;etc
+ * or
+ * imap://foo;auth=DIGEST-MD5 imap bar com/;etc
+ *
+ * We try to get "foo imap free fr".
+ */
- at_host_name = g_strndup (at, (semic - 1) - at);
+ if (!g_str_has_prefix (imap_uri, "imap://")) {
+ return NULL;
+ }
+
+ user_name = at_host_name = account_name = NULL;
+
+ /* check for embedded @ and then look for first colon after that */
+ start = imap_uri + 7;
+ at = strchr (start, '@');
+ semic = strchr (start, ';');
- account_name = g_strconcat (user_name, at_host_name, NULL);
+ if ( strlen (imap_uri) < 7 || at == NULL ) {
+ return g_strdup ("Unknown");
+ }
+
+ if (semic < at) {
+ /* we have a ";auth=FOO host" schema
+ Set semic to the next semicolon, which ends the hostname. */
+ user_name = g_strndup (start, semic - start);
+ /* look for ';' at the end of the domain name */
+ semic = strchr (at, ';');
+ } else {
+ user_name = g_strndup (start, at - start);
+ }
- g_free (user_name);
- g_free (at_host_name);
+ at_host_name = g_strndup (at, (semic - 1) - at);
- return account_name;
+ account_name = g_strconcat (user_name, at_host_name, NULL);
+
+ g_free (user_name);
+ g_free (at_host_name);
+
+ return account_name;
}
static void
account_text_handler (GMarkupParseContext *context,
- const gchar *text,
- gsize text_len,
- gpointer user_data,
- GError **error)
-{
- EvolutionAccountContext *account_context;
- const GSList *uri_element, *source_element;
- gchar *url;
-
- uri_element = g_markup_parse_context_get_element_stack (context);
- source_element = uri_element->next;
-
- if (strcmp ((gchar *) uri_element->data, "url") != 0 ||
- !source_element ||
- strcmp ((gchar *) source_element->data, "source") != 0) {
- return;
- }
-
- account_context = (EvolutionAccountContext *) user_data;
-
- url = g_strndup (text, text_len);
- account_context->account = get_account_name_from_imap_uri (url);
- g_free (url);
+ const gchar *text,
+ gsize text_len,
+ gpointer user_data,
+ GError **error)
+{
+ EvolutionAccountContext *account_context;
+ const GSList *uri_element, *source_element;
+ gchar *url;
+
+ uri_element = g_markup_parse_context_get_element_stack (context);
+ source_element = uri_element->next;
+
+ if (strcmp ((gchar *) uri_element->data, "url") != 0 ||
+ !source_element ||
+ strcmp ((gchar *) source_element->data, "source") != 0) {
+ return;
+ }
+
+ account_context = (EvolutionAccountContext *) user_data;
+
+ url = g_strndup (text, text_len);
+ account_context->account = get_account_name_from_imap_uri (url);
+ g_free (url);
}
void
get_imap_accounts (void)
{
- GConfClient *client;
- GMarkupParser parser = { 0 };
- GMarkupParseContext *parse_context;
- GSList *list, *l;
- EvolutionAccountContext account_context = { 0 };
-
- client = gconf_client_get_default ();
-
- list = gconf_client_get_list (client,
- "/apps/evolution/mail/accounts",
- GCONF_VALUE_STRING,
- NULL);
-
- parser.start_element = account_start_element_handler;
- parser.text = account_text_handler;
- parse_context = g_markup_parse_context_new (&parser, 0, &account_context, NULL);
-
- accounts = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_free);
-
- for (l = list; l; l = l->next) {
- g_markup_parse_context_parse (parse_context, (const gchar *) l->data, -1, NULL);
-
- if (account_context.account &&
- account_context.uid) {
- g_hash_table_insert (accounts,
- account_context.account,
- account_context.uid);
- } else {
- g_free (account_context.account);
- g_free (account_context.uid);
- }
- }
+ GConfClient *client;
+ GMarkupParser parser = { 0 };
+ GMarkupParseContext *parse_context;
+ GSList *list, *l;
+ EvolutionAccountContext account_context = { 0 };
+
+ client = gconf_client_get_default ();
+
+ list = gconf_client_get_list (client,
+ "/apps/evolution/mail/accounts",
+ GCONF_VALUE_STRING,
+ NULL);
+
+ parser.start_element = account_start_element_handler;
+ parser.text = account_text_handler;
+ parse_context = g_markup_parse_context_new (&parser, 0, &account_context, NULL);
+
+ accounts = g_hash_table_new_full (g_str_hash, g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify) g_free);
+
+ for (l = list; l; l = l->next) {
+ g_markup_parse_context_parse (parse_context, (const gchar *) l->data, -1, NULL);
+
+ if (account_context.account &&
+ account_context.uid) {
+ g_hash_table_insert (accounts,
+ account_context.account,
+ account_context.uid);
+ } else {
+ g_free (account_context.account);
+ g_free (account_context.uid);
+ }
+ }
- g_markup_parse_context_free (parse_context);
+ g_markup_parse_context_free (parse_context);
- g_slist_foreach (list, (GFunc) g_free, NULL);
- g_slist_free (list);
+ g_slist_foreach (list, (GFunc) g_free, NULL);
+ g_slist_free (list);
}
static MailStorageType
get_mail_storage_type_from_path (const gchar *path)
{
- MailStorageType type = MAIL_STORAGE_NONE;
- gchar *basename;
+ MailStorageType type = MAIL_STORAGE_NONE;
+ gchar *basename;
+
+ basename = g_path_get_basename (path);
- basename = g_path_get_basename (path);
+ if (g_str_has_prefix (path, local_dir) &&
+ strchr (basename, '.') == NULL) {
+ type = MAIL_STORAGE_LOCAL;
+ } else if (g_str_has_prefix (path, imap_dir) &&
+ strcmp (basename, "summary") == 0) {
+ type = MAIL_STORAGE_IMAP;
+ }
- if (g_str_has_prefix (path, local_dir) &&
- strchr (basename, '.') == NULL) {
- type = MAIL_STORAGE_LOCAL;
- } else if (g_str_has_prefix (path, imap_dir) &&
- strcmp (basename, "summary") == 0) {
- type = MAIL_STORAGE_IMAP;
- }
-
- /* Exclude non wanted folders */
- if (strcasestr (path, "junk") ||
- strcasestr (path, "spam") ||
- strcasestr (path, "trash") ||
- strcasestr (path, "drafts") ||
- strcasestr (path, "sent") ||
- strcasestr (path, "outbox")) {
- type = MAIL_STORAGE_NONE;
- }
+ /* Exclude non wanted folders */
+ if (strcasestr (path, "junk") ||
+ strcasestr (path, "spam") ||
+ strcasestr (path, "trash") ||
+ strcasestr (path, "drafts") ||
+ strcasestr (path, "sent") ||
+ strcasestr (path, "outbox")) {
+ type = MAIL_STORAGE_NONE;
+ }
- g_free (basename);
+ g_free (basename);
- return type;
+ return type;
}
static GMimeStream *
email_get_stream (const gchar *path,
- gint flags,
- off_t start)
+ gint flags,
+ off_t start)
{
- GMimeStream *stream;
- gint fd;
+ GMimeStream *stream;
+ gint fd;
- fd = g_open (path, flags, S_IRUSR | S_IWUSR);
+ fd = g_open (path, flags, S_IRUSR | S_IWUSR);
- if (fd == -1) {
- return NULL;
- }
+ if (fd == -1) {
+ return NULL;
+ }
- stream = g_mime_stream_fs_new_with_bounds (fd, start, -1);
+ stream = g_mime_stream_fs_new_with_bounds (fd, start, -1);
- if (!stream) {
- close (fd);
- }
+ if (!stream) {
+ close (fd);
+ }
- return stream;
+ return stream;
}
static gint
read_summary_header (FILE *summary)
{
- gint32 version, n_messages;
+ gint32 version, n_messages;
- read_summary (summary,
- SUMMARY_TYPE_INT32, &version,
- SUMMARY_TYPE_INT32, NULL,
- SUMMARY_TYPE_INT32, NULL,
- SUMMARY_TYPE_INT32, NULL,
- SUMMARY_TYPE_INT32, &n_messages,
- -1);
-
- if ((version < 0x100 && version >= 13)) {
- read_summary (summary,
- SUMMARY_TYPE_INT32, NULL,
- SUMMARY_TYPE_INT32, NULL,
- SUMMARY_TYPE_INT32, NULL,
- -1);
- }
-
- if (version != 0x30c) {
- read_summary (summary,
- SUMMARY_TYPE_INT32, NULL,
- SUMMARY_TYPE_INT32, NULL,
- -1);
- }
+ read_summary (summary,
+ SUMMARY_TYPE_INT32, &version,
+ SUMMARY_TYPE_INT32, NULL,
+ SUMMARY_TYPE_INT32, NULL,
+ SUMMARY_TYPE_INT32, NULL,
+ SUMMARY_TYPE_INT32, &n_messages,
+ -1);
+
+ if ((version < 0x100 && version >= 13)) {
+ read_summary (summary,
+ SUMMARY_TYPE_INT32, NULL,
+ SUMMARY_TYPE_INT32, NULL,
+ SUMMARY_TYPE_INT32, NULL,
+ -1);
+ }
+
+ if (version != 0x30c) {
+ read_summary (summary,
+ SUMMARY_TYPE_INT32, NULL,
+ SUMMARY_TYPE_INT32, NULL,
+ -1);
+ }
- return n_messages;
+ return n_messages;
}
gpointer
tracker_module_file_get_data (const gchar *path)
{
- EvolutionFileData *data = NULL;
- MailStorageType type;
+ EvolutionFileData *data = NULL;
+ MailStorageType type;
- type = get_mail_storage_type_from_path (path);
+ type = get_mail_storage_type_from_path (path);
- if (type == MAIL_STORAGE_NONE) {
- return NULL;
- }
+ if (type == MAIL_STORAGE_NONE) {
+ return NULL;
+ }
- data = g_slice_new0 (EvolutionFileData);
- data->type = type;
+ data = g_slice_new0 (EvolutionFileData);
+ data->type = type;
- if (type == MAIL_STORAGE_IMAP) {
- EvolutionImapData *imap_data;
+ if (type == MAIL_STORAGE_IMAP) {
+ EvolutionImapData *imap_data;
- imap_data = (EvolutionImapData *) data;
+ imap_data = (EvolutionImapData *) data;
- imap_data->fd = tracker_file_open (path, TRUE);
+ imap_data->fd = tracker_file_open (path, TRUE);
- if (imap_data->fd == -1) {
- return NULL;
- }
+ if (imap_data->fd == -1) {
+ return NULL;
+ }
- imap_data->summary = fdopen (imap_data->fd, "r");
- imap_data->n_messages = read_summary_header (imap_data->summary);
- imap_data->cur_message = 1;
- } else {
- EvolutionLocalData *local_data;
+ imap_data->summary = fdopen (imap_data->fd, "r");
+ imap_data->n_messages = read_summary_header (imap_data->summary);
+ imap_data->cur_message = 1;
+ } else {
+ EvolutionLocalData *local_data;
- local_data = (EvolutionLocalData *) data;
+ local_data = (EvolutionLocalData *) data;
#if defined(__linux__)
- local_data->stream = email_get_stream (path, O_RDONLY | O_NOATIME, 0);
+ local_data->stream = email_get_stream (path, O_RDONLY | O_NOATIME, 0);
#else
- local_data->stream = email_get_stream (path, O_RDONLY, 0);
+ local_data->stream = email_get_stream (path, O_RDONLY, 0);
#endif
- if (local_data->stream) {
- local_data->parser = g_mime_parser_new_with_stream (local_data->stream);
- g_mime_parser_set_scan_from (local_data->parser, TRUE);
-
- /* Initialize to the first message */
- local_data->message = g_mime_parser_construct_message (local_data->parser);
- }
- }
+ if (local_data->stream) {
+ local_data->parser = g_mime_parser_new_with_stream (local_data->stream);
+ g_mime_parser_set_scan_from (local_data->parser, TRUE);
+
+ /* Initialize to the first message */
+ local_data->message = g_mime_parser_construct_message (local_data->parser);
+ }
+ }
- return data;
+ return data;
}
static void
free_imap_data (EvolutionImapData *data)
{
- fclose (data->summary);
- close (data->fd);
+ fclose (data->summary);
+ close (data->fd);
}
static void
free_local_data (EvolutionLocalData *data)
{
- if (data->mime_parts) {
- g_list_foreach (data->mime_parts, (GFunc) g_object_unref, NULL);
- g_list_free (data->mime_parts);
- }
-
- if (data->message) {
- g_object_unref (data->message);
- }
-
- if (data->parser) {
- g_object_unref (data->parser);
- }
-
- if (data->stream) {
- g_mime_stream_close (data->stream);
- g_object_unref (data->stream);
- }
+ if (data->mime_parts) {
+ g_list_foreach (data->mime_parts, (GFunc) g_object_unref, NULL);
+ g_list_free (data->mime_parts);
+ }
+
+ if (data->message) {
+ g_object_unref (data->message);
+ }
+
+ if (data->parser) {
+ g_object_unref (data->parser);
+ }
+
+ if (data->stream) {
+ g_mime_stream_close (data->stream);
+ g_object_unref (data->stream);
+ }
}
void
tracker_module_file_free_data (gpointer file_data)
{
- EvolutionFileData *data;
+ EvolutionFileData *data;
- data = (EvolutionFileData *) file_data;
+ data = (EvolutionFileData *) file_data;
- if (data->type == MAIL_STORAGE_LOCAL) {
- free_local_data ((EvolutionLocalData *) data);
- } else if (data->type == MAIL_STORAGE_IMAP) {
- free_imap_data ((EvolutionImapData *) data);
- }
+ if (data->type == MAIL_STORAGE_LOCAL) {
+ free_local_data ((EvolutionLocalData *) data);
+ } else if (data->type == MAIL_STORAGE_IMAP) {
+ free_imap_data ((EvolutionImapData *) data);
+ }
- g_slice_free (EvolutionFileData, data);
+ g_slice_free (EvolutionFileData, data);
}
static gint
get_mbox_message_id (GMimeMessage *message)
{
- const gchar *header, *pos;
- gchar *number;
- gint id;
+ const gchar *header, *pos;
+ gchar *number;
+ gint id;
- header = g_mime_message_get_header (message, "X-Evolution");
- pos = strchr (header, '-');
+ header = g_mime_message_get_header (message, "X-Evolution");
+ pos = strchr (header, '-');
- number = g_strndup (header, pos - header);
- id = strtoul (number, NULL, 16);
+ number = g_strndup (header, pos - header);
+ id = strtoul (number, NULL, 16);
- g_free (number);
+ g_free (number);
- return id;
+ return id;
}
static guint
get_mbox_message_flags (GMimeMessage *message)
{
- const gchar *header, *pos;
+ const gchar *header, *pos;
- header = g_mime_message_get_header (message, "X-Evolution");
- pos = strchr (header, '-');
+ header = g_mime_message_get_header (message, "X-Evolution");
+ pos = strchr (header, '-');
- return (guint) strtoul (pos + 1, NULL, 16);
+ return (guint) strtoul (pos + 1, NULL, 16);
}
static void
get_mbox_uri (TrackerFile *file,
- GMimeMessage *message,
- gchar **dirname,
- gchar **basename)
+ GMimeMessage *message,
+ gchar **dirname,
+ gchar **basename)
{
- gchar *dir, *name;
+ gchar *dir, *name;
- dir = tracker_string_replace (file->path, local_dir, NULL);
- dir = tracker_string_remove (dir, ".sbd");
+ dir = tracker_string_replace (file->path, local_dir, NULL);
+ dir = tracker_string_remove (dir, ".sbd");
- name = g_strdup_printf ("%s;uid=%d", dir, get_mbox_message_id (message));
+ name = g_strdup_printf ("%s;uid=%d", dir, get_mbox_message_id (message));
- *dirname = g_strdup ("email://local local");
- *basename = name;
+ *dirname = g_strdup ("email://local local");
+ *basename = name;
- g_free (dir);
+ g_free (dir);
}
static void
get_mbox_attachment_uri (TrackerFile *file,
- GMimeMessage *message,
- GMimePart *part,
- gchar **dirname,
- gchar **basename)
+ GMimeMessage *message,
+ GMimePart *part,
+ gchar **dirname,
+ gchar **basename)
{
- gchar *dir;
+ gchar *dir;
- dir = tracker_string_replace (file->path, local_dir, NULL);
- dir = tracker_string_remove (dir, ".sbd");
+ dir = tracker_string_replace (file->path, local_dir, NULL);
+ dir = tracker_string_remove (dir, ".sbd");
- *dirname = g_strdup_printf ("email://local local/%s;uid=%d",
- dir, get_mbox_message_id (message));
- *basename = g_strdup (g_mime_part_get_filename (part));
+ *dirname = g_strdup_printf ("email://local local/%s;uid=%d",
+ dir, get_mbox_message_id (message));
+ *basename = g_strdup (g_mime_part_get_filename (part));
- g_free (dir);
+ g_free (dir);
}
static GList *
get_mbox_recipient_list (GMimeMessage *message,
- const gchar *type)
+ const gchar *type)
{
- GList *list = NULL;
- const InternetAddressList *addresses;
-
- addresses = g_mime_message_get_recipients (message, type);
-
- while (addresses) {
- InternetAddress *address;
- gchar *str;
-
- address = addresses->address;
+ GList *list = NULL;
+ const InternetAddressList *addresses;
- if (address->name && address->value.addr) {
- str = g_strdup_printf ("%s %s", address->name, address->value.addr);
- } else if (address->value.addr) {
- str = g_strdup (address->value.addr);
- } else if (address->name) {
- str = g_strdup (address->name);
- } else {
- str = NULL;
- }
+ addresses = g_mime_message_get_recipients (message, type);
- if (str) {
- list = g_list_prepend (list, str);
- }
+ while (addresses) {
+ InternetAddress *address;
+ gchar *str;
+
+ address = addresses->address;
+
+ if (address->name && address->value.addr) {
+ str = g_strdup_printf ("%s %s", address->name, address->value.addr);
+ } else if (address->value.addr) {
+ str = g_strdup (address->value.addr);
+ } else if (address->name) {
+ str = g_strdup (address->name);
+ } else {
+ str = NULL;
+ }
+
+ if (str) {
+ list = g_list_prepend (list, str);
+ }
- addresses = addresses->next;
- }
+ addresses = addresses->next;
+ }
- return g_list_reverse (list);
+ return g_list_reverse (list);
}
static TrackerMetadata *
get_metadata_for_data_wrapper (GMimeDataWrapper *wrapper)
{
- TrackerMetadata *metadata;
- GMimeStream *stream;
- gchar *path;
- gint fd;
-
- path = g_build_filename (g_get_tmp_dir (), "tracker-evolution-module-XXXXXX", NULL);
- fd = g_mkstemp (path);
- metadata = NULL;
+ TrackerMetadata *metadata;
+ GMimeStream *stream;
+ gchar *path;
+ gint fd;
+
+ path = g_build_filename (g_get_tmp_dir (), "tracker-evolution-module-XXXXXX", NULL);
+ fd = g_mkstemp (path);
+ metadata = NULL;
- stream = g_mime_stream_fs_new (fd);
+ stream = g_mime_stream_fs_new (fd);
- if (g_mime_data_wrapper_write_to_stream (wrapper, stream) != -1) {
- g_mime_stream_flush (stream);
+ if (g_mime_data_wrapper_write_to_stream (wrapper, stream) != -1) {
+ g_mime_stream_flush (stream);
- metadata = tracker_metadata_utils_get_data (path);
- g_unlink (path);
- }
+ metadata = tracker_metadata_utils_get_data (path);
+ g_unlink (path);
+ }
- g_mime_stream_close (stream);
- g_object_unref (stream);
- g_free (path);
+ g_mime_stream_close (stream);
+ g_object_unref (stream);
+ g_free (path);
- return metadata;
+ return metadata;
}
static TrackerMetadata *
get_metadata_for_mbox_attachment (TrackerFile *file,
- GMimeMessage *message,
- GMimePart *part)
+ GMimeMessage *message,
+ GMimePart *part)
{
- TrackerMetadata *metadata;
- GMimeDataWrapper *content;
+ TrackerMetadata *metadata;
+ GMimeDataWrapper *content;
- content = g_mime_part_get_content_object (part);
+ content = g_mime_part_get_content_object (part);
- if (!content) {
- return NULL;
- }
+ if (!content) {
+ return NULL;
+ }
- metadata = get_metadata_for_data_wrapper (content);
+ metadata = get_metadata_for_data_wrapper (content);
- if (metadata) {
- gchar *dirname, *basename;
+ if (metadata) {
+ gchar *dirname, *basename;
- get_mbox_attachment_uri (file, message, part,
- &dirname, &basename);
+ get_mbox_attachment_uri (file, message, part,
+ &dirname, &basename);
- tracker_metadata_insert (metadata, METADATA_FILE_PATH, dirname);
- tracker_metadata_insert (metadata, METADATA_FILE_NAME, basename);
- }
+ tracker_metadata_insert (metadata, METADATA_FILE_PATH, dirname);
+ tracker_metadata_insert (metadata, METADATA_FILE_NAME, basename);
+ }
- g_object_unref (content);
+ g_object_unref (content);
- return metadata;
+ return metadata;
}
static TrackerMetadata *
get_metadata_for_mbox (TrackerFile *file)
{
- EvolutionLocalData *data;
- GMimeMessage *message;
- TrackerMetadata *metadata;
- gchar *dirname, *basename;
- time_t date;
- GList *list;
- guint flags;
-
- data = file->data;
- message = data->message;
-
- if (!message) {
- return NULL;
- }
-
- flags = get_mbox_message_flags (message);
-
- if (flags & EVOLUTION_MESSAGE_JUNK ||
- flags & EVOLUTION_MESSAGE_DELETED) {
- return NULL;
- }
-
- if (data->current_mime_part) {
- /* We're processing an attachment */
- return get_metadata_for_mbox_attachment (file, message, data->current_mime_part->data);
- }
-
- metadata = tracker_metadata_new ();
-
- get_mbox_uri (file, message, &dirname, &basename);
- tracker_metadata_insert (metadata, METADATA_FILE_PATH, dirname);
- tracker_metadata_insert (metadata, METADATA_FILE_NAME, basename);
+ EvolutionLocalData *data;
+ GMimeMessage *message;
+ TrackerMetadata *metadata;
+ gchar *dirname, *basename;
+ time_t date;
+ GList *list;
+ guint flags;
+
+ data = file->data;
+ message = data->message;
+
+ if (!message) {
+ return NULL;
+ }
+
+ flags = get_mbox_message_flags (message);
+
+ if (flags & EVOLUTION_MESSAGE_JUNK ||
+ flags & EVOLUTION_MESSAGE_DELETED) {
+ return NULL;
+ }
- g_mime_message_get_date (message, &date, NULL);
+ if (data->current_mime_part) {
+ /* We're processing an attachment */
+ return get_metadata_for_mbox_attachment (file, message, data->current_mime_part->data);
+ }
+
+ metadata = tracker_metadata_new ();
+
+ get_mbox_uri (file, message, &dirname, &basename);
+ tracker_metadata_insert (metadata, METADATA_FILE_PATH, dirname);
+ tracker_metadata_insert (metadata, METADATA_FILE_NAME, basename);
+
+ g_mime_message_get_date (message, &date, NULL);
tracker_metadata_insert (metadata, METADATA_EMAIL_DATE,
- tracker_guint_to_string (date));
+ tracker_guint_to_string (date));
- tracker_metadata_insert (metadata, METADATA_EMAIL_SENDER,
- g_strdup (g_mime_message_get_sender (message)));
- tracker_metadata_insert (metadata, METADATA_EMAIL_SUBJECT,
- g_strdup (g_mime_message_get_subject (message)));
+ tracker_metadata_insert (metadata, METADATA_EMAIL_SENDER,
+ g_strdup (g_mime_message_get_sender (message)));
+ tracker_metadata_insert (metadata, METADATA_EMAIL_SUBJECT,
+ g_strdup (g_mime_message_get_subject (message)));
- list = get_mbox_recipient_list (message, GMIME_RECIPIENT_TYPE_TO);
- tracker_metadata_insert_multiple_values (metadata, METADATA_EMAIL_SENT_TO, list);
+ list = get_mbox_recipient_list (message, GMIME_RECIPIENT_TYPE_TO);
+ tracker_metadata_insert_multiple_values (metadata, METADATA_EMAIL_SENT_TO, list);
- list = get_mbox_recipient_list (message, GMIME_RECIPIENT_TYPE_CC);
- tracker_metadata_insert_multiple_values (metadata, METADATA_EMAIL_CC, list);
+ list = get_mbox_recipient_list (message, GMIME_RECIPIENT_TYPE_CC);
+ tracker_metadata_insert_multiple_values (metadata, METADATA_EMAIL_CC, list);
- return metadata;
+ return metadata;
}
static void
skip_content_info (FILE *summary)
{
- guint32 count, i;
+ guint32 count, i;
+
+ if (fgetc (summary)) {
+ read_summary (summary,
+ SUMMARY_TYPE_TOKEN, NULL,
+ SUMMARY_TYPE_TOKEN, NULL,
+ SUMMARY_TYPE_UINT32, &count,
+ -1);
+
+ if (count <= 500) {
+ for (i = 0; i < count; i++) {
+ read_summary (summary,
+ SUMMARY_TYPE_TOKEN, NULL,
+ SUMMARY_TYPE_TOKEN, NULL,
+ -1);
+ }
+ }
+
+ read_summary (summary,
+ SUMMARY_TYPE_TOKEN, NULL,
+ SUMMARY_TYPE_TOKEN, NULL,
+ SUMMARY_TYPE_TOKEN, NULL,
+ SUMMARY_TYPE_UINT32, NULL,
+ -1);
+ }
- if (fgetc (summary)) {
- read_summary (summary,
- SUMMARY_TYPE_TOKEN, NULL,
- SUMMARY_TYPE_TOKEN, NULL,
- SUMMARY_TYPE_UINT32, &count,
- -1);
-
- if (count <= 500) {
- for (i = 0; i < count; i++) {
- read_summary (summary,
- SUMMARY_TYPE_TOKEN, NULL,
- SUMMARY_TYPE_TOKEN, NULL,
- -1);
- }
- }
-
- read_summary (summary,
- SUMMARY_TYPE_TOKEN, NULL,
- SUMMARY_TYPE_TOKEN, NULL,
- SUMMARY_TYPE_TOKEN, NULL,
- SUMMARY_TYPE_UINT32, NULL,
- -1);
- }
-
- read_summary (summary,
- SUMMARY_TYPE_UINT32, &count,
- -1);
-
- for (i = 0; i < count; i++) {
- skip_content_info (summary);
- }
+ read_summary (summary,
+ SUMMARY_TYPE_UINT32, &count,
+ -1);
+
+ for (i = 0; i < count; i++) {
+ skip_content_info (summary);
+ }
}
static gboolean
-get_imap_attachment_info (const gchar *mime_file,
- gchar **name,
- GMimePartEncodingType *encoding)
+get_imap_attachment_info (const gchar *mime_file,
+ gchar **name,
+ GMimePartEncodingType *encoding)
{
- GMimeContentType *mime;
+ GMimeContentType *mime;
gchar *tmp, *mime_content;
- const gchar *pos_content_type, *pos_encoding, *pos_end_encoding;
+ const gchar *pos_content_type, *pos_encoding, *pos_end_encoding;
- if (name) {
- *name = NULL;
- }
-
- if (encoding) {
- *encoding = GMIME_PART_ENCODING_DEFAULT;
- }
+ if (name) {
+ *name = NULL;
+ }
+
+ if (encoding) {
+ *encoding = GMIME_PART_ENCODING_DEFAULT;
+ }
if (!g_file_get_contents (mime_file, &tmp, NULL, NULL)) {
return FALSE;
}
- /* all text content in lower case for comparisons */
+ /* all text content in lower case for comparisons */
mime_content = g_ascii_strdown (tmp, -1);
- g_free (tmp);
+ g_free (tmp);
pos_content_type = strstr (mime_content, "content-type:");
- if (pos_content_type) {
- pos_encoding = strstr (pos_content_type, "content-transfer-encoding:");
- }
-
- if (!pos_content_type || !pos_encoding) {
- g_free (mime_content);
- return FALSE;
- }
-
- pos_content_type += strlen ("content-type:");
- pos_encoding += strlen ("content-transfer-encoding:");
-
- /* ignore spaces, tab or line returns */
- while (*pos_content_type != '\0' && (*pos_content_type == ' ' || *pos_content_type == '\t' || *pos_content_type == '\n')) {
- pos_content_type++;
- }
-
- while (*pos_encoding != '\0' && *pos_encoding == ' ') {
- pos_encoding++;
- }
-
- if (*pos_content_type == '\0' ||
- *pos_encoding == '\0') {
- g_free (mime_content);
- return FALSE;
- }
-
- mime = g_mime_content_type_new_from_string (pos_content_type);
-
- if (mime) {
- if (name) {
- *name = g_strdup (g_mime_content_type_get_parameter (mime, "name"));
- }
-
- g_mime_content_type_destroy (mime);
- }
-
- if (name && !*name) {
- g_free (mime_content);
- return FALSE;
- }
-
- /* Find end of encoding */
- pos_end_encoding = pos_encoding;
-
- while (*pos_end_encoding != '\0' &&
- *pos_end_encoding != ' ' &&
- *pos_end_encoding != '\n' &&
- *pos_end_encoding != '\t') {
- pos_end_encoding++;
- }
-
- if (encoding && pos_encoding != pos_end_encoding) {
- gchar *encoding_str = g_strndup (pos_encoding, pos_end_encoding - pos_encoding);
-
- if (strcmp (encoding_str, "7bit") == 0) {
- *encoding = GMIME_PART_ENCODING_7BIT;
- } else if (strcmp (encoding_str, "8bit") == 0) {
- *encoding = GMIME_PART_ENCODING_7BIT;
- } else if (strcmp (encoding_str, "binary") == 0) {
- *encoding = GMIME_PART_ENCODING_BINARY;
- } else if (strcmp (encoding_str, "base64") == 0) {
- *encoding = GMIME_PART_ENCODING_BASE64;
- } else if (strcmp (encoding_str, "quoted-printable") == 0) {
- *encoding = GMIME_PART_ENCODING_QUOTEDPRINTABLE;
- } else if (strcmp (encoding_str, "x-uuencode") == 0) {
- *encoding = GMIME_PART_ENCODING_UUENCODE;
- }
+ if (pos_content_type) {
+ pos_encoding = strstr (pos_content_type, "content-transfer-encoding:");
+ }
+
+ if (!pos_content_type || !pos_encoding) {
+ g_free (mime_content);
+ return FALSE;
+ }
+
+ pos_content_type += strlen ("content-type:");
+ pos_encoding += strlen ("content-transfer-encoding:");
- g_free (encoding_str);
- }
+ /* ignore spaces, tab or line returns */
+ while (*pos_content_type != '\0' && (*pos_content_type == ' ' || *pos_content_type == '\t' || *pos_content_type == '\n')) {
+ pos_content_type++;
+ }
+
+ while (*pos_encoding != '\0' && *pos_encoding == ' ') {
+ pos_encoding++;
+ }
+
+ if (*pos_content_type == '\0' ||
+ *pos_encoding == '\0') {
+ g_free (mime_content);
+ return FALSE;
+ }
+
+ mime = g_mime_content_type_new_from_string (pos_content_type);
+
+ if (mime) {
+ if (name) {
+ *name = g_strdup (g_mime_content_type_get_parameter (mime, "name"));
+ }
+
+ g_mime_content_type_destroy (mime);
+ }
+
+ if (name && !*name) {
+ g_free (mime_content);
+ return FALSE;
+ }
+
+ /* Find end of encoding */
+ pos_end_encoding = pos_encoding;
+
+ while (*pos_end_encoding != '\0' &&
+ *pos_end_encoding != ' ' &&
+ *pos_end_encoding != '\n' &&
+ *pos_end_encoding != '\t') {
+ pos_end_encoding++;
+ }
+
+ if (encoding && pos_encoding != pos_end_encoding) {
+ gchar *encoding_str = g_strndup (pos_encoding, pos_end_encoding - pos_encoding);
+
+ if (strcmp (encoding_str, "7bit") == 0) {
+ *encoding = GMIME_PART_ENCODING_7BIT;
+ } else if (strcmp (encoding_str, "8bit") == 0) {
+ *encoding = GMIME_PART_ENCODING_7BIT;
+ } else if (strcmp (encoding_str, "binary") == 0) {
+ *encoding = GMIME_PART_ENCODING_BINARY;
+ } else if (strcmp (encoding_str, "base64") == 0) {
+ *encoding = GMIME_PART_ENCODING_BASE64;
+ } else if (strcmp (encoding_str, "quoted-printable") == 0) {
+ *encoding = GMIME_PART_ENCODING_QUOTEDPRINTABLE;
+ } else if (strcmp (encoding_str, "x-uuencode") == 0) {
+ *encoding = GMIME_PART_ENCODING_UUENCODE;
+ }
+
+ g_free (encoding_str);
+ }
g_free (mime_content);
- return TRUE;
+ return TRUE;
}
static void
get_imap_uri (TrackerFile *file,
- const gchar *uid,
- gchar **uri_base,
- gchar **basename)
+ const gchar *uid,
+ gchar **uri_base,
+ gchar **basename)
{
- GList *keys, *k;
- gchar *path, *dir, *subdirs;
+ GList *keys, *k;
+ gchar *path, *dir, *subdirs;
- path = file->path;
- keys = g_hash_table_get_keys (accounts);
- *uri_base = *basename = NULL;
+ path = file->path;
+ keys = g_hash_table_get_keys (accounts);
+ *uri_base = *basename = NULL;
- for (k = keys; k; k = k->next) {
- if (strstr (path, k->data)) {
- *uri_base = g_strdup_printf ("email://%s", (gchar *) g_hash_table_lookup (accounts, k->data));
+ for (k = keys; k; k = k->next) {
+ if (strstr (path, k->data)) {
+ *uri_base = g_strdup_printf ("email://%s", (gchar *) g_hash_table_lookup (accounts, k->data));
- dir = g_build_filename (imap_dir, k->data, NULL);
+ dir = g_build_filename (imap_dir, k->data, NULL);
- /* now remove all relevant info to create the email:// basename */
- subdirs = g_strdup (path);
- subdirs = tracker_string_remove (subdirs, dir);
- subdirs = tracker_string_remove (subdirs, "/folders");
- subdirs = tracker_string_remove (subdirs, "/subfolders");
- subdirs = tracker_string_remove (subdirs, "/summary");
+ /* now remove all relevant info to create the email:// basename */
+ subdirs = g_strdup (path);
+ subdirs = tracker_string_remove (subdirs, dir);
+ subdirs = tracker_string_remove (subdirs, "/folders");
+ subdirs = tracker_string_remove (subdirs, "/subfolders");
+ subdirs = tracker_string_remove (subdirs, "/summary");
- *basename = g_strdup_printf ("%s;uid=%s", subdirs, uid);
+ *basename = g_strdup_printf ("%s;uid=%s", subdirs, uid);
- g_free (subdirs);
- g_free (dir);
+ g_free (subdirs);
+ g_free (dir);
- break;
- }
- }
+ break;
+ }
+ }
- g_list_free (keys);
+ g_list_free (keys);
- return;
+ return;
}
static void
get_imap_attachment_uri (TrackerFile *file,
- gchar **dirname,
- gchar **basename)
+ gchar **dirname,
+ gchar **basename)
{
- EvolutionImapData *data;
- gchar *message_dirname, *message_basename, *name;
+ EvolutionImapData *data;
+ gchar *message_dirname, *message_basename, *name;
- data = file->data;
+ data = file->data;
- if (!get_imap_attachment_info (data->current_mime_part->data, &name, NULL)) {
- return;
- }
+ if (!get_imap_attachment_info (data->current_mime_part->data, &name, NULL)) {
+ return;
+ }
- get_imap_uri (file, data->cur_message_uid, &message_dirname, &message_basename);
- *dirname = g_strdup_printf ("%s/%s", message_dirname, message_basename);
- *basename = name;
+ get_imap_uri (file, data->cur_message_uid, &message_dirname, &message_basename);
+ *dirname = g_strdup_printf ("%s/%s", message_dirname, message_basename);
+ *basename = name;
- g_free (message_dirname);
- g_free (message_basename);
+ g_free (message_dirname);
+ g_free (message_basename);
}
static GList *
get_imap_recipient_list (const gchar *str)
{
- GList *list = NULL;
- gchar **arr;
- gint i;
+ GList *list = NULL;
+ gchar **arr;
+ gint i;
- if (!str) {
- return NULL;
- }
+ if (!str) {
+ return NULL;
+ }
- arr = g_strsplit (str, ",", -1);
+ arr = g_strsplit (str, ",", -1);
- for (i = 0; arr[i]; i++) {
- g_strstrip (arr[i]);
- list = g_list_prepend (list, g_strdup (arr[i]));
- }
+ for (i = 0; arr[i]; i++) {
+ g_strstrip (arr[i]);
+ list = g_list_prepend (list, g_strdup (arr[i]));
+ }
- g_strfreev (arr);
+ g_strfreev (arr);
- return g_list_reverse (list);
+ return g_list_reverse (list);
}
static gchar *
get_imap_message_path (TrackerFile *file,
- const gchar *uid)
+ const gchar *uid)
{
- gchar *prefix, *message_path;
+ gchar *prefix, *message_path;
- prefix = g_strndup (file->path, strlen (file->path) - strlen ("summary"));
- message_path = g_strconcat (prefix, uid, ".", NULL);
- g_free (prefix);
+ prefix = g_strndup (file->path, strlen (file->path) - strlen ("summary"));
+ message_path = g_strconcat (prefix, uid, ".", NULL);
+ g_free (prefix);
- return message_path;
+ return message_path;
}
static TrackerMetadata *
get_metadata_for_imap_attachment (TrackerFile *file,
- const gchar *mime_file)
+ const gchar *mime_file)
{
- TrackerMetadata *metadata;
- GMimeStream *stream;
- GMimeDataWrapper *wrapper;
- GMimePartEncodingType encoding;
- gchar *path, *name;
-
- if (!get_imap_attachment_info (mime_file, &name, &encoding)) {
- return NULL;
- }
+ TrackerMetadata *metadata;
+ GMimeStream *stream;
+ GMimeDataWrapper *wrapper;
+ GMimePartEncodingType encoding;
+ gchar *path, *name;
- path = g_strdup (mime_file);
- path = tracker_string_remove (path, ".MIME");
+ if (!get_imap_attachment_info (mime_file, &name, &encoding)) {
+ return NULL;
+ }
+
+ path = g_strdup (mime_file);
+ path = tracker_string_remove (path, ".MIME");
#if defined(__linux__)
- stream = email_get_stream (path, O_RDONLY | O_NOATIME, 0);
+ stream = email_get_stream (path, O_RDONLY | O_NOATIME, 0);
#else
- stream = email_get_stream (path, O_RDONLY, 0);
+ stream = email_get_stream (path, O_RDONLY, 0);
#endif
- if (!stream) {
- g_free (name);
- g_free (path);
- return NULL;
- }
-
- wrapper = g_mime_data_wrapper_new_with_stream (stream, encoding);
- metadata = get_metadata_for_data_wrapper (wrapper);
-
- if (metadata) {
- EvolutionImapData *data;
- gchar *dirname, *basename;
-
- data = file->data;
-
- get_imap_uri (file,
- data->cur_message_uid,
- &dirname, &basename);
-
- tracker_metadata_insert (metadata, METADATA_FILE_NAME, g_strdup (name));
- tracker_metadata_insert (metadata, METADATA_FILE_PATH,
- g_strdup_printf ("%s/%s", dirname, basename));
-
- g_free (dirname);
- g_free (basename);
- }
-
- g_object_unref (wrapper);
- g_object_unref (stream);
- g_free (name);
- g_free (path);
+ if (!stream) {
+ g_free (name);
+ g_free (path);
+ return NULL;
+ }
+
+ wrapper = g_mime_data_wrapper_new_with_stream (stream, encoding);
+ metadata = get_metadata_for_data_wrapper (wrapper);
+
+ if (metadata) {
+ EvolutionImapData *data;
+ gchar *dirname, *basename;
+
+ data = file->data;
- return metadata;
+ get_imap_uri (file,
+ data->cur_message_uid,
+ &dirname, &basename);
+
+ tracker_metadata_insert (metadata, METADATA_FILE_NAME, g_strdup (name));
+ tracker_metadata_insert (metadata, METADATA_FILE_PATH,
+ g_strdup_printf ("%s/%s", dirname, basename));
+
+ g_free (dirname);
+ g_free (basename);
+ }
+
+ g_object_unref (wrapper);
+ g_object_unref (stream);
+ g_free (name);
+ g_free (path);
+
+ return metadata;
}
static TrackerMetadata *
get_metadata_for_imap (TrackerFile *file)
{
- EvolutionImapData *data;
- TrackerMetadata *metadata = NULL;
- gchar *dirname, *basename;
- gchar *uid, *subject, *from, *to, *cc;
- gint32 i, count, flags;
- time_t date;
- GList *list;
- gboolean deleted;
-
- data = file->data;
-
- if (data->cur_message > data->n_messages) {
- return NULL;
- }
-
- if (data->current_mime_part) {
- return get_metadata_for_imap_attachment (file, data->current_mime_part->data);
- }
-
- uid = NULL;
-
- if (!read_summary (data->summary,
- SUMMARY_TYPE_STRING, &uid, /* message uid */
- SUMMARY_TYPE_UINT32, &flags, /* flags */
- -1)) {
- g_free (uid);
- return NULL;
- }
-
- deleted = ((flags & EVOLUTION_MESSAGE_JUNK) != 0 ||
- (flags & EVOLUTION_MESSAGE_DELETED) != 0);
-
- subject = NULL;
- from = NULL;
- to = NULL;
- cc = NULL;
-
- if (!read_summary (data->summary,
- SUMMARY_TYPE_UINT32, NULL, /* size */
- SUMMARY_TYPE_TIME_T, NULL, /* date sent */
- SUMMARY_TYPE_TIME_T, &date, /* date received */
- SUMMARY_TYPE_STRING, &subject, /* subject */
- SUMMARY_TYPE_STRING, &from, /* from */
- SUMMARY_TYPE_STRING, &to, /* to */
- SUMMARY_TYPE_STRING, &cc, /* cc */
- SUMMARY_TYPE_STRING, NULL, /* mlist */
- -1)) {
- g_free (subject);
- g_free (from);
- g_free (to);
- g_free (cc);
- return NULL;
- }
-
- /* save current message uid */
- data->cur_message_uid = g_strdup (uid);
-
- if (!deleted) {
- metadata = tracker_metadata_new ();
- get_imap_uri (file, uid, &dirname, &basename);
-
- tracker_metadata_insert (metadata, METADATA_FILE_PATH, dirname);
- tracker_metadata_insert (metadata, METADATA_FILE_NAME, basename);
-
- tracker_metadata_insert (metadata, METADATA_EMAIL_DATE,
- tracker_guint_to_string (date));
-
- tracker_metadata_insert (metadata, METADATA_EMAIL_SENDER, from);
- tracker_metadata_insert (metadata, METADATA_EMAIL_SUBJECT, subject);
-
- list = get_imap_recipient_list (to);
- tracker_metadata_insert_multiple_values (metadata, METADATA_EMAIL_SENT_TO, list);
-
- list = get_imap_recipient_list (cc);
- tracker_metadata_insert_multiple_values (metadata, METADATA_EMAIL_CC, list);
- }
-
- g_free (uid);
- g_free (to);
- g_free (cc);
-
- if (!read_summary (data->summary,
- SUMMARY_TYPE_INT32, NULL,
- SUMMARY_TYPE_INT32, NULL,
- SUMMARY_TYPE_UINT32, &count,
- -1)) {
- goto corruption;
- }
-
- /* references */
- for (i = 0; i < count; i++) {
- if (read_summary (data->summary,
- SUMMARY_TYPE_INT32, NULL,
- SUMMARY_TYPE_INT32, NULL,
- -1)) {
- continue;
- }
-
- goto corruption;
- }
-
- if (!read_summary (data->summary, SUMMARY_TYPE_UINT32, &count, -1)) {
- goto corruption;
- }
-
- /* user flags */
- for (i = 0; i < count; i++) {
- if (read_summary (data->summary, SUMMARY_TYPE_STRING, NULL, -1)) {
- continue;
- }
-
- goto corruption;
- }
-
- if (!read_summary (data->summary, SUMMARY_TYPE_UINT32, &count, -1)) {
- goto corruption;
- }
-
- /* user tags */
- for (i = 0; i < count; i++) {
- if (read_summary (data->summary,
- SUMMARY_TYPE_STRING, NULL,
- SUMMARY_TYPE_STRING, NULL,
- -1)) {
- continue;
- }
-
- goto corruption;
- }
-
- /* server flags */
- if (!read_summary (data->summary,
- SUMMARY_TYPE_UINT32, NULL,
- -1)) {
- goto corruption;
- }
+ EvolutionImapData *data;
+ TrackerMetadata *metadata = NULL;
+ gchar *dirname, *basename;
+ gchar *uid, *subject, *from, *to, *cc;
+ gint32 i, count, flags;
+ time_t date;
+ GList *list;
+ gboolean deleted;
+
+ data = file->data;
+
+ if (data->cur_message > data->n_messages) {
+ return NULL;
+ }
+
+ if (data->current_mime_part) {
+ return get_metadata_for_imap_attachment (file, data->current_mime_part->data);
+ }
+
+ uid = NULL;
+
+ if (!read_summary (data->summary,
+ SUMMARY_TYPE_STRING, &uid, /* message uid */
+ SUMMARY_TYPE_UINT32, &flags, /* flags */
+ -1)) {
+ g_free (uid);
+ return NULL;
+ }
+
+ deleted = ((flags & EVOLUTION_MESSAGE_JUNK) != 0 ||
+ (flags & EVOLUTION_MESSAGE_DELETED) != 0);
+
+ subject = NULL;
+ from = NULL;
+ to = NULL;
+ cc = NULL;
+
+ if (!read_summary (data->summary,
+ SUMMARY_TYPE_UINT32, NULL, /* size */
+ SUMMARY_TYPE_TIME_T, NULL, /* date sent */
+ SUMMARY_TYPE_TIME_T, &date, /* date received */
+ SUMMARY_TYPE_STRING, &subject, /* subject */
+ SUMMARY_TYPE_STRING, &from, /* from */
+ SUMMARY_TYPE_STRING, &to, /* to */
+ SUMMARY_TYPE_STRING, &cc, /* cc */
+ SUMMARY_TYPE_STRING, NULL, /* mlist */
+ -1)) {
+ g_free (subject);
+ g_free (from);
+ g_free (to);
+ g_free (cc);
+ return NULL;
+ }
+
+ /* save current message uid */
+ data->cur_message_uid = g_strdup (uid);
+
+ if (!deleted) {
+ metadata = tracker_metadata_new ();
+ get_imap_uri (file, uid, &dirname, &basename);
+
+ tracker_metadata_insert (metadata, METADATA_FILE_PATH, dirname);
+ tracker_metadata_insert (metadata, METADATA_FILE_NAME, basename);
+
+ tracker_metadata_insert (metadata, METADATA_EMAIL_DATE,
+ tracker_guint_to_string (date));
+
+ tracker_metadata_insert (metadata, METADATA_EMAIL_SENDER, from);
+ tracker_metadata_insert (metadata, METADATA_EMAIL_SUBJECT, subject);
+
+ list = get_imap_recipient_list (to);
+ tracker_metadata_insert_multiple_values (metadata, METADATA_EMAIL_SENT_TO, list);
+
+ list = get_imap_recipient_list (cc);
+ tracker_metadata_insert_multiple_values (metadata, METADATA_EMAIL_CC, list);
+ }
+
+ g_free (uid);
+ g_free (to);
+ g_free (cc);
+
+ if (!read_summary (data->summary,
+ SUMMARY_TYPE_INT32, NULL,
+ SUMMARY_TYPE_INT32, NULL,
+ SUMMARY_TYPE_UINT32, &count,
+ -1)) {
+ goto corruption;
+ }
+
+ /* references */
+ for (i = 0; i < count; i++) {
+ if (read_summary (data->summary,
+ SUMMARY_TYPE_INT32, NULL,
+ SUMMARY_TYPE_INT32, NULL,
+ -1)) {
+ continue;
+ }
+
+ goto corruption;
+ }
- skip_content_info (data->summary);
+ if (!read_summary (data->summary, SUMMARY_TYPE_UINT32, &count, -1)) {
+ goto corruption;
+ }
+
+ /* user flags */
+ for (i = 0; i < count; i++) {
+ if (read_summary (data->summary, SUMMARY_TYPE_STRING, NULL, -1)) {
+ continue;
+ }
+
+ goto corruption;
+ }
+
+ if (!read_summary (data->summary, SUMMARY_TYPE_UINT32, &count, -1)) {
+ goto corruption;
+ }
+
+ /* user tags */
+ for (i = 0; i < count; i++) {
+ if (read_summary (data->summary,
+ SUMMARY_TYPE_STRING, NULL,
+ SUMMARY_TYPE_STRING, NULL,
+ -1)) {
+ continue;
+ }
+
+ goto corruption;
+ }
+
+ /* server flags */
+ if (!read_summary (data->summary,
+ SUMMARY_TYPE_UINT32, NULL,
+ -1)) {
+ goto corruption;
+ }
- return metadata;
+ skip_content_info (data->summary);
+
+ return metadata;
corruption:
- /* assume corruption */
- if (metadata) {
- tracker_metadata_free (metadata);
- }
+ /* assume corruption */
+ if (metadata) {
+ tracker_metadata_free (metadata);
+ }
- return NULL;
+ return NULL;
}
void
tracker_module_file_get_uri (TrackerFile *file,
- gchar **dirname,
- gchar **basename)
+ gchar **dirname,
+ gchar **basename)
{
- EvolutionFileData *file_data;
+ EvolutionFileData *file_data;
+
+ file_data = file->data;
- file_data = file->data;
+ if (!file_data) {
+ /* It isn't any of the files the
+ * module is interested for */
+ return;
+ }
+
+ switch (file_data->type) {
+ case MAIL_STORAGE_LOCAL: {
+ EvolutionLocalData *data = file->data;
+
+ if (!data->message) {
+ return;
+ }
+
+ if (data->current_mime_part) {
+ /* We're currently on an attachment */
+ get_mbox_attachment_uri (file, data->message,
+ data->current_mime_part->data,
+ dirname, basename);
+ } else {
+ get_mbox_uri (file, data->message, dirname, basename);
+ }
- if (!file_data) {
- /* It isn't any of the files the
- * module is interested for */
- return;
- }
-
- switch (file_data->type) {
- case MAIL_STORAGE_LOCAL: {
- EvolutionLocalData *data = file->data;
-
- if (!data->message) {
- return;
- }
-
- if (data->current_mime_part) {
- /* We're currently on an attachment */
- get_mbox_attachment_uri (file, data->message,
- data->current_mime_part->data,
- dirname, basename);
- } else {
- get_mbox_uri (file, data->message, dirname, basename);
- }
-
- break;
- }
- case MAIL_STORAGE_IMAP: {
- EvolutionImapData *data = file->data;
-
- if (data->current_mime_part) {
- /* We're currently on an attachment */
- get_imap_attachment_uri (file, dirname, basename);
- } else {
- get_imap_uri (file, data->cur_message_uid, dirname, basename);
- }
-
- break;
- }
- default:
- break;
- }
+ break;
+ }
+ case MAIL_STORAGE_IMAP: {
+ EvolutionImapData *data = file->data;
+
+ if (data->current_mime_part) {
+ /* We're currently on an attachment */
+ get_imap_attachment_uri (file, dirname, basename);
+ } else {
+ get_imap_uri (file, data->cur_message_uid, dirname, basename);
+ }
+
+ break;
+ }
+ default:
+ break;
+ }
}
gchar *
tracker_module_file_get_service_type (TrackerFile *file)
{
- EvolutionFileData *data;
+ EvolutionFileData *data;
- data = file->data;
+ data = file->data;
- if (!data) {
- /* It isn't any of the files the module handles */
- return NULL;
- }
-
- if (data->type == MAIL_STORAGE_LOCAL) {
- EvolutionLocalData *local_data = file->data;
-
- if (local_data->current_mime_part) {
- return g_strdup ("EvolutionAttachments");
- }
- } else if (data->type == MAIL_STORAGE_IMAP) {
- EvolutionImapData *imap_data = file->data;
-
- if (imap_data->current_mime_part) {
- return g_strdup ("EvolutionAttachments");
- }
- }
+ if (!data) {
+ /* It isn't any of the files the module handles */
+ return NULL;
+ }
- return g_strdup ("EvolutionEmails");
+ if (data->type == MAIL_STORAGE_LOCAL) {
+ EvolutionLocalData *local_data = file->data;
+
+ if (local_data->current_mime_part) {
+ return g_strdup ("EvolutionAttachments");
+ }
+ } else if (data->type == MAIL_STORAGE_IMAP) {
+ EvolutionImapData *imap_data = file->data;
+
+ if (imap_data->current_mime_part) {
+ return g_strdup ("EvolutionAttachments");
+ }
+ }
+
+ return g_strdup ("EvolutionEmails");
}
TrackerMetadata *
tracker_module_file_get_metadata (TrackerFile *file)
{
- EvolutionFileData *data;
+ EvolutionFileData *data;
- data = file->data;
+ data = file->data;
- if (!data) {
- /* It isn't any of the files the
- * module is interested for */
- return NULL;
- }
-
- switch (data->type) {
- case MAIL_STORAGE_LOCAL:
- return get_metadata_for_mbox (file);
- case MAIL_STORAGE_IMAP:
- return get_metadata_for_imap (file);
- default:
- break;
- }
+ if (!data) {
+ /* It isn't any of the files the
+ * module is interested for */
+ return NULL;
+ }
+
+ switch (data->type) {
+ case MAIL_STORAGE_LOCAL:
+ return get_metadata_for_mbox (file);
+ case MAIL_STORAGE_IMAP:
+ return get_metadata_for_imap (file);
+ default:
+ break;
+ }
- return NULL;
+ return NULL;
}
static gchar *
get_text_for_mbox (TrackerFile *file)
{
- EvolutionLocalData *data;
- gboolean is_html;
+ EvolutionLocalData *data;
+ gboolean is_html;
- data = file->data;
+ data = file->data;
- if (data->current_mime_part) {
- /* FIXME: Extract text from attachments */
- return NULL;
- }
+ if (data->current_mime_part) {
+ /* FIXME: Extract text from attachments */
+ return NULL;
+ }
- return g_mime_message_get_body (data->message, TRUE, &is_html);
+ return g_mime_message_get_body (data->message, TRUE, &is_html);
}
static gchar *
get_text_for_imap (TrackerFile *file)
{
- EvolutionImapData *data;
- gchar *message_path;
- gchar *body = NULL;
-
- data = file->data;
-
- if (data->current_mime_part) {
- /* FIXME: Extract text from attachments */
- return NULL;
- }
-
- message_path = get_imap_message_path (file, data->cur_message_uid);
- g_file_get_contents (message_path, &body, NULL, NULL);
- g_free (message_path);
+ EvolutionImapData *data;
+ gchar *message_path;
+ gchar *body = NULL;
+
+ data = file->data;
+
+ if (data->current_mime_part) {
+ /* FIXME: Extract text from attachments */
+ return NULL;
+ }
+
+ message_path = get_imap_message_path (file, data->cur_message_uid);
+ g_file_get_contents (message_path, &body, NULL, NULL);
+ g_free (message_path);
- return body;
+ return body;
}
gchar *
tracker_module_file_get_text (TrackerFile *file)
{
- EvolutionFileData *data;
- gchar *text = NULL;
+ EvolutionFileData *data;
+ gchar *text = NULL;
- data = file->data;
+ data = file->data;
- if (!data) {
- /* It isn't any of the files the
- * module is interested in */
- return NULL;
- }
-
- if (data->type == MAIL_STORAGE_LOCAL) {
- text = get_text_for_mbox (file);
- } else if (data->type == MAIL_STORAGE_IMAP) {
- text = get_text_for_imap (file);
- }
+ if (!data) {
+ /* It isn't any of the files the
+ * module is interested in */
+ return NULL;
+ }
- return text;
+ if (data->type == MAIL_STORAGE_LOCAL) {
+ text = get_text_for_mbox (file);
+ } else if (data->type == MAIL_STORAGE_IMAP) {
+ text = get_text_for_imap (file);
+ }
+
+ return text;
}
static GList *
extract_imap_mime_parts (TrackerFile *file)
{
- EvolutionImapData *data;
- gboolean has_attachment = TRUE;
- gint n_attachment = 0;
- gchar *message_path;
- GList *mime_parts = NULL;
-
- data = file->data;
- message_path = get_imap_message_path (file, data->cur_message_uid);
-
- while (has_attachment) {
- gchar *mime_file;
-
- n_attachment++;
- mime_file = g_strdup_printf ("%s%d.MIME", message_path, n_attachment);
-
- if (g_file_test (mime_file, G_FILE_TEST_EXISTS)) {
- mime_parts = g_list_prepend (mime_parts, mime_file);
- } else {
- g_free (mime_file);
- has_attachment = FALSE;
- }
- }
+ EvolutionImapData *data;
+ gboolean has_attachment = TRUE;
+ gint n_attachment = 0;
+ gchar *message_path;
+ GList *mime_parts = NULL;
+
+ data = file->data;
+ message_path = get_imap_message_path (file, data->cur_message_uid);
+
+ while (has_attachment) {
+ gchar *mime_file;
+
+ n_attachment++;
+ mime_file = g_strdup_printf ("%s%d.MIME", message_path, n_attachment);
+
+ if (g_file_test (mime_file, G_FILE_TEST_EXISTS)) {
+ mime_parts = g_list_prepend (mime_parts, mime_file);
+ } else {
+ g_free (mime_file);
+ has_attachment = FALSE;
+ }
+ }
- g_free (message_path);
+ g_free (message_path);
- return g_list_reverse (mime_parts);;
+ return g_list_reverse (mime_parts);;
}
static void
extract_mbox_mime_parts (GMimeObject *object,
- gpointer user_data)
+ gpointer user_data)
{
- GList **list = (GList **) user_data;
- GMimePart *part;
- const gchar *disposition, *filename;
-
- if (GMIME_IS_MESSAGE_PART (object)) {
- GMimeMessage *message;
-
- message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (object));
-
- if (message) {
- g_mime_message_foreach_part (message, extract_mbox_mime_parts, user_data);
- g_object_unref (message);
- }
-
- return;
- } else if (GMIME_IS_MULTIPART (object)) {
- g_mime_multipart_foreach (GMIME_MULTIPART (object), extract_mbox_mime_parts, user_data);
- return;
- }
-
- part = GMIME_PART (object);
- disposition = g_mime_part_get_content_disposition (part);
-
- if (!disposition ||
- (strcmp (disposition, GMIME_DISPOSITION_ATTACHMENT) != 0 &&
- strcmp (disposition, GMIME_DISPOSITION_INLINE) != 0)) {
- return;
- }
-
- filename = g_mime_part_get_filename (GMIME_PART (object));
-
- if (!filename ||
- strcmp (filename, "signature.asc") == 0 ||
- strcmp (filename, "signature.pgp") == 0) {
- return;
- }
+ GList **list = (GList **) user_data;
+ GMimePart *part;
+ const gchar *disposition, *filename;
+
+ if (GMIME_IS_MESSAGE_PART (object)) {
+ GMimeMessage *message;
+
+ message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (object));
+
+ if (message) {
+ g_mime_message_foreach_part (message, extract_mbox_mime_parts, user_data);
+ g_object_unref (message);
+ }
+
+ return;
+ } else if (GMIME_IS_MULTIPART (object)) {
+ g_mime_multipart_foreach (GMIME_MULTIPART (object), extract_mbox_mime_parts, user_data);
+ return;
+ }
+
+ part = GMIME_PART (object);
+ disposition = g_mime_part_get_content_disposition (part);
+
+ if (!disposition ||
+ (strcmp (disposition, GMIME_DISPOSITION_ATTACHMENT) != 0 &&
+ strcmp (disposition, GMIME_DISPOSITION_INLINE) != 0)) {
+ return;
+ }
+
+ filename = g_mime_part_get_filename (GMIME_PART (object));
- *list = g_list_prepend (*list, g_object_ref (object));
+ if (!filename ||
+ strcmp (filename, "signature.asc") == 0 ||
+ strcmp (filename, "signature.pgp") == 0) {
+ return;
+ }
+
+ *list = g_list_prepend (*list, g_object_ref (object));
}
gboolean
tracker_module_file_iter_contents (TrackerFile *file)
{
- EvolutionFileData *data;
+ EvolutionFileData *data;
- data = file->data;
+ data = file->data;
- if (data->type == MAIL_STORAGE_IMAP) {
- EvolutionImapData *imap_data = file->data;
+ if (data->type == MAIL_STORAGE_IMAP) {
+ EvolutionImapData *imap_data = file->data;
- /* Iterate through mime parts, if any */
- if (!imap_data->mime_parts) {
- imap_data->mime_parts = extract_imap_mime_parts (file);
- imap_data->current_mime_part = imap_data->mime_parts;
- } else {
- imap_data->current_mime_part = imap_data->current_mime_part->next;
- }
-
- if (imap_data->current_mime_part) {
- return TRUE;
- }
-
- g_list_foreach (imap_data->mime_parts, (GFunc) g_free, NULL);
- g_list_free (imap_data->mime_parts);
- imap_data->mime_parts = NULL;
-
- g_free (imap_data->cur_message_uid);
- imap_data->cur_message_uid = NULL;
-
- imap_data->cur_message++;
-
- return (imap_data->cur_message < imap_data->n_messages);
- } else if (data->type == MAIL_STORAGE_LOCAL) {
- EvolutionLocalData *local_data = file->data;
-
- if (!local_data->parser) {
- return FALSE;
- }
-
- if (local_data->message) {
- /* Iterate through mime parts, if any */
- if (!local_data->mime_parts) {
- g_mime_message_foreach_part (local_data->message,
- extract_mbox_mime_parts,
- &local_data->mime_parts);
- local_data->current_mime_part = local_data->mime_parts;
- } else {
- local_data->current_mime_part = local_data->current_mime_part->next;
- }
-
- if (local_data->current_mime_part) {
- return TRUE;
- }
-
- /* all possible mime parts have been already iterated, move on */
- g_object_unref (local_data->message);
-
- g_list_foreach (local_data->mime_parts, (GFunc) g_object_unref, NULL);
- g_list_free (local_data->mime_parts);
- local_data->mime_parts = NULL;
- }
+ /* Iterate through mime parts, if any */
+ if (!imap_data->mime_parts) {
+ imap_data->mime_parts = extract_imap_mime_parts (file);
+ imap_data->current_mime_part = imap_data->mime_parts;
+ } else {
+ imap_data->current_mime_part = imap_data->current_mime_part->next;
+ }
+
+ if (imap_data->current_mime_part) {
+ return TRUE;
+ }
+
+ g_list_foreach (imap_data->mime_parts, (GFunc) g_free, NULL);
+ g_list_free (imap_data->mime_parts);
+ imap_data->mime_parts = NULL;
+
+ g_free (imap_data->cur_message_uid);
+ imap_data->cur_message_uid = NULL;
+
+ imap_data->cur_message++;
+
+ return (imap_data->cur_message < imap_data->n_messages);
+ } else if (data->type == MAIL_STORAGE_LOCAL) {
+ EvolutionLocalData *local_data = file->data;
+
+ if (!local_data->parser) {
+ return FALSE;
+ }
+
+ if (local_data->message) {
+ /* Iterate through mime parts, if any */
+ if (!local_data->mime_parts) {
+ g_mime_message_foreach_part (local_data->message,
+ extract_mbox_mime_parts,
+ &local_data->mime_parts);
+ local_data->current_mime_part = local_data->mime_parts;
+ } else {
+ local_data->current_mime_part = local_data->current_mime_part->next;
+ }
+
+ if (local_data->current_mime_part) {
+ return TRUE;
+ }
+
+ /* all possible mime parts have been already iterated, move on */
+ g_object_unref (local_data->message);
+
+ g_list_foreach (local_data->mime_parts, (GFunc) g_object_unref, NULL);
+ g_list_free (local_data->mime_parts);
+ local_data->mime_parts = NULL;
+ }
- local_data->message = g_mime_parser_construct_message (local_data->parser);
+ local_data->message = g_mime_parser_construct_message (local_data->parser);
- return (local_data->message != NULL);
- }
+ return (local_data->message != NULL);
+ }
- return FALSE;
+ return FALSE;
}
Modified: branches/indexer-split/src/tracker-indexer/modules/files.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/files.c (original)
+++ branches/indexer-split/src/tracker-indexer/modules/files.c Sat Sep 20 15:12:19 2008
@@ -33,14 +33,14 @@
#include <tracker-indexer/tracker-module.h>
#define METADATA_FILE_NAME_DELIMITED "File:NameDelimited"
-#define METADATA_FILE_EXT "File:Ext"
-#define METADATA_FILE_PATH "File:Path"
-#define METADATA_FILE_NAME "File:Name"
-#define METADATA_FILE_LINK "File:Link"
-#define METADATA_FILE_MIMETYPE "File:Mime"
-#define METADATA_FILE_SIZE "File:Size"
-#define METADATA_FILE_MODIFIED "File:Modified"
-#define METADATA_FILE_ACCESSED "File:Accessed"
+#define METADATA_FILE_EXT "File:Ext"
+#define METADATA_FILE_PATH "File:Path"
+#define METADATA_FILE_NAME "File:Name"
+#define METADATA_FILE_LINK "File:Link"
+#define METADATA_FILE_MIMETYPE "File:Mime"
+#define METADATA_FILE_SIZE "File:Size"
+#define METADATA_FILE_MODIFIED "File:Modified"
+#define METADATA_FILE_ACCESSED "File:Accessed"
G_CONST_RETURN gchar *
tracker_module_get_name (void)
@@ -52,14 +52,14 @@
gchar *
tracker_module_file_get_service_type (TrackerFile *file)
{
- gchar *mime_type;
- gchar *service_type;
+ gchar *mime_type;
+ gchar *service_type;
- mime_type = tracker_file_get_mime_type (file->path);
- service_type = tracker_ontology_get_service_by_mime (mime_type);
- g_free (mime_type);
+ mime_type = tracker_file_get_mime_type (file->path);
+ service_type = tracker_ontology_get_service_by_mime (mime_type);
+ g_free (mime_type);
- return service_type;
+ return service_type;
}
static gboolean
@@ -135,11 +135,11 @@
path = file->path;
- if (check_exclude_file (path)) {
- return NULL;
- }
+ if (check_exclude_file (path)) {
+ return NULL;
+ }
- return tracker_metadata_utils_get_data (path);
+ return tracker_metadata_utils_get_data (path);
}
gchar *
@@ -149,9 +149,9 @@
path = file->path;
- if (check_exclude_file (path)) {
- return NULL;
- }
+ if (check_exclude_file (path)) {
+ return NULL;
+ }
- return tracker_metadata_utils_get_text (path);
+ return tracker_metadata_utils_get_text (path);
}
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 15:12:19 2008
@@ -27,9 +27,9 @@
#include "tracker-indexer.h"
#include "tracker-indexer-glue.h"
-#define THUMBNAILER_SERVICE "org.freedesktop.thumbnailer"
-#define THUMBNAILER_PATH "/org/freedesktop/thumbnailer/Generic"
-#define THUMBNAILER_INTERFACE "org.freedesktop.thumbnailer.Generic"
+#define THUMBNAILER_SERVICE "org.freedesktop.thumbnailer"
+#define THUMBNAILER_PATH "/org/freedesktop/thumbnailer/Generic"
+#define THUMBNAILER_INTERFACE "org.freedesktop.thumbnailer.Generic"
static DBusGConnection *connection;
static DBusGProxy *proxy;
@@ -39,40 +39,40 @@
dbus_register_service (DBusGProxy *proxy,
const gchar *name)
{
- GError *error = NULL;
- guint result;
+ GError *error = NULL;
+ guint result;
- g_message ("Registering DBus service...\n"
+ g_message ("Registering DBus service...\n"
" Name:'%s'",
name);
- if (!org_freedesktop_DBus_request_name (proxy,
- name,
- DBUS_NAME_FLAG_DO_NOT_QUEUE,
- &result, &error)) {
- g_critical ("Could not aquire name:'%s', %s",
+ if (!org_freedesktop_DBus_request_name (proxy,
+ name,
+ DBUS_NAME_FLAG_DO_NOT_QUEUE,
+ &result, &error)) {
+ g_critical ("Could not aquire name:'%s', %s",
name,
error ? error->message : "no error given");
- g_error_free (error);
+ g_error_free (error);
- return FALSE;
+ return FALSE;
}
- if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
- g_critical ("DBus service name:'%s' is already taken, "
+ if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ g_critical ("DBus service name:'%s' is already taken, "
"perhaps the application is already running?",
name);
- return FALSE;
+ return FALSE;
}
- return TRUE;
+ return TRUE;
}
static void
name_owner_changed_cb (DBusGProxy *proxy,
- gchar *name,
- gchar *old_owner,
- gchar *new_owner,
+ gchar *name,
+ gchar *old_owner,
+ gchar *new_owner,
gpointer user_data)
{
if (strcmp (name, TRACKER_DAEMON_SERVICE) == 0 && (!new_owner || !*new_owner)) {
@@ -84,18 +84,18 @@
}
static gboolean
-dbus_register_object (GObject *object,
- DBusGConnection *connection,
- DBusGProxy *proxy,
- const DBusGObjectInfo *info,
- const gchar *path)
-{
- g_message ("Registering DBus object...");
- g_message (" Path:'%s'", path);
- g_message (" Object Type:'%s'", G_OBJECT_TYPE_NAME (object));
+dbus_register_object (GObject *object,
+ DBusGConnection *connection,
+ DBusGProxy *proxy,
+ const DBusGObjectInfo *info,
+ const gchar *path)
+{
+ g_message ("Registering DBus object...");
+ g_message (" Path:'%s'", path);
+ g_message (" Object Type:'%s'", G_OBJECT_TYPE_NAME (object));
- dbus_g_object_type_install_info (G_OBJECT_TYPE (object), info);
- dbus_g_connection_register_g_object (connection, path, object);
+ dbus_g_object_type_install_info (G_OBJECT_TYPE (object), info);
+ dbus_g_connection_register_g_object (connection, path, object);
dbus_g_proxy_add_signal (proxy, "NameOwnerChanged",
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
@@ -104,7 +104,7 @@
dbus_g_proxy_connect_signal (proxy, "NameOwnerChanged",
G_CALLBACK (name_owner_changed_cb),
object, NULL);
- return TRUE;
+ return TRUE;
}
DBusGProxy*
@@ -116,7 +116,7 @@
static gboolean
dbus_register_names (void)
{
- GError *error = NULL;
+ GError *error = NULL;
if (connection) {
g_critical ("The DBusGConnection is already set, have we already initialized?");
@@ -128,42 +128,42 @@
return FALSE;
}
- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
- if (!connection) {
- g_critical ("Could not connect to the DBus session bus, %s",
+ if (!connection) {
+ g_critical ("Could not connect to the DBus session bus, %s",
error ? error->message : "no error given.");
g_clear_error (&error);
- return FALSE;
- }
+ return FALSE;
+ }
- /* The definitions below (DBUS_SERVICE_DBUS, etc) are
- * predefined for us to just use (dbus_g_proxy_...)
- */
- proxy = dbus_g_proxy_new_for_name (connection,
- DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS);
-
- /* Register the service name for org.freedesktop.Tracker */
- if (!dbus_register_service (proxy, TRACKER_INDEXER_SERVICE)) {
- return FALSE;
- }
-
- thumb_proxy = dbus_g_proxy_new_for_name (connection,
- THUMBNAILER_SERVICE,
- THUMBNAILER_PATH,
- THUMBNAILER_INTERFACE);
- return TRUE;
+ /* The definitions below (DBUS_SERVICE_DBUS, etc) are
+ * predefined for us to just use (dbus_g_proxy_...)
+ */
+ proxy = dbus_g_proxy_new_for_name (connection,
+ DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS);
+
+ /* Register the service name for org.freedesktop.Tracker */
+ if (!dbus_register_service (proxy, TRACKER_INDEXER_SERVICE)) {
+ return FALSE;
+ }
+
+ thumb_proxy = dbus_g_proxy_new_for_name (connection,
+ THUMBNAILER_SERVICE,
+ THUMBNAILER_PATH,
+ THUMBNAILER_INTERFACE);
+ return TRUE;
}
gboolean
tracker_dbus_init (void)
{
- /* Don't reinitialize */
- if (connection && proxy) {
- return TRUE;
- }
+ /* Don't reinitialize */
+ if (connection && proxy) {
+ return TRUE;
+ }
/* Register names and get proxy/connection details */
if (!dbus_register_names ()) {
Modified: branches/indexer-split/src/tracker-indexer/tracker-dbus.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-dbus.h (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-dbus.h Sat Sep 20 15:12:19 2008
@@ -28,8 +28,8 @@
G_BEGIN_DECLS
-gboolean tracker_dbus_init (void);
-void tracker_dbus_shutdown (void);
+gboolean tracker_dbus_init (void);
+void tracker_dbus_shutdown (void);
gboolean tracker_dbus_register_object (GObject *object);
DBusGProxy* tracker_dbus_get_thumbnailer (void);
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 15:12:19 2008
@@ -34,10 +34,10 @@
guint32
tracker_db_get_new_service_id (TrackerDBInterface *iface)
{
- guint32 files_max;
+ guint32 files_max;
TrackerDBResultSet *result_set;
TrackerDBInterface *temp_iface;
- static guint32 max = 0;
+ static guint32 max = 0;
if (G_LIKELY (max != 0)) {
return ++max;
@@ -144,10 +144,10 @@
gboolean
tracker_db_check_service (TrackerService *service,
- const gchar *dirname,
- const gchar *basename,
- guint32 *id,
- time_t *mtime)
+ const gchar *dirname,
+ const gchar *basename,
+ guint32 *id,
+ time_t *mtime)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
@@ -220,9 +220,9 @@
gboolean
tracker_db_create_service (TrackerService *service,
- guint32 id,
- const gchar *dirname,
- const gchar *basename,
+ guint32 id,
+ const gchar *dirname,
+ const gchar *basename,
TrackerMetadata *metadata)
{
TrackerDBInterface *iface;
@@ -278,14 +278,14 @@
static gchar *
db_get_metadata (TrackerService *service,
- guint service_id,
- gboolean keywords)
+ guint service_id,
+ gboolean keywords)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- gchar *query;
- GString *result;
- gchar *str = NULL;
+ gchar *query;
+ GString *result;
+ gchar *str = NULL;
iface = tracker_db_manager_get_db_interface_by_type (tracker_service_get_name (service),
TRACKER_DB_CONTENT_TYPE_METADATA);
@@ -327,13 +327,13 @@
static void
result_set_to_metadata (TrackerDBResultSet *result_set,
TrackerMetadata *metadata,
- gboolean numeric,
- gboolean only_embedded)
+ gboolean numeric,
+ gboolean only_embedded)
{
TrackerField *field;
- gchar *value;
- gint numeric_value;
- gint metadata_id;
+ gchar *value;
+ gint numeric_value;
+ gint metadata_id;
gboolean valid = TRUE;
while (valid) {
@@ -389,12 +389,12 @@
TrackerMetadata *
tracker_db_get_all_metadata (TrackerService *service,
- guint32 service_id,
- gboolean only_embedded)
+ guint32 service_id,
+ gboolean only_embedded)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set = NULL;
- gchar *service_id_str;
+ gchar *service_id_str;
TrackerMetadata *metadata;
metadata = tracker_metadata_new ();
@@ -405,19 +405,19 @@
result_set = tracker_db_interface_execute_procedure (iface, NULL, "GetMetadataIDValue", service_id_str, NULL);
if (result_set) {
- result_set_to_metadata (result_set, metadata, FALSE, only_embedded);
+ result_set_to_metadata (result_set, metadata, FALSE, only_embedded);
g_object_unref (result_set);
}
result_set = tracker_db_interface_execute_procedure (iface, NULL, "GetMetadataIDValueKeyword", service_id_str, NULL);
if (result_set) {
- result_set_to_metadata (result_set, metadata, FALSE, only_embedded);
+ result_set_to_metadata (result_set, metadata, FALSE, only_embedded);
g_object_unref (result_set);
}
result_set = tracker_db_interface_execute_procedure (iface, NULL, "GetMetadataIDValueNumeric", service_id_str, NULL);
if (result_set) {
- result_set_to_metadata (result_set, metadata, TRUE, only_embedded);
+ result_set_to_metadata (result_set, metadata, TRUE, only_embedded);
g_object_unref (result_set);
}
@@ -428,7 +428,7 @@
void
tracker_db_delete_service (TrackerService *service,
- guint32 service_id)
+ guint32 service_id)
{
TrackerDBInterface *iface;
@@ -455,8 +455,8 @@
void
tracker_db_move_service (TrackerService *service,
- const gchar *from,
- const gchar *to)
+ const gchar *from,
+ const gchar *to)
{
TrackerDBInterface *iface;
GError *error = NULL;
@@ -499,7 +499,7 @@
void
tracker_db_delete_all_metadata (TrackerService *service,
- guint32 service_id)
+ guint32 service_id)
{
TrackerDBInterface *iface;
gchar *service_id_str;
@@ -531,28 +531,28 @@
gchar *
tracker_db_get_unparsed_metadata (TrackerService *service,
- guint service_id)
+ guint service_id)
{
return db_get_metadata (service, service_id, TRUE);
}
gchar *
tracker_db_get_parsed_metadata (TrackerService *service,
- guint service_id)
+ guint service_id)
{
return db_get_metadata (service, service_id, FALSE);
}
gchar **
tracker_db_get_property_values (TrackerService *service_def,
- guint32 id,
+ guint32 id,
TrackerField *field)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set = NULL;
- gint metadata_key;
- gchar **final_result = NULL;
- gboolean is_numeric = FALSE;
+ gint metadata_key;
+ gchar **final_result = NULL;
+ gboolean is_numeric = FALSE;
iface = tracker_db_manager_get_db_interface_by_type (tracker_service_get_name (service_def),
TRACKER_DB_CONTENT_TYPE_METADATA);
@@ -633,10 +633,10 @@
void
tracker_db_set_metadata (TrackerService *service,
- guint32 id,
- TrackerField *field,
- const gchar *value,
- const gchar *parsed_value)
+ guint32 id,
+ TrackerField *field,
+ const gchar *value,
+ const gchar *parsed_value)
{
TrackerDBInterface *iface;
gint metadata_key;
@@ -720,7 +720,7 @@
void
tracker_db_delete_metadata (TrackerService *service,
- guint32 id,
+ guint32 id,
TrackerField *field,
const gchar *value)
{
@@ -795,7 +795,7 @@
void
tracker_db_set_text (TrackerService *service,
- guint32 id,
+ guint32 id,
const gchar *text)
{
TrackerDBInterface *iface;
@@ -818,11 +818,11 @@
gchar *
tracker_db_get_text (TrackerService *service,
- guint32 id)
+ guint32 id)
{
TrackerDBInterface *iface;
- TrackerField *field;
- gchar *service_id_str, *contents = NULL;
+ TrackerField *field;
+ gchar *service_id_str, *contents = NULL;
TrackerDBResultSet *result_set;
service_id_str = tracker_guint32_to_string (id);
@@ -849,7 +849,7 @@
void
tracker_db_delete_text (TrackerService *service,
- guint32 id)
+ guint32 id)
{
TrackerDBInterface *iface;
TrackerField *field;
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 15:12:19 2008
@@ -27,73 +27,73 @@
#include "tracker-metadata.h"
G_BEGIN_DECLS
-guint32 tracker_db_get_new_service_id (TrackerDBInterface *iface);
-void tracker_db_increment_stats (TrackerDBInterface *iface,
+guint32 tracker_db_get_new_service_id (TrackerDBInterface *iface);
+void tracker_db_increment_stats (TrackerDBInterface *iface,
TrackerService *service);
-void tracker_db_decrement_stats (TrackerDBInterface *iface,
+void tracker_db_decrement_stats (TrackerDBInterface *iface,
TrackerService *service);
/* Using path */
-gboolean tracker_db_check_service (TrackerService *service,
- const gchar *dirname,
- const gchar *basename,
- guint32 *id,
- time_t *mtime);
-guint tracker_db_get_service_type (const gchar *dirname,
- const gchar *basename);
+gboolean tracker_db_check_service (TrackerService *service,
+ const gchar *dirname,
+ const gchar *basename,
+ guint32 *id,
+ time_t *mtime);
+guint tracker_db_get_service_type (const gchar *dirname,
+ const gchar *basename);
/* Services */
-gboolean tracker_db_create_service (TrackerService *service,
- guint32 id,
- const gchar *dirname,
- const gchar *basename,
+gboolean tracker_db_create_service (TrackerService *service,
+ guint32 id,
+ const gchar *dirname,
+ const gchar *basename,
TrackerMetadata *metadata);
-void tracker_db_delete_service (TrackerService *service,
- guint32 id);
-void tracker_db_move_service (TrackerService *service,
- const gchar *from,
- const gchar *to);
+void tracker_db_delete_service (TrackerService *service,
+ guint32 id);
+void tracker_db_move_service (TrackerService *service,
+ const gchar *from,
+ const gchar *to);
/* Metadata */
-void tracker_db_set_metadata (TrackerService *service,
- guint32 id,
+void tracker_db_set_metadata (TrackerService *service,
+ guint32 id,
TrackerField *field,
- const gchar *value,
- const gchar *parsed_value);
-TrackerMetadata *tracker_db_get_all_metadata (TrackerService *service,
- guint32 id,
- gboolean only_embedded);
-gchar * tracker_db_get_parsed_metadata (TrackerService *service,
- guint32 id);
-gchar * tracker_db_get_unparsed_metadata (TrackerService *service,
- guint32 id);
-gchar ** tracker_db_get_property_values (TrackerService *service_def,
- guint32 id,
+ const gchar *value,
+ const gchar *parsed_value);
+TrackerMetadata *tracker_db_get_all_metadata (TrackerService *service,
+ guint32 id,
+ gboolean only_embedded);
+gchar * tracker_db_get_parsed_metadata (TrackerService *service,
+ guint32 id);
+gchar * tracker_db_get_unparsed_metadata (TrackerService *service,
+ guint32 id);
+gchar ** tracker_db_get_property_values (TrackerService *service_def,
+ guint32 id,
TrackerField *field_def);
-void tracker_db_delete_all_metadata (TrackerService *service,
- guint32 id);
-void tracker_db_delete_metadata (TrackerService *service,
- guint32 id,
+void tracker_db_delete_all_metadata (TrackerService *service,
+ guint32 id);
+void tracker_db_delete_metadata (TrackerService *service,
+ guint32 id,
TrackerField *field,
- const gchar *value);
+ const gchar *value);
/* Contents */
-void tracker_db_set_text (TrackerService *service,
- guint32 id,
- const gchar *text);
-gchar * tracker_db_get_text (TrackerService *service,
- guint32 id);
-void tracker_db_delete_text (TrackerService *service,
- guint32 id);
+void tracker_db_set_text (TrackerService *service,
+ guint32 id,
+ const gchar *text);
+gchar * tracker_db_get_text (TrackerService *service,
+ guint32 id);
+void tracker_db_delete_text (TrackerService *service,
+ guint32 id);
/* Events */
-void tracker_db_create_event (TrackerDBInterface *iface,
- guint32 service_id,
- const gchar *type);
+void tracker_db_create_event (TrackerDBInterface *iface,
+ guint32 service_id,
+ const gchar *type);
Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c Sat Sep 20 15:12:19 2008
@@ -113,10 +113,10 @@
}
gboolean
-tracker_indexer_module_file_get_uri (GModule *module,
+tracker_indexer_module_file_get_uri (GModule *module,
TrackerFile *file,
- gchar **dirname,
- gchar **basename)
+ gchar **dirname,
+ gchar **basename)
{
TrackerModuleFileGetUriFunc func;
gchar *tmp_dirname;
@@ -162,7 +162,7 @@
}
gchar *
-tracker_indexer_module_file_get_service_type (GModule *module,
+tracker_indexer_module_file_get_service_type (GModule *module,
TrackerFile *file)
{
TrackerModuleFileGetServiceTypeFunc func;
@@ -184,20 +184,20 @@
if (g_module_symbol (module, "tracker_module_file_get_metadata", (gpointer *) &func)) {
return (func) (file);
- }
+ }
return NULL;
}
gchar *
-tracker_indexer_module_file_get_text (GModule *module,
+tracker_indexer_module_file_get_text (GModule *module,
TrackerFile *file)
{
TrackerModuleFileGetText func;
if (g_module_symbol (module, "tracker_module_file_get_text", (gpointer *) &func)) {
return (func) (file);
- }
+ }
return NULL;
}
Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-module.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-module.h (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-module.h Sat Sep 20 15:12:19 2008
@@ -28,30 +28,30 @@
G_BEGIN_DECLS
-GModule * tracker_indexer_module_load (const gchar *module_name);
+GModule * tracker_indexer_module_load (const gchar *module_name);
-void tracker_indexer_module_init (GModule *module);
-void tracker_indexer_module_shutdown (GModule *module);
+void tracker_indexer_module_init (GModule *module);
+void tracker_indexer_module_shutdown (GModule *module);
-G_CONST_RETURN gchar * tracker_indexer_module_get_name (GModule *module);
+G_CONST_RETURN gchar * tracker_indexer_module_get_name (GModule *module);
-TrackerFile * tracker_indexer_module_file_new (GModule *module,
+TrackerFile * tracker_indexer_module_file_new (GModule *module,
const gchar *path);
-void tracker_indexer_module_file_free (GModule *module,
+void tracker_indexer_module_file_free (GModule *module,
TrackerFile *file);
-gboolean tracker_indexer_module_file_get_uri (GModule *module,
+gboolean tracker_indexer_module_file_get_uri (GModule *module,
TrackerFile *file,
- gchar **dirname,
- gchar **basename);
-gchar * tracker_indexer_module_file_get_service_type (GModule *module,
+ gchar **dirname,
+ gchar **basename);
+gchar * tracker_indexer_module_file_get_service_type (GModule *module,
TrackerFile *file);
-TrackerMetadata * tracker_indexer_module_file_get_metadata (GModule *module,
+TrackerMetadata * tracker_indexer_module_file_get_metadata (GModule *module,
TrackerFile *file);
-gchar * tracker_indexer_module_file_get_text (GModule *module,
+gchar * tracker_indexer_module_file_get_text (GModule *module,
TrackerFile *file);
-gboolean tracker_indexer_module_file_iter_contents (GModule *module,
+gboolean tracker_indexer_module_file_iter_contents (GModule *module,
TrackerFile *file);
G_END_DECLS
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 15:12:19 2008
@@ -41,7 +41,7 @@
* in the process_func() function.
*
* NOTE: Normally all indexing petitions will be sent over DBus, being
- * everything just pushed in the files queue.
+ * everything just pushed in the files queue.
*/
#include "config.h"
@@ -77,19 +77,19 @@
#define TRACKER_INDEXER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_INDEXER, TrackerIndexerPrivate))
/* Flush every 'x' seconds */
-#define FLUSH_FREQUENCY 60
+#define FLUSH_FREQUENCY 60
#define LOW_DISK_CHECK_FREQUENCY 10
#define SIGNAL_STATUS_FREQUENCY 10
/* Transaction every 'x' items */
-#define TRANSACTION_MAX 2000
+#define TRANSACTION_MAX 2000
/* Throttle defaults */
-#define THROTTLE_DEFAULT 0
+#define THROTTLE_DEFAULT 0
#define THROTTLE_DEFAULT_ON_BATTERY 5
-#define TRACKER_INDEXER_ERROR "tracker-indexer-error-domain"
+#define TRACKER_INDEXER_ERROR "tracker-indexer-error-domain"
#define TRACKER_INDEXER_ERROR_CODE 0
typedef struct PathInfo PathInfo;
@@ -165,10 +165,10 @@
};
enum TrackerIndexerState {
- TRACKER_INDEXER_STATE_FLUSHING = 1 << 0,
- TRACKER_INDEXER_STATE_PAUSED = 1 << 1,
+ TRACKER_INDEXER_STATE_FLUSHING = 1 << 0,
+ TRACKER_INDEXER_STATE_PAUSED = 1 << 1,
TRACKER_INDEXER_STATE_DISK_FULL = 1 << 2,
- TRACKER_INDEXER_STATE_STOPPED = 1 << 3
+ TRACKER_INDEXER_STATE_STOPPED = 1 << 3
};
enum {
@@ -187,13 +187,13 @@
LAST_SIGNAL
};
-static gboolean process_func (gpointer data);
-static void check_disk_space_start (TrackerIndexer *indexer);
-static void state_set_flags (TrackerIndexer *indexer,
+static gboolean process_func (gpointer data);
+static void check_disk_space_start (TrackerIndexer *indexer);
+static void state_set_flags (TrackerIndexer *indexer,
TrackerIndexerState state);
-static void state_unset_flags (TrackerIndexer *indexer,
+static void state_unset_flags (TrackerIndexer *indexer,
TrackerIndexerState state);
-static void state_check (TrackerIndexer *indexer);
+static void state_check (TrackerIndexer *indexer);
static guint signals[LAST_SIGNAL] = { 0, };
@@ -274,7 +274,7 @@
const gchar *why)
{
gdouble seconds_elapsed;
- guint files_remaining;
+ guint files_remaining;
files_remaining = g_queue_get_length (indexer->private->file_queue);
seconds_elapsed = g_timer_elapsed (indexer->private->timer, NULL);
@@ -342,7 +342,7 @@
static void
schedule_flush (TrackerIndexer *indexer,
- gboolean immediately)
+ gboolean immediately)
{
if (indexer->private->state != 0) {
return;
@@ -483,9 +483,9 @@
}
static void
-tracker_indexer_get_property (GObject *object,
- guint prop_id,
- GValue *value,
+tracker_indexer_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
GParamSpec *pspec)
{
TrackerIndexerPrivate *priv;
@@ -624,7 +624,7 @@
check_stopped (TrackerIndexer *indexer,
gboolean interrupted)
{
- gchar *str;
+ gchar *str;
gdouble seconds_elapsed;
/* No more modules to query, we're done */
@@ -662,25 +662,25 @@
check_is_disk_space_low (TrackerIndexer *indexer)
{
const gchar *path;
- struct statvfs st;
- gint limit;
+ struct statvfs st;
+ gint limit;
- limit = tracker_config_get_low_disk_space_limit (indexer->private->config);
+ limit = tracker_config_get_low_disk_space_limit (indexer->private->config);
path = indexer->private->db_dir;
- if (limit < 1) {
- return FALSE;
- }
+ if (limit < 1) {
+ return FALSE;
+ }
- if (statvfs (path, &st) == -1) {
+ if (statvfs (path, &st) == -1) {
g_warning ("Could not statvfs '%s'", path);
- return FALSE;
- }
+ return FALSE;
+ }
- if (((long long) st.f_bavail * 100 / st.f_blocks) <= limit) {
+ if (((long long) st.f_bavail * 100 / st.f_blocks) <= limit) {
g_warning ("Disk space is low");
- return TRUE;
- }
+ return TRUE;
+ }
return FALSE;
}
@@ -810,7 +810,7 @@
priv->module_names = tracker_module_config_get_modules ();
for (l = priv->module_names; l; l = l->next) {
- g_quark_from_string (l->data);
+ g_quark_from_string (l->data);
}
priv->indexer_modules = g_hash_table_new_full (g_str_hash,
@@ -882,8 +882,8 @@
}
static void
-index_metadata_item (TrackerField *field,
- const gchar *value,
+index_metadata_item (TrackerField *field,
+ const gchar *value,
MetadataForeachData *data)
{
TrackerDBIndex *index;
@@ -968,9 +968,9 @@
}
static void
-index_metadata (TrackerIndexer *indexer,
- guint32 id,
- TrackerService *service,
+index_metadata (TrackerIndexer *indexer,
+ guint32 id,
+ TrackerService *service,
TrackerMetadata *metadata)
{
MetadataForeachData data;
@@ -988,7 +988,7 @@
static void
unindex_metadata (TrackerIndexer *indexer,
- guint32 id,
+ guint32 id,
TrackerService *service,
TrackerMetadata *metadata)
{
@@ -1008,16 +1008,16 @@
static void
send_text_to_index (TrackerIndexer *indexer,
- gint service_id,
- gint service_type,
+ gint service_id,
+ gint service_type,
const gchar *text,
- gboolean full_parsing,
- gint weight_factor)
+ gboolean full_parsing,
+ gint weight_factor)
{
TrackerDBIndex *index;
GHashTable *parsed;
- GHashTableIter iter;
- gpointer key, value;
+ GHashTableIter iter;
+ gpointer key, value;
if (!text) {
return;
@@ -1059,10 +1059,10 @@
static void
index_text_with_parsing (TrackerIndexer *indexer,
- gint service_id,
- gint service_type_id,
- const gchar *content,
- gint weight_factor)
+ gint service_id,
+ gint service_type_id,
+ const gchar *content,
+ gint weight_factor)
{
send_text_to_index (indexer,
service_id,
@@ -1074,10 +1074,10 @@
static void
unindex_text_with_parsing (TrackerIndexer *indexer,
- gint service_id,
- gint service_type_id,
- const gchar *content,
- gint weight_factor)
+ gint service_id,
+ gint service_type_id,
+ const gchar *content,
+ gint weight_factor)
{
send_text_to_index (indexer,
service_id,
@@ -1089,10 +1089,10 @@
static void
index_text_no_parsing (TrackerIndexer *indexer,
- gint service_id,
- gint service_type_id,
+ gint service_id,
+ gint service_type_id,
const gchar *content,
- gchar weight_factor)
+ gchar weight_factor)
{
send_text_to_index (indexer,
service_id,
@@ -1104,10 +1104,10 @@
static void
unindex_text_no_parsing (TrackerIndexer *indexer,
- gint service_id,
- gint service_type_id,
- const gchar *content,
- gint weight_factor)
+ gint service_id,
+ gint service_type_id,
+ const gchar *content,
+ gint weight_factor)
{
send_text_to_index (indexer,
service_id,
@@ -1122,10 +1122,10 @@
gpointer value,
gpointer user_data)
{
- TrackerDBIndex *index;
+ TrackerDBIndex *index;
UpdateWordsForeachData *data;
- gchar *word;
- gint score;
+ gchar *word;
+ gint score;
word = key;
score = GPOINTER_TO_INT (value);
@@ -1143,9 +1143,9 @@
static void
update_words_no_parsing (TrackerIndexer *indexer,
- gint service_id,
- gint service_type_id,
- GHashTable *words)
+ gint service_id,
+ gint service_type_id,
+ GHashTable *words)
{
UpdateWordsForeachData user_data;
@@ -1163,7 +1163,7 @@
GHashTable *new_table;
gpointer k;
gpointer v;
- gchar *word;
+ gchar *word;
gint new_score;
word = key;
@@ -1178,12 +1178,12 @@
calculated_score = old_score - new_score;
if (calculated_score != 0) {
- 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);
+ 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,
@@ -1195,7 +1195,7 @@
static void
item_update_content (TrackerIndexer *indexer,
TrackerService *service,
- guint32 id,
+ guint32 id,
const gchar *old_text,
const gchar *new_text)
{
@@ -1341,9 +1341,9 @@
static void
item_move (TrackerIndexer *indexer,
- PathInfo *info,
- const gchar *dirname,
- const gchar *basename)
+ PathInfo *info,
+ const gchar *dirname,
+ const gchar *basename)
{
TrackerService *service;
TrackerMetadata *metadata;
@@ -1394,7 +1394,7 @@
static void
item_delete (TrackerIndexer *indexer,
- PathInfo *info,
+ PathInfo *info,
const gchar *dirname,
const gchar *basename)
{
@@ -1472,7 +1472,7 @@
g_free (metadata);
/* Delete service */
- tracker_db_delete_service (service, service_id);
+ tracker_db_delete_service (service, service_id);
tracker_db_delete_all_metadata (service, service_id);
tracker_db_decrement_stats (indexer->private->common, service);
@@ -1483,8 +1483,8 @@
const gchar *service_type,
const gchar *uri,
const gchar *property,
- GStrv values,
- GError **error)
+ GStrv values,
+ GError **error)
{
TrackerService *service;
TrackerField *field;
@@ -1622,8 +1622,8 @@
const gchar *service_type,
const gchar *uri,
const gchar *property,
- GStrv values,
- GError **error)
+ GStrv values,
+ GError **error)
{
TrackerService *service;
TrackerField *field;
@@ -1725,9 +1725,9 @@
static gboolean
should_index_file (TrackerIndexer *indexer,
- PathInfo *info,
- const gchar *dirname,
- const gchar *basename)
+ PathInfo *info,
+ const gchar *dirname,
+ const gchar *basename)
{
TrackerService *service;
gchar *service_type;
@@ -1782,8 +1782,8 @@
* complete.
*
* Note: info->file->path = '/tmp/foo/bar'
- * dirname = '/tmp/foo'
- * basename = 'bar'
+ * dirname = '/tmp/foo'
+ * basename = 'bar'
*
* Example A. PathInfo is file.
* 1) Lookup 'dirname', if exists then
@@ -1829,7 +1829,7 @@
g_debug ("%s:'%s' exists in cache, %s",
is_dir ? "Path" : "Parent path",
- str,
+ str,
should_index ? "should index" : "should not index");
return should_index;
@@ -1899,7 +1899,7 @@
}
static gboolean
process_file (TrackerIndexer *indexer,
- PathInfo *info)
+ PathInfo *info)
{
TrackerMetadata *metadata;
gchar *dirname;
@@ -2135,7 +2135,7 @@
if (indexer->private->state != 0) {
/* Some flag has been set, meaning the idle function should stop */
- indexer->private->idle_id = 0;
+ indexer->private->idle_id = 0;
return FALSE;
}
@@ -2207,7 +2207,7 @@
static void
state_unset_flags (TrackerIndexer *indexer,
- TrackerIndexerState state)
+ TrackerIndexerState state)
{
indexer->private->state &= ~(state);
state_check (indexer);
@@ -2215,7 +2215,7 @@
void
tracker_indexer_set_running (TrackerIndexer *indexer,
- gboolean running)
+ gboolean running)
{
TrackerIndexerState state;
@@ -2247,9 +2247,9 @@
}
void
-tracker_indexer_pause (TrackerIndexer *indexer,
+tracker_indexer_pause (TrackerIndexer *indexer,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
guint request_id;
@@ -2286,10 +2286,10 @@
}
void
-tracker_indexer_pause_for_duration (TrackerIndexer *indexer,
- guint seconds,
+tracker_indexer_pause_for_duration (TrackerIndexer *indexer,
+ guint seconds,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
guint request_id;
@@ -2324,9 +2324,9 @@
}
void
-tracker_indexer_continue (TrackerIndexer *indexer,
+tracker_indexer_continue (TrackerIndexer *indexer,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
guint request_id;
@@ -2335,7 +2335,7 @@
tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), context);
tracker_dbus_request_new (request_id,
- "DBus request to continue the indexer");
+ "DBus request to continue the indexer");
if (tracker_indexer_get_running (indexer) == FALSE) {
tracker_dbus_request_comment (request_id,
@@ -2429,12 +2429,12 @@
}
void
-tracker_indexer_file_move (TrackerIndexer *indexer,
- const gchar *module_name,
- gchar *from,
- gchar *to,
+tracker_indexer_file_move (TrackerIndexer *indexer,
+ const gchar *module_name,
+ gchar *from,
+ gchar *to,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
GModule *module;
guint request_id;
@@ -2472,15 +2472,15 @@
}
void
-tracker_indexer_property_set (TrackerIndexer *indexer,
- const gchar *service_type,
- const gchar *uri,
- const gchar *property,
- GStrv values,
+tracker_indexer_property_set (TrackerIndexer *indexer,
+ const gchar *service_type,
+ const gchar *uri,
+ const gchar *property,
+ GStrv values,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
- guint request_id;
+ guint request_id;
GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -2493,7 +2493,7 @@
tracker_dbus_async_return_if_fail (g_strv_length (values) > 0, context);
tracker_dbus_request_new (request_id,
- "DBus request to set %d values in property '%s' for file '%s' ",
+ "DBus request to set %d values in property '%s' for file '%s' ",
g_strv_length (values),
property,
uri);
@@ -2519,15 +2519,15 @@
}
void
-tracker_indexer_property_remove (TrackerIndexer *indexer,
- const gchar *service_type,
- const gchar *uri,
- const gchar *property,
- GStrv values,
- DBusGMethodInvocation *context,
- GError **error)
+tracker_indexer_property_remove (TrackerIndexer *indexer,
+ const gchar *service_type,
+ const gchar *uri,
+ const gchar *property,
+ GStrv values,
+ DBusGMethodInvocation *context,
+ GError **error)
{
- guint request_id;
+ guint request_id;
GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -2539,7 +2539,7 @@
tracker_dbus_async_return_if_fail (values != NULL, context);
tracker_dbus_request_new (request_id,
- "DBus request to remove %d values in property '%s' for file '%s' ",
+ "DBus request to remove %d values in property '%s' for file '%s' ",
g_strv_length (values),
property,
uri);
@@ -2563,9 +2563,9 @@
}
void
-tracker_indexer_shutdown (TrackerIndexer *indexer,
+tracker_indexer_shutdown (TrackerIndexer *indexer,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
guint request_id;
@@ -2573,7 +2573,7 @@
request_id = tracker_dbus_get_next_request_id ();
tracker_dbus_request_new (request_id,
- "DBus request to shutdown the indexer");
+ "DBus request to shutdown the indexer");
tracker_indexer_stop (indexer);
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 15:12:19 2008
@@ -25,21 +25,21 @@
#include <glib-object.h>
#include <dbus/dbus-glib.h>
-#define TRACKER_DAEMON_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_DAEMON_SERVICE "org.freedesktop.Tracker"
#define TRACKER_INDEXER_SERVICE "org.freedesktop.Tracker.Indexer"
-#define TRACKER_INDEXER_PATH "/org/freedesktop/Tracker/Indexer"
+#define TRACKER_INDEXER_PATH "/org/freedesktop/Tracker/Indexer"
#define TRACKER_INDEXER_INTERFACE "org.freedesktop.Tracker.Indexer"
G_BEGIN_DECLS
-#define TRACKER_TYPE_INDEXER (tracker_indexer_get_type())
-#define TRACKER_INDEXER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_INDEXER, TrackerIndexer))
+#define TRACKER_TYPE_INDEXER (tracker_indexer_get_type())
+#define TRACKER_INDEXER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_INDEXER, TrackerIndexer))
#define TRACKER_INDEXER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_INDEXER, TrackerIndexerClass))
-#define TRACKER_IS_INDEXER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_INDEXER))
+#define TRACKER_IS_INDEXER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_INDEXER))
#define TRACKER_IS_INDEXER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKER_TYPE_INDEXER))
#define TRACKER_INDEXER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_INDEXER, TrackerIndexerClass))
-typedef struct TrackerIndexer TrackerIndexer;
+typedef struct TrackerIndexer TrackerIndexer;
typedef struct TrackerIndexerClass TrackerIndexerClass;
typedef struct TrackerIndexerPrivate TrackerIndexerPrivate;
@@ -53,81 +53,81 @@
struct TrackerIndexerClass {
GObjectClass parent_class;
- void (*status) (TrackerIndexer *indexer,
- gdouble seconds_elapsed,
- const gchar *current_module_name,
- guint items_indexed,
- guint items_remaining);
- void (*started) (TrackerIndexer *indexer);
- void (*paused) (TrackerIndexer *indexer);
- void (*continued) (TrackerIndexer *indexer);
- void (*finished) (TrackerIndexer *indexer,
- gdouble seconds_elapsed,
- guint items_indexed);
- void (*module_started) (TrackerIndexer *indexer,
- const gchar *module_name);
+ void (*status) (TrackerIndexer *indexer,
+ gdouble seconds_elapsed,
+ const gchar *current_module_name,
+ guint items_indexed,
+ guint items_remaining);
+ void (*started) (TrackerIndexer *indexer);
+ void (*paused) (TrackerIndexer *indexer);
+ void (*continued) (TrackerIndexer *indexer);
+ void (*finished) (TrackerIndexer *indexer,
+ gdouble seconds_elapsed,
+ guint items_indexed);
+ void (*module_started) (TrackerIndexer *indexer,
+ const gchar *module_name);
void (*module_finished) (TrackerIndexer *indexer,
- const gchar *module_name);
+ const gchar *module_name);
};
-GType tracker_indexer_get_type (void) G_GNUC_CONST;
+GType tracker_indexer_get_type (void) G_GNUC_CONST;
-TrackerIndexer *tracker_indexer_new (void);
-gboolean tracker_indexer_get_running (TrackerIndexer *indexer);
-void tracker_indexer_set_running (TrackerIndexer *indexer,
- gboolean running);
-void tracker_indexer_stop (TrackerIndexer *indexer);
-void tracker_indexer_process_all (TrackerIndexer *indexer);
+TrackerIndexer *tracker_indexer_new (void);
+gboolean tracker_indexer_get_running (TrackerIndexer *indexer);
+void tracker_indexer_set_running (TrackerIndexer *indexer,
+ gboolean running);
+void tracker_indexer_stop (TrackerIndexer *indexer);
+void tracker_indexer_process_all (TrackerIndexer *indexer);
/* DBus methods */
-void tracker_indexer_pause (TrackerIndexer *indexer,
+void tracker_indexer_pause (TrackerIndexer *indexer,
DBusGMethodInvocation *context,
- GError **error);
-void tracker_indexer_pause_for_duration (TrackerIndexer *indexer,
- guint seconds,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_indexer_continue (TrackerIndexer *indexer,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_indexer_files_check (TrackerIndexer *indexer,
- const gchar *module,
- GStrv files,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_indexer_files_update (TrackerIndexer *indexer,
- const gchar *module,
- GStrv files,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_indexer_files_delete (TrackerIndexer *indexer,
- const gchar *module,
- GStrv files,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_indexer_file_move (TrackerIndexer *indexer,
- const gchar *module_name,
- gchar *from,
- gchar *to,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_indexer_property_set (TrackerIndexer *indexer,
- const gchar *service_type,
- const gchar *uri,
- const gchar *property,
- GStrv values,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_indexer_property_remove (TrackerIndexer *indexer,
- const gchar *service_type,
- const gchar *uri,
- const gchar *property,
- GStrv values,
+ GError **error);
+void tracker_indexer_pause_for_duration (TrackerIndexer *indexer,
+ guint seconds,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_indexer_continue (TrackerIndexer *indexer,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_indexer_files_check (TrackerIndexer *indexer,
+ const gchar *module,
+ GStrv files,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_indexer_files_update (TrackerIndexer *indexer,
+ const gchar *module,
+ GStrv files,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_indexer_files_delete (TrackerIndexer *indexer,
+ const gchar *module,
+ GStrv files,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_indexer_file_move (TrackerIndexer *indexer,
+ const gchar *module_name,
+ gchar *from,
+ gchar *to,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_indexer_property_set (TrackerIndexer *indexer,
+ const gchar *service_type,
+ const gchar *uri,
+ const gchar *property,
+ GStrv values,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_indexer_property_remove (TrackerIndexer *indexer,
+ const gchar *service_type,
+ const gchar *uri,
+ const gchar *property,
+ GStrv values,
DBusGMethodInvocation *context,
- GError **error);
-void tracker_indexer_shutdown (TrackerIndexer *indexer,
+ GError **error);
+void tracker_indexer_shutdown (TrackerIndexer *indexer,
DBusGMethodInvocation *context,
- GError **error);
+ GError **error);
G_END_DECLS
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 15:12:19 2008
@@ -52,15 +52,15 @@
"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" \
+ "\n" \
" http://www.gnu.org/licenses/gpl.txt\n";
#define QUIT_TIMEOUT 300 /* 5 minutes worth of seconds */
static GMainLoop *main_loop;
-static guint quit_timeout_id;
+static guint quit_timeout_id;
-static gint verbosity = -1;
+static gint verbosity = -1;
static gboolean process_all = FALSE;
static gboolean run_forever = FALSE;
@@ -70,10 +70,10 @@
N_("Logging, 0 = errors only, "
"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 },
+ { "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"),
@@ -88,13 +88,13 @@
g_message ("General options:");
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",
tracker_config_get_enable_thumbnails (config) ? "yes" : "no");
@@ -165,17 +165,17 @@
initialize_signal_handler (void)
{
#ifndef OS_WIN32
- struct sigaction act, ign_act;
- sigset_t empty_mask;
+ struct sigaction act, ign_act;
+ sigset_t empty_mask;
sigemptyset (&empty_mask);
act.sa_handler = signal_handler;
act.sa_mask = empty_mask;
act.sa_flags = 0;
- ign_act.sa_handler = SIG_IGN;
- ign_act.sa_mask = empty_mask;
- ign_act.sa_flags = 0;
+ ign_act.sa_handler = SIG_IGN;
+ ign_act.sa_mask = empty_mask;
+ ign_act.sa_flags = 0;
sigaction (SIGTERM, &act, NULL);
sigaction (SIGILL, &act, NULL);
@@ -186,76 +186,76 @@
sigaction (SIGABRT, &act, NULL);
sigaction (SIGUSR1, &act, NULL);
sigaction (SIGINT, &act, NULL);
- /* sigaction (SIGPIPE, &ign_act, NULL); */
+ /* sigaction (SIGPIPE, &ign_act, NULL); */
#endif
}
static gboolean
quit_timeout_cb (gpointer user_data)
{
- TrackerIndexer *indexer;
+ TrackerIndexer *indexer;
- indexer = TRACKER_INDEXER (user_data);
+ indexer = TRACKER_INDEXER (user_data);
- if (!tracker_indexer_get_running (indexer)) {
- g_message ("Indexer is still not running after %d seconds, quitting...",
- QUIT_TIMEOUT);
- g_main_loop_quit (main_loop);
- quit_timeout_id = 0;
- } else {
- g_message ("Indexer is now running, staying alive until finished...");
- }
+ if (!tracker_indexer_get_running (indexer)) {
+ g_message ("Indexer is still not running after %d seconds, quitting...",
+ QUIT_TIMEOUT);
+ g_main_loop_quit (main_loop);
+ quit_timeout_id = 0;
+ } else {
+ g_message ("Indexer is now running, staying alive until finished...");
+ }
- return FALSE;
+ return FALSE;
}
static void
indexer_finished_cb (TrackerIndexer *indexer,
- gdouble seconds_elapsed,
- guint items_indexed,
- gboolean interrupted,
- gpointer user_data)
+ gdouble seconds_elapsed,
+ guint items_indexed,
+ gboolean interrupted,
+ gpointer user_data)
{
- g_message ("Finished indexing sent items");
+ g_message ("Finished indexing sent items");
- if (interrupted) {
- g_message ("Indexer was told to shutdown");
- g_main_loop_quit (main_loop);
- return;
- }
-
- if (quit_timeout_id) {
- g_message ("Cancelling previous quit timeout");
- g_source_remove (quit_timeout_id);
- }
-
- if (!run_forever) {
- g_message ("Waiting another %d seconds for more items before quitting...",
- QUIT_TIMEOUT);
-
- quit_timeout_id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
- QUIT_TIMEOUT,
- quit_timeout_cb,
- g_object_ref (indexer),
- (GDestroyNotify) g_object_unref);
- }
+ if (interrupted) {
+ g_message ("Indexer was told to shutdown");
+ g_main_loop_quit (main_loop);
+ return;
+ }
+
+ if (quit_timeout_id) {
+ g_message ("Cancelling previous quit timeout");
+ g_source_remove (quit_timeout_id);
+ }
+
+ if (!run_forever) {
+ g_message ("Waiting another %d seconds for more items before quitting...",
+ QUIT_TIMEOUT);
+
+ quit_timeout_id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
+ QUIT_TIMEOUT,
+ quit_timeout_cb,
+ g_object_ref (indexer),
+ (GDestroyNotify) g_object_unref);
+ }
}
gint
main (gint argc, gchar *argv[])
{
- TrackerConfig *config;
+ TrackerConfig *config;
TrackerIndexer *indexer;
- TrackerDBManagerFlags flags = 0;
+ TrackerDBManagerFlags flags = 0;
GOptionContext *context;
GError *error = NULL;
- gchar *filename;
+ gchar *filename;
g_type_init ();
if (!g_thread_supported ()) {
g_thread_init (NULL);
- }
+ }
setlocale (LC_ALL, "");
@@ -280,40 +280,40 @@
initialize_signal_handler ();
- /* Check XDG spec locations XDG_DATA_HOME _MUST_ be writable. */
- if (!tracker_env_check_xdg_dirs ()) {
- return EXIT_FAILURE;
- }
+ /* Check XDG spec locations XDG_DATA_HOME _MUST_ be writable. */
+ if (!tracker_env_check_xdg_dirs ()) {
+ return EXIT_FAILURE;
+ }
- /* Initialize logging */
- config = tracker_config_new ();
+ /* Initialize logging */
+ config = tracker_config_new ();
if (verbosity > -1) {
tracker_config_set_verbosity (config, verbosity);
}
filename = g_build_filename (g_get_user_data_dir (),
- "tracker",
- "tracker-indexer.log",
- NULL);
+ "tracker",
+ "tracker-indexer.log",
+ NULL);
- tracker_log_init (filename, tracker_config_get_verbosity (config));
+ tracker_log_init (filename, tracker_config_get_verbosity (config));
g_print ("Starting log:\n File:'%s'\n", filename);
- g_free (filename);
+ g_free (filename);
- /* Make sure we initialize DBus, this shows we are started
- * successfully when called upon from the daemon.
- */
- if (!tracker_dbus_init ()) {
- return EXIT_FAILURE;
- }
+ /* Make sure we initialize DBus, this shows we are started
+ * successfully when called upon from the daemon.
+ */
+ if (!tracker_dbus_init ()) {
+ return EXIT_FAILURE;
+ }
sanity_check_option_values (config);
- /* Initialize database manager */
- if (tracker_config_get_low_memory_mode (config)) {
- flags |= TRACKER_DB_MANAGER_LOW_MEMORY_MODE;
- }
+ /* Initialize database manager */
+ if (tracker_config_get_low_memory_mode (config)) {
+ flags |= TRACKER_DB_MANAGER_LOW_MEMORY_MODE;
+ }
tracker_db_manager_init (flags, NULL);
if (!tracker_db_index_manager_init (0,
@@ -322,23 +322,23 @@
return EXIT_FAILURE;
}
- tracker_module_config_init ();
+ tracker_module_config_init ();
/* Set IO priority */
tracker_ioprio_init ();
- /* nice() uses attribute "warn_unused_result" and so complains
+ /* 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...
*/
- if (nice (19) == -1 && errno) {
- const gchar *str;
+ if (nice (19) == -1 && errno) {
+ const gchar *str;
- str = g_strerror (errno);
- g_message ("Couldn't set nice value to 19, %s",
- str ? str : "no error given");
- }
+ str = g_strerror (errno);
+ g_message ("Couldn't set nice value to 19, %s",
+ str ? str : "no error given");
+ }
indexer = tracker_indexer_new ();
@@ -347,15 +347,15 @@
return EXIT_FAILURE;
}
- /* Create the indexer and run the main loop */
- g_signal_connect (indexer, "finished",
+ /* Create the indexer and run the main loop */
+ g_signal_connect (indexer, "finished",
G_CALLBACK (indexer_finished_cb),
- NULL);
+ NULL);
- if (process_all) {
- /* Tell the indexer to process all configured modules */
- tracker_indexer_process_all (indexer);
- }
+ if (process_all) {
+ /* Tell the indexer to process all configured modules */
+ tracker_indexer_process_all (indexer);
+ }
g_message ("Starting...");
@@ -364,19 +364,19 @@
g_message ("Shutdown started");
- if (quit_timeout_id) {
- g_source_remove (quit_timeout_id);
- }
-
- g_main_loop_unref (main_loop);
- g_object_unref (indexer);
- g_object_unref (config);
-
- tracker_dbus_shutdown ();
- tracker_db_index_manager_shutdown ();
- tracker_db_manager_shutdown ();
- tracker_module_config_shutdown ();
- tracker_log_shutdown ();
+ if (quit_timeout_id) {
+ g_source_remove (quit_timeout_id);
+ }
+
+ g_main_loop_unref (main_loop);
+ g_object_unref (indexer);
+ g_object_unref (config);
+
+ tracker_dbus_shutdown ();
+ tracker_db_index_manager_shutdown ();
+ tracker_db_manager_shutdown ();
+ tracker_module_config_shutdown ();
+ tracker_log_shutdown ();
return EXIT_SUCCESS;
}
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 15:12:19 2008
@@ -37,18 +37,18 @@
#define HAVE_HILDON_THUMBNAIL
#define METADATA_FILE_NAME_DELIMITED "File:NameDelimited"
-#define METADATA_FILE_EXT "File:Ext"
-#define METADATA_FILE_PATH "File:Path"
-#define METADATA_FILE_NAME "File:Name"
-#define METADATA_FILE_LINK "File:Link"
-#define METADATA_FILE_MIMETYPE "File:Mime"
-#define METADATA_FILE_SIZE "File:Size"
-#define METADATA_FILE_MODIFIED "File:Modified"
-#define METADATA_FILE_ACCESSED "File:Accessed"
-
-#undef TRY_LOCALE_TO_UTF8_CONVERSION
-#define TEXT_MAX_SIZE 1048576 /* bytes */
-#define TEXT_CHECK_SIZE 65535 /* bytes */
+#define METADATA_FILE_EXT "File:Ext"
+#define METADATA_FILE_PATH "File:Path"
+#define METADATA_FILE_NAME "File:Name"
+#define METADATA_FILE_LINK "File:Link"
+#define METADATA_FILE_MIMETYPE "File:Mime"
+#define METADATA_FILE_SIZE "File:Size"
+#define METADATA_FILE_MODIFIED "File:Modified"
+#define METADATA_FILE_ACCESSED "File:Accessed"
+
+#undef TRY_LOCALE_TO_UTF8_CONVERSION
+#define TEXT_MAX_SIZE 1048576 /* bytes */
+#define TEXT_CHECK_SIZE 65535 /* bytes */
typedef struct {
GPid pid;
@@ -86,8 +86,8 @@
}
static void
-process_context_child_watch_cb (GPid pid,
- gint status,
+process_context_child_watch_cb (GPid pid,
+ gint status,
gpointer user_data)
{
g_debug ("Process '%d' exited with code: %d->'%s'",
@@ -145,8 +145,8 @@
static gboolean
metadata_read_cb (GIOChannel *channel,
- GIOCondition condition,
- gpointer user_data)
+ GIOCondition condition,
+ gpointer user_data)
{
GPtrArray *array;
GIOStatus status;
@@ -292,7 +292,7 @@
{
gchar **values;
gchar *service_type;
- gint i;
+ gint i;
service_type = tracker_ontology_get_service_by_mime (mime_type);
if (!service_type) {
@@ -304,7 +304,7 @@
return;
}
- g_free (service_type);
+ g_free (service_type);
values = metadata_query_file (path, mime_type);
@@ -343,7 +343,7 @@
if (!utf_value)
continue;
- tracker_metadata_insert (metadata, name, utf_value);
+ tracker_metadata_insert (metadata, name, utf_value);
}
g_strfreev (values);
@@ -351,8 +351,8 @@
static gboolean
get_file_content_read_cb (GIOChannel *channel,
- GIOCondition condition,
- gpointer user_data)
+ GIOCondition condition,
+ gpointer user_data)
{
ProcessContext *context;
GString *text;
@@ -423,8 +423,8 @@
{
GError *error = NULL;
gchar *str;
- gsize bytes_read;
- gsize bytes_written;
+ gsize bytes_read;
+ gsize bytes_written;
str = g_locale_to_utf8 (s->str,
s->len,
@@ -452,31 +452,31 @@
static gchar *
get_file_content (const gchar *path)
{
- GFile *file;
- GFileInputStream *stream;
- GError *error = NULL;
- GString *s;
- gssize bytes;
- gssize bytes_valid;
- gssize bytes_read_total;
- gssize buf_size;
- gchar buf[TEXT_CHECK_SIZE];
- gboolean has_more_data;
- gboolean has_reached_max;
- gboolean is_utf8;
-
- file = g_file_new_for_path (path);
- stream = g_file_read (file, NULL, &error);
-
- if (error) {
- g_message ("Could not get read file:'%s', %s",
- path,
- error->message);
- g_error_free (error);
- g_object_unref (file);
+ GFile *file;
+ GFileInputStream *stream;
+ GError *error = NULL;
+ GString *s;
+ gssize bytes;
+ gssize bytes_valid;
+ gssize bytes_read_total;
+ gssize buf_size;
+ gchar buf[TEXT_CHECK_SIZE];
+ gboolean has_more_data;
+ gboolean has_reached_max;
+ gboolean is_utf8;
+
+ file = g_file_new_for_path (path);
+ stream = g_file_read (file, NULL, &error);
+
+ if (error) {
+ g_message ("Could not get read file:'%s', %s",
+ path,
+ error->message);
+ g_error_free (error);
+ g_object_unref (file);
- return NULL;
- }
+ return NULL;
+ }
s = g_string_new ("");
has_reached_max = FALSE;
@@ -565,17 +565,17 @@
g_debug (" Maximum indexable limit reached");
}
- if (error) {
- g_message ("Could not read input stream for:'%s', %s",
- path,
- error->message);
- g_error_free (error);
+ if (error) {
+ g_message ("Could not read input stream for:'%s', %s",
+ path,
+ error->message);
+ g_error_free (error);
g_string_free (s, TRUE);
- g_object_unref (stream);
- g_object_unref (file);
+ g_object_unref (stream);
+ g_object_unref (file);
- return NULL;
- }
+ return NULL;
+ }
/* Check for UTF-8 Validity, if not try to convert it to the
* locale we are in.
@@ -596,22 +596,22 @@
s->len);
s = g_string_truncate (s, bytes_valid);
}
-#else /* TRY_LOCALE_TO_UTF8_CONVERSION */
+#else /* TRY_LOCALE_TO_UTF8_CONVERSION */
g_debug (" Truncating to last valid UTF-8 character (%d/%d bytes)",
bytes_valid,
s->len);
s = g_string_truncate (s, bytes_valid);
-#endif /* TRY_LOCALE_TO_UTF8_CONVERSION */
+#endif /* TRY_LOCALE_TO_UTF8_CONVERSION */
- g_object_unref (stream);
- g_object_unref (file);
+ g_object_unref (stream);
+ g_object_unref (file);
if (s->len < 1) {
g_string_free (s, TRUE);
s = NULL;
}
- return s ? g_string_free (s, FALSE) : NULL;
+ return s ? g_string_free (s, FALSE) : NULL;
}
#ifdef THUMBNAIL_RETRIEVAL_ENABLED
@@ -620,10 +620,10 @@
static void
get_file_thumbnail_queue_cb (DBusGProxy *proxy,
DBusGProxyCall *call,
- gpointer user_data)
+ gpointer user_data)
{
GError *error = NULL;
- guint handle;
+ guint handle;
/* FIXME: What is the point of this? */
dbus_g_proxy_end_call (proxy, call, &error,
@@ -639,7 +639,7 @@
{
#ifdef HAVE_HILDON_THUMBNAIL
static gchar *batch[51];
- static guint count = 0;
+ static guint count = 0;
static gboolean not_available = FALSE;
if (not_available) {
@@ -784,9 +784,9 @@
/* No need to filter text based files - index them directly */
if (service_type &&
- (strcmp (service_type, "Text") == 0 ||
- strcmp (service_type, "Development") == 0)) {
- text = get_file_content (path);
+ (strcmp (service_type, "Text") == 0 ||
+ strcmp (service_type, "Development") == 0)) {
+ text = get_file_content (path);
} else {
text = get_file_content_by_filter (path, mime_type);
}
@@ -800,16 +800,16 @@
TrackerMetadata *
tracker_metadata_utils_get_data (const gchar *path)
{
- TrackerMetadata *metadata;
+ TrackerMetadata *metadata;
struct stat st;
const gchar *ext;
gchar *mime_type;
if (g_lstat (path, &st) < 0) {
- return NULL;
- }
+ return NULL;
+ }
- metadata = tracker_metadata_new ();
+ metadata = tracker_metadata_new ();
ext = strrchr (path, '.');
if (ext) {
@@ -818,12 +818,12 @@
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,
g_path_get_dirname (path));
tracker_metadata_insert (metadata, METADATA_FILE_NAME_DELIMITED,
- g_filename_to_utf8 (path, -1, NULL, NULL, NULL));
+ g_filename_to_utf8 (path, -1, NULL, NULL, NULL));
tracker_metadata_insert (metadata, METADATA_FILE_MIMETYPE,
mime_type);
@@ -840,19 +840,19 @@
link_path = g_file_read_link (path, NULL);
tracker_metadata_insert (metadata, METADATA_FILE_LINK,
- g_filename_to_utf8 (link_path, -1, NULL, NULL, NULL));
+ g_filename_to_utf8 (link_path, -1, NULL, NULL, NULL));
g_free (link_path);
}
/* FIXME: These should be dealt directly as integer/times/whatever, not strings */
tracker_metadata_insert (metadata, METADATA_FILE_SIZE,
- tracker_guint_to_string (st.st_size));
+ tracker_guint_to_string (st.st_size));
tracker_metadata_insert (metadata, METADATA_FILE_MODIFIED,
- tracker_date_to_string (st.st_mtime));
+ tracker_date_to_string (st.st_mtime));
tracker_metadata_insert (metadata, METADATA_FILE_ACCESSED,
- tracker_date_to_string (st.st_atime));
+ tracker_date_to_string (st.st_atime));
metadata_utils_get_embedded (path, mime_type, metadata);
- return metadata;
+ return metadata;
}
Modified: branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.h (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.h Sat Sep 20 15:12:19 2008
@@ -27,7 +27,7 @@
G_BEGIN_DECLS
TrackerMetadata *tracker_metadata_utils_get_data (const gchar *path);
-gchar * tracker_metadata_utils_get_text (const gchar *path);
+gchar * tracker_metadata_utils_get_text (const gchar *path);
G_END_DECLS
Modified: branches/indexer-split/src/tracker-indexer/tracker-metadata.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-metadata.c (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-metadata.c Sat Sep 20 15:12:19 2008
@@ -24,26 +24,26 @@
#include "tracker-metadata.h"
struct TrackerMetadata {
- GHashTable *table;
+ GHashTable *table;
};
TrackerMetadata *
tracker_metadata_new (void)
{
- TrackerMetadata *metadata;
+ TrackerMetadata *metadata;
- metadata = g_slice_new (TrackerMetadata);
- metadata->table = g_hash_table_new_full (g_direct_hash,
- g_direct_equal,
- (GDestroyNotify) g_object_unref,
+ metadata = g_slice_new (TrackerMetadata);
+ metadata->table = g_hash_table_new_full (g_direct_hash,
+ g_direct_equal,
+ (GDestroyNotify) g_object_unref,
NULL);
- return metadata;
+ return metadata;
}
static gboolean
remove_metadata_foreach (gpointer key,
- gpointer value,
- gpointer user_data)
+ gpointer value,
+ gpointer user_data)
{
TrackerField *field;
@@ -66,81 +66,81 @@
tracker_metadata_free (TrackerMetadata *metadata)
{
g_hash_table_foreach_remove (metadata->table,
- remove_metadata_foreach,
- NULL);
+ remove_metadata_foreach,
+ NULL);
g_hash_table_destroy (metadata->table);
- g_slice_free (TrackerMetadata, metadata);
+ g_slice_free (TrackerMetadata, metadata);
}
void
tracker_metadata_insert (TrackerMetadata *metadata,
- const gchar *field_name,
- gchar *value)
+ const gchar *field_name,
+ gchar *value)
{
- TrackerField *field;
+ TrackerField *field;
- field = tracker_ontology_get_field_by_name (field_name);
+ field = tracker_ontology_get_field_by_name (field_name);
g_return_if_fail (TRACKER_IS_FIELD (field));
- g_return_if_fail (tracker_field_get_multiple_values (field) == FALSE);
+ g_return_if_fail (tracker_field_get_multiple_values (field) == FALSE);
- g_hash_table_insert (metadata->table,
- g_object_ref (field),
+ g_hash_table_insert (metadata->table,
+ g_object_ref (field),
value);
}
void
tracker_metadata_insert_multiple_values (TrackerMetadata *metadata,
- const gchar *field_name,
- GList *list)
+ const gchar *field_name,
+ GList *list)
{
- TrackerField *field;
+ TrackerField *field;
- field = tracker_ontology_get_field_by_name (field_name);
+ field = tracker_ontology_get_field_by_name (field_name);
g_return_if_fail (TRACKER_IS_FIELD (field));
- g_return_if_fail (tracker_field_get_multiple_values (field) == TRUE);
+ g_return_if_fail (tracker_field_get_multiple_values (field) == TRUE);
- g_hash_table_insert (metadata->table,
- g_object_ref (field),
- list);
+ g_hash_table_insert (metadata->table,
+ g_object_ref (field),
+ list);
}
G_CONST_RETURN gchar *
tracker_metadata_lookup (TrackerMetadata *metadata,
- const gchar *field_name)
+ const gchar *field_name)
{
- TrackerField *field;
+ TrackerField *field;
- field = tracker_ontology_get_field_by_name (field_name);
+ field = tracker_ontology_get_field_by_name (field_name);
g_return_val_if_fail (TRACKER_IS_FIELD (field), NULL);
- g_return_val_if_fail (tracker_field_get_multiple_values (field) == FALSE, NULL);
+ g_return_val_if_fail (tracker_field_get_multiple_values (field) == FALSE, NULL);
- return g_hash_table_lookup (metadata->table, field);
+ return g_hash_table_lookup (metadata->table, field);
}
G_CONST_RETURN GList *
tracker_metadata_lookup_multiple_values (TrackerMetadata *metadata,
- const gchar *field_name)
+ const gchar *field_name)
{
- TrackerField *field;
+ TrackerField *field;
- field = tracker_ontology_get_field_by_name (field_name);
+ field = tracker_ontology_get_field_by_name (field_name);
g_return_val_if_fail (TRACKER_IS_FIELD (field), NULL);
- g_return_val_if_fail (tracker_field_get_multiple_values (field) == TRUE, NULL);
+ g_return_val_if_fail (tracker_field_get_multiple_values (field) == TRUE, NULL);
- return g_hash_table_lookup (metadata->table, field);
+ return g_hash_table_lookup (metadata->table, field);
}
void
-tracker_metadata_foreach (TrackerMetadata *metadata,
- TrackerMetadataForeach func,
- gpointer user_data)
-{
- g_hash_table_foreach (metadata->table,
- (GHFunc) func,
- user_data);
+tracker_metadata_foreach (TrackerMetadata *metadata,
+ TrackerMetadataForeach func,
+ gpointer user_data)
+{
+ g_hash_table_foreach (metadata->table,
+ (GHFunc) func,
+ user_data);
}
Modified: branches/indexer-split/src/tracker-indexer/tracker-metadata.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-metadata.h (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-metadata.h Sat Sep 20 15:12:19 2008
@@ -32,23 +32,23 @@
gpointer user_data);
TrackerMetadata * tracker_metadata_new (void);
-void tracker_metadata_free (TrackerMetadata *metadata);
+void tracker_metadata_free (TrackerMetadata *metadata);
-void tracker_metadata_insert (TrackerMetadata *metadata,
- const gchar *field_name,
- gchar *value);
-void tracker_metadata_insert_multiple_values (TrackerMetadata *metadata,
- const gchar *field_name,
- GList *list);
+void tracker_metadata_insert (TrackerMetadata *metadata,
+ const gchar *field_name,
+ gchar *value);
+void tracker_metadata_insert_multiple_values (TrackerMetadata *metadata,
+ const gchar *field_name,
+ GList *list);
-G_CONST_RETURN gchar * tracker_metadata_lookup (TrackerMetadata *metadata,
- const gchar *field_name);
+G_CONST_RETURN gchar * tracker_metadata_lookup (TrackerMetadata *metadata,
+ const gchar *field_name);
G_CONST_RETURN GList * tracker_metadata_lookup_multiple_values (TrackerMetadata *metadata,
- const gchar *field_name);
+ const gchar *field_name);
-void tracker_metadata_foreach (TrackerMetadata *metadata,
+void tracker_metadata_foreach (TrackerMetadata *metadata,
TrackerMetadataForeach func,
- gpointer user_data);
+ gpointer user_data);
G_END_DECLS
Modified: branches/indexer-split/src/tracker-indexer/tracker-module.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-module.h (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-module.h Sat Sep 20 15:12:19 2008
@@ -30,41 +30,41 @@
typedef struct TrackerFile TrackerFile;
struct TrackerFile {
- gchar *path;
+ gchar *path;
gpointer data;
};
-typedef void (* TrackerModuleInit) (void);
-typedef void (* TrackerModuleShutdown) (void);
+typedef void (* TrackerModuleInit) (void);
+typedef void (* TrackerModuleShutdown) (void);
-typedef const gchar * (* TrackerModuleGetNameFunc) (void);
-typedef gchar ** (* TrackerModuleGetDirectoriesFunc) (void);
+typedef const gchar * (* TrackerModuleGetNameFunc) (void);
+typedef gchar ** (* TrackerModuleGetDirectoriesFunc) (void);
-typedef gpointer (* TrackerModuleFileGetDataFunc) (const gchar *path);
-typedef void (* TrackerModuleFileFreeDataFunc) (gpointer data);
+typedef gpointer (* TrackerModuleFileGetDataFunc) (const gchar *path);
+typedef void (* TrackerModuleFileFreeDataFunc) (gpointer data);
-typedef gchar * (* TrackerModuleFileGetServiceTypeFunc) (TrackerFile *file);
-typedef void (* TrackerModuleFileGetUriFunc) (TrackerFile *file,
- gchar **dirname,
- gchar **basename);
-
-typedef TrackerMetadata * (* TrackerModuleFileGetMetadataFunc) (TrackerFile *file);
-typedef gchar * (* TrackerModuleFileGetText) (TrackerFile *path);
-typedef gboolean (* TrackerModuleFileIterContents) (TrackerFile *path);
-
-
-void tracker_module_init (void);
-void tracker_module_shutdown (void);
-G_CONST_RETURN gchar *tracker_module_get_name (void);
-gpointer tracker_module_file_get_data (const gchar *path);
-void tracker_module_file_free_data (gpointer file_data);
-gchar * tracker_module_file_get_service_type (TrackerFile *file);
-void tracker_module_file_get_uri (TrackerFile *file,
- gchar **dirname,
- gchar **basename);
-TrackerMetadata * tracker_module_file_get_metadata (TrackerFile *file);
-gchar * tracker_module_file_get_text (TrackerFile *file);
-gboolean tracker_module_file_iter_contents (TrackerFile *file);
+typedef gchar * (* TrackerModuleFileGetServiceTypeFunc) (TrackerFile *file);
+typedef void (* TrackerModuleFileGetUriFunc) (TrackerFile *file,
+ gchar **dirname,
+ gchar **basename);
+
+typedef TrackerMetadata * (* TrackerModuleFileGetMetadataFunc) (TrackerFile *file);
+typedef gchar * (* TrackerModuleFileGetText) (TrackerFile *path);
+typedef gboolean (* TrackerModuleFileIterContents) (TrackerFile *path);
+
+
+void tracker_module_init (void);
+void tracker_module_shutdown (void);
+G_CONST_RETURN gchar *tracker_module_get_name (void);
+gpointer tracker_module_file_get_data (const gchar *path);
+void tracker_module_file_free_data (gpointer file_data);
+gchar * tracker_module_file_get_service_type (TrackerFile *file);
+void tracker_module_file_get_uri (TrackerFile *file,
+ gchar **dirname,
+ gchar **basename);
+TrackerMetadata * tracker_module_file_get_metadata (TrackerFile *file);
+gchar * tracker_module_file_get_text (TrackerFile *file);
+gboolean tracker_module_file_iter_contents (TrackerFile *file);
G_END_DECLS
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 15:12:19 2008
@@ -70,9 +70,9 @@
static void tracker_preferences_cmd_add_ignore_pattern (GtkWidget *widget, gpointer data);
static void tracker_preferences_cmd_remove_ignore_pattern (GtkWidget *widget, gpointer data);
static void append_item_to_list (TrackerPreferences *dialog, const gchar* const item,
- const gchar* const widget);
+ const gchar* const widget);
static void remove_selection_from_list (TrackerPreferences *dialog,
- const gchar* const widget);
+ const gchar* const widget);
static GSList *treeview_get_values (GtkTreeView *treeview);
static gint _strcmp (gconstpointer a, gconstpointer b);
static void initialize_listview (GtkWidget *treeview);
@@ -303,10 +303,10 @@
widget = glade_xml_get_widget (priv->gxml, "comLanguage");
str_value = tracker_configuration_get_string ("/Indexing/Language", NULL);
- if (str_value == NULL) {
- /* no value for language? Default to "en" */
- str_value = g_strdup( "en" ) ;
- }
+ if (str_value == NULL) {
+ /* no value for language? Default to "en" */
+ str_value = g_strdup( "en" ) ;
+ }
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 2);
@@ -620,10 +620,10 @@
widget = glade_xml_get_widget (priv->gxml, "comLanguage");
gint i = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
str_value = tracker_configuration_get_string ("/Indexing/Language", NULL);
- if (str_value == NULL) {
- /* no value for language? Default to "en" */
- str_value = g_strdup( "en" ) ;
- }
+ if (str_value == NULL) {
+ /* no value for language? Default to "en" */
+ str_value = g_strdup( "en" ) ;
+ }
if (i != -1) {
if (strcmp (str_value, LanguageMap[i].language) != 0) {
flag_restart = TRUE;
Modified: branches/indexer-split/src/tracker-preferences/tracker-preferences.h
==============================================================================
--- branches/indexer-split/src/tracker-preferences/tracker-preferences.h (original)
+++ branches/indexer-split/src/tracker-preferences/tracker-preferences.h Sat Sep 20 15:12:19 2008
@@ -24,10 +24,10 @@
G_BEGIN_DECLS
-#define TRACKER_TYPE_PREFERENCES (tracker_preferences_get_type())
-#define TRACKER_PREFERENCES(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), TRACKER_TYPE_PREFERENCES, TrackerPreferences))
+#define TRACKER_TYPE_PREFERENCES (tracker_preferences_get_type())
+#define TRACKER_PREFERENCES(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), TRACKER_TYPE_PREFERENCES, TrackerPreferences))
#define TRACKER_PREFERENCES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TRACKER_TYPE_PREFERENCES, TrackerPreferencesClass))
-#define TRACKER_IS_PREFERENCES(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), TRACKER_TYPE_PREFERENCES))
+#define TRACKER_IS_PREFERENCES(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), TRACKER_TYPE_PREFERENCES))
#define TRACKER_IS_PREFERENCES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), TRACKER_TYPE_PREFERENCES))
#define TRACKER_PREFERENCES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), TRACKER_TYPE_PREFERENCES, TrackerPreferencesClass))
Modified: branches/indexer-split/src/tracker-search-tool/sexy-icon-entry.c
==============================================================================
--- branches/indexer-split/src/tracker-search-tool/sexy-icon-entry.c (original)
+++ branches/indexer-split/src/tracker-search-tool/sexy-icon-entry.c Sat Sep 20 15:12:19 2008
@@ -293,7 +293,7 @@
alloc->x = xborder;
alloc->y = yborder;
alloc->width = widget->allocation.width - xborder * 2;
- alloc->height = requisition.height - yborder * 2;
+ alloc->height = requisition.height - yborder * 2;
}
static void
@@ -323,7 +323,7 @@
else
{
allocation->x = text_area_alloc->x + text_area_alloc->width -
- allocation->width - ICON_MARGIN;
+ allocation->width - ICON_MARGIN;
}
}
@@ -395,7 +395,7 @@
int i;
gtkentry = GTK_ENTRY(widget);
- entry = SEXY_ICON_ENTRY(widget);
+ entry = SEXY_ICON_ENTRY(widget);
for (i = 0; i < MAX_ICONS; i++)
{
@@ -429,7 +429,7 @@
if (left_icon_alloc.width > 0)
{
text_area_alloc.x = left_icon_alloc.x + left_icon_alloc.width +
- ICON_MARGIN;
+ ICON_MARGIN;
}
if (right_icon_alloc.width > 0)
@@ -505,13 +505,13 @@
int val;
guchar r, g, b;
- has_alpha = gdk_pixbuf_get_has_alpha(src);
- width = gdk_pixbuf_get_width(src);
- height = gdk_pixbuf_get_height(src);
- src_rowstride = gdk_pixbuf_get_rowstride(src);
- dest_rowstride = gdk_pixbuf_get_rowstride(dest);
+ has_alpha = gdk_pixbuf_get_has_alpha(src);
+ width = gdk_pixbuf_get_width(src);
+ height = gdk_pixbuf_get_height(src);
+ src_rowstride = gdk_pixbuf_get_rowstride(src);
+ dest_rowstride = gdk_pixbuf_get_rowstride(dest);
original_pixels = gdk_pixbuf_get_pixels(src);
- target_pixels = gdk_pixbuf_get_pixels(dest);
+ target_pixels = gdk_pixbuf_get_pixels(dest);
for (i = 0; i < height; i++)
{
@@ -655,7 +655,7 @@
const char *name = g_param_spec_get_name(param);
if (strcmp(name, "pixbuf") && strcmp(name, "stock") &&
- strcmp(name, "image") && strcmp(name, "pixmap") &&
+ strcmp(name, "image") && strcmp(name, "pixmap") &&
strcmp(name, "icon_set") && strcmp(name, "pixbuf_animation"))
{
return;
@@ -761,7 +761,7 @@
if (event->button == 1 &&
sexy_icon_entry_get_icon_highlight(entry, i) &&
- event->x >= 0 && event->y >= 0 &&
+ event->x >= 0 && event->y >= 0 &&
event->x <= width && event->y <= height)
{
entry->priv->icons[i].hovered = TRUE;
Modified: branches/indexer-split/src/tracker-search-tool/sexy-icon-entry.h
==============================================================================
--- branches/indexer-split/src/tracker-search-tool/sexy-icon-entry.h (original)
+++ branches/indexer-split/src/tracker-search-tool/sexy-icon-entry.h Sat Sep 20 15:12:19 2008
@@ -21,7 +21,7 @@
#ifndef _SEXY_ICON_ENTRY_H_
#define _SEXY_ICON_ENTRY_H_
-typedef struct _SexyIconEntry SexyIconEntry;
+typedef struct _SexyIconEntry SexyIconEntry;
typedef struct _SexyIconEntryClass SexyIconEntryClass;
typedef struct _SexyIconEntryPriv SexyIconEntryPriv;
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 15:12:19 2008
@@ -6,8 +6,8 @@
*
* (C) 2002 the Free Software Foundation
*
- * Authors: Dennis Cranston <dennis_cranston yahoo com>
- * George Lebl
+ * Authors: Dennis Cranston <dennis_cranston yahoo com>
+ * George Lebl
*
*
* This program is free software; you can redistribute it and/or
@@ -88,7 +88,7 @@
void
quit_cb (GtkWidget * widget,
- GdkEvent * event,
+ GdkEvent * event,
gpointer data)
{
quit_application ((GSearchWindow *) data);
@@ -96,14 +96,14 @@
void
click_close_cb (GtkWidget * widget,
- gpointer data)
+ gpointer data)
{
quit_application ((GSearchWindow *) data);
}
void
click_stop_cb (GtkWidget * widget,
- gpointer data)
+ gpointer data)
{
GSearchWindow * gsearch = data;
@@ -114,76 +114,76 @@
void
click_help_cb (GtkWidget * widget,
- gpointer data)
+ gpointer data)
{
GtkWidget * window = data;
GError * error = NULL;
gnome_help_display_desktop_on_screen (NULL, "tracker-search-tool", "tracker-search-tool",
- NULL, gtk_widget_get_screen (widget), &error);
+ NULL, gtk_widget_get_screen (widget), &error);
if (error) {
GtkWidget * dialog;
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- _("Could not open help document."));
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Could not open help document."));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- error->message);
+ error->message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
- gtk_widget_show (dialog);
- g_error_free (error);
- }
+ gtk_widget_show (dialog);
+ g_error_free (error);
+ }
}
void
click_expander_cb (GObject * object,
- GParamSpec * param_spec,
- gpointer data)
+ GParamSpec * param_spec,
+ gpointer data)
{
GSearchWindow * gsearch = data;
if (gtk_expander_get_expanded (GTK_EXPANDER (object)) == TRUE) {
gtk_widget_show (gsearch->available_options_vbox);
gtk_window_set_geometry_hints (GTK_WINDOW (gsearch->window),
- GTK_WIDGET (gsearch->window),
- &gsearch->window_geometry,
- GDK_HINT_MIN_SIZE);
+ GTK_WIDGET (gsearch->window),
+ &gsearch->window_geometry,
+ GDK_HINT_MIN_SIZE);
}
else {
GdkGeometry default_geometry = {DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT};
gtk_widget_hide (gsearch->available_options_vbox);
gtk_window_set_geometry_hints (GTK_WINDOW (gsearch->window),
- GTK_WIDGET (gsearch->window),
- &default_geometry,
- GDK_HINT_MIN_SIZE);
+ GTK_WIDGET (gsearch->window),
+ &default_geometry,
+ GDK_HINT_MIN_SIZE);
}
}
void
size_allocate_cb (GtkWidget * widget,
- GtkAllocation * allocation,
- gpointer data)
+ GtkAllocation * allocation,
+ gpointer data)
{
GtkWidget * button = data;
- gtk_widget_set_size_request (button, allocation->width, -1);
+ gtk_widget_set_size_request (button, allocation->width, -1);
}
/*
void
add_constraint_cb (GtkWidget * widget,
- gpointer data)
+ gpointer data)
{
GSearchWindow * gsearch = data;
gint index;
@@ -195,19 +195,19 @@
void
remove_constraint_cb (GtkWidget * widget,
- gpointer data)
+ gpointer data)
{
GList * list = data;
GSearchWindow * gsearch = g_list_first (list)->data;
GSearchConstraint * constraint = g_list_last (list)->data;
- gsearch->window_geometry.min_height -= WINDOW_HEIGHT_STEP;
+ gsearch->window_geometry.min_height -= WINDOW_HEIGHT_STEP;
gtk_window_set_geometry_hints (GTK_WINDOW (gsearch->window),
- GTK_WIDGET (gsearch->window),
- &gsearch->window_geometry,
- GDK_HINT_MIN_SIZE);
+ GTK_WIDGET (gsearch->window),
+ &gsearch->window_geometry,
+ GDK_HINT_MIN_SIZE);
gtk_container_remove (GTK_CONTAINER (gsearch->available_options_vbox), widget->parent);
@@ -222,7 +222,7 @@
void
constraint_activate_cb (GtkWidget * widget,
- gpointer data)
+ gpointer data)
{
GSearchWindow * gsearch = data;
@@ -234,7 +234,7 @@
void
constraint_update_info_cb (GtkWidget * widget,
- gpointer data)
+ gpointer data)
{
static gchar * string;
GSearchConstraint * opt = data;
@@ -245,7 +245,7 @@
void
name_contains_activate_cb (GtkWidget * widget,
- gpointer data)
+ gpointer data)
{
GSearchWindow * gsearch = data;
@@ -324,22 +324,22 @@
gint response;
primary = g_strdup_printf (ngettext ("Are you sure you want to open %d document?",
- "Are you sure you want to open %d documents?",
- count),
- count);
+ "Are you sure you want to open %d documents?",
+ count),
+ count);
secondary = g_strdup_printf (ngettext ("This will open %d separate window.",
- "This will open %d separate windows.",
- count),
- count);
+ "This will open %d separate windows.",
+ count),
+ count);
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_CANCEL,
- primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_CANCEL,
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary);
+ secondary);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -362,8 +362,8 @@
static void
display_dialog_could_not_open_file (GtkWidget * window,
- const gchar * file,
- const gchar * message)
+ const gchar * file,
+ const gchar * message)
{
GtkWidget * dialog;
gchar * primary;
@@ -371,20 +371,20 @@
primary = g_strdup_printf (_("Could not open document \"%s\"."), file);
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- message);
+ message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (dialog);
g_free (primary);
@@ -392,7 +392,7 @@
static void
display_dialog_could_not_open_folder (GtkWidget * window,
- const gchar * folder)
+ const gchar * folder)
{
GtkWidget * dialog;
gchar * primary;
@@ -400,20 +400,20 @@
primary = g_strdup_printf (_("Could not open folder \"%s\"."), folder);
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- _("The nautilus file manager is not running."));
+ _("The nautilus file manager is not running."));
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (dialog);
g_free (primary);
@@ -439,12 +439,12 @@
gtk_tree_selection_get_selected (GTK_TREE_SELECTION (gsearch->search_results_selection),
&model,
- &iter);
+ &iter);
gtk_tree_model_get (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- COLUMN_NAME, &name,
- COLUMN_PATH, &path,
- -1);
+ COLUMN_NAME, &name,
+ COLUMN_PATH, &path,
+ -1);
//g_print ("selected uri is %s/%s\n", path, name);
@@ -481,10 +481,10 @@
0);
temp = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(),
- icon_name,
- METADATA_IMAGE_HEIGHT,
- GTK_ICON_LOOKUP_FORCE_SVG,
- NULL);
+ icon_name,
+ METADATA_IMAGE_HEIGHT,
+ GTK_ICON_LOOKUP_FORCE_SVG,
+ NULL);
g_free (icon_name);
@@ -525,12 +525,12 @@
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter, tmp->data);
gtk_tree_model_get (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- COLUMN_ICON, &pixbuf,
- COLUMN_URI, &uri,
- COLUMN_MIME, &mime,
+ COLUMN_ICON, &pixbuf,
+ COLUMN_URI, &uri,
+ COLUMN_MIME, &mime,
COLUMN_TYPE, &type,
- COLUMN_NO_FILES_FOUND, &no_files_found,
- -1);
+ COLUMN_NO_FILES_FOUND, &no_files_found,
+ -1);
/* get large icon for documents, images and videos only */
GdkPixbuf *large_icon = NULL;
@@ -547,7 +547,7 @@
}
- g_free (uri);
+ g_free (uri);
g_free (mime);
}
@@ -557,7 +557,7 @@
void
open_file_cb (GtkAction * action,
- gpointer data)
+ gpointer data)
{
GSearchWindow * gsearch = data;
GtkTreeModel * model;
@@ -593,11 +593,11 @@
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter, tmp->data);
gtk_tree_model_get (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- COLUMN_URI, &uri,
+ COLUMN_URI, &uri,
COLUMN_MIME, &mime,
COLUMN_EXEC, &exec,
- COLUMN_NO_FILES_FOUND, &no_files_found,
- -1);
+ COLUMN_NO_FILES_FOUND, &no_files_found,
+ -1);
if (gsearch->type == SERVICE_EMAILS) {
@@ -638,9 +638,9 @@
if (!g_file_test (locale_file, G_FILE_TEST_EXISTS)) {
gtk_tree_selection_unselect_iter (GTK_TREE_SELECTION (gsearch->search_results_selection),
- &iter);
+ &iter);
display_dialog_could_not_open_file (gsearch->window, uri,
- _("The document does not exist."));
+ _("The document does not exist."));
} else if (open_file_with_xdg_open (gsearch->window, locale_file) == FALSE) {
@@ -656,8 +656,8 @@
} else {
display_dialog_could_not_open_file (gsearch->window, uri,
- _("There is no installed viewer capable "
- "of displaying the document."));
+ _("There is no installed viewer capable "
+ "of displaying the document."));
}
}
}
@@ -673,7 +673,7 @@
static gint
display_dialog_folder_open_limit (GtkWidget * window,
- gint count)
+ gint count)
{
GtkWidget * dialog;
GtkWidget * button;
@@ -682,22 +682,22 @@
gint response;
primary = g_strdup_printf (ngettext ("Are you sure you want to open %d folder?",
- "Are you sure you want to open %d folders?",
- count),
- count);
+ "Are you sure you want to open %d folders?",
+ count),
+ count);
secondary = g_strdup_printf (ngettext ("This will open %d separate window.",
"This will open %d separate windows.",
count),
- count);
+ count);
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_CANCEL,
- primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_CANCEL,
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary);
+ secondary);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -720,7 +720,7 @@
void
open_folder_cb (GtkAction * action,
- gpointer data)
+ gpointer data)
{
GSearchWindow * gsearch = data;
GtkTreeModel * model;
@@ -779,8 +779,8 @@
static void
display_dialog_could_not_move_to_trash (GtkWidget * window,
- const gchar * file,
- const gchar * message)
+ const gchar * file,
+ const gchar * message)
{
GtkWidget * dialog;
gchar * primary;
@@ -788,27 +788,27 @@
primary = g_strdup_printf (_("Could not move \"%s\" to trash."), file);
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- message);
+ message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (dialog);
g_free (primary);
}
static gint
display_dialog_delete_permanently (GtkWidget * window,
- const gchar * file)
+ const gchar * file)
{
GtkWidget * dialog;
GtkWidget * button;
@@ -817,18 +817,18 @@
gint response;
primary = g_strdup_printf (_("Do you want to delete \"%s\" permanently?"),
- g_path_get_basename (file));
+ g_path_get_basename (file));
secondary = g_strdup_printf (_("Trash is unavailable. Could not move \"%s\" to the trash."),
- file);
+ file);
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_CANCEL,
- primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_CANCEL,
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary);
+ secondary);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -852,8 +852,8 @@
static void
display_dialog_could_not_delete (GtkWidget * window,
- const gchar * file,
- const gchar * message)
+ const gchar * file,
+ const gchar * message)
{
GtkWidget * dialog;
gchar * primary;
@@ -861,20 +861,20 @@
primary = g_strdup_printf (_("Could not delete \"%s\"."), file);
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- message);
+ message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (dialog);
g_free (primary);
}
@@ -884,7 +884,7 @@
{
GnomeVFSURI * trash_uri;
GnomeVFSURI * uri;
- gchar * filename;
+ gchar * filename;
filename = gnome_vfs_escape_path_string (file);
uri = gnome_vfs_uri_new (filename);
@@ -911,7 +911,7 @@
void
move_to_trash_cb (GtkAction * action,
- gpointer data)
+ gpointer data)
{
GSearchWindow * gsearch = data;
gint total;
@@ -935,16 +935,16 @@
gchar * trash_path;
list = gtk_tree_selection_get_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection),
- &model);
+ &model);
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
g_list_nth (list, 0)->data);
gtk_tree_model_get (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- COLUMN_NAME, &utf8_basename,
- COLUMN_PATH, &utf8_basepath,
- COLUMN_NO_FILES_FOUND, &no_files_found,
- -1);
+ COLUMN_NAME, &utf8_basename,
+ COLUMN_PATH, &utf8_basepath,
+ COLUMN_NO_FILES_FOUND, &no_files_found,
+ -1);
if (no_files_found) {
g_free (utf8_basename);
@@ -960,7 +960,7 @@
(!g_file_test (locale_filename, G_FILE_TEST_IS_SYMLINK))) {
gtk_tree_selection_unselect_iter (GTK_TREE_SELECTION (gsearch->search_results_selection), &iter);
display_dialog_could_not_move_to_trash (gsearch->window, utf8_basename,
- _("The document does not exist."));
+ _("The document does not exist."));
}
else if (trash_path != NULL) {
GnomeVFSResult result;
@@ -983,10 +983,10 @@
gchar * message;
message = g_strdup_printf (_("Moving \"%s\" failed: %s."),
- utf8_filename,
- gnome_vfs_result_to_string (result));
+ utf8_filename,
+ gnome_vfs_result_to_string (result));
display_dialog_could_not_move_to_trash (gsearch->window, utf8_basename,
- message);
+ message);
g_free (message);
}
g_free (source_uri);
@@ -1017,7 +1017,7 @@
gchar * message;
message = g_strdup_printf (_("Deleting \"%s\" failed: %s."),
- utf8_filename, gnome_vfs_result_to_string (result));
+ utf8_filename, gnome_vfs_result_to_string (result));
display_dialog_could_not_delete (gsearch->window, utf8_basename, message);
@@ -1041,8 +1041,8 @@
gboolean
file_button_press_event_cb (GtkWidget * widget,
- GdkEventButton * event,
- gpointer data)
+ GdkEventButton * event,
+ gpointer data)
{
GtkTreeView * tree = data;
GtkTreePath * path;
@@ -1071,8 +1071,8 @@
gboolean
file_key_press_event_cb (GtkWidget * widget,
- GdkEventKey * event,
- gpointer data)
+ GdkEventKey * event,
+ gpointer data)
{
if (event->keyval == GDK_space || event->keyval == GDK_Return) {
if (event->state != GDK_CONTROL_MASK) {
@@ -1089,8 +1089,8 @@
gboolean
file_button_release_event_cb (GtkWidget * widget,
- GdkEventButton * event,
- gpointer data)
+ GdkEventButton * event,
+ gpointer data)
{
GSearchWindow * gsearch = data;
gboolean no_files_found = FALSE;
@@ -1109,18 +1109,18 @@
GList * list;
list = gtk_tree_selection_get_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection),
- &model);
+ &model);
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- g_list_first (list)->data);
+ g_list_first (list)->data);
gtk_tree_model_get (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- COLUMN_NO_FILES_FOUND, &no_files_found,
- -1);
+ COLUMN_NO_FILES_FOUND, &no_files_found,
+ -1);
if (!no_files_found) {
gtk_menu_popup (GTK_MENU (gsearch->search_results_popup_menu), NULL, NULL, NULL, NULL,
- event->button, event->time);
+ event->button, event->time);
}
g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
g_list_free (list);
@@ -1128,7 +1128,7 @@
else if (event->button == 1 || event->button == 2) {
if (gsearch->is_search_results_single_click_to_activate == TRUE) {
if (!(event->state & GDK_CONTROL_MASK) && !(event->state & GDK_SHIFT_MASK)) {
- open_file_cb ((GtkAction *) NULL, data);
+ open_file_cb ((GtkAction *) NULL, data);
}
}
}
@@ -1164,10 +1164,10 @@
gboolean
file_motion_notify_cb (GtkWidget *widget,
- GdkEventMotion *event,
- gpointer user_data)
+ GdkEventMotion *event,
+ gpointer user_data)
{
- GSearchWindow * gsearch = user_data;
+ GSearchWindow * gsearch = user_data;
GdkCursor * cursor;
GtkTreePath * last_hover_path;
GtkTreeIter iter;
@@ -1179,7 +1179,7 @@
if (event->window != gtk_tree_view_get_bin_window (GTK_TREE_VIEW (gsearch->search_results_tree_view))) {
gdk_window_set_cursor (event->window, NULL);
- return FALSE;
+ return FALSE;
}
last_hover_path = gsearch->search_results_hover_path;
@@ -1204,39 +1204,39 @@
gtk_tree_path_compare (last_hover_path, gsearch->search_results_hover_path))) {
if (last_hover_path) {
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store),
- &iter, last_hover_path);
+ &iter, last_hover_path);
gtk_tree_model_row_changed (GTK_TREE_MODEL (gsearch->search_results_list_store),
- last_hover_path, &iter);
+ last_hover_path, &iter);
}
if (gsearch->search_results_hover_path) {
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store),
- &iter, gsearch->search_results_hover_path);
+ &iter, gsearch->search_results_hover_path);
gtk_tree_model_row_changed (GTK_TREE_MODEL (gsearch->search_results_list_store),
- gsearch->search_results_hover_path, &iter);
+ gsearch->search_results_hover_path, &iter);
}
}
gtk_tree_path_free (last_hover_path);
- return FALSE;
+ return FALSE;
}
gboolean
file_leave_notify_cb (GtkWidget *widget,
- GdkEventCrossing *event,
- gpointer user_data)
+ GdkEventCrossing *event,
+ gpointer user_data)
{
- GSearchWindow * gsearch = user_data;
+ GSearchWindow * gsearch = user_data;
GtkTreeIter iter;
if (gsearch->is_search_results_single_click_to_activate && (gsearch->search_results_hover_path != NULL)) {
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store),
- &iter,
- gsearch->search_results_hover_path);
+ &iter,
+ gsearch->search_results_hover_path);
gtk_tree_model_row_changed (GTK_TREE_MODEL (gsearch->search_results_list_store),
- gsearch->search_results_hover_path,
- &iter);
+ gsearch->search_results_hover_path,
+ &iter);
gtk_tree_path_free (gsearch->search_results_hover_path);
gsearch->search_results_hover_path = NULL;
@@ -1249,8 +1249,8 @@
void
drag_begin_file_cb (GtkWidget * widget,
- GdkDragContext * context,
- gpointer data)
+ GdkDragContext * context,
+ gpointer data)
{
GSearchWindow * gsearch = data;
gint number_of_selected_rows;
@@ -1267,14 +1267,14 @@
GList * list;
list = gtk_tree_selection_get_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection),
- &model);
+ &model);
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- g_list_first (list)->data);
+ g_list_first (list)->data);
gtk_tree_model_get (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- COLUMN_ICON, &pixbuf,
- -1);
+ COLUMN_ICON, &pixbuf,
+ -1);
g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
g_list_free (list);
@@ -1294,7 +1294,7 @@
GnomeDesktopItem *item = NULL;
gchar *exec_string = NULL;
gchar *save_uri = NULL;
- time_t seconds;
+ time_t seconds;
item = gnome_desktop_item_new ();
@@ -1312,8 +1312,8 @@
save_uri = g_strdup_printf ("/tmp/tracker-email-shortcut-file%d.desktop", (int)seconds);
gnome_desktop_item_save (item,
save_uri,
- TRUE,
- NULL);
+ TRUE,
+ NULL);
g_free (exec_string);
@@ -1339,7 +1339,7 @@
}
list = gtk_tree_selection_get_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection),
- &model);
+ &model);
for (tmp = list; tmp; tmp = tmp->next) {
@@ -1352,11 +1352,11 @@
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter, tmp->data);
gtk_tree_model_get (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
- COLUMN_NAME, &utf8_name,
- COLUMN_PATH, &utf8_path,
- COLUMN_URI, &utf8_uri,
- COLUMN_NO_FILES_FOUND, &no_files_found,
- -1);
+ COLUMN_NAME, &utf8_name,
+ COLUMN_PATH, &utf8_path,
+ COLUMN_URI, &utf8_uri,
+ COLUMN_NO_FILES_FOUND, &no_files_found,
+ -1);
file = g_build_filename (utf8_path, utf8_name, NULL);
@@ -1372,19 +1372,19 @@
}
if (gsearch->type < 10) {
gtk_selection_data_set (selection_data,
- selection_data->target,
- 8,
- (guchar *) uri_list,
- strlen (uri_list));
+ selection_data->target,
+ 8,
+ (guchar *) uri_list,
+ strlen (uri_list));
} else {
gchar *desktop_uri;
desktop_uri = make_email_desktop_file (utf8_uri, utf8_name);
gtk_selection_data_set (selection_data,
- selection_data->target,
- 8,
- (guchar *) desktop_uri,
- strlen (desktop_uri));
- g_free (desktop_uri);
+ selection_data->target,
+ 8,
+ (guchar *) desktop_uri,
+ strlen (desktop_uri));
+ g_free (desktop_uri);
}
g_free (tmp_uri);
}
@@ -1403,11 +1403,11 @@
void
drag_data_animation_cb (GtkWidget * widget,
- GdkDragContext * context,
- GtkSelectionData * selection_data,
- guint info,
- guint time,
- gpointer data)
+ GdkDragContext * context,
+ GtkSelectionData * selection_data,
+ guint info,
+ guint time,
+ gpointer data)
{
GSearchWindow * gsearch = data;
GnomeDesktopItem * ditem;
@@ -1473,17 +1473,17 @@
void
show_file_selector_cb (GtkAction * action,
- gpointer data)
+ gpointer data)
{
GSearchWindow * gsearch = data;
GtkWidget * file_chooser;
file_chooser = gtk_file_chooser_dialog_new (_("Save Search Results As..."),
- GTK_WINDOW (gsearch->window),
- GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
- NULL);
+ GTK_WINDOW (gsearch->window),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ NULL);
#if GTK_CHECK_VERSION(2,7,3)
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (file_chooser), TRUE);
@@ -1491,10 +1491,10 @@
if (gsearch->save_results_as_default_filename != NULL) {
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_chooser),
- gsearch->save_results_as_default_filename);
+ gsearch->save_results_as_default_filename);
} else {
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (file_chooser),
- g_get_home_dir());
+ g_get_home_dir());
}
g_signal_connect (G_OBJECT (file_chooser), "response",
@@ -1517,20 +1517,20 @@
secondary = g_strdup (_("You did not select a document name."));
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary);
+ secondary);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (dialog);
g_free (primary);
g_free (secondary);
@@ -1538,31 +1538,31 @@
static void
display_dialog_could_not_save_to (GtkWidget * window,
- const gchar * file,
- const gchar * message)
+ const gchar * file,
+ const gchar * message)
{
GtkWidget * dialog;
gchar * primary;
primary = g_strdup_printf (_("Could not save \"%s\" document to \"%s\"."),
- g_path_get_basename (file),
- g_path_get_dirname (file));
+ g_path_get_basename (file),
+ g_path_get_dirname (file));
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- message);
+ message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (dialog);
g_free (primary);
}
@@ -1570,7 +1570,7 @@
#if !GTK_CHECK_VERSION(2,7,3)
static gint
display_dialog_could_not_save_exists (GtkWidget * window,
- const gchar * file)
+ const gchar * file)
{
GtkWidget * dialog;
GtkWidget * button;
@@ -1579,19 +1579,19 @@
gint response;
primary = g_strdup_printf (_("The document \"%s\" already exists. "
- "Would you like to replace it?"),
- g_path_get_basename (file));
+ "Would you like to replace it?"),
+ g_path_get_basename (file));
secondary = g_strdup (_("If you replace an existing file, "
- "its contents will be overwritten."));
+ "its contents will be overwritten."));
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_CANCEL,
- primary);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_CANCEL,
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary);
+ secondary);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -1616,8 +1616,8 @@
void
save_results_cb (GtkWidget * chooser,
- gint response,
- gpointer data)
+ gint response,
+ gpointer data)
{
GSearchWindow * gsearch = data;
GtkListStore * store;
@@ -1647,7 +1647,7 @@
if (g_file_test (gsearch->save_results_as_default_filename, G_FILE_TEST_IS_DIR)) {
display_dialog_could_not_save_to (gsearch->window, utf8,
- _("The document name you selected is a folder."));
+ _("The document name you selected is a folder."));
g_free (utf8);
return;
}
@@ -1696,19 +1696,19 @@
}
else {
display_dialog_could_not_save_to (gsearch->window, utf8,
- _("You may not have write permissions to the document."));
+ _("You may not have write permissions to the document."));
}
g_free (utf8);
}
void
save_session_cb (GnomeClient * client,
- gint phase,
- GnomeRestartStyle save_style,
- gint shutdown,
- GnomeInteractStyle interact_style,
- gint fast,
- gpointer client_data)
+ gint phase,
+ GnomeRestartStyle save_style,
+ gint shutdown,
+ GnomeInteractStyle interact_style,
+ gint fast,
+ gpointer client_data)
{
GSearchWindow * gsearch = client_data;
char ** argv;
@@ -1721,8 +1721,8 @@
gboolean
key_press_cb (GtkWidget * widget,
- GdkEventKey * event,
- gpointer data)
+ GdkEventKey * event,
+ gpointer data)
{
GSearchWindow * gsearch = data;
@@ -1748,7 +1748,7 @@
}
list = gtk_tree_selection_get_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection),
- &model);
+ &model);
gtk_tree_model_get_iter (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter,
g_list_first (list)->data);
@@ -1761,7 +1761,7 @@
if (!no_files_found) {
gtk_menu_popup (GTK_MENU (gsearch->search_results_popup_menu), NULL, NULL, NULL, NULL,
- event->keyval, event->time);
+ event->keyval, event->time);
return TRUE;
}
}
@@ -1780,8 +1780,8 @@
void
disable_quick_search_cb (GtkWidget * dialog,
- gint response,
- gpointer data)
+ gint response,
+ gpointer data)
{
gtk_widget_destroy (GTK_WIDGET (dialog));
@@ -1792,9 +1792,9 @@
void
single_click_to_activate_key_changed_cb (GConfClient * client,
- guint cnxn_id,
- GConfEntry * entry,
- gpointer user_data)
+ guint cnxn_id,
+ GConfEntry * entry,
+ gpointer user_data)
{
GSearchWindow * gsearch = user_data;
GConfValue * value = gconf_entry_get_value (entry);
@@ -1807,7 +1807,7 @@
void
columns_changed_cb (GtkTreeView * treeview,
- gpointer user_data)
+ gpointer user_data)
{
GSList * order = tracker_search_get_columns_order (treeview);
@@ -1819,8 +1819,8 @@
gboolean
window_state_event_cb (GtkWidget * widget,
- GdkEventWindowState * event,
- gpointer data)
+ GdkEventWindowState * event,
+ gpointer data)
{
GSearchWindow * gsearch = data;
Modified: branches/indexer-split/src/tracker-search-tool/tracker-search-tool-callbacks.h
==============================================================================
--- branches/indexer-split/src/tracker-search-tool/tracker-search-tool-callbacks.h (original)
+++ branches/indexer-split/src/tracker-search-tool/tracker-search-tool-callbacks.h Sat Sep 20 15:12:19 2008
@@ -6,7 +6,7 @@
*
* (C) 2002 the Free Software Foundation
*
- * Authors: Dennis Cranston <dennis_cranston yahoo com>
+ * Authors: Dennis Cranston <dennis_cranston yahoo com>
* George Lebl
*
*
@@ -42,44 +42,44 @@
void
die_cb (GnomeClient * client,
- gpointer data);
+ gpointer data);
void
quit_cb (GtkWidget * widget,
- GdkEvent * event,
- gpointer data);
+ GdkEvent * event,
+ gpointer data);
void
click_close_cb (GtkWidget * widget,
- gpointer data);
+ gpointer data);
void
click_stop_cb (GtkWidget * widget,
- gpointer data);
+ gpointer data);
void
click_help_cb (GtkWidget * widget,
- gpointer data);
+ gpointer data);
void
click_expander_cb (GObject * object,
- GParamSpec * param_spec,
- gpointer data);
+ GParamSpec * param_spec,
+ gpointer data);
void
size_allocate_cb (GtkWidget * widget,
- GtkAllocation * allocation,
- gpointer data);
+ GtkAllocation * allocation,
+ gpointer data);
void
add_constraint_cb (GtkWidget * widget,
- gpointer data);
+ gpointer data);
void
remove_constraint_cb (GtkWidget * widget,
- gpointer data);
+ gpointer data);
void
constraint_activate_cb (GtkWidget * widget,
- gpointer data);
+ gpointer data);
void
constraint_update_info_cb (GtkWidget * widget,
- gpointer data);
+ gpointer data);
void
name_contains_activate_cb (GtkWidget * widget,
- gpointer data);
+ gpointer data);
gboolean
text_changed_cb (GtkWidget * widget,
@@ -101,44 +101,44 @@
void
open_file_cb (GtkAction * action,
- gpointer data);
+ gpointer data);
void
open_folder_cb (GtkAction * action,
- gpointer data);
+ gpointer data);
void
file_changed_cb (GnomeVFSMonitorHandle * handle,
- const gchar * monitor_uri,
- const gchar * info_uri,
- GnomeVFSMonitorEventType event_type,
- gpointer data);
+ const gchar * monitor_uri,
+ const gchar * info_uri,
+ GnomeVFSMonitorEventType event_type,
+ gpointer data);
void
move_to_trash_cb (GtkAction * action,
- gpointer data);
+ gpointer data);
void
drag_begin_file_cb (GtkWidget * widget,
- GdkDragContext * context,
- gpointer data);
+ GdkDragContext * context,
+ gpointer data);
void
drag_file_cb (GtkWidget * widget,
- GdkDragContext * context,
- GtkSelectionData * selection_data,
- guint info,
- guint time,
- gpointer data);
+ GdkDragContext * context,
+ GtkSelectionData * selection_data,
+ guint info,
+ guint time,
+ gpointer data);
void
drag_data_animation_cb (GtkWidget * widget,
- GdkDragContext * context,
- GtkSelectionData * selection_data,
- guint info,
- guint time,
- gpointer data);
+ GdkDragContext * context,
+ GtkSelectionData * selection_data,
+ guint info,
+ guint time,
+ gpointer data);
void
show_file_selector_cb (GtkAction * action,
- gpointer data);
+ gpointer data);
void
save_results_cb (GtkWidget * chooser,
- gint response,
- gpointer data);
+ gint response,
+ gpointer data);
void
@@ -146,59 +146,59 @@
void
save_session_cb (GnomeClient * client,
- gint phase,
- GnomeRestartStyle save_style,
- gint shutdown,
- GnomeInteractStyle interact_style,
- gint fast,
- gpointer client_data);
+ gint phase,
+ GnomeRestartStyle save_style,
+ gint shutdown,
+ GnomeInteractStyle interact_style,
+ gint fast,
+ gpointer client_data);
gboolean
key_press_cb (GtkWidget * widget,
- GdkEventKey * event,
- gpointer data);
+ GdkEventKey * event,
+ gpointer data);
gboolean
file_button_release_event_cb (GtkWidget * widget,
- GdkEventButton * event,
- gpointer data);
+ GdkEventButton * event,
+ gpointer data);
gboolean
-file_event_after_cb (GtkWidget * widget,
- GdkEventButton * event,
- gpointer data);
+file_event_after_cb (GtkWidget * widget,
+ GdkEventButton * event,
+ gpointer data);
gboolean
file_button_press_event_cb (GtkWidget * widget,
- GdkEventButton * event,
- gpointer data);
+ GdkEventButton * event,
+ gpointer data);
gboolean
file_key_press_event_cb (GtkWidget * widget,
- GdkEventKey * event,
- gpointer data);
+ GdkEventKey * event,
+ gpointer data);
gboolean
file_motion_notify_cb (GtkWidget *widget,
- GdkEventMotion *event,
- gpointer user_data);
+ GdkEventMotion *event,
+ gpointer user_data);
gboolean
file_leave_notify_cb (GtkWidget *widget,
- GdkEventCrossing *event,
- gpointer user_data);
+ GdkEventCrossing *event,
+ gpointer user_data);
gboolean
not_running_timeout_cb (gpointer data);
void
disable_quick_search_cb (GtkWidget * dialog,
- gint response,
- gpointer data);
+ gint response,
+ gpointer data);
void
single_click_to_activate_key_changed_cb (GConfClient * client,
- guint cnxn_id,
- GConfEntry * entry,
- gpointer user_data);
+ guint cnxn_id,
+ GConfEntry * entry,
+ gpointer user_data);
void
columns_changed_cb (GtkTreeView * treeview,
- gpointer user_data);
+ gpointer user_data);
gboolean
window_state_event_cb (GtkWidget * widget,
- GdkEventWindowState * event,
- gpointer data);
+ GdkEventWindowState * event,
+ gpointer data);
void
suggest_search_cb (GtkWidget *widget,
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 15:12:19 2008
@@ -51,8 +51,8 @@
#define C_STANDARD_STRFTIME_CHARACTERS "aAbBcdHIjmMpSUwWxXyYZ"
#define C_STANDARD_NUMERIC_STRFTIME_CHARACTERS "dHIjmMSUwWyY"
#define SUS_EXTENDED_STRFTIME_MODIFIERS "EO"
-#define BINARY_EXEC_MIME_TYPE "application/x-executable"
-#define MAX_SYMLINKS_FOLLOWED 32
+#define BINARY_EXEC_MIME_TYPE "application/x-executable"
+#define MAX_SYMLINKS_FOLLOWED 32
#define GSEARCH_DATE_FORMAT_LOCALE "locale"
#define GSEARCH_DATE_FORMAT_ISO "iso"
@@ -251,9 +251,9 @@
g_return_if_fail (client != NULL);
gconf_client_add_dir (client,
- dir,
- GCONF_CLIENT_PRELOAD_RECURSIVE,
- &error);
+ dir,
+ GCONF_CLIENT_PRELOAD_RECURSIVE,
+ &error);
tracker_search_gconf_handle_error (&error);
}
@@ -274,18 +274,18 @@
g_return_if_fail (client != NULL);
gconf_client_add_dir (client,
- dir,
- GCONF_CLIENT_PRELOAD_NONE,
- &error);
+ dir,
+ GCONF_CLIENT_PRELOAD_NONE,
+ &error);
tracker_search_gconf_handle_error (&error);
gconf_client_notify_add (client,
- key,
- callback,
- user_data,
- NULL,
- &error);
+ key,
+ callback,
+ user_data,
+ NULL,
+ &error);
tracker_search_gconf_handle_error (&error);
}
@@ -325,9 +325,9 @@
gboolean
is_quick_search_excluded_path (const gchar * path)
{
- GSList * exclude_path_list;
- GSList * tmp_list;
- gchar * dir;
+ GSList * exclude_path_list;
+ GSList * tmp_list;
+ gchar * dir;
gboolean results = FALSE;
dir = g_strdup (path);
@@ -347,7 +347,7 @@
/* Check path against the Quick-Search-Excluded-Paths list. */
exclude_path_list = tracker_search_gconf_get_list ("/apps/tracker-search-tool/quick_search_excluded_paths",
- GCONF_VALUE_STRING);
+ GCONF_VALUE_STRING);
for (tmp_list = exclude_path_list; tmp_list; tmp_list = tmp_list->next) {
@@ -403,9 +403,9 @@
gboolean
is_second_scan_excluded_path (const gchar * path)
{
- GSList * exclude_path_list;
- GSList * tmp_list;
- gchar * dir;
+ GSList * exclude_path_list;
+ GSList * tmp_list;
+ gchar * dir;
gboolean results = FALSE;
dir = g_strdup (path);
@@ -425,7 +425,7 @@
/* Check path against the Quick-Search-Excluded-Paths list. */
exclude_path_list = tracker_search_gconf_get_list ("/apps/tracker-search-tool/quick_search_second_scan_excluded_paths",
- GCONF_VALUE_STRING);
+ GCONF_VALUE_STRING);
for (tmp_list = exclude_path_list; tmp_list; tmp_list = tmp_list->next) {
@@ -519,32 +519,32 @@
gchar * needle,
gchar * replacement)
{
- GString * str;
- gint pos, needle_len;
+ GString * str;
+ gint pos, needle_len;
g_return_val_if_fail (haystack && needle, NULL);
needle_len = strlen (needle);
- str = g_string_new ("");
+ str = g_string_new ("");
- for (pos = 0; haystack[pos]; pos++)
- {
- if (strncmp (&haystack[pos], needle, needle_len) == 0)
- {
+ for (pos = 0; haystack[pos]; pos++)
+ {
+ if (strncmp (&haystack[pos], needle, needle_len) == 0)
+ {
if (replacement) {
- str = g_string_append (str, replacement);
+ str = g_string_append (str, replacement);
}
- pos += needle_len - 1;
+ pos += needle_len - 1;
- } else {
- str = g_string_append_c (str, haystack[pos]);
+ } else {
+ str = g_string_append_c (str, haystack[pos]);
}
- }
+ }
- return g_string_free (str, FALSE);
+ return g_string_free (str, FALSE);
}
static gint
@@ -633,7 +633,7 @@
gchar *
get_readable_date (const gchar * format_string,
- const time_t file_time_raw)
+ const time_t file_time_raw)
{
struct tm * file_time;
gchar * format;
@@ -826,7 +826,7 @@
gchar *
get_file_type_description (const gchar * file,
const char *mime,
- GnomeVFSFileInfo * file_info)
+ GnomeVFSFileInfo * file_info)
{
gchar * desc;
@@ -853,8 +853,8 @@
}
if (g_file_test (absolute_symlink, G_FILE_TEST_EXISTS) != TRUE) {
- if ((g_ascii_strcasecmp (mime, "x-special/socket") != 0) &&
- (g_ascii_strcasecmp (mime, "x-special/fifo") != 0)) {
+ if ((g_ascii_strcasecmp (mime, "x-special/socket") != 0) &&
+ (g_ascii_strcasecmp (mime, "x-special/fifo") != 0)) {
g_free (absolute_symlink);
g_free (desc);
return g_strdup (_("link (broken)"));
@@ -887,13 +887,13 @@
static void
tracker_search_draw_frame_row (GdkPixbuf * frame_image,
- gint target_width,
- gint source_width,
- gint source_v_position,
- gint dest_v_position,
- GdkPixbuf * result_pixbuf,
- gint left_offset,
- gint height)
+ gint target_width,
+ gint source_width,
+ gint source_v_position,
+ gint dest_v_position,
+ GdkPixbuf * result_pixbuf,
+ gint left_offset,
+ gint height)
{
gint remaining_width;
gint h_offset;
@@ -904,7 +904,7 @@
while (remaining_width > 0) {
slab_width = remaining_width > source_width ? source_width : remaining_width;
gdk_pixbuf_copy_area (frame_image, left_offset, source_v_position, slab_width,
- height, result_pixbuf, left_offset + h_offset, dest_v_position);
+ height, result_pixbuf, left_offset + h_offset, dest_v_position);
remaining_width -= slab_width;
h_offset += slab_width;
}
@@ -912,13 +912,13 @@
static void
tracker_search_draw_frame_column (GdkPixbuf * frame_image,
- gint target_height,
- gint source_height,
- gint source_h_position,
- gint dest_h_position,
- GdkPixbuf * result_pixbuf,
- gint top_offset,
- gint width)
+ gint target_height,
+ gint source_height,
+ gint source_h_position,
+ gint dest_h_position,
+ GdkPixbuf * result_pixbuf,
+ gint top_offset,
+ gint width)
{
gint remaining_height;
gint v_offset;
@@ -929,7 +929,7 @@
while (remaining_height > 0) {
slab_height = remaining_height > source_height ? source_height : remaining_height;
gdk_pixbuf_copy_area (frame_image, source_h_position, top_offset, width, slab_height,
- result_pixbuf, dest_h_position, top_offset + v_offset);
+ result_pixbuf, dest_h_position, top_offset + v_offset);
remaining_height -= slab_height;
v_offset += slab_height;
}
@@ -937,13 +937,13 @@
static GdkPixbuf *
tracker_search_stretch_frame_image (GdkPixbuf *frame_image,
- gint left_offset,
- gint top_offset,
- gint right_offset,
- gint bottom_offset,
- gint dest_width,
- gint dest_height,
- gboolean fill_flag)
+ gint left_offset,
+ gint top_offset,
+ gint right_offset,
+ gint bottom_offset,
+ gint dest_width,
+ gint dest_height,
+ gboolean fill_flag)
{
GdkPixbuf * result_pixbuf;
guchar * pixels_ptr;
@@ -980,38 +980,38 @@
/* Draw the left top corner and top row */
gdk_pixbuf_copy_area (frame_image, 0, 0, left_offset, top_offset, result_pixbuf, 0, 0);
tracker_search_draw_frame_row (frame_image, target_width, target_frame_width, 0, 0,
- result_pixbuf, left_offset, top_offset);
+ result_pixbuf, left_offset, top_offset);
/* Draw the right top corner and left column */
gdk_pixbuf_copy_area (frame_image, frame_width - right_offset, 0, right_offset, top_offset,
- result_pixbuf, dest_width - right_offset, 0);
+ result_pixbuf, dest_width - right_offset, 0);
tracker_search_draw_frame_column (frame_image, target_height, target_frame_height, 0, 0,
- result_pixbuf, top_offset, left_offset);
+ result_pixbuf, top_offset, left_offset);
/* Draw the bottom right corner and bottom row */
gdk_pixbuf_copy_area (frame_image, frame_width - right_offset, frame_height - bottom_offset,
- right_offset, bottom_offset, result_pixbuf, dest_width - right_offset,
+ right_offset, bottom_offset, result_pixbuf, dest_width - right_offset,
dest_height - bottom_offset);
tracker_search_draw_frame_row (frame_image, target_width, target_frame_width,
- frame_height - bottom_offset, dest_height - bottom_offset,
+ frame_height - bottom_offset, dest_height - bottom_offset,
result_pixbuf, left_offset, bottom_offset);
/* Draw the bottom left corner and the right column */
gdk_pixbuf_copy_area (frame_image, 0, frame_height - bottom_offset, left_offset, bottom_offset,
- result_pixbuf, 0, dest_height - bottom_offset);
+ result_pixbuf, 0, dest_height - bottom_offset);
tracker_search_draw_frame_column (frame_image, target_height, target_frame_height,
- frame_width - right_offset, dest_width - right_offset,
+ frame_width - right_offset, dest_width - right_offset,
result_pixbuf, top_offset, right_offset);
return result_pixbuf;
}
static GdkPixbuf *
tracker_search_embed_image_in_frame (GdkPixbuf * source_image,
- GdkPixbuf * frame_image,
- gint left_offset,
- gint top_offset,
- gint right_offset,
- gint bottom_offset)
+ GdkPixbuf * frame_image,
+ gint left_offset,
+ gint top_offset,
+ gint right_offset,
+ gint bottom_offset)
{
GdkPixbuf * result_pixbuf;
gint source_width, source_height;
@@ -1024,7 +1024,7 @@
dest_height = source_height + top_offset + bottom_offset;
result_pixbuf = tracker_search_stretch_frame_image (frame_image, left_offset, top_offset, right_offset, bottom_offset,
- dest_width, dest_height, FALSE);
+ dest_width, dest_height, FALSE);
gdk_pixbuf_copy_area (source_image, 0, 0, source_width, source_height, result_pixbuf, left_offset, top_offset);
@@ -1110,16 +1110,16 @@
uri = gnome_vfs_get_uri_from_local_path (file);
if ((strncmp (mime, "image/", 6) != 0) ||
- ((int)file_info->size < (int)gsearch->show_thumbnails_file_size_limit)) {
- if (gsearch->thumbnail_factory == NULL) {
- gsearch->thumbnail_factory = gnome_thumbnail_factory_new (GNOME_THUMBNAIL_SIZE_NORMAL);
+ ((int)file_info->size < (int)gsearch->show_thumbnails_file_size_limit)) {
+ if (gsearch->thumbnail_factory == NULL) {
+ gsearch->thumbnail_factory = gnome_thumbnail_factory_new (GNOME_THUMBNAIL_SIZE_NORMAL);
}
lookup_flags = GNOME_ICON_LOOKUP_FLAGS_SHOW_SMALL_IMAGES_AS_THEMSELVES |
- GNOME_ICON_LOOKUP_FLAGS_ALLOW_SVG_AS_THEMSELVES;
+ GNOME_ICON_LOOKUP_FLAGS_ALLOW_SVG_AS_THEMSELVES;
}
icon_name = gnome_icon_lookup (gtk_icon_theme_get_default (),
- gsearch->thumbnail_factory,
+ gsearch->thumbnail_factory,
uri,
NULL,
file_info,
@@ -1132,9 +1132,9 @@
GdkPixbuf *
get_file_pixbuf (GSearchWindow * gsearch,
- const gchar * file,
+ const gchar * file,
const char *mime,
- GnomeVFSFileInfo * file_info)
+ GnomeVFSFileInfo * file_info)
{
GdkPixbuf * pixbuf = NULL;
gchar * icon_name = NULL;
@@ -1144,7 +1144,7 @@
}
else if ((g_file_test (file, G_FILE_TEST_IS_EXECUTABLE)) &&
- (g_ascii_strcasecmp (mime, "application/x-executable-binary") == 0)) {
+ (g_ascii_strcasecmp (mime, "application/x-executable-binary") == 0)) {
icon_name = g_strdup (ICON_THEME_EXECUTABLE_ICON);
}
else if (g_ascii_strcasecmp (mime, "x-special/device-char") == 0) {
@@ -1230,11 +1230,11 @@
gboolean
open_file_with_xdg_open (GtkWidget * window,
- const gchar * file)
+ const gchar * file)
{
gboolean result;
- gchar *quoted_filename = g_shell_quote (file);
- gchar *command = g_strconcat ("xdg-open ", quoted_filename, NULL);
+ gchar *quoted_filename = g_shell_quote (file);
+ gchar *command = g_strconcat ("xdg-open ", quoted_filename, NULL);
g_free (quoted_filename);
result = g_spawn_command_line_async (command, NULL);
@@ -1245,10 +1245,10 @@
gboolean
open_file_with_nautilus (GtkWidget * window,
- const gchar * file)
+ const gchar * file)
{
GnomeDesktopItem * ditem;
- GdkScreen * screen;
+ GdkScreen * screen;
GError *error = NULL;
gchar * command;
gchar * contents;
@@ -1257,11 +1257,11 @@
escaped = g_shell_quote (file);
command = g_strconcat ("nautilus ",
- "--sm-disable ",
- "--no-desktop ",
- "--no-default-window ",
- escaped,
- NULL);
+ "--sm-disable ",
+ "--no-desktop ",
+ "--no-default-window ",
+ escaped,
+ NULL);
contents = g_strdup_printf ("[Desktop Entry]\n"
"Name=Nautilus\n"
@@ -1273,10 +1273,10 @@
command);
ditem = gnome_desktop_item_new_from_string (NULL,
- contents,
- strlen (contents),
- GNOME_DESKTOP_ITEM_LOAD_NO_TRANSLATIONS ,
- NULL);
+ contents,
+ strlen (contents),
+ GNOME_DESKTOP_ITEM_LOAD_NO_TRANSLATIONS ,
+ NULL);
if (ditem == NULL) {
g_free (contents);
@@ -1288,10 +1288,10 @@
screen = gtk_widget_get_screen (window);
gnome_desktop_item_set_launch_time (ditem,
- gtk_get_current_event_time ());
+ gtk_get_current_event_time ());
gnome_desktop_item_launch_on_screen (ditem, NULL,
- GNOME_DESKTOP_ITEM_LAUNCH_ONLY_ONE,
+ GNOME_DESKTOP_ITEM_LAUNCH_ONLY_ONE,
screen, -1, &error);
gnome_desktop_item_unref (ditem);
@@ -1308,7 +1308,7 @@
gboolean
open_file_with_application (GtkWidget * window,
- const gchar * file)
+ const gchar * file)
{
GnomeVFSMimeApplication * application;
const char * mime;
@@ -1320,8 +1320,8 @@
if (application) {
const char *desktop_file;
GnomeDesktopItem *ditem;
- GdkScreen *screen;
- GError *error = NULL;
+ GdkScreen *screen;
+ GError *error = NULL;
GList *uris = NULL;
gboolean result;
char *uri;
@@ -1342,7 +1342,7 @@
g_error_free (error);
}
else {
- screen = gtk_widget_get_screen (window);
+ screen = gtk_widget_get_screen (window);
gnome_desktop_item_set_launch_time (ditem, gtk_get_current_event_time ());
gnome_desktop_item_launch_on_screen (ditem, uris,
GNOME_DESKTOP_ITEM_LAUNCH_APPEND_PATHS, screen, -1, &error);
@@ -1379,14 +1379,14 @@
gchar *
tracker_search_get_unique_filename (const gchar * path,
- const gchar * suffix)
+ const gchar * suffix)
{
const gint num_of_words = 12;
- gchar * words[] = {
+ gchar * words[] = {
"foo",
"bar",
"blah",
- "cranston",
+ "cranston",
"frobate",
"hadjaha",
"greasy",
@@ -1422,7 +1422,7 @@
GtkWidget *
tracker_search_button_new_with_stock_icon (const gchar * string,
- const gchar * stock_id)
+ const gchar * stock_id)
{
GtkWidget * align;
GtkWidget * button;
@@ -1563,7 +1563,7 @@
void
tracker_set_atk_relationship(GtkWidget *obj1, int relation_type,
- GtkWidget *obj2)
+ GtkWidget *obj2)
{
AtkObject *atk_obj1, *atk_obj2, *targets[1];
AtkRelationSet *atk_rel_set;
Modified: branches/indexer-split/src/tracker-search-tool/tracker-search-tool-support.h
==============================================================================
--- branches/indexer-split/src/tracker-search-tool/tracker-search-tool-support.h (original)
+++ branches/indexer-split/src/tracker-search-tool/tracker-search-tool-support.h Sat Sep 20 15:12:19 2008
@@ -38,10 +38,10 @@
#define ICON_SIZE 40
#define ICON_THEME_EXECUTABLE_ICON "application-x-executable"
#define ICON_THEME_REGULAR_ICON "gnome-fs-regular"
-#define ICON_THEME_CHAR_DEVICE "gnome-fs-chardev"
+#define ICON_THEME_CHAR_DEVICE "gnome-fs-chardev"
#define ICON_THEME_BLOCK_DEVICE "gnome-fs-blockdev"
-#define ICON_THEME_SOCKET "gnome-fs-socket"
-#define ICON_THEME_FIFO "gnome-fs-fifo"
+#define ICON_THEME_SOCKET "gnome-fs-socket"
+#define ICON_THEME_FIFO "gnome-fs-fifo"
gboolean
@@ -176,8 +176,8 @@
void
tracker_set_atk_relationship (GtkWidget *obj1,
- int relation_type,
- GtkWidget *obj2);
+ int relation_type,
+ GtkWidget *obj2);
#ifdef __cplusplus
}
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 15:12:19 2008
@@ -53,7 +53,7 @@
#define TRACKER_SEARCH_TOOL_DEFAULT_ICON_SIZE 32
#define TRACKER_SEARCH_TOOL_STOCK "panel-searchtool"
#define TRACKER_SEARCH_TOOL_REFRESH_DURATION 50000
-#define LEFT_LABEL_SPACING " "
+#define LEFT_LABEL_SPACING " "
static GObjectClass * parent_class;
static TrackerClient *tracker_client;
@@ -91,9 +91,9 @@
struct _GSearchOptionTemplate {
GSearchConstraintType type; /* The available option type */
- gchar * option; /* An option string to pass to the command */
- gchar * desc; /* The description for display */
- gchar * units; /* Optional units for display */
+ gchar * option; /* An option string to pass to the command */
+ gchar * desc; /* The description for display */
+ gchar * units; /* Optional units for display */
gboolean is_selected;
};
@@ -135,24 +135,24 @@
};
static service_info_t services[16] = {
- { "Emails", N_("Emails"), "stock_mail", NULL, SERVICE_EMAILS, NULL, FALSE, 0, 0},
- { "EvolutionEmails",
- N_("Emails"), "stock_mail", NULL, SERVICE_EMAILS, NULL, FALSE, 0, 0},
- { "ModestEmails", N_("Emails"), "stock_mail", NULL, SERVICE_EMAILS, NULL, FALSE, 0, 0},
- { "ThunderbirdEmails",
- N_("Emails"), "stock_mail", NULL, SERVICE_EMAILS, NULL, FALSE, 0, 0},
- { "Files", N_("All Files"), "system-file-manager", NULL, SERVICE_FILES, NULL, FALSE, 0, 0},
- { "Folders", N_("Folders"), "folder", NULL, SERVICE_FOLDERS, NULL, FALSE, 0, 0},
- { "Documents", N_("Documents"), "x-office-document", NULL, SERVICE_DOCUMENTS, NULL, FALSE, 0, 0},
- { "Images", N_("Images"), "image-x-generic", NULL, SERVICE_IMAGES, NULL, FALSE, 0, 0},
- { "Music", N_("Music"), "audio-x-generic", NULL, SERVICE_MUSIC, NULL, FALSE, 0, 0},
- { "Videos", N_("Videos"), "video-x-generic", NULL, SERVICE_VIDEOS, NULL, FALSE, 0, 0},
- { "Text", N_("Text"), "text-x-generic", NULL, SERVICE_TEXT_FILES, NULL, FALSE, 0, 0},
- { "Development", N_("Development"), "applications-development", NULL, SERVICE_DEVELOPMENT_FILES, NULL, FALSE, 0, 0},
- { "Conversations", N_("Chat Logs"), "stock_help-chat", NULL, SERVICE_CONVERSATIONS, NULL, FALSE, 0, 0},
- { "Applications", N_("Applications"), "system-run", NULL, SERVICE_APPLICATIONS, NULL, FALSE, 0, 0},
- { "WebHistory", N_("WebHistory"), "text-html", NULL, SERVICE_WEBHISTORY, NULL, FALSE, 0, 0},
- { NULL, NULL, NULL, NULL, -1, NULL, FALSE, 0, 0},
+ { "Emails", N_("Emails"), "stock_mail", NULL, SERVICE_EMAILS, NULL, FALSE, 0, 0},
+ { "EvolutionEmails",
+ N_("Emails"), "stock_mail", NULL, SERVICE_EMAILS, NULL, FALSE, 0, 0},
+ { "ModestEmails", N_("Emails"), "stock_mail", NULL, SERVICE_EMAILS, NULL, FALSE, 0, 0},
+ { "ThunderbirdEmails",
+ N_("Emails"), "stock_mail", NULL, SERVICE_EMAILS, NULL, FALSE, 0, 0},
+ { "Files", N_("All Files"), "system-file-manager", NULL, SERVICE_FILES, NULL, FALSE, 0, 0},
+ { "Folders", N_("Folders"), "folder", NULL, SERVICE_FOLDERS, NULL, FALSE, 0, 0},
+ { "Documents", N_("Documents"), "x-office-document", NULL, SERVICE_DOCUMENTS, NULL, FALSE, 0, 0},
+ { "Images", N_("Images"), "image-x-generic", NULL, SERVICE_IMAGES, NULL, FALSE, 0, 0},
+ { "Music", N_("Music"), "audio-x-generic", NULL, SERVICE_MUSIC, NULL, FALSE, 0, 0},
+ { "Videos", N_("Videos"), "video-x-generic", NULL, SERVICE_VIDEOS, NULL, FALSE, 0, 0},
+ { "Text", N_("Text"), "text-x-generic", NULL, SERVICE_TEXT_FILES, NULL, FALSE, 0, 0},
+ { "Development", N_("Development"), "applications-development", NULL, SERVICE_DEVELOPMENT_FILES, NULL, FALSE, 0, 0},
+ { "Conversations", N_("Chat Logs"), "stock_help-chat", NULL, SERVICE_CONVERSATIONS, NULL, FALSE, 0, 0},
+ { "Applications", N_("Applications"), "system-run", NULL, SERVICE_APPLICATIONS, NULL, FALSE, 0, 0},
+ { "WebHistory", N_("WebHistory"), "text-html", NULL, SERVICE_WEBHISTORY, NULL, FALSE, 0, 0},
+ { NULL, NULL, NULL, NULL, -1, NULL, FALSE, 0, 0},
};
static GSearchOptionTemplate GSearchOptionTemplates[] = {
@@ -204,16 +204,16 @@
static GtkTargetEntry GSearchDndTable[] = {
{ "text/uri-list", 0, 1 },
{ "text/plain", 0, 0 },
- { "STRING", 0, 0 }
+ { "STRING", 0, 0 }
};
static guint GSearchTotalDnds = sizeof (GSearchDndTable) / sizeof (GSearchDndTable[0]);
static GtkActionEntry GSearchUiEntries[] = {
- { "Open", GTK_STOCK_OPEN, N_("_Open"), NULL, NULL, NULL },
- { "OpenFolder", GTK_STOCK_OPEN, N_("O_pen Folder"), NULL, NULL, NULL },
- { "MoveToTrash", GTK_STOCK_DELETE, N_("Mo_ve to Trash"), NULL, NULL, NULL },
+ { "Open", GTK_STOCK_OPEN, N_("_Open"), NULL, NULL, NULL },
+ { "OpenFolder", GTK_STOCK_OPEN, N_("O_pen Folder"), NULL, NULL, NULL },
+ { "MoveToTrash", GTK_STOCK_DELETE, N_("Mo_ve to Trash"), NULL, NULL, NULL },
{ "SaveResultsAs", GTK_STOCK_SAVE_AS, N_("_Save Results As..."), NULL, NULL, NULL },
};
@@ -239,22 +239,22 @@
GtkWidget * dialog;
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- _("Character set conversion failed for \"%s\""),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Character set conversion failed for \"%s\""),
string);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- (error == NULL) ? " " : error->message);
+ (error == NULL) ? " " : error->message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
g_signal_connect (G_OBJECT (dialog),
- "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (dialog);
}
@@ -293,7 +293,7 @@
gsearch->focus = gtk_window_get_focus (GTK_WINDOW (gsearch->window));
gtk_widget_set_sensitive (gsearch->find_button, FALSE);
- if (gsearch->type < 10) {
+ if (gsearch->type < 10) {
gtk_widget_set_sensitive (gsearch->search_results_save_results_as_item, FALSE);
}
gtk_widget_set_sensitive (gsearch->search_results_vbox, TRUE);
@@ -309,7 +309,7 @@
gtk_window_set_default (GTK_WINDOW (gsearch->window), gsearch->find_button);
gtk_widget_set_sensitive (gsearch->name_and_folder_table, TRUE);
gtk_widget_set_sensitive (gsearch->find_button, TRUE);
- if (gsearch->type < 10) {
+ if (gsearch->type < 10) {
gtk_widget_set_sensitive (gsearch->search_results_save_results_as_item, TRUE);
}
gtk_widget_show (gsearch->find_button);
@@ -424,7 +424,7 @@
gchar *uri;
gtk_tree_model_get (GTK_TREE_MODEL (snippet_row->gsearch->search_results_list_store), &iter,
- COLUMN_URI, &uri,
+ COLUMN_URI, &uri,
-1);
if ( (strcmp (snippet_row->uri, uri) == 0)) {
@@ -523,8 +523,8 @@
escape_path_string = gnome_vfs_escape_path_string (uri);
gnome_vfs_get_file_info (escape_path_string, vfs_file_info,
- GNOME_VFS_FILE_INFO_DEFAULT |
- GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
+ GNOME_VFS_FILE_INFO_DEFAULT |
+ GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
pixbuf = get_file_pixbuf (gsearch, uri, mime, vfs_file_info);
@@ -605,7 +605,7 @@
pixbuf = gdk_pixbuf_new_from_file_at_scale (icon, ICON_SIZE, ICON_SIZE, TRUE, NULL);
} else {
pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), icon,
- ICON_SIZE, 0, NULL);
+ ICON_SIZE, 0, NULL);
}
}
@@ -665,8 +665,8 @@
g_object_set_data (G_OBJECT (button), "suggestion", suggestion);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (suggest_search_cb), gsearch);
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (suggest_search_cb), gsearch);
}
static void
@@ -694,7 +694,7 @@
{
gchar * title_bar_string = NULL;
- title_bar_string = g_strconcat ( _("Tracker Search Tool-"), gsearch->search_term ,NULL);
+ 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);
}
@@ -727,59 +727,59 @@
switch (constraint_id) {
case SEARCH_CONSTRAINT_CONTAINS_THE_TEXT:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/contains_the_text",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_DATE_MODIFIED_BEFORE:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/date_modified_less_than",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_DATE_MODIFIED_AFTER:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/date_modified_more_than",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_SIZE_IS_MORE_THAN:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/size_at_least",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_SIZE_IS_LESS_THAN:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/size_at_most",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_FILE_IS_EMPTY:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/file_is_empty",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_OWNED_BY_USER:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/owned_by_user",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_OWNED_BY_GROUP:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/owned_by_group",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_OWNER_IS_UNRECOGNIZED:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/owner_is_unrecognized",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_FILE_IS_NOT_NAMED:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/name_does_not_contain",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_FILE_MATCHES_REGULAR_EXPRESSION:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/name_matches_regular_expression",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_SHOW_HIDDEN_FILES_AND_FOLDERS:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/show_hidden_files_and_folders",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_FOLLOW_SYMBOLIC_LINKS:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/follow_symbolic_links",
- flag);
+ flag);
break;
case SEARCH_CONSTRAINT_SEARCH_OTHER_FILESYSTEMS:
tracker_search_gconf_set_boolean ("/apps/tracker-search-tool/select/include_other_filesystems",
- flag);
+ flag);
break;
default:
@@ -793,7 +793,7 @@
* @name : Accessible Name
* @desc : Accessible Description
* Description: This function adds accessible name and description to a
- * Gtk widget.
+ * Gtk widget.
*/
static void
@@ -819,29 +819,29 @@
* @obj2 : The second widget in the relation @rel_type.
* @rel_type : Relation type which relates @obj1 and @obj2
* Description: This function establishes Atk Relation between two given
- * objects.
+ * objects.
*/
/* static void */
/* add_atk_relation (GtkWidget * obj1, */
-/* GtkWidget * obj2, */
-/* AtkRelationType rel_type) */
+/* GtkWidget * obj2, */
+/* AtkRelationType rel_type) */
/* { */
-/* AtkObject * atk_obj1, * atk_obj2; */
-/* AtkRelationSet * relation_set; */
-/* AtkRelation * relation; */
+/* AtkObject * atk_obj1, * atk_obj2; */
+/* AtkRelationSet * relation_set; */
+/* AtkRelation * relation; */
-/* g_assert (GTK_IS_WIDGET (obj1)); */
-/* g_assert (GTK_IS_WIDGET (obj2)); */
+/* g_assert (GTK_IS_WIDGET (obj1)); */
+/* g_assert (GTK_IS_WIDGET (obj2)); */
-/* atk_obj1 = gtk_widget_get_accessible (obj1); */
+/* atk_obj1 = gtk_widget_get_accessible (obj1); */
-/* atk_obj2 = gtk_widget_get_accessible (obj2); */
+/* atk_obj2 = gtk_widget_get_accessible (obj2); */
-/* relation_set = atk_object_ref_relation_set (atk_obj1); */
-/* relation = atk_relation_new (&atk_obj2, 1, rel_type); */
-/* atk_relation_set_add (relation_set, relation); */
-/* g_object_unref (G_OBJECT (relation)); */
+/* relation_set = atk_object_ref_relation_set (atk_obj1); */
+/* relation = atk_relation_new (&atk_obj2, 1, rel_type); */
+/* atk_relation_set_add (relation_set, relation); */
+/* g_object_unref (G_OBJECT (relation)); */
/* } */
@@ -860,7 +860,7 @@
file_is_named_utf8 = (gchar *) gtk_entry_get_text (GTK_ENTRY (gsearch->search_entry));
file_is_named_locale = g_locale_from_utf8 (file_is_named_utf8 != NULL ? file_is_named_utf8 : "" ,
- -1, NULL, NULL, NULL);
+ -1, NULL, NULL, NULL);
g_string_append_printf (gs, "named=%s", file_is_named_locale);
g_free (file_is_named_locale);
@@ -895,10 +895,10 @@
static void
filename_cell_data_func (GtkTreeViewColumn * column,
- GtkCellRenderer * renderer,
- GtkTreeModel * model,
- GtkTreeIter * iter,
- GSearchWindow * gsearch)
+ GtkCellRenderer * renderer,
+ GtkTreeModel * model,
+ GtkTreeIter * iter,
+ GSearchWindow * gsearch)
{
GtkTreePath * path;
PangoUnderline underline;
@@ -950,19 +950,19 @@
g_object_set (renderer,
"markup", markup,
- "underline", underline,
- "underline-set", underline_set,
- NULL);
+ "underline", underline,
+ "underline-set", underline_set,
+ NULL);
g_free (markup);
}
static void
snippet_cell_data_func (GtkTreeViewColumn * column,
- GtkCellRenderer * renderer,
- GtkTreeModel * model,
- GtkTreeIter * iter,
- GSearchWindow * gsearch)
+ GtkCellRenderer * renderer,
+ GtkTreeModel * model,
+ GtkTreeIter * iter,
+ GSearchWindow * gsearch)
{
gchar * snippet;
gint width;
@@ -971,7 +971,7 @@
g_object_set (renderer,
"markup", snippet,
- NULL);
+ NULL);
g_free (snippet);
@@ -986,10 +986,10 @@
static gboolean
gsearch_equal_func (GtkTreeModel * model,
- gint column,
- const gchar * key,
- GtkTreeIter * iter,
- gpointer search_data)
+ gint column,
+ const gchar * key,
+ GtkTreeIter * iter,
+ gpointer search_data)
{
gboolean results = TRUE;
gchar * name;
@@ -1048,16 +1048,16 @@
label = gtk_label_new_with_mnemonic (_("Search _results: "));
gtk_box_pack_start (GTK_BOX (label_box), label, FALSE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
/* Translators: this will appears as "Search results: no search performed" */
gsearch->count_label = gtk_label_new (_("no search performed"));
gtk_label_set_selectable (GTK_LABEL (gsearch->count_label), TRUE);
tracker_set_atk_relationship(gsearch->count_label,
- ATK_RELATION_LABELLED_BY,
- label);
+ ATK_RELATION_LABELLED_BY,
+ label);
tracker_set_atk_relationship(label, ATK_RELATION_LABEL_FOR,
- gsearch->count_label);
+ gsearch->count_label);
gtk_box_pack_start (GTK_BOX (label_box), gsearch->count_label, FALSE, TRUE, 0);
@@ -1079,12 +1079,12 @@
gsearch->back_button = button_prev;
g_signal_connect (G_OBJECT (gsearch->back_button), "clicked",
- G_CALLBACK (prev_results_cb), (gpointer) gsearch);
+ G_CALLBACK (prev_results_cb), (gpointer) gsearch);
gsearch->forward_button = button_next;
g_signal_connect (G_OBJECT (gsearch->forward_button), "clicked",
- G_CALLBACK (next_results_cb), (gpointer) gsearch);
+ G_CALLBACK (next_results_cb), (gpointer) gsearch);
gtk_widget_show_all (hbox);
@@ -1099,14 +1099,14 @@
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (window), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
gsearch->search_results_tree_view = GTK_TREE_VIEW (gtk_tree_view_new ());
gtk_tree_view_set_headers_visible (gsearch->search_results_tree_view, FALSE);
gtk_tree_view_set_search_equal_func (gsearch->search_results_tree_view,
- gsearch_equal_func, NULL, NULL);
+ gsearch_equal_func, NULL, NULL);
gtk_tree_view_set_rules_hint (gsearch->search_results_tree_view, TRUE);
@@ -1136,17 +1136,17 @@
g_signal_connect (G_OBJECT (gsearch->search_results_tree_view),
"event_after",
- G_CALLBACK (file_event_after_cb),
+ G_CALLBACK (file_event_after_cb),
(gpointer) gsearch);
g_signal_connect (G_OBJECT (gsearch->search_results_tree_view),
"button_release_event",
- G_CALLBACK (file_button_release_event_cb),
+ G_CALLBACK (file_button_release_event_cb),
(gpointer) gsearch);
g_signal_connect (G_OBJECT (gsearch->search_results_tree_view),
"button_press_event",
- G_CALLBACK (file_button_press_event_cb),
+ G_CALLBACK (file_button_press_event_cb),
(gpointer) gsearch->search_results_tree_view);
g_signal_connect (G_OBJECT (gsearch->search_results_tree_view),
@@ -1155,19 +1155,19 @@
(gpointer) gsearch);
g_signal_connect (G_OBJECT (gsearch->search_results_tree_view),
- "motion_notify_event",
- G_CALLBACK (file_motion_notify_cb),
- (gpointer) gsearch);
+ "motion_notify_event",
+ G_CALLBACK (file_motion_notify_cb),
+ (gpointer) gsearch);
g_signal_connect (G_OBJECT (gsearch->search_results_tree_view),
- "leave_notify_event",
- G_CALLBACK (file_leave_notify_cb),
- (gpointer) gsearch);
+ "leave_notify_event",
+ G_CALLBACK (file_leave_notify_cb),
+ (gpointer) gsearch);
g_signal_connect (G_OBJECT (gsearch->search_results_selection),
- "changed",
- G_CALLBACK (select_changed_cb),
- (gpointer) gsearch);
+ "changed",
+ G_CALLBACK (select_changed_cb),
+ (gpointer) gsearch);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (gsearch->search_results_tree_view));
@@ -1187,9 +1187,9 @@
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
- gtk_tree_view_column_set_attributes (column, renderer,
- "pixbuf", COLUMN_ICON,
- NULL);
+ gtk_tree_view_column_set_attributes (column, renderer,
+ "pixbuf", COLUMN_ICON,
+ NULL);
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_column_set_reorderable (column, TRUE);
gtk_tree_view_append_column (GTK_TREE_VIEW (gsearch->search_results_tree_view), column);
@@ -1197,10 +1197,10 @@
column = gtk_tree_view_column_new ();
gtk_tree_view_column_set_title (column, _("Name"));
gsearch->search_results_name_cell_renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (column, gsearch->search_results_name_cell_renderer, TRUE);
+ gtk_tree_view_column_pack_start (column, gsearch->search_results_name_cell_renderer, TRUE);
- gtk_tree_view_column_set_attributes (column, gsearch->search_results_name_cell_renderer,
- "text", COLUMN_NAME,
+ gtk_tree_view_column_set_attributes (column, gsearch->search_results_name_cell_renderer,
+ "text", COLUMN_NAME,
NULL);
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
@@ -1209,7 +1209,7 @@
gtk_tree_view_column_set_reorderable (column, TRUE);
gtk_tree_view_column_set_cell_data_func (column, gsearch->search_results_name_cell_renderer,
- (GtkTreeCellDataFunc) filename_cell_data_func,
+ (GtkTreeCellDataFunc) filename_cell_data_func,
gsearch, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (gsearch->search_results_tree_view), column);
@@ -1224,7 +1224,7 @@
gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_set_cell_data_func (column, renderer,
- (GtkTreeCellDataFunc) snippet_cell_data_func,
+ (GtkTreeCellDataFunc) snippet_cell_data_func,
gsearch, NULL);
gtk_tree_view_column_set_reorderable (column, TRUE);
@@ -1239,9 +1239,9 @@
gtk_tree_view_set_enable_search (GTK_TREE_VIEW (gsearch->search_results_tree_view), FALSE);
g_signal_connect (G_OBJECT (gsearch->search_results_tree_view),
- "columns-changed",
- G_CALLBACK (columns_changed_cb),
- (gpointer) gsearch);
+ "columns-changed",
+ G_CALLBACK (columns_changed_cb),
+ (gpointer) gsearch);
return vbox;
}
@@ -1262,8 +1262,8 @@
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (window), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
gsearch->category_list = gtk_tree_view_new ();
@@ -1280,9 +1280,9 @@
GTK_SELECTION_BROWSE);
g_signal_connect (G_OBJECT (gsearch->category_selection),
- "changed",
- G_CALLBACK (category_changed_cb),
- (gpointer) gsearch);
+ "changed",
+ G_CALLBACK (category_changed_cb),
+ (gpointer) gsearch);
gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (gsearch->category_list));
@@ -1291,10 +1291,10 @@
gtk_tree_view_column_set_title (column, _("_Categories"));
gsearch->category_name_cell_renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_end (column, gsearch->category_name_cell_renderer, TRUE);
+ gtk_tree_view_column_pack_end (column, gsearch->category_name_cell_renderer, TRUE);
- gtk_tree_view_column_set_attributes (column, gsearch->category_name_cell_renderer,
- "text", CATEGORY_TITLE,
+ gtk_tree_view_column_set_attributes (column, gsearch->category_name_cell_renderer,
+ "text", CATEGORY_TITLE,
NULL);
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
@@ -1303,9 +1303,9 @@
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
- gtk_tree_view_column_set_attributes (column, renderer,
- "pixbuf", CATEGORY_ICON_NAME,
- NULL);
+ gtk_tree_view_column_set_attributes (column, renderer,
+ "pixbuf", CATEGORY_ICON_NAME,
+ NULL);
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
@@ -1362,10 +1362,10 @@
void
set_clone_command (GSearchWindow * gsearch,
- gint * argcp,
- gchar *** argvp,
- gpointer client_data,
- gboolean escape_values)
+ gint * argcp,
+ gchar *** argvp,
+ gpointer client_data,
+ gboolean escape_values)
{
gchar ** argv;
gchar * file_is_named_utf8;
@@ -1379,7 +1379,7 @@
file_is_named_utf8 = (gchar *) gtk_entry_get_text (GTK_ENTRY (gsearch->search_entry));
file_is_named_locale = g_locale_from_utf8 (file_is_named_utf8 != NULL ? file_is_named_utf8 : "" ,
- -1, NULL, NULL, NULL);
+ -1, NULL, NULL, NULL);
if (escape_values) {
tmp = g_shell_quote (file_is_named_locale);
} else {
@@ -1412,45 +1412,45 @@
gtk_window_add_accel_group (GTK_WINDOW (gsearch->window), accel_group);
if (!gtk_ui_manager_add_ui_from_string (gsearch->window_ui_manager, GSearchUiDescription, -1, &error)) {
- g_message ("Building menus failed: %s", error->message);
+ g_message ("Building menus failed: %s", error->message);
g_error_free (error);
- exit (EXIT_FAILURE);
+ exit (EXIT_FAILURE);
}
action = gtk_ui_manager_get_action (gsearch->window_ui_manager, "/PopupMenu/Open");
g_signal_connect (G_OBJECT (action),
- "activate",
- G_CALLBACK (open_file_cb),
- (gpointer) gsearch);
+ "activate",
+ G_CALLBACK (open_file_cb),
+ (gpointer) gsearch);
action = gtk_ui_manager_get_action (gsearch->window_ui_manager, "/PopupMenu/OpenFolder");
g_signal_connect (G_OBJECT (action),
- "activate",
- G_CALLBACK (open_folder_cb),
- (gpointer) gsearch);
+ "activate",
+ G_CALLBACK (open_folder_cb),
+ (gpointer) gsearch);
action = gtk_ui_manager_get_action (gsearch->window_ui_manager, "/PopupMenu/MoveToTrash");
g_signal_connect (G_OBJECT (action),
- "activate",
- G_CALLBACK (move_to_trash_cb),
- (gpointer) gsearch);
+ "activate",
+ G_CALLBACK (move_to_trash_cb),
+ (gpointer) gsearch);
action = gtk_ui_manager_get_action (gsearch->window_ui_manager, "/PopupMenu/SaveResultsAs");
g_signal_connect (G_OBJECT (action),
- "activate",
- G_CALLBACK (show_file_selector_cb),
- (gpointer) gsearch);
+ "activate",
+ G_CALLBACK (show_file_selector_cb),
+ (gpointer) gsearch);
gsearch->search_results_popup_menu = gtk_ui_manager_get_widget (gsearch->window_ui_manager,
- "/PopupMenu");
+ "/PopupMenu");
gsearch->search_results_save_results_as_item = gtk_ui_manager_get_widget (gsearch->window_ui_manager,
- "/PopupMenu/SaveResultsAs");
+ "/PopupMenu/SaveResultsAs");
}
static void
gsearch_window_size_allocate (GtkWidget * widget,
- GtkAllocation * allocation,
- GSearchWindow * gsearch)
+ GtkAllocation * allocation,
+ GSearchWindow * gsearch)
{
if (gsearch->is_window_maximized == FALSE) {
gsearch->window_width = allocation->width;
@@ -1615,7 +1615,7 @@
gpointer user_data)
{
service_info_t *service;
- gboolean first_service = FALSE, has_hits = FALSE;
+ gboolean first_service = FALSE, has_hits = FALSE;
GSearchWindow *gsearch = user_data;
@@ -1636,7 +1636,7 @@
gtk_list_store_clear (gsearch->category_store);
- for (service = services; service->service; ++service) {
+ for (service = services; service->service; ++service) {
if (service->hit_count == 0) {
continue;
@@ -1716,7 +1716,7 @@
gtk_tree_selection_get_selected (GTK_TREE_SELECTION (gsearch->category_selection),
&model,
- &iter);
+ &iter);
gtk_tree_model_get (model, &iter, 2, &name, -1);
@@ -1813,7 +1813,7 @@
stop_animation (gsearch);
if (error) {
- display_error_dialog (gsearch->window, _("Could not connect to search service as it may be busy"));
+ display_error_dialog (gsearch->window, _("Could not connect to search service as it may be busy"));
g_error_free (error);
return;
}
@@ -1841,9 +1841,9 @@
/* update hit count after search in case of dud hits */
tracker_search_text_get_hit_count_async (tracker_client, gsearch->current_service->service_type,
- gsearch->search_term,
- (TrackerIntReply)end_refresh_count,
- gsearch);
+ gsearch->search_term,
+ (TrackerIntReply)end_refresh_count,
+ gsearch);
@@ -1921,7 +1921,7 @@
GtkWidget * label;
GtkWidget * container;
GtkWidget * main_container;
- service_info_t *service;
+ service_info_t *service;
gsearch->snippet_queue = g_queue_new ();
@@ -1951,17 +1951,17 @@
G_TYPE_BOOLEAN);
service->pixbuf = gtk_icon_theme_load_icon (theme, service->icon_name,
- 24,
- GTK_ICON_LOOKUP_USE_BUILTIN,
- NULL);
+ 24,
+ GTK_ICON_LOOKUP_USE_BUILTIN,
+ NULL);
g_object_ref (service->pixbuf);
}
gsearch->email_pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), "email",
- ICON_SIZE,
- GTK_ICON_LOOKUP_USE_BUILTIN,
- NULL);
+ ICON_SIZE,
+ GTK_ICON_LOOKUP_USE_BUILTIN,
+ NULL);
gsearch->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gsearch->is_window_maximized = tracker_search_gconf_get_boolean ("/apps/tracker-search-tool/default_window_maximized");
@@ -1978,10 +1978,10 @@
&gsearch->window_geometry, GDK_HINT_MIN_SIZE);
tracker_search_get_stored_window_geometry (&gsearch->window_width,
- &gsearch->window_height);
+ &gsearch->window_height);
gtk_window_set_default_size (GTK_WINDOW (gsearch->window),
- gsearch->window_width,
- gsearch->window_height);
+ gsearch->window_width,
+ gsearch->window_height);
if (gsearch->is_window_maximized == TRUE) {
gtk_window_maximize (GTK_WINDOW (gsearch->window));
@@ -2077,7 +2077,7 @@
gtk_widget_set_sensitive (gsearch->find_button, TRUE);
g_signal_connect (G_OBJECT (gsearch->find_button), "clicked",
- G_CALLBACK (click_find_cb),
+ G_CALLBACK (click_find_cb),
(gpointer) gsearch);
if (gsearch->is_window_accessible) {
@@ -2110,7 +2110,7 @@
static void
gsearch_window_finalize (GObject * object)
{
- parent_class->finalize (object);
+ parent_class->finalize (object);
}
static void
@@ -2150,7 +2150,7 @@
gchar * click_to_activate_pref = NULL;
/* Get value of nautilus click behavior (single or double click to activate items) */
-/* click_to_activate_pref = tracker_search_gconf_get_string ("/apps/nautilus/preferences/click_policy"); */
+/* click_to_activate_pref = tracker_search_gconf_get_string ("/apps/nautilus/preferences/click_policy"); */
if (click_to_activate_pref == NULL) {
gsearch->is_search_results_single_click_to_activate = FALSE;
@@ -2161,9 +2161,9 @@
(strncmp (click_to_activate_pref, "single", 6) == 0) ? TRUE : FALSE;
tracker_search_gconf_watch_key ("/apps/nautilus/preferences",
- "/apps/nautilus/preferences/click_policy",
- (GConfClientNotifyFunc) single_click_to_activate_key_changed_cb,
- gsearch);
+ "/apps/nautilus/preferences/click_policy",
+ (GConfClientNotifyFunc) single_click_to_activate_key_changed_cb,
+ gsearch);
g_free (click_to_activate_pref);
}
@@ -2171,7 +2171,7 @@
gchar *
tracker_search_pixmap_file (const gchar * partial_path)
{
- gchar * path;
+ gchar * path;
path = g_build_filename (TRACKER_DATADIR "/tracker/icons", partial_path, NULL);
if (g_file_test (path, G_FILE_TEST_EXISTS)) {
@@ -2208,12 +2208,12 @@
textdomain (GETTEXT_PACKAGE);
program = gnome_program_init ("tracker-search-tool",
- VERSION,
- LIBGNOMEUI_MODULE,
- argc, argv,
- GNOME_PARAM_APP_DATADIR, TRACKER_DATADIR,
- GNOME_PARAM_GOPTION_CONTEXT, option_context,
- GNOME_PARAM_NONE);
+ VERSION,
+ LIBGNOMEUI_MODULE,
+ argc, argv,
+ GNOME_PARAM_APP_DATADIR, TRACKER_DATADIR,
+ GNOME_PARAM_GOPTION_CONTEXT, option_context,
+ GNOME_PARAM_NONE);
g_set_application_name (_("Tracker Search Tool"));
@@ -2235,22 +2235,22 @@
gtk_window_set_policy (GTK_WINDOW (gsearch->window), TRUE, TRUE, TRUE);
g_signal_connect (G_OBJECT (gsearch->window), "delete_event",
- G_CALLBACK (quit_cb),
- (gpointer) gsearch);
+ G_CALLBACK (quit_cb),
+ (gpointer) gsearch);
g_signal_connect (G_OBJECT (gsearch->window), "key_press_event",
- G_CALLBACK (key_press_cb),
- (gpointer) gsearch);
+ G_CALLBACK (key_press_cb),
+ (gpointer) gsearch);
g_signal_connect (G_OBJECT (gsearch->window), "window_state_event",
- G_CALLBACK (window_state_event_cb),
- (gpointer) gsearch);
+ G_CALLBACK (window_state_event_cb),
+ (gpointer) gsearch);
if ((client = gnome_master_client ()) != NULL) {
g_signal_connect (client, "save_yourself",
- G_CALLBACK (save_session_cb),
- (gpointer) gsearch);
+ G_CALLBACK (save_session_cb),
+ (gpointer) gsearch);
g_signal_connect (client, "die",
- G_CALLBACK (die_cb),
- (gpointer) gsearch);
+ G_CALLBACK (die_cb),
+ (gpointer) gsearch);
}
gtk_widget_show (gsearch->window);
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 15:12:19 2008
@@ -52,10 +52,10 @@
#define MAX_SEARCH_RESULTS 10
-#define GSEARCH_TYPE_WINDOW (gsearch_window_get_type ())
-#define GSEARCH_WINDOW(obj) (GTK_CHECK_CAST((obj), GSEARCH_TYPE_WINDOW, GSearchWindow))
+#define GSEARCH_TYPE_WINDOW (gsearch_window_get_type ())
+#define GSEARCH_WINDOW(obj) (GTK_CHECK_CAST((obj), GSEARCH_TYPE_WINDOW, GSearchWindow))
#define GSEARCH_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST((klass), GSEARCH_TYPE_WINDOW, GSearchWindowClass))
-#define GSEARCH_IS_WINDOW(obj) (GTK_CHECK_TYPE((obj), GSEARCH_TYPE_WINDOW))
+#define GSEARCH_IS_WINDOW(obj) (GTK_CHECK_TYPE((obj), GSEARCH_TYPE_WINDOW))
#define GSEARCH_IS_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE((obj), GSEARCH_TYPE_WINDOW))
#define GSEARCH_WINDOW_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), GSEARCH_TYPE_WINDOW, GSearchWindowClass))
@@ -63,8 +63,8 @@
#define DEFAULT_WINDOW_WIDTH 700
#define DEFAULT_WINDOW_HEIGHT 580
-#define WINDOW_HEIGHT_STEP 35
-#define NUM_VISIBLE_COLUMNS 5
+#define WINDOW_HEIGHT_STEP 35
+#define NUM_VISIBLE_COLUMNS 5
#define DEFAULT_SEPARATOR_POSITION 170
typedef enum {
@@ -99,11 +99,11 @@
typedef struct {
- gchar *service;
+ gchar *service;
gchar *display_name;
- gchar *icon_name;
+ gchar *icon_name;
GdkPixbuf *pixbuf;
- ServiceType service_type;
+ ServiceType service_type;
GtkListStore *store;
gboolean has_hits;
gint hit_count;
@@ -118,15 +118,15 @@
typedef struct _GSearchMonitor GSearchMonitor;
struct _GSearchWindow {
- GtkWindow parent_instance;
+ GtkWindow parent_instance;
- GtkWidget * window;
- GtkUIManager * window_ui_manager;
- GdkGeometry window_geometry;
- gint window_width;
- gint window_height;
- gboolean is_window_maximized;
- gboolean is_window_accessible;
+ GtkWidget * window;
+ GtkUIManager * window_ui_manager;
+ GdkGeometry window_geometry;
+ gint window_width;
+ gint window_height;
+ gboolean is_window_maximized;
+ gboolean is_window_accessible;
gboolean page_setup_mode;
@@ -136,73 +136,73 @@
GHashTable *category_table;
/* sidebar category list */
- GtkWidget *category_list;
+ GtkWidget *category_list;
GtkListStore *category_store;
- GtkTreeSelection *category_selection;
- GtkTreeIter category_iter;
- GtkCellRenderer *category_name_cell_renderer;
+ GtkTreeSelection *category_selection;
+ GtkTreeIter category_iter;
+ GtkCellRenderer *category_name_cell_renderer;
GdkPixbuf *email_pixbuf;
gint current_page;
gint type;
guint old_type;
- service_info_t *current_service;
+ service_info_t *current_service;
GtkWidget *metatile;
GtkWidget *no_results;
GtkWidget *count_label;
GtkWidget *message_box;
- GtkWidget * search_entry;
+ GtkWidget * search_entry;
GtkWidget * warning_label;
- GtkWidget * look_in_folder_button;
- GtkWidget * name_and_folder_table;
- GtkWidget * find_button;
- GtkWidget * back_button;
- GtkWidget * forward_button;
- GtkWidget * stop_button;
- GtkWidget * focus;
-
- GtkWidget * show_more_options_expander;
- GtkWidget * available_options_vbox;
- GtkWidget * available_options_label;
- GtkWidget * available_options_combo_box;
- 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;
- GtkWidget * search_results_save_results_as_item;
- GtkTreeView * search_results_tree_view;
- GtkListStore * search_results_list_store;
+ GtkWidget * look_in_folder_button;
+ GtkWidget * name_and_folder_table;
+ GtkWidget * find_button;
+ GtkWidget * back_button;
+ GtkWidget * forward_button;
+ GtkWidget * stop_button;
+ GtkWidget * focus;
+
+ GtkWidget * show_more_options_expander;
+ GtkWidget * available_options_vbox;
+ GtkWidget * available_options_label;
+ GtkWidget * available_options_combo_box;
+ 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;
+ GtkWidget * search_results_save_results_as_item;
+ GtkTreeView * search_results_tree_view;
+ GtkListStore * search_results_list_store;
GtkCellRenderer * search_results_name_cell_renderer;
GtkTreeSelection * search_results_selection;
- GtkTreeIter search_results_iter;
- GtkTreePath * search_results_hover_path;
- GHashTable * search_results_pixbuf_hash_table;
- gchar * search_results_date_format_string;
+ GtkTreeIter search_results_iter;
+ GtkTreePath * search_results_hover_path;
+ GHashTable * search_results_pixbuf_hash_table;
+ gchar * search_results_date_format_string;
GnomeThumbnailFactory * thumbnail_factory;
- gint show_thumbnails_file_size_limit;
+ gint show_thumbnails_file_size_limit;
gboolean show_thumbnails;
- gboolean is_search_results_single_click_to_activate;
+ gboolean is_search_results_single_click_to_activate;
gboolean is_locate_database_check_finished;
gboolean is_locate_database_available;
- gchar * save_results_as_default_filename;
+ gchar * save_results_as_default_filename;
GSearchCommandDetails * command_details;
gchar * search_term;
};
struct _GSearchCommandDetails {
- pid_t command_pid;
- GSearchCommandStatus command_status;
+ pid_t command_pid;
+ GSearchCommandStatus command_status;
- gchar * name_contains_pattern_string;
- gchar * name_contains_regex_string;
- gchar * look_in_folder_string;
+ gchar * name_contains_pattern_string;
+ gchar * name_contains_regex_string;
+ gchar * look_in_folder_string;
gboolean is_command_first_pass;
gboolean is_command_using_quick_mode;
@@ -216,8 +216,8 @@
gint constraint_id;
union {
gchar * text;
- gint time;
- gint number;
+ gint time;
+ gint number;
} data;
};
@@ -226,7 +226,7 @@
};
struct _GSearchMonitor {
- GSearchWindow * gsearch;
+ GSearchWindow * gsearch;
GtkTreeRowReference * reference;
GnomeVFSMonitorHandle * handle;
};
@@ -239,7 +239,7 @@
gchar *
build_search_command (GSearchWindow * gsearch,
- gboolean first_pass);
+ gboolean first_pass);
void
select_category (GtkTreeSelection * treeselection,
@@ -262,33 +262,33 @@
void
spawn_search_command (GSearchWindow * gsearch,
- gchar * command);
+ gchar * command);
void
add_constraint (GSearchWindow * gsearch,
- gint constraint_id,
- gchar * value,
- gboolean show_constraint);
+ gint constraint_id,
+ gchar * value,
+ gboolean show_constraint);
void
update_constraint_info (GSearchConstraint * constraint,
- gchar * info);
+ gchar * info);
void
remove_constraint (gint constraint_id);
void
set_constraint_gconf_boolean (gint constraint_id,
- gboolean flag);
+ gboolean flag);
void
set_constraint_selected_state (GSearchWindow * gsearch,
- gint constraint_id,
- gboolean state);
+ gint constraint_id,
+ gboolean state);
void
set_clone_command (GSearchWindow * gsearch,
- gint * argcp,
- gchar *** argvp,
- gpointer client_data,
- gboolean escape_values);
+ gint * argcp,
+ gchar *** argvp,
+ gpointer client_data,
+ gboolean escape_values);
gchar *
get_desktop_item_name (GSearchWindow * gsearch);
@@ -298,9 +298,9 @@
gboolean
tree_model_iter_free_monitor (GtkTreeModel * model,
- GtkTreePath * path,
- GtkTreeIter * iter,
- gpointer data);
+ GtkTreePath * path,
+ GtkTreeIter * iter,
+ gpointer data);
#ifdef __cplusplus
}
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 15:12:19 2008
@@ -47,9 +47,9 @@
{
gchar *thumbnails_dir = NULL;
- const gchar *home_dir;
+ const gchar *home_dir;
- home_dir = g_get_home_dir ();
+ home_dir = g_get_home_dir ();
thumbnails_dir = g_build_filename (home_dir, ".thumbnails", NULL);
@@ -57,8 +57,8 @@
if (g_file_test (thumbnails_dir, G_FILE_TEST_EXISTS) &&
!g_file_test (thumbnails_dir, G_FILE_TEST_IS_DIR)) {
g_printerr ("%s exists but is not a directory.\n", thumbnails_dir);
- g_free (thumbnails_dir);
- return FALSE;
+ g_free (thumbnails_dir);
+ return FALSE;
}
g_free (thumbnails_dir);
@@ -67,8 +67,8 @@
if (g_mkdir_with_parents (thumbnails_dir, 00775) == -1) {
g_printerr ("failed: g_mkdir_with_parents (%s)\n", thumbnails_dir);
- g_free (thumbnails_dir);
- return FALSE;
+ g_free (thumbnails_dir);
+ return FALSE;
}
g_free (thumbnails_dir);
@@ -79,10 +79,10 @@
static gboolean
valid_thumbnail_exists (const gchar *thumbnail_filename, const gchar *uri, const gchar *mtime)
{
- FILE *fp;
+ FILE *fp;
png_structp png_ptr;
png_infop info_ptr;
- gint i, count, tests_passed;
+ gint i, count, tests_passed;
png_textp pngtext;
if (g_file_test (thumbnail_filename, G_FILE_TEST_EXISTS)) {
@@ -107,8 +107,8 @@
}
fclose (fp);
- png_destroy_info_struct (png_ptr, &info_ptr);
- png_destroy_read_struct (&png_ptr, NULL, NULL);
+ png_destroy_info_struct (png_ptr, &info_ptr);
+ png_destroy_read_struct (&png_ptr, NULL, NULL);
if (tests_passed == 2) {
@@ -118,25 +118,25 @@
g_printerr ("but it is not valid. Recreating thumbnail...\n");
}
- return FALSE;
+ return FALSE;
}
static gboolean
generate_thumbnail (const gchar *filename, const gchar *thumbnail_filename, const gchar *mime, gint size)
{
- gchar *thumbnailer;
- gchar *args[5];
- gint i;
- gboolean error = FALSE;
+ gchar *thumbnailer;
+ gchar *args[5];
+ gint i;
+ gboolean error = FALSE;
/* do we have a thumbnailer for this mime type? */
thumbnailer = g_strconcat (LIBDIR "/tracker/thumbnailers/",
- mime, "_thumbnailer", NULL);
+ mime, "_thumbnailer", NULL);
if (!g_file_test (thumbnailer, G_FILE_TEST_EXISTS)) {
g_printerr ("Thumbnailer '%s' for mime %s not found\n", thumbnailer, mime);
- g_free (thumbnailer);
+ g_free (thumbnailer);
return FALSE;
}
@@ -144,56 +144,56 @@
args[0] = g_strdup (thumbnailer);
args[1] = g_filename_from_utf8 (filename, -1, NULL, NULL, NULL);
args[2] = g_strdup (thumbnail_filename);
- args[3] = g_strdup_printf ("%d", size);
+ args[3] = g_strdup_printf ("%d", size);
args[4] = NULL;
if (!g_spawn_sync (NULL, args, NULL,
- G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
- NULL, NULL, NULL, NULL, NULL, NULL)) {
+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL)) {
g_printerr ("%s failed to create %s\n", thumbnailer, thumbnail_filename);
g_remove (thumbnail_filename);
- error = TRUE;
+ error = TRUE;
}
- for (i = 0; i < 4; i++) {
- g_free (args[i]);
- }
- g_free (thumbnailer);
+ for (i = 0; i < 4; i++) {
+ g_free (args[i]);
+ }
+ g_free (thumbnailer);
- return !error;
+ return !error;
}
static gboolean
ensure_correct_thumbnail (const gchar *uri, const gchar *thumbnail_filename, const gchar *mtime) {
- FILE *fp;
+ FILE *fp;
png_structp png_ptr;
png_infop info_ptr;
png_textp pngtext;
png_uint_32 width, height;
- gint bit_depth, color_type, interlace_method;
- gint compression_method, filter_method;
+ gint bit_depth, color_type, interlace_method;
+ gint compression_method, filter_method;
png_colorp palette = NULL;
- gint num_palette;
+ gint num_palette;
png_bytepp row_pointers;
- guint i;
+ guint i;
/* the fd.o spec requires us to set certain PNG keys. As far as I can
* 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 ((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)));
if (setjmp (png_jmpbuf (png_ptr))) {
g_printerr ("Error reading thumbnail\n");
- png_destroy_info_struct (png_ptr, &info_ptr);
- png_destroy_read_struct (&png_ptr, NULL, NULL);
- fclose (fp);
+ png_destroy_info_struct (png_ptr, &info_ptr);
+ png_destroy_read_struct (&png_ptr, NULL, NULL);
+ fclose (fp);
g_remove (thumbnail_filename);
return FALSE;
}
@@ -212,8 +212,8 @@
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);
+ png_destroy_info_struct (png_ptr, &info_ptr);
+ png_destroy_read_struct (&png_ptr, NULL, NULL);
fclose (fp);
/* write the new thumbnail (overwrites the old) */
@@ -225,66 +225,66 @@
g_printerr ("Error creating thumbnail\n");
} else {
- png_init_io (png_ptr, fp);
+ png_init_io (png_ptr, fp);
- png_set_IHDR (png_ptr, info_ptr, width, height, bit_depth,
- color_type, interlace_method, compression_method, filter_method);
+ png_set_IHDR (png_ptr, info_ptr, width, height, bit_depth,
+ color_type, interlace_method, compression_method, filter_method);
- if (palette && num_palette > 0)
- png_set_PLTE (png_ptr, info_ptr, palette, num_palette);
+ if (palette && num_palette > 0)
+ png_set_PLTE (png_ptr, info_ptr, palette, num_palette);
- /* set the required fields */
- pngtext = g_new0 (png_text, 3);
- pngtext[0].key = "Thumb::URI";
- pngtext[0].text = g_strdup (uri);
- pngtext[0].text_length = strlen (uri);
- pngtext[0].compression = PNG_TEXT_COMPRESSION_NONE;
- pngtext[1].key = "Thumb::MTime";
- pngtext[1].text = g_strdup (mtime);
- pngtext[1].text_length = strlen (mtime);
- pngtext[1].compression = PNG_TEXT_COMPRESSION_NONE;
- /* set some optional fields */
- pngtext[2].key = "Software";
- 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);
-
- g_free (pngtext[0].text);
- g_free (pngtext[1].text);
- g_free (pngtext);
- }
+ /* set the required fields */
+ pngtext = g_new0 (png_text, 3);
+ pngtext[0].key = "Thumb::URI";
+ pngtext[0].text = g_strdup (uri);
+ pngtext[0].text_length = strlen (uri);
+ pngtext[0].compression = PNG_TEXT_COMPRESSION_NONE;
+ pngtext[1].key = "Thumb::MTime";
+ pngtext[1].text = g_strdup (mtime);
+ pngtext[1].text_length = strlen (mtime);
+ pngtext[1].compression = PNG_TEXT_COMPRESSION_NONE;
+ /* set some optional fields */
+ pngtext[2].key = "Software";
+ 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);
+
+ g_free (pngtext[0].text);
+ g_free (pngtext[1].text);
+ g_free (pngtext);
+ }
fclose (fp);
for (i = 0; i < height; i++) {
g_free (row_pointers[i]);
}
- g_free (row_pointers);
+ g_free (row_pointers);
- png_destroy_info_struct (png_ptr, &info_ptr);
- png_destroy_write_struct (&png_ptr, NULL);
+ png_destroy_info_struct (png_ptr, &info_ptr);
+ png_destroy_write_struct (&png_ptr, NULL);
- return TRUE;
+ return TRUE;
}
static gboolean
validate_args (gint argc, gchar **argv)
{
- if (argc < 4) {
- return FALSE;
- }
-
- if (!strcmp (argv[3], "normal")
- || !strcmp (argv[3], "large")
- || !strcmp (argv[3], "preview")) {
- return TRUE;
- }
+ if (argc < 4) {
+ return FALSE;
+ }
+
+ if (!strcmp (argv[3], "normal")
+ || !strcmp (argv[3], "large")
+ || !strcmp (argv[3], "preview")) {
+ return TRUE;
+ }
- return FALSE;
+ return FALSE;
}
@@ -296,18 +296,18 @@
gint
main (gint argc, gchar *argv[])
{
- gchar *uri;
- gchar realname[MAXPATHLEN];
+ gchar *uri;
+ gchar realname[MAXPATHLEN];
struct stat stat_info;
- gchar *mtime;
- gchar *uri_hash;
- GChecksum *checksum;
- gchar *thumbnail_filename;
-
- if (!validate_args (argc, argv)) {
- g_printerr ("Usage: ./tracker-thumbnailer filename mimetype [normal|large|preview]\n");
- return EXIT_FAILURE;
- }
+ gchar *mtime;
+ gchar *uri_hash;
+ GChecksum *checksum;
+ gchar *thumbnail_filename;
+
+ if (!validate_args (argc, argv)) {
+ g_printerr ("Usage: ./tracker-thumbnailer filename mimetype [normal|large|preview]\n");
+ return EXIT_FAILURE;
+ }
/* only make normal size thumbnails for now */
if (strcmp (argv[3], "normal") != 0) {
@@ -335,53 +335,53 @@
/* create path to thumbnail */
- checksum = g_checksum_new (G_CHECKSUM_MD5);
+ checksum = g_checksum_new (G_CHECKSUM_MD5);
g_checksum_update (checksum, (guchar *)uri, strlen (uri));
uri_hash = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
g_checksum_free (checksum);
thumbnail_filename = g_build_filename (g_get_home_dir (), ".thumbnails", argv[3], uri_hash, NULL);
- g_free (uri_hash);
+ g_free (uri_hash);
/* get stat information on the file */
if (g_stat (argv[1], &stat_info) == -1) {
g_printerr ("stat () failed for %s\n", argv[1]);
- g_free (thumbnail_filename);
- g_free (uri);
+ g_free (thumbnail_filename);
+ g_free (uri);
return EXIT_FAILURE;
}
mtime = g_strdup_printf ("%lu", stat_info.st_mtime);
/* check to see if the thumbnail already exists */
- if (valid_thumbnail_exists (thumbnail_filename, uri, mtime)) {
- g_print ("%s\n", thumbnail_filename);
- g_free (mtime);
- g_free (thumbnail_filename);
- g_free (uri);
- return EXIT_SUCCESS;
- }
-
- if (!generate_thumbnail (uri, thumbnail_filename, argv[2], 128)) {
- g_free (mtime);
- g_free (thumbnail_filename);
- g_free (uri);
- return EXIT_FAILURE;
- }
-
- if (g_file_test (thumbnail_filename, G_FILE_TEST_EXISTS)) {
- ensure_correct_thumbnail (uri, thumbnail_filename, mtime);
- } else {
- g_free (mtime);
- g_free (thumbnail_filename);
- g_free (uri);
+ if (valid_thumbnail_exists (thumbnail_filename, uri, mtime)) {
+ g_print ("%s\n", thumbnail_filename);
+ g_free (mtime);
+ g_free (thumbnail_filename);
+ g_free (uri);
+ return EXIT_SUCCESS;
+ }
+
+ if (!generate_thumbnail (uri, thumbnail_filename, argv[2], 128)) {
+ g_free (mtime);
+ g_free (thumbnail_filename);
+ g_free (uri);
return EXIT_FAILURE;
- }
+ }
+
+ if (g_file_test (thumbnail_filename, G_FILE_TEST_EXISTS)) {
+ ensure_correct_thumbnail (uri, thumbnail_filename, mtime);
+ } else {
+ g_free (mtime);
+ g_free (thumbnail_filename);
+ g_free (uri);
+ return EXIT_FAILURE;
+ }
/* if we get here, everything must have succeeded */
g_print ("%s\n", thumbnail_filename);
- g_free (thumbnail_filename);
- g_free (uri);
- g_free (mtime);
+ g_free (thumbnail_filename);
+ g_free (uri);
+ g_free (mtime);
return EXIT_SUCCESS;
}
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 15:12:19 2008
@@ -32,28 +32,28 @@
#include <libtracker/tracker.h>
-static gchar *service;
-static gchar **mimes;
-static gint limit = 512;
-static gint offset;
+static gchar *service;
+static gchar **mimes;
+static gint limit = 512;
+static gint offset;
static GOptionEntry entries[] = {
{ "service", 's', 0, G_OPTION_ARG_STRING, &service,
- N_("Search from a specific service"),
- NULL
- },
+ N_("Search from a specific service"),
+ NULL
+ },
{ "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
- N_("Limit the number of results shown"),
- N_("512")
- },
+ N_("Limit the number of results shown"),
+ N_("512")
+ },
{ "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
- N_("Offset the results"),
- N_("0")
- },
+ N_("Offset the results"),
+ N_("0")
+ },
{ "add-mime", 'm', 0, G_OPTION_ARG_STRING_ARRAY, &mimes,
- N_("MIME types (can be used multiple times)"),
- NULL
- },
+ N_("MIME types (can be used multiple times)"),
+ NULL
+ },
{ NULL }
};
@@ -62,9 +62,9 @@
{
TrackerClient *client;
- ServiceType type;
+ ServiceType type;
GOptionContext *context;
- GError *error = NULL;
+ GError *error = NULL;
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -74,16 +74,16 @@
g_option_context_add_main_entries (context, entries, "tracker-files");
g_option_context_parse (context, &argc, &argv, NULL);
- if (!service && !mimes) {
- gchar *help;
+ if (!service && !mimes) {
+ gchar *help;
- help = g_option_context_get_help (context, TRUE, NULL);
- g_option_context_free (context);
- g_printerr (help);
- g_free (help);
+ help = g_option_context_get_help (context, TRUE, NULL);
+ g_option_context_free (context);
+ g_printerr (help);
+ g_free (help);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
g_option_context_free (context);
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 15:12:19 2008
@@ -32,102 +32,102 @@
#define MAX_FILENAME_WIDTH 35
-static gchar *path;
-static gchar **fields;
+static gchar *path;
+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"),
- NULL,
- },
+ N_("Path to use for directory to get metadata information about"),
+ NULL,
+ },
{ G_OPTION_REMAINING, 0, 0,
- G_OPTION_ARG_STRING_ARRAY, &fields,
- NULL,
- NULL
- },
+ G_OPTION_ARG_STRING_ARRAY, &fields,
+ NULL,
+ NULL
+ },
{ NULL }
};
static void
print_header (gchar **fields_resolved)
{
- 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",
- fields_resolved[i],
- i < cols - 1 ? ", " : "");
-
- width += g_utf8_strlen (fields_resolved[i], -1);
- width += i < cols - 1 ? 2 : 0;
- }
- g_print ("\n");
-
- /* Line under header */
- g_print (" ");
- for (i = 0; i < width; i++) {
- g_print ("-");
- }
- g_print ("\n");
+ 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",
+ fields_resolved[i],
+ i < cols - 1 ? ", " : "");
+
+ width += g_utf8_strlen (fields_resolved[i], -1);
+ width += i < cols - 1 ? 2 : 0;
+ }
+ g_print ("\n");
+
+ /* Line under header */
+ g_print (" ");
+ for (i = 0; i < width; i++) {
+ g_print ("-");
+ }
+ g_print ("\n");
}
static void
get_meta_table_data (gpointer data,
- gpointer user_data)
+ gpointer user_data)
{
gchar **meta;
gchar **p;
- gchar **fields;
- gchar *basename;
- gint i;
- gint len;
- gint cols;
+ gchar **fields;
+ gchar *basename;
+ gint i;
+ gint len;
+ gint cols;
meta = data;
- fields = user_data;
+ fields = user_data;
- basename = g_path_get_basename (*meta);
- len = g_utf8_strlen (basename, -1);
- cols = g_strv_length (meta);
+ 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) {
+ if (i == 0) {
g_print (" %-*.*s",
- MAX (len, MAX_FILENAME_WIDTH),
- MAX (len, MAX_FILENAME_WIDTH),
- basename);
-
- if (len > MAX_FILENAME_WIDTH) {
- gint i = 0;
-
- g_print ("\n");
- while (i++ < MAX_FILENAME_WIDTH + 2) {
- g_print (" ");
- }
- }
-
- g_print (" (");
- } else {
- g_print ("%s%s",
- *p,
- i < cols - 1 ? ", " : "");
- }
+ MAX (len, MAX_FILENAME_WIDTH),
+ MAX (len, MAX_FILENAME_WIDTH),
+ basename);
+
+ if (len > MAX_FILENAME_WIDTH) {
+ gint i = 0;
+
+ g_print ("\n");
+ while (i++ < MAX_FILENAME_WIDTH + 2) {
+ g_print (" ");
+ }
+ }
+
+ g_print (" (");
+ } else {
+ g_print ("%s%s",
+ *p,
+ i < cols - 1 ? ", " : "");
+ }
}
- g_free (basename);
+ g_free (basename);
g_print (")\n");
}
@@ -135,57 +135,57 @@
int
main (int argc, char **argv)
{
- TrackerClient *client;
- GOptionContext *context;
- GError *error = NULL;
- gchar *summary;
- const gchar *failed = NULL;
- gchar **fields_resolved = NULL;
- gchar *path_in_utf8;
- GPtrArray *array;
- gint i, j;
+ TrackerClient *client;
+ GOptionContext *context;
+ GError *error = NULL;
+ gchar *summary;
+ const gchar *failed = NULL;
+ gchar **fields_resolved = NULL;
+ gchar *path_in_utf8;
+ GPtrArray *array;
+ gint i, j;
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
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>
- */
+ * 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.
- */
- summary = g_strconcat (_("To use multiple meta-data types simply list them, for example:"),
- "\n"
- "\n"
- " -p ", _("PATH"), " File:Size File:Type",
- NULL);
+ */
+ summary = g_strconcat (_("To use multiple meta-data types simply list them, for example:"),
+ "\n"
+ "\n"
+ " -p ", _("PATH"), " File:Size File:Type",
+ NULL);
g_option_context_set_summary (context, summary);
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_parse (context, &argc, &argv, NULL);
g_free (summary);
- if (!path) {
- failed = _("No path was given");
- } else if (!fields) {
- failed = _("No fields were given");
- }
+ if (!path) {
+ failed = _("No path was given");
+ } else if (!fields) {
+ failed = _("No fields were given");
+ }
if (failed) {
- gchar *help;
+ gchar *help;
- g_printerr ("%s\n\n", failed);
+ g_printerr ("%s\n\n", failed);
- help = g_option_context_get_help (context, TRUE, NULL);
- g_option_context_free (context);
- g_printerr (help);
- g_free (help);
+ help = g_option_context_get_help (context, TRUE, NULL);
+ g_option_context_free (context);
+ g_printerr (help);
+ g_free (help);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
g_option_context_free (context);
@@ -197,66 +197,66 @@
return EXIT_FAILURE;
}
- fields_resolved = g_new0 (gchar*, g_strv_length (fields) + 1);
+ fields_resolved = g_new0 (gchar*, g_strv_length (fields) + 1);
- for (i = 0, j = 0; fields && fields[i] != NULL; i++) {
- gchar *field;
+ for (i = 0, j = 0; fields && fields[i] != NULL; i++) {
+ gchar *field;
- field = g_locale_to_utf8 (fields[i], -1, NULL, NULL, NULL);
+ field = g_locale_to_utf8 (fields[i], -1, NULL, NULL, NULL);
- if (field) {
- fields_resolved[j++] = field;
- }
- }
+ if (field) {
+ fields_resolved[j++] = field;
+ }
+ }
- fields_resolved[j] = NULL;
+ fields_resolved[j] = NULL;
path_in_utf8 = g_filename_to_utf8 (path, -1, NULL, NULL, &error);
- if (error) {
+ if (error) {
g_printerr ("%s:'%s', %s\n",
- _("Could not get UTF-8 path from path"),
- path,
- error->message);
- g_error_free (error);
- tracker_disconnect (client);
+ _("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,
- &error);
+ 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"),
- path,
- error->message);
- g_error_free (error);
- g_strfreev (fields_resolved);
- tracker_disconnect (client);
+ _("Could not get meta-data for files in directory"),
+ path,
+ error->message);
+ g_error_free (error);
+ g_strfreev (fields_resolved);
+ tracker_disconnect (client);
- return EXIT_FAILURE;
+ return EXIT_FAILURE;
}
- if (!array) {
- g_print ("%s\n",
+ if (!array) {
+ 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,
- fields_resolved);
- g_ptr_array_free (array, TRUE);
- }
+ } else {
+ g_print ("%s:\n",
+ _("Results"));
+
+ print_header (fields_resolved);
+
+ g_ptr_array_foreach (array,
+ get_meta_table_data,
+ fields_resolved);
+ g_ptr_array_free (array, TRUE);
+ }
g_strfreev (fields_resolved);
tracker_disconnect (client);
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 15:12:19 2008
@@ -35,44 +35,44 @@
#include <trackerd/mingw-compat.h>
#endif /* G_OS_WIN32 */
-static gchar *path;
-static gchar *search;
-static gchar **fields;
-static gchar *service;
-static gchar *keyword;
-static gint limit = 512;
-static gint offset;
+static gchar *path;
+static gchar *search;
+static gchar **fields;
+static gchar *service;
+static gchar *keyword;
+static gint limit = 512;
+static gint offset;
static GOptionEntry entries[] = {
{ "path", 'p', 0, G_OPTION_ARG_STRING, &path,
- N_("Path to use in query"),
- NULL,
- },
+ N_("Path to use in query"),
+ NULL,
+ },
{ "service", 's', 0, G_OPTION_ARG_STRING, &service,
- N_("Search from a specific service"),
- NULL
- },
+ N_("Search from a specific service"),
+ NULL
+ },
{ "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
- N_("Limit the number of results shown"),
- N_("512")
- },
+ N_("Limit the number of results shown"),
+ N_("512")
+ },
{ "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
- N_("Offset the results"),
- N_("0")
- },
+ N_("Offset the results"),
+ N_("0")
+ },
{ "search-term", 't', 0, G_OPTION_ARG_STRING, &search,
- N_("Adds a fulltext search filter"),
- NULL,
- },
+ N_("Adds a fulltext search filter"),
+ NULL,
+ },
{ "keyword", 'k', 0, G_OPTION_ARG_STRING, &keyword,
- N_("Adds a keyword filter"),
- NULL
- },
+ N_("Adds a keyword filter"),
+ NULL
+ },
{ G_OPTION_REMAINING, 0, 0,
- G_OPTION_ARG_STRING_ARRAY, &fields,
- N_("Metadata Fields"),
- NULL
- },
+ G_OPTION_ARG_STRING_ARRAY, &fields,
+ N_("Metadata Fields"),
+ NULL
+ },
{ NULL }
};
@@ -81,7 +81,7 @@
{
gchar **meta;
gchar **p;
- gint i;
+ gint i;
meta = value;
@@ -99,39 +99,39 @@
int
main (int argc, char **argv)
{
- TrackerClient *client;
- ServiceType type;
- GOptionContext *context;
- GError *error = NULL;
- gchar *path_in_utf8;
- gchar *content;
- gchar *buffer;
- gsize size;
- GPtrArray *array;
+ TrackerClient *client;
+ ServiceType type;
+ GOptionContext *context;
+ GError *error = NULL;
+ gchar *path_in_utf8;
+ gchar *content;
+ gchar *buffer;
+ gsize size;
+ GPtrArray *array;
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
context = g_option_context_new (_("- Query using RDF and return results "
- "with specified metadata fields"));
+ "with specified metadata fields"));
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_parse (context, &argc, &argv, NULL);
- if (!fields || !path) {
- gchar *help;
+ if (!fields || !path) {
+ gchar *help;
- g_printerr ("%s\n\n",
+ g_printerr ("%s\n\n",
_("Path or fields are missing"));
- help = g_option_context_get_help (context, TRUE, NULL);
- g_option_context_free (context);
- g_printerr (help);
- g_free (help);
+ help = g_option_context_get_help (context, TRUE, NULL);
+ g_option_context_free (context);
+ g_printerr (help);
+ g_free (help);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
g_option_context_free (context);
@@ -145,10 +145,10 @@
if (limit <= 0) {
limit = 512;
- }
+ }
if (!service) {
- g_print ("%s\n",
+ g_print ("%s\n",
_("Defaulting to 'files' service"));
type = SERVICE_FILES;
@@ -161,27 +161,27 @@
}
}
- path_in_utf8 = g_filename_to_utf8 (path, -1, NULL, NULL, &error);
- if (error) {
+ 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"),
- path,
- error->message);
- g_error_free (error);
- tracker_disconnect (client);
+ _("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) {
+ if (error) {
g_printerr ("%s:'%s', %s\n",
- _("Could not read file"),
- path_in_utf8,
- error->message);
- g_error_free (error);
- g_free (path_in_utf8);
- tracker_disconnect (client);
+ _("Could not read file"),
+ path_in_utf8,
+ error->message);
+ g_error_free (error);
+ g_free (path_in_utf8);
+ tracker_disconnect (client);
return EXIT_FAILURE;
}
@@ -189,49 +189,49 @@
g_free (path_in_utf8);
buffer = g_locale_to_utf8 (content, size, NULL, NULL, &error);
- g_free (content);
+ g_free (content);
- if (error) {
+ if (error) {
g_printerr ("%s, %s\n",
- _("Could not convert query file to UTF-8"),
- error->message);
- g_error_free (error);
- tracker_disconnect (client);
+ _("Could not convert query file to UTF-8"),
+ error->message);
+ g_error_free (error);
+ tracker_disconnect (client);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
array = tracker_search_query (client,
- time (NULL),
- type,
- fields,
- search,
- keyword,
- buffer,
- offset,
- limit,
- FALSE,
+ time (NULL),
+ type,
+ fields,
+ search,
+ keyword,
+ buffer,
+ offset,
+ limit,
+ FALSE,
NULL,
FALSE,
- &error);
- g_free (buffer);
+ &error);
+ g_free (buffer);
if (error) {
g_printerr ("%s, %s\n",
- _("Could not query search"),
- error->message);
+ _("Could not query search"),
+ error->message);
g_error_free (error);
return EXIT_FAILURE;
}
- if (!array) {
- g_print ("%s\n",
+ if (!array) {
+ g_print ("%s\n",
_("No results found matching your query"));
- } else {
- g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
- g_ptr_array_free (array, TRUE);
- }
+ } else {
+ g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
+ g_ptr_array_free (array, TRUE);
+ }
tracker_disconnect (client);
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 15:12:19 2008
@@ -31,34 +31,34 @@
#include <libtracker/tracker.h>
-static gint limit = 512;
-static gint offset;
-static gchar **terms;
-static gchar *service;
+static gint limit = 512;
+static gint offset;
+static gchar **terms;
+static gchar *service;
static gboolean detailed;
static GOptionEntry entries[] = {
{ "service", 's', 0, G_OPTION_ARG_STRING, &service,
- N_("Search from a specific service"),
- NULL
- },
+ N_("Search from a specific service"),
+ NULL
+ },
{ "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
- N_("Limit the number of results shown"),
- N_("512")
- },
+ N_("Limit the number of results shown"),
+ N_("512")
+ },
{ "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
- N_("Offset the results"),
- N_("0")
- },
+ N_("Offset the results"),
+ N_("0")
+ },
{ "detailed", 'd', 0, G_OPTION_ARG_NONE, &detailed,
- N_("Show more detailed results with service and mime type"),
- NULL
- },
+ 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"),
- NULL
- },
+ G_OPTION_ARG_STRING_ARRAY, &terms,
+ N_("search terms"),
+ NULL
+ },
{ NULL }
};
@@ -68,26 +68,26 @@
gchar **meta;
gchar **p;
gchar *str;
- gint i;
+ gint i;
meta = value;
for (p = meta, i = 0; *p; p++, i++) {
- switch (i) {
- case 0:
+ switch (i) {
+ case 0:
str = g_filename_from_utf8 (*p, -1, NULL, NULL, NULL);
- g_print (" %s:'%s'", _("Path"), str);
+ g_print (" %s:'%s'", _("Path"), str);
g_free (str);
- break;
- case 1:
+ break;
+ case 1:
g_print (", %s:'%s'", _("Service"), *p);
- break;
- case 2:
+ break;
+ case 2:
g_print (", %s:'%s'", _("MIME-type"), *p);
- break;
- default:
- break;
- }
+ break;
+ default:
+ break;
+ }
}
g_print ("\n");
@@ -96,68 +96,68 @@
int
main (int argc, char **argv)
{
- TrackerClient *client;
- ServiceType type;
- GOptionContext *context;
- GError *error = NULL;
- gchar *search;
- gchar *summary;
- gchar **strv;
- gchar **p;
- GPtrArray *array;
+ TrackerClient *client;
+ ServiceType type;
+ GOptionContext *context;
+ GError *error = NULL;
+ gchar *search;
+ gchar *summary;
+ gchar **strv;
+ gchar **p;
+ GPtrArray *array;
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
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 (_("- Search files for certain terms"));
/* Translators: this message will appear after the usage string */
- /* and before the list of options. */
+ /* and before the list of options. */
summary = g_strconcat (_("Specifying multiple terms apply an AND "
- "operator to the search performed"),
- "\n",
- _("This means if you search for 'foo' and 'bar', "
- "they must BOTH exist"),
- "\n",
- "\n",
+ "operator to the search performed"),
+ "\n",
+ _("This means if you search for 'foo' and 'bar', "
+ "they must BOTH exist"),
+ "\n",
+ "\n",
_("Recognized services include:"),
"\n"
- "\n",
- " Documents\n"
- " Emails\n"
- " EmailAttachments\n"
- " Music\n"
- " Images\n"
- " Videos\n"
- " Text\n"
- " Development\n"
- " Applications\n"
- " Conversations\n"
- " Folders\n"
- " Files",
+ "\n",
+ " Documents\n"
+ " Emails\n"
+ " EmailAttachments\n"
+ " Music\n"
+ " Images\n"
+ " Videos\n"
+ " Text\n"
+ " Development\n"
+ " Applications\n"
+ " Conversations\n"
+ " Folders\n"
+ " Files",
NULL);
- g_option_context_set_summary (context, summary);
+ g_option_context_set_summary (context, summary);
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_parse (context, &argc, &argv, NULL);
g_free (summary);
- if (!terms) {
- gchar *help;
+ if (!terms) {
+ gchar *help;
- g_printerr ("%s\n\n",
+ g_printerr ("%s\n\n",
_("Search terms are missing"));
- help = g_option_context_get_help (context, TRUE, NULL);
- g_option_context_free (context);
- g_printerr (help);
- g_free (help);
+ help = g_option_context_get_help (context, TRUE, NULL);
+ g_option_context_free (context);
+ g_printerr (help);
+ g_free (help);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
g_option_context_free (context);
@@ -171,10 +171,10 @@
if (limit <= 0) {
limit = 512;
- }
+ }
if (!service) {
- g_print ("%s\n",
+ g_print ("%s\n",
_("Defaulting to 'files' service"));
type = SERVICE_FILES;
@@ -191,78 +191,78 @@
if (detailed) {
array = tracker_search_text_detailed (client,
- time (NULL),
- type,
- search,
- offset,
- limit,
- &error);
- g_free (search);
+ time (NULL),
+ type,
+ search,
+ offset,
+ limit,
+ &error);
+ g_free (search);
- if (error) {
- g_printerr ("%s, %s\n",
+ if (error) {
+ g_printerr ("%s, %s\n",
_("Could not get find detailed results by text"),
error->message);
- g_error_free (error);
- tracker_disconnect (client);
+ g_error_free (error);
+ tracker_disconnect (client);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
- if (!array) {
- g_print ("%s\n",
+ if (!array) {
+ g_print ("%s\n",
_("No results found matching your query"));
- } else {
- g_print ("%s\n",
+ } else {
+ g_print ("%s\n",
_("Results:"));
- g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
- g_ptr_array_free (array, TRUE);
- }
+ g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
+ g_ptr_array_free (array, TRUE);
+ }
} else {
strv = tracker_search_text (client,
- time (NULL),
- type,
- search,
- offset,
- limit,
- &error);
- g_free (search);
+ time (NULL),
+ type,
+ search,
+ offset,
+ limit,
+ &error);
+ g_free (search);
- if (error) {
- g_printerr ("%s, %s\n",
+ if (error) {
+ g_printerr ("%s, %s\n",
_("Could not get find results by text"),
error->message);
- g_error_free (error);
- tracker_disconnect (client);
+ g_error_free (error);
+ tracker_disconnect (client);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
- if (!strv) {
- g_print ("%s\n",
+ if (!strv) {
+ g_print ("%s\n",
_("No results found matching your query"));
- } else {
+ } else {
g_print ("%s:\n",
_("Results"));
- for (p = strv; *p; p++) {
- gchar *s;
+ for (p = strv; *p; p++) {
+ gchar *s;
- s = g_locale_from_utf8 (*p, -1, NULL, NULL, NULL);
+ s = g_locale_from_utf8 (*p, -1, NULL, NULL, NULL);
- if (!s) {
- continue;
- }
+ if (!s) {
+ continue;
+ }
- g_print (" %s\n", s);
- g_free (s);
- }
+ g_print (" %s\n", s);
+ g_free (s);
+ }
- g_free (strv);
- }
+ g_free (strv);
+ }
}
tracker_disconnect (client);
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 15:12:19 2008
@@ -35,17 +35,17 @@
get_meta_table_data (gpointer value)
{
gchar **meta;
- gchar **p;
- gint i;
+ gchar **p;
+ gint i;
meta = value;
for (p = meta, i = 0; *p; p++, i++) {
- if (i == 0) {
- g_print (" %s", *p);
- } else {
+ if (i == 0) {
+ g_print (" %s", *p);
+ } else {
g_print (" = %s", *p);
- }
+ }
}
g_print ("\n");
@@ -57,15 +57,15 @@
TrackerClient *client;
GOptionContext *context;
GPtrArray *array;
- GError *error = NULL;
+ GError *error = NULL;
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
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> */
- context = g_option_context_new (_(" - Show number of indexed files for each service"));
+ /* Translators: this messagge will apper immediately after the */
+ /* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE> */
+ context = g_option_context_new (_(" - Show number of indexed files for each service"));
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
@@ -81,23 +81,23 @@
if (error) {
g_printerr ("%s, %s\n",
- _("Could not get Tracker statistics"),
- error->message);
+ _("Could not get Tracker statistics"),
+ error->message);
g_error_free (error);
- return EXIT_FAILURE;
+ return EXIT_FAILURE;
}
- if (!array) {
- g_print ("%s\n",
+ if (!array) {
+ g_print ("%s\n",
_("No statistics available"));
- } else {
- g_print ("%s\n",
+ } else {
+ g_print ("%s\n",
_("Statistics:"));
- g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
- g_ptr_array_free (array, TRUE);
- }
+ g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
+ g_ptr_array_free (array, TRUE);
+ }
tracker_disconnect (client);
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 15:12:19 2008
@@ -35,8 +35,8 @@
main (gint argc, gchar *argv[])
{
TrackerClient *client;
- GError *error = NULL;
- gchar *status;
+ GError *error = NULL;
+ gchar *status;
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -51,11 +51,11 @@
return EXIT_FAILURE;
}
- status = tracker_get_status (client, &error);
+ status = tracker_get_status (client, &error);
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 15:12:19 2008
@@ -35,48 +35,48 @@
#include <trackerd/mingw-compat.h>
#endif /* G_OS_WIN32 */
-static gint limit = 512;
-static gint offset;
-static gchar **add;
-static gchar **remove;
-static gchar **search;
-static gchar **files;
+static gint limit = 512;
+static gint offset;
+static gchar **add;
+static gchar **remove;
+static gchar **search;
+static gchar **files;
static gboolean remove_all;
static gboolean list;
static GOptionEntry entries[] = {
{ "add", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &add,
- N_("Add specified tag to a file"),
- N_("TAG")
- },
+ 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"),
- N_("TAG")
- },
+ N_("Remove specified tag from a file"),
+ N_("TAG")
+ },
{ "remove-all", 'R', 0, G_OPTION_ARG_NONE, &remove_all,
- N_("Remove all tags from a file"),
- NULL
- },
+ N_("Remove all tags from a file"),
+ NULL
+ },
{ "list", 't', 0, G_OPTION_ARG_NONE, &list,
- N_("List all defined tags"),
- NULL
- },
+ N_("List all defined tags"),
+ NULL
+ },
{ "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
- N_("Limit the number of results shown"),
- N_("512")
- },
+ N_("Limit the number of results shown"),
+ N_("512")
+ },
{ "offset", 'o', 0, G_OPTION_ARG_INT, &offset,
- N_("Offset the results"),
- N_("0")
- },
+ N_("Offset the results"),
+ N_("0")
+ },
{ "search", 's', 0, G_OPTION_ARG_STRING_ARRAY, &search,
- N_("Search for files with specified tag"),
- N_("TAG")
- },
+ N_("Search for files with specified tag"),
+ N_("TAG")
+ },
{ G_OPTION_REMAINING, 0,
- G_OPTION_FLAG_FILENAME, G_OPTION_ARG_STRING_ARRAY, &files,
- N_("FILE..."),
- NULL},
+ G_OPTION_FLAG_FILENAME, G_OPTION_ARG_STRING_ARRAY, &files,
+ N_("FILE..."),
+ NULL},
{ NULL }
};
@@ -85,7 +85,7 @@
{
gchar **meta;
gchar **p;
- gint i;
+ gint i;
meta = value;
@@ -103,65 +103,65 @@
int
main (int argc, char **argv)
{
- TrackerClient *client;
- GOptionContext *context;
- GError *error = NULL;
- const gchar *failed = NULL;
- gchar *summary;
- gchar **files_resolved = NULL;
- gchar **search_resolved = NULL;
- gchar **tags_to_add = NULL;
- gchar **tags_to_remove = NULL;
- gchar *error_str = NULL;
- gint i, j;
+ TrackerClient *client;
+ GOptionContext *context;
+ GError *error = NULL;
+ const gchar *failed = NULL;
+ gchar *summary;
+ gchar **files_resolved = NULL;
+ gchar **search_resolved = NULL;
+ gchar **tags_to_add = NULL;
+ gchar **tags_to_remove = NULL;
+ gchar *error_str = NULL;
+ gint i, j;
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
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>
- */
+ * 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.
- */
- summary = g_strconcat (_("To add, remove, or search for multiple tags "
- "at the same time, join multiple options, for example:"),
- "\n"
- "\n"
- " -a ", _("TAG"), " -a ", _("TAG"), " -a ", _("TAG"),
- NULL);
+ */
+ summary = g_strconcat (_("To add, remove, or search for multiple tags "
+ "at the same time, join multiple options, for example:"),
+ "\n"
+ "\n"
+ " -a ", _("TAG"), " -a ", _("TAG"), " -a ", _("TAG"),
+ NULL);
g_option_context_set_summary (context, summary);
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_parse (context, &argc, &argv, NULL);
g_free (summary);
- /* Check arguments */
+ /* Check arguments */
if ((add || remove || remove_all) && !files) {
- failed = _("No files were specified");
- } else if ((add || remove) && remove_all) {
- failed = _("Add and delete actions can not be used with remove all actions");
- } else if (search && files) {
- failed = _("Files are not needed with searching");
- } else if (!add && !remove && !remove_all && !files && !search && !list) {
- failed = _("No arguments were provided");
- }
+ failed = _("No files were specified");
+ } else if ((add || remove) && remove_all) {
+ failed = _("Add and delete actions can not be used with remove all actions");
+ } else if (search && files) {
+ failed = _("Files are not needed with searching");
+ } else if (!add && !remove && !remove_all && !files && !search && !list) {
+ failed = _("No arguments were provided");
+ }
if (failed) {
- gchar *help;
+ gchar *help;
- g_printerr ("%s\n\n", failed);
+ g_printerr ("%s\n\n", failed);
- help = g_option_context_get_help (context, TRUE, NULL);
- g_option_context_free (context);
- g_printerr (help);
- g_free (help);
+ help = g_option_context_get_help (context, TRUE, NULL);
+ g_option_context_free (context);
+ g_printerr (help);
+ g_free (help);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
g_option_context_free (context);
@@ -174,168 +174,168 @@
}
if (files) {
- files_resolved = g_new0 (gchar*, g_strv_length (files) + 1);
+ files_resolved = g_new0 (gchar*, g_strv_length (files) + 1);
for (i = 0, j = 0; files[i] != NULL; i++) {
- /* GFile *file; */
+ /* GFile *file; */
/* gchar *path; */
- /* file = g_file_new_for_commandline_arg (files[i]); */
- /* path = g_file_get_path (file); */
- /* g_object_unref (file); */
+ /* file = g_file_new_for_commandline_arg (files[i]); */
+ /* path = g_file_get_path (file); */
+ /* g_object_unref (file); */
- files_resolved[j++] = g_strdup (files[i]);
+ files_resolved[j++] = g_strdup (files[i]);
}
- files_resolved[j] = NULL;
+ files_resolved[j] = NULL;
}
if (add || remove || remove_all) {
if (add) {
- tags_to_add = g_new0 (gchar*, g_strv_length (add) + 1);
+ tags_to_add = g_new0 (gchar*, g_strv_length (add) + 1);
for (i = 0, j = 0; add[i] != NULL; i++) {
gchar *path;
- path = g_locale_to_utf8 (add[i], -1, NULL, NULL, NULL);
- if (path) {
- tags_to_add[j++] = path;
- }
+ path = g_locale_to_utf8 (add[i], -1, NULL, NULL, NULL);
+ if (path) {
+ tags_to_add[j++] = path;
+ }
}
- }
+ }
if (remove) {
- tags_to_remove = g_new0 (gchar*, g_strv_length (remove) + 1);
+ tags_to_remove = g_new0 (gchar*, g_strv_length (remove) + 1);
for (i = 0, j = 0; remove[i] != NULL; i++) {
gchar *path;
- path = g_locale_to_utf8 (remove[i], -1, NULL, NULL, NULL);
- if (path) {
- tags_to_remove[j++] = path;
- }
+ path = g_locale_to_utf8 (remove[i], -1, NULL, NULL, NULL);
+ if (path) {
+ tags_to_remove[j++] = path;
+ }
}
- }
+ }
for (i = 0; files_resolved[i] != NULL; i++) {
if (remove_all) {
tracker_keywords_remove_all (client,
- SERVICE_FILES,
- files_resolved[i],
- &error);
+ SERVICE_FILES,
+ files_resolved[i],
+ &error);
if (error) {
- gchar *str;
+ gchar *str;
- str = g_strdup_printf (_("Could not remove all tags for '%s'"),
- files_resolved[i]);
+ str = g_strdup_printf (_("Could not remove all tags for '%s'"),
+ files_resolved[i]);
g_printerr ("%s, %s\n",
- str,
- error->message);
- g_free (str);
- g_clear_error (&error);
+ str,
+ error->message);
+ g_free (str);
+ g_clear_error (&error);
}
}
if (tags_to_add) {
tracker_keywords_add (client,
- SERVICE_FILES,
- files_resolved[i],
- tags_to_add,
- &error);
+ SERVICE_FILES,
+ files_resolved[i],
+ tags_to_add,
+ &error);
if (error) {
- gchar *str;
+ gchar *str;
- str = g_strdup_printf (_("Could not add tags for '%s'"),
- files_resolved[i]);
+ str = g_strdup_printf (_("Could not add tags for '%s'"),
+ files_resolved[i]);
g_printerr ("%s, %s\n",
- str,
- error->message);
- g_free (str);
- g_clear_error (&error);
+ str,
+ error->message);
+ g_free (str);
+ g_clear_error (&error);
}
}
if (tags_to_remove) {
tracker_keywords_remove (client,
- SERVICE_FILES,
- files_resolved[i],
- tags_to_remove,
- &error);
+ SERVICE_FILES,
+ files_resolved[i],
+ tags_to_remove,
+ &error);
if (error) {
- gchar *str;
+ gchar *str;
- str = g_strdup_printf (_("Could not remove tags for '%s'"),
- files_resolved[i]);
+ str = g_strdup_printf (_("Could not remove tags for '%s'"),
+ files_resolved[i]);
g_printerr ("%s, %s\n",
- str,
- error->message);
- g_free (str);
- g_clear_error (&error);
+ str,
+ error->message);
+ g_free (str);
+ g_clear_error (&error);
}
}
}
}
if (((!files && list) ||
- (!files && (!add && !remove && !remove_all))) && !search) {
+ (!files && (!add && !remove && !remove_all))) && !search) {
GPtrArray *array;
array = tracker_keywords_get_list (client,
- SERVICE_FILES,
- &error);
+ SERVICE_FILES,
+ &error);
- if (error) {
- error_str = g_strdup (_("Could not get tag list"));
- goto finish;
- }
+ if (error) {
+ error_str = g_strdup (_("Could not get tag list"));
+ goto finish;
+ }
- if (!array) {
- g_print ("%s\n",
+ if (!array) {
+ g_print ("%s\n",
_("No tags found"));
- } else {
- g_print ("%s:\n",
+ } else {
+ g_print ("%s:\n",
_("All tags"));
- g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
- g_ptr_array_free (array, TRUE);
- }
+ g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
+ g_ptr_array_free (array, TRUE);
+ }
}
if ((files && list) ||
- (files && (!add && !remove && !remove_all))) {
- g_print ("%s:\n",
- _("Tags found"));
+ (files && (!add && !remove && !remove_all))) {
+ g_print ("%s:\n",
+ _("Tags found"));
for (i = 0, j = 0; files_resolved[i] != NULL; i++) {
gchar **tags;
- tags = tracker_keywords_get (client,
- SERVICE_FILES,
- files_resolved[i],
- &error);
+ tags = tracker_keywords_get (client,
+ SERVICE_FILES,
+ files_resolved[i],
+ &error);
if (error) {
- error_str = g_strdup_printf (_("Could not get tags for file:'%s'"),
- files_resolved[i]);
- goto finish;
+ error_str = g_strdup_printf (_("Could not get tags for file:'%s'"),
+ files_resolved[i]);
+ goto finish;
}
if (!tags) {
continue;
- }
+ }
g_print (" '%s': ", files_resolved[i]);
for (j = 0; tags[j] != NULL; j++) {
- if (j > 0) {
- g_print ("|");
- }
+ if (j > 0) {
+ g_print ("|");
+ }
g_print ("%s", tags[j]);
- }
+ }
g_print ("\n");
@@ -346,16 +346,16 @@
if (search) {
gchar **results;
- search_resolved = g_new0 (gchar*, g_strv_length (search) + 1);
+ search_resolved = g_new0 (gchar*, g_strv_length (search) + 1);
for (i = 0, j = 0; search[i] != NULL; i++) {
gchar *str;
- str = g_locale_to_utf8 (search[i], -1, NULL, NULL, NULL);
- search_resolved[j++] = str;
+ str = g_locale_to_utf8 (search[i], -1, NULL, NULL, NULL);
+ search_resolved[j++] = str;
}
- search_resolved[j] = NULL;
+ search_resolved[j] = NULL;
results = tracker_keywords_search (client, -1,
SERVICE_FILES,
@@ -364,40 +364,40 @@
limit,
&error);
- if (error) {
- error_str = g_strdup (_("Could not search tags"));
- goto finish;
- }
+ if (error) {
+ error_str = g_strdup (_("Could not search tags"));
+ goto finish;
+ }
if (!results) {
- g_print ("%s\n",
+ g_print ("%s\n",
_("No tags found"));
} else {
for (i = 0; results[i] != NULL; i++) {
g_print (" %s\n", results[i]);
- }
- }
+ }
+ }
g_strfreev (results);
}
finish:
- g_strfreev (tags_to_remove);
- g_strfreev (tags_to_add);
- g_strfreev (search_resolved);
- g_strfreev (files_resolved);
-
- tracker_disconnect (client);
-
- if (error_str) {
- g_printerr ("%s, %s\n",
- error_str,
- error->message);
- g_free (error_str);
- g_clear_error (&error);
+ g_strfreev (tags_to_remove);
+ g_strfreev (tags_to_add);
+ g_strfreev (search_resolved);
+ g_strfreev (files_resolved);
+
+ tracker_disconnect (client);
+
+ if (error_str) {
+ g_printerr ("%s, %s\n",
+ error_str,
+ error->message);
+ g_free (error_str);
+ g_clear_error (&error);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
- return EXIT_SUCCESS;
+ 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 15:12:19 2008
@@ -34,36 +34,36 @@
#include <trackerd/mingw-compat.h>
#endif /* G_OS_WIN32 */
-static gchar **fields;
-static gchar *service;
-static gchar *path;
-static gchar *count;
-static gchar *sum;
+static gchar **fields;
+static gchar *service;
+static gchar *path;
+static gchar *count;
+static gchar *sum;
static gboolean descending;
static GOptionEntry entries[] = {
{ "path", 'p', 0, G_OPTION_ARG_STRING, &path,
- N_("Path to use in query"),
- NULL
- },
+ N_("Path to use in query"),
+ NULL
+ },
{ "service", 's', 0, G_OPTION_ARG_STRING, &service,
- N_("Search from a specific service"),
- NULL
- },
+ N_("Search from a specific service"),
+ NULL
+ },
{ "count", 'c', 0, G_OPTION_ARG_STRING, &count,
- N_("Count instances of unique fields of this type"),
- "e.g. File:Mime"
- },
+ 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"),
- "e.g. File:Mime"
- },
+ N_("Sum the values of this field"),
+ "e.g. File:Mime"
+ },
{ "desc", 'o', 0, G_OPTION_ARG_NONE, &descending,
- N_("Sort to descending order"),
- NULL},
+ N_("Sort to descending order"),
+ NULL},
{ G_OPTION_REMAINING, 0, 0,
- G_OPTION_ARG_STRING_ARRAY, &fields,
- N_("Required fields"), NULL},
+ G_OPTION_ARG_STRING_ARRAY, &fields,
+ N_("Required fields"), NULL},
{ NULL }
};
@@ -71,8 +71,8 @@
get_meta_table_data (gpointer value)
{
gchar **meta;
- gchar **p;
- gint i;
+ gchar **p;
+ gint i;
meta = value;
@@ -90,14 +90,14 @@
int
main (int argc, char **argv)
{
- TrackerClient *client;
- ServiceType type;
- GOptionContext *context;
- GError *error = NULL;
- gchar *content;
- gchar *buffer = NULL;
- gsize size;
- GPtrArray *array;
+ TrackerClient *client;
+ ServiceType type;
+ GOptionContext *context;
+ GError *error = NULL;
+ gchar *content;
+ gchar *buffer = NULL;
+ gsize size;
+ GPtrArray *array;
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -107,19 +107,19 @@
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_parse (context, &argc, &argv, NULL);
- if (!fields) {
- gchar *help;
+ 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);
- g_option_context_free (context);
- g_printerr (help);
- g_free (help);
+ help = g_option_context_get_help (context, TRUE, NULL);
+ g_option_context_free (context);
+ g_printerr (help);
+ g_free (help);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
g_option_context_free (context);
@@ -132,7 +132,7 @@
}
if (!service) {
- g_print ("%s\n",
+ g_print ("%s\n",
_("Defaulting to 'files' service"));
type = SERVICE_FILES;
@@ -146,47 +146,47 @@
}
if (path) {
- gchar *path_in_utf8;
+ gchar *path_in_utf8;
- 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"),
- 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"),
- 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);
+ 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"),
+ 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"),
+ path_in_utf8,
+ error->message);
+ g_error_free (error);
+ g_free (path_in_utf8);
+ tracker_disconnect (client);
+
+ return EXIT_FAILURE;
+ }
- 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,
@@ -198,27 +198,27 @@
0,
512,
&error);
- g_free (buffer);
+ g_free (buffer);
if (error) {
g_printerr ("%s, %s\n",
- _("Could not query search"),
- error->message);
+ _("Could not query search"),
+ error->message);
g_error_free (error);
return EXIT_FAILURE;
}
- if (!array) {
- g_print ("%s\n",
+ if (!array) {
+ g_print ("%s\n",
_("No results found matching your query"));
- } else {
+ } else {
g_print ("%s:\n",
_("Results"));
- g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
- g_ptr_array_free (array, TRUE);
- }
+ g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);
+ g_ptr_array_free (array, TRUE);
+ }
tracker_disconnect (client);
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 15:12:19 2008
@@ -10,8 +10,8 @@
#define getc_unlocked(s) getc(s)
-#define RLIMIT_CPU 0 /* CPU time in seconds */
-#define RLIMIT_AS 6 /* address space (virt. memory) limit */
+#define RLIMIT_CPU 0 /* CPU time in seconds */
+#define RLIMIT_AS 6 /* address space (virt. memory) limit */
typedef unsigned long rlim_t;
struct rlimit {
@@ -20,8 +20,8 @@
};
#define localtime_r( _clock, _result ) \
- ( *(_result) = *localtime( (_clock) ), \
- (_result) )
+ ( *(_result) = *localtime( (_clock) ), \
+ (_result) )
#include <time.h>
#include <sys/time.h>
@@ -29,7 +29,7 @@
struct timezone {
int tz_minuteswest; /* minutes west of Greenwich */
- int tz_dsttime; /* type of dst correction */
+ int tz_dsttime; /* type of dst correction */
};
static int gettimeofday (struct timeval *tv, struct timezone *tz)
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 15:12:19 2008
@@ -49,52 +49,52 @@
/* This is the number of files to be called back with from GIO at a
* time so we don't get called back for every file.
*/
-#define FILES_GROUP_SIZE 100
+#define FILES_GROUP_SIZE 100
struct _TrackerCrawlerPrivate {
TrackerConfig *config;
- gchar *module_name;
+ gchar *module_name;
/* Found data */
- GQueue *directories;
- GQueue *files;
+ GQueue *directories;
+ GQueue *files;
/* Idle handler for processing found data */
- guint idle_id;
+ guint idle_id;
/* Options */
- gboolean use_module_paths;
+ gboolean use_module_paths;
/* Actual paths that exist which we are crawling */
- GSList *paths;
- GSList *current_path;
- gboolean handled_paths;
-
- GSList *recurse_paths;
- GSList *current_recurse_path;
- gboolean handled_recurse_paths;
-
- GList *ignored_directory_patterns;
- GList *ignored_file_patterns;
- GList *index_file_patterns;
+ GSList *paths;
+ GSList *current_path;
+ gboolean handled_paths;
+
+ GSList *recurse_paths;
+ GSList *current_recurse_path;
+ gboolean handled_recurse_paths;
+
+ GList *ignored_directory_patterns;
+ GList *ignored_file_patterns;
+ GList *index_file_patterns;
/* Legacy NoWatchDirectoryRoots */
- GSList *no_watch_directory_roots;
- GSList *watch_directory_roots;
- GSList *crawl_directory_roots;
+ GSList *no_watch_directory_roots;
+ GSList *watch_directory_roots;
+ GSList *crawl_directory_roots;
/* Statistics */
- GTimer *timer;
- guint enumerations;
- guint directories_found;
- guint directories_ignored;
- guint files_found;
- guint files_ignored;
+ GTimer *timer;
+ guint enumerations;
+ guint directories_found;
+ guint directories_ignored;
+ guint files_found;
+ guint files_ignored;
/* Status */
- gboolean running;
- gboolean finished;
+ gboolean running;
+ gboolean finished;
};
enum {
@@ -106,14 +106,14 @@
typedef struct {
TrackerCrawler *crawler;
- GFile *parent;
+ GFile *parent;
} EnumeratorData;
-static void tracker_crawler_finalize (GObject *object);
+static void tracker_crawler_finalize (GObject *object);
static void file_enumerate_next (GFileEnumerator *enumerator,
EnumeratorData *ed);
static void file_enumerate_children (TrackerCrawler *crawler,
- GFile *file);
+ GFile *file);
static guint signals[LAST_SIGNAL] = { 0, };
@@ -273,12 +273,12 @@
static gboolean
is_path_ignored (TrackerCrawler *crawler,
- const gchar *path,
- gboolean is_directory)
+ const gchar *path,
+ gboolean is_directory)
{
- GList *l;
- gchar *basename;
- gboolean ignore;
+ GList *l;
+ gchar *basename;
+ gboolean ignore;
if (tracker_is_empty_string (path)) {
return TRUE;
@@ -372,7 +372,7 @@
}
}
- ignore = FALSE;
+ ignore = FALSE;
done:
g_free (basename);
@@ -382,7 +382,7 @@
static void
add_file (TrackerCrawler *crawler,
- GFile *file)
+ GFile *file)
{
gchar *path;
@@ -411,7 +411,7 @@
static void
add_directory (TrackerCrawler *crawler,
- GFile *file)
+ GFile *file)
{
gchar *path;
@@ -441,15 +441,15 @@
static void
process_file (TrackerCrawler *crawler,
const gchar *module_name,
- GFile *file)
+ GFile *file)
{
g_signal_emit (crawler, signals[PROCESSING_FILE], 0, module_name, file);
}
static void
process_directory (TrackerCrawler *crawler,
- const gchar *module_name,
- GFile *file)
+ const gchar *module_name,
+ GFile *file)
{
g_signal_emit (crawler, signals[PROCESSING_DIRECTORY], 0, module_name, file);
@@ -459,9 +459,9 @@
static gboolean
process_func (gpointer data)
{
- TrackerCrawler *crawler;
+ TrackerCrawler *crawler;
TrackerCrawlerPrivate *priv;
- GFile *file;
+ GFile *file;
crawler = TRACKER_CRAWLER (data);
priv = crawler->private;
@@ -569,7 +569,7 @@
static EnumeratorData *
enumerator_data_new (TrackerCrawler *crawler,
- GFile *parent)
+ GFile *parent)
{
EnumeratorData *ed;
@@ -591,7 +591,7 @@
static void
file_enumerator_close_cb (GObject *enumerator,
GAsyncResult *result,
- gpointer user_data)
+ gpointer user_data)
{
TrackerCrawler *crawler;
@@ -610,12 +610,12 @@
GAsyncResult *result,
gpointer user_data)
{
- TrackerCrawler *crawler;
- EnumeratorData *ed;
+ TrackerCrawler *crawler;
+ EnumeratorData *ed;
GFileEnumerator *enumerator;
- GFile *parent, *child;
- GFileInfo *info;
- GList *files, *l;
+ GFile *parent, *child;
+ GFileInfo *info;
+ GList *files, *l;
enumerator = G_FILE_ENUMERATOR (object);
@@ -687,14 +687,14 @@
}
static void
-file_enumerate_children_cb (GObject *file,
+file_enumerate_children_cb (GObject *file,
GAsyncResult *result,
- gpointer user_data)
+ gpointer user_data)
{
- TrackerCrawler *crawler;
- EnumeratorData *ed;
+ TrackerCrawler *crawler;
+ EnumeratorData *ed;
GFileEnumerator *enumerator;
- GFile *parent;
+ GFile *parent;
parent = G_FILE (file);
crawler = TRACKER_CRAWLER (user_data);
@@ -713,7 +713,7 @@
static void
file_enumerate_children (TrackerCrawler *crawler,
- GFile *file)
+ GFile *file)
{
crawler->private->enumerations++;
@@ -734,10 +734,10 @@
priv = crawler->private;
if (priv->recurse_paths) {
- GSList *new_list;
- GSList *l;
- GFile *file;
- gchar *path;
+ GSList *new_list;
+ GSList *l;
+ GFile *file;
+ gchar *path;
gboolean exists;
new_list = NULL;
@@ -773,14 +773,14 @@
tracker_crawler_start (TrackerCrawler *crawler)
{
TrackerCrawlerPrivate *priv;
- GFile *file;
- GSList *paths = NULL;
- GList *recurse_directories;
- GList *directories;
- GList *l;
- GSList *sl;
- gchar *path;
- gboolean exists;
+ GFile *file;
+ GSList *paths = NULL;
+ GList *recurse_directories;
+ GList *directories;
+ GList *l;
+ GSList *sl;
+ gchar *path;
+ gboolean exists;
g_return_val_if_fail (TRACKER_IS_CRAWLER (crawler), FALSE);
@@ -955,7 +955,7 @@
*/
void
tracker_crawler_add_path (TrackerCrawler *crawler,
- const gchar *path)
+ const gchar *path)
{
TrackerCrawlerPrivate *priv;
@@ -971,7 +971,7 @@
void
tracker_crawler_set_use_module_paths (TrackerCrawler *crawler,
- gboolean use_paths)
+ gboolean use_paths)
{
TrackerCrawlerPrivate *priv;
@@ -984,8 +984,8 @@
gboolean
tracker_crawler_is_path_ignored (TrackerCrawler *crawler,
- const gchar *path,
- gboolean is_directory)
+ const gchar *path,
+ gboolean is_directory)
{
g_return_val_if_fail (TRACKER_IS_CRAWLER (crawler), TRUE);
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 15:12:19 2008
@@ -27,40 +27,40 @@
G_BEGIN_DECLS
-#define TRACKER_TYPE_CRAWLER (tracker_crawler_get_type ())
-#define TRACKER_CRAWLER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_CRAWLER, TrackerCrawler))
-#define TRACKER_CRAWLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_CRAWLER, TrackerCrawlerClass))
-#define TRACKER_IS_CRAWLER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_CRAWLER))
+#define TRACKER_TYPE_CRAWLER (tracker_crawler_get_type ())
+#define TRACKER_CRAWLER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_CRAWLER, TrackerCrawler))
+#define TRACKER_CRAWLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_CRAWLER, TrackerCrawlerClass))
+#define TRACKER_IS_CRAWLER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_CRAWLER))
#define TRACKER_IS_CRAWLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_CRAWLER))
-#define TRACKER_CRAWLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerClass))
+#define TRACKER_CRAWLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerClass))
-typedef struct _TrackerCrawler TrackerCrawler;
+typedef struct _TrackerCrawler TrackerCrawler;
typedef struct _TrackerCrawlerClass TrackerCrawlerClass;
typedef struct _TrackerCrawlerPrivate TrackerCrawlerPrivate;
struct _TrackerCrawler {
- GObject parent;
+ GObject parent;
TrackerCrawlerPrivate *private;
};
struct _TrackerCrawlerClass {
- GObjectClass parent;
+ GObjectClass parent;
};
-GType tracker_crawler_get_type (void);
-TrackerCrawler *tracker_crawler_new (TrackerConfig *config,
+GType tracker_crawler_get_type (void);
+TrackerCrawler *tracker_crawler_new (TrackerConfig *config,
const gchar *module_name);
-gboolean tracker_crawler_start (TrackerCrawler *crawler);
-void tracker_crawler_stop (TrackerCrawler *crawler);
-gboolean tracker_crawler_is_path_ignored (TrackerCrawler *crawler,
+gboolean tracker_crawler_start (TrackerCrawler *crawler);
+void tracker_crawler_stop (TrackerCrawler *crawler);
+gboolean tracker_crawler_is_path_ignored (TrackerCrawler *crawler,
const gchar *path,
- gboolean is_directory);
+ gboolean is_directory);
/* Convenience API for old .cfg file */
-void tracker_crawler_add_path (TrackerCrawler *crawler,
+void tracker_crawler_add_path (TrackerCrawler *crawler,
const gchar *path);
-void tracker_crawler_set_use_module_paths (TrackerCrawler *crawler,
- gboolean use_paths);
+void tracker_crawler_set_use_module_paths (TrackerCrawler *crawler,
+ gboolean use_paths);
G_END_DECLS
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 15:12:19 2008
@@ -44,33 +44,33 @@
#define TRACKER_DAEMON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DAEMON, TrackerDaemonPrivate))
typedef struct {
- TrackerConfig *config;
+ TrackerConfig *config;
TrackerProcessor *processor;
- DBusGProxy *indexer_proxy;
- GPtrArray *last_stats;
+ DBusGProxy *indexer_proxy;
+ GPtrArray *last_stats;
} TrackerDaemonPrivate;
enum {
- INDEX_STATE_CHANGE,
- INDEX_FINISHED,
+ INDEX_STATE_CHANGE,
+ INDEX_FINISHED,
INDEX_PROGRESS,
SERVICE_STATISTICS_UPDATED,
- LAST_SIGNAL
+ LAST_SIGNAL
};
-static void tracker_daemon_finalize (GObject *object);
-static void indexer_pause_cb (DBusGProxy *proxy,
- GError *error,
- gpointer user_data);
+static void tracker_daemon_finalize (GObject *object);
+static void indexer_pause_cb (DBusGProxy *proxy,
+ GError *error,
+ gpointer user_data);
static void indexer_continue_cb (DBusGProxy *proxy,
- GError *error,
- gpointer user_data);
-static void indexer_paused_cb (DBusGProxy *proxy,
- GError *error,
- gpointer user_data);
+ GError *error,
+ gpointer user_data);
+static void indexer_paused_cb (DBusGProxy *proxy,
+ GError *error,
+ gpointer user_data);
static void indexer_continued_cb (DBusGProxy *proxy,
- GError *error,
- gpointer user_data);
+ GError *error,
+ gpointer user_data);
static guint signals[LAST_SIGNAL] = {0};
@@ -85,15 +85,15 @@
object_class->finalize = tracker_daemon_finalize;
- signals[INDEX_STATE_CHANGE] =
- g_signal_new ("index-state-change",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- tracker_marshal_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN,
- G_TYPE_NONE,
- 7,
+ signals[INDEX_STATE_CHANGE] =
+ g_signal_new ("index-state-change",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ tracker_marshal_VOID__STRING_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN,
+ G_TYPE_NONE,
+ 7,
G_TYPE_STRING,
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
@@ -101,40 +101,40 @@
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN);
- signals[INDEX_FINISHED] =
- g_signal_new ("index-finished",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__DOUBLE,
- G_TYPE_NONE,
- 1,
+ signals[INDEX_FINISHED] =
+ g_signal_new ("index-finished",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__DOUBLE,
+ G_TYPE_NONE,
+ 1,
G_TYPE_DOUBLE);
- signals[INDEX_PROGRESS] =
- g_signal_new ("index-progress",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- tracker_marshal_VOID__STRING_STRING_INT_INT_INT_DOUBLE,
- G_TYPE_NONE,
- 6,
+ signals[INDEX_PROGRESS] =
+ g_signal_new ("index-progress",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ tracker_marshal_VOID__STRING_STRING_INT_INT_INT_DOUBLE,
+ G_TYPE_NONE,
+ 6,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_INT,
G_TYPE_INT,
G_TYPE_INT,
G_TYPE_DOUBLE);
- signals[SERVICE_STATISTICS_UPDATED] =
- g_signal_new ("service-statistics-updated",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- tracker_marshal_VOID__BOXED,
- G_TYPE_NONE,
- 1,
+ signals[SERVICE_STATISTICS_UPDATED] =
+ g_signal_new ("service-statistics-updated",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ tracker_marshal_VOID__BOXED,
+ G_TYPE_NONE,
+ 1,
G_TYPE_STRV);
g_type_class_add_private (object_class, sizeof (TrackerDaemonPrivate));
@@ -151,19 +151,19 @@
static void
indexer_finished_cb (DBusGProxy *proxy,
- gdouble seconds_elapsed,
- guint items_done,
- gboolean interrupted,
- gpointer user_data)
+ gdouble seconds_elapsed,
+ guint items_done,
+ gboolean interrupted,
+ gpointer user_data)
{
- GObject *daemon;
+ GObject *daemon;
TrackerDaemonPrivate *priv;
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- GPtrArray *values = NULL;
- GPtrArray *new_stats;
- GStrv strv;
- guint i;
+ GPtrArray *values = NULL;
+ GPtrArray *new_stats;
+ GStrv strv;
+ guint i;
daemon = tracker_dbus_get_object (TRACKER_TYPE_DAEMON);
priv = TRACKER_DAEMON_GET_PRIVATE (daemon);
@@ -241,7 +241,7 @@
TrackerDaemonPrivate *priv;
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- DBusGProxy *proxy;
+ DBusGProxy *proxy;
priv = TRACKER_DAEMON_GET_PRIVATE (object);
@@ -274,7 +274,7 @@
static void
tracker_daemon_finalize (GObject *object)
{
- TrackerDaemon *daemon;
+ TrackerDaemon *daemon;
TrackerDaemonPrivate *priv;
daemon = TRACKER_DAEMON (object);
@@ -304,7 +304,7 @@
tracker_daemon_new (TrackerConfig *config,
TrackerProcessor *processor)
{
- TrackerDaemon *object;
+ TrackerDaemon *object;
TrackerDaemonPrivate *priv;
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
@@ -333,8 +333,8 @@
static void
indexer_continue_cb (DBusGProxy *proxy,
- GError *error,
- gpointer user_data)
+ GError *error,
+ gpointer user_data)
{
if (error) {
g_message ("Could not continue the indexer, %s",
@@ -352,8 +352,8 @@
static void
indexer_continued_cb (DBusGProxy *proxy,
- GError *error,
- gpointer user_data)
+ GError *error,
+ gpointer user_data)
{
g_message ("The indexer has continued");
}
@@ -362,9 +362,9 @@
* Functions
*/
void
-tracker_daemon_get_version (TrackerDaemon *object,
+tracker_daemon_get_version (TrackerDaemon *object,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
guint request_id;
gint major = 0;
@@ -373,9 +373,9 @@
gint version;
gchar *str;
- request_id = tracker_dbus_get_next_request_id ();
+ request_id = tracker_dbus_get_next_request_id ();
- tracker_dbus_request_new (request_id,
+ tracker_dbus_request_new (request_id,
"DBus request to get daemon version");
@@ -390,19 +390,19 @@
}
void
-tracker_daemon_get_status (TrackerDaemon *object,
+tracker_daemon_get_status (TrackerDaemon *object,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDaemonPrivate *priv;
- gchar *status;
- guint request_id;
+ gchar *status;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
priv = TRACKER_DAEMON_GET_PRIVATE (object);
- tracker_dbus_request_new (request_id,
+ tracker_dbus_request_new (request_id,
"DBus request to get daemon status");
status = g_strdup (tracker_status_get_as_string ());
@@ -415,15 +415,15 @@
}
void
-tracker_daemon_get_services (TrackerDaemon *object,
- gboolean main_services_only,
+tracker_daemon_get_services (TrackerDaemon *object,
+ gboolean main_services_only,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- GHashTable *values = NULL;
+ guint request_id;
+ GHashTable *values = NULL;
/* FIXME: Note, the main_services_only variable is redundant */
@@ -457,14 +457,14 @@
}
void
-tracker_daemon_get_stats (TrackerDaemon *object,
+tracker_daemon_get_stats (TrackerDaemon *object,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- GPtrArray *values = NULL;
+ guint request_id;
+ GPtrArray *values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -497,15 +497,15 @@
}
void
-tracker_daemon_set_bool_option (TrackerDaemon *object,
- const gchar *option,
- gboolean value,
+tracker_daemon_set_bool_option (TrackerDaemon *object,
+ const gchar *option,
+ gboolean value,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDaemonPrivate *priv;
- guint request_id;
- GError *actual_error = NULL;
+ guint request_id;
+ GError *actual_error = NULL;
/* FIXME: Shouldn't we just make the TrackerConfig module a
* DBus object instead so values can be tweaked in real time
@@ -518,7 +518,7 @@
priv = TRACKER_DAEMON_GET_PRIVATE (object);
- tracker_dbus_request_new (request_id,
+ tracker_dbus_request_new (request_id,
"DBus request to set daemon boolean option, "
"key:'%s', value:%s",
option,
@@ -544,8 +544,8 @@
}
}
} else if (strcasecmp (option, "FastMerges") == 0) {
- tracker_config_set_fast_merges (priv->config, value);
- g_message ("Fast merges set to %d", value);
+ tracker_config_set_fast_merges (priv->config, value);
+ g_message ("Fast merges set to %d", value);
} else if (strcasecmp (option, "EnableIndexing") == 0) {
/* FIXME: Ideally we should be picking up the
* "nofify::enable-indexing" change on the
@@ -553,32 +553,32 @@
* the signal change and to set the daemon to
* readonly mode.
*/
- tracker_config_set_enable_indexing (priv->config, value);
+ tracker_config_set_enable_indexing (priv->config, value);
tracker_status_set_is_readonly (value);
g_message ("Enable indexing set to %d", value);
} else if (strcasecmp (option, "EnableWatching") == 0) {
- tracker_config_set_enable_watches (priv->config, value);
+ tracker_config_set_enable_watches (priv->config, value);
g_message ("Enable Watching set to %d", value);
} else if (strcasecmp (option, "LowMemoryMode") == 0) {
- tracker_config_set_low_memory_mode (priv->config, value);
+ tracker_config_set_low_memory_mode (priv->config, value);
g_message ("Extra memory usage set to %d", !value);
} else if (strcasecmp (option, "IndexFileContents") == 0) {
- tracker_config_set_enable_content_indexing (priv->config, value);
+ tracker_config_set_enable_content_indexing (priv->config, value);
g_message ("Index file contents set to %d", value);
} else if (strcasecmp (option, "GenerateThumbs") == 0) {
- tracker_config_set_enable_thumbnails (priv->config, value);
+ tracker_config_set_enable_thumbnails (priv->config, value);
g_message ("Generate thumbnails set to %d", value);
} else if (strcasecmp (option, "IndexMountedDirectories") == 0) {
- tracker_config_set_index_mounted_directories (priv->config, value);
+ tracker_config_set_index_mounted_directories (priv->config, value);
g_message ("Indexing mounted directories set to %d", value);
} else if (strcasecmp (option, "IndexRemovableDevices") == 0) {
- tracker_config_set_index_removable_devices (priv->config, value);
+ tracker_config_set_index_removable_devices (priv->config, value);
g_message ("Indexing removable devices set to %d", value);
} else if (strcasecmp (option, "BatteryIndex") == 0) {
- tracker_config_set_disable_indexing_on_battery (priv->config, !value);
+ tracker_config_set_disable_indexing_on_battery (priv->config, !value);
g_message ("Disable index on battery set to %d", !value);
} else if (strcasecmp (option, "BatteryIndexInitial") == 0) {
- tracker_config_set_disable_indexing_on_battery_init (priv->config, !value);
+ tracker_config_set_disable_indexing_on_battery_init (priv->config, !value);
g_message ("Disable initial index sweep on battery set to %d", !value);
} else {
g_set_error (&actual_error,
@@ -598,15 +598,15 @@
}
void
-tracker_daemon_set_int_option (TrackerDaemon *object,
- const gchar *option,
- gint value,
+tracker_daemon_set_int_option (TrackerDaemon *object,
+ const gchar *option,
+ gint value,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDaemonPrivate *priv;
- guint request_id;
- GError *actual_error = NULL;
+ guint request_id;
+ GError *actual_error = NULL;
/* FIXME: Shouldn't we just make the TrackerConfig module a
* DBus object instead so values can be tweaked in real time
@@ -619,20 +619,20 @@
priv = TRACKER_DAEMON_GET_PRIVATE (object);
- tracker_dbus_request_new (request_id,
+ tracker_dbus_request_new (request_id,
"DBus request to set daemon integer option, "
"key:'%s', value:%d",
option,
value);
if (strcasecmp (option, "Throttle") == 0) {
- tracker_config_set_throttle (priv->config, value);
+ tracker_config_set_throttle (priv->config, value);
g_message ("throttle set to %d", value);
} else if (strcasecmp (option, "MaxText") == 0) {
- tracker_config_set_max_text_to_index (priv->config, value);
+ tracker_config_set_max_text_to_index (priv->config, value);
g_message ("Maxinum amount of text set to %d", value);
} else if (strcasecmp (option, "MaxWords") == 0) {
- tracker_config_set_max_words_to_index (priv->config, value);
+ tracker_config_set_max_words_to_index (priv->config, value);
g_message ("Maxinum number of unique words set to %d", value);
} else {
g_set_error (&actual_error,
@@ -652,17 +652,17 @@
}
void
-tracker_daemon_shutdown (TrackerDaemon *object,
- gboolean reindex,
- DBusGMethodInvocation *context,
- GError **error)
+tracker_daemon_shutdown (TrackerDaemon *object,
+ gboolean reindex,
+ DBusGMethodInvocation *context,
+ GError **error)
{
TrackerDaemonPrivate *priv;
- guint request_id;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
- tracker_dbus_request_new (request_id,
+ tracker_dbus_request_new (request_id,
"DBus request to shutdown daemon, "
"reindex:%s",
reindex ? "yes" : "no");
@@ -681,12 +681,12 @@
}
void
-tracker_daemon_prompt_index_signals (TrackerDaemon *object,
+tracker_daemon_prompt_index_signals (TrackerDaemon *object,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDaemonPrivate *priv;
- guint request_id;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -698,27 +698,27 @@
/* Signal state change */
tracker_status_signal ();
- /* Signal progress */
- g_signal_emit_by_name (object,
+ /* Signal progress */
+ g_signal_emit_by_name (object,
"index-progress",
- "Files",
- "",
- tracker_processor_get_files_total (priv->processor),
- tracker_processor_get_directories_found (priv->processor),
- tracker_processor_get_directories_total (priv->processor),
+ "Files",
+ "",
+ tracker_processor_get_files_total (priv->processor),
+ tracker_processor_get_directories_found (priv->processor),
+ tracker_processor_get_directories_total (priv->processor),
tracker_processor_get_seconds_elapsed (priv->processor));
#if 1
/* FIXME: We need a way of knowing WHAT service we have a
* count for, i.e. emails, files, etc.
*/
- g_signal_emit_by_name (object,
+ g_signal_emit_by_name (object,
"index-progress",
- "Emails",
- "",
- 0, /* priv->tracker->index_count, */
- 0, /* priv->tracker->mbox_processed, */
- 0, /* priv->tracker->mbox_count); */
+ "Emails",
+ "",
+ 0, /* priv->tracker->index_count, */
+ 0, /* priv->tracker->mbox_processed, */
+ 0, /* priv->tracker->mbox_count); */
0); /* seconds elapsed */
#endif
Modified: branches/indexer-split/src/trackerd/tracker-daemon.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-daemon.h (original)
+++ branches/indexer-split/src/trackerd/tracker-daemon.h Sat Sep 20 15:12:19 2008
@@ -28,20 +28,20 @@
#include "tracker-processor.h"
-#define TRACKER_DAEMON_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_DAEMON_PATH "/org/freedesktop/Tracker"
+#define TRACKER_DAEMON_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_DAEMON_PATH "/org/freedesktop/Tracker"
#define TRACKER_DAEMON_INTERFACE "org.freedesktop.Tracker"
G_BEGIN_DECLS
-#define TRACKER_TYPE_DAEMON (tracker_daemon_get_type ())
-#define TRACKER_DAEMON(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DAEMON, TrackerDaemon))
+#define TRACKER_TYPE_DAEMON (tracker_daemon_get_type ())
+#define TRACKER_DAEMON(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DAEMON, TrackerDaemon))
#define TRACKER_DAEMON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_DAEMON, TrackerDaemonClass))
#define TRACKER_IS_DAEMON(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DAEMON))
#define TRACKER_IS_DAEMON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DAEMON))
#define TRACKER_DAEMON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DAEMON, TrackerDaemonClass))
-typedef struct TrackerDaemon TrackerDaemon;
+typedef struct TrackerDaemon TrackerDaemon;
typedef struct TrackerDaemonClass TrackerDaemonClass;
struct TrackerDaemon {
@@ -52,37 +52,37 @@
GObjectClass parent;
};
-GType tracker_daemon_get_type (void);
-TrackerDaemon *tracker_daemon_new (TrackerConfig *config,
- TrackerProcessor *processor);
-void tracker_daemon_get_version (TrackerDaemon *object,
+GType tracker_daemon_get_type (void);
+TrackerDaemon *tracker_daemon_new (TrackerConfig *config,
+ TrackerProcessor *processor);
+void tracker_daemon_get_version (TrackerDaemon *object,
DBusGMethodInvocation *context,
GError **error);
-void tracker_daemon_get_status (TrackerDaemon *object,
+void tracker_daemon_get_status (TrackerDaemon *object,
DBusGMethodInvocation *context,
GError **error);
-void tracker_daemon_get_services (TrackerDaemon *object,
- gboolean main_services_only,
+void tracker_daemon_get_services (TrackerDaemon *object,
+ gboolean main_services_only,
DBusGMethodInvocation *context,
GError **error);
-void tracker_daemon_get_stats (TrackerDaemon *object,
+void tracker_daemon_get_stats (TrackerDaemon *object,
DBusGMethodInvocation *context,
GError **error);
-void tracker_daemon_set_bool_option (TrackerDaemon *object,
- const gchar *option,
- gboolean value,
+void tracker_daemon_set_bool_option (TrackerDaemon *object,
+ const gchar *option,
+ gboolean value,
DBusGMethodInvocation *context,
GError **error);
-void tracker_daemon_set_int_option (TrackerDaemon *object,
- const gchar *option,
- gint value,
+void tracker_daemon_set_int_option (TrackerDaemon *object,
+ const gchar *option,
+ gint value,
DBusGMethodInvocation *context,
GError **error);
-void tracker_daemon_shutdown (TrackerDaemon *object,
- gboolean reindex,
+void tracker_daemon_shutdown (TrackerDaemon *object,
+ gboolean reindex,
DBusGMethodInvocation *context,
GError **error);
-void tracker_daemon_prompt_index_signals (TrackerDaemon *object,
+void tracker_daemon_prompt_index_signals (TrackerDaemon *object,
DBusGMethodInvocation *context,
GError **error);
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 15:12:19 2008
@@ -50,7 +50,7 @@
#define ZLIBBUFSIZ 8192
typedef struct {
- TrackerConfig *config;
+ TrackerConfig *config;
TrackerLanguage *language;
} TrackerDBPrivate;
@@ -77,13 +77,13 @@
static gchar *
compress_string (const gchar *ptr,
- gint size,
- gint *compressed_size)
+ gint size,
+ gint *compressed_size)
{
z_stream zs;
- gchar *buf, *swap;
+ gchar *buf, *swap;
unsigned char obuf[ZLIBBUFSIZ];
- gint rv, asiz, bsiz, osiz;
+ gint rv, asiz, bsiz, osiz;
if (size < 0) {
size = strlen (ptr);
@@ -168,7 +168,7 @@
static gboolean
db_exec_proc_no_reply (TrackerDBInterface *iface,
- const gchar *procedure,
+ const gchar *procedure,
...)
{
TrackerDBResultSet *result_set;
@@ -193,12 +193,12 @@
static void
db_save_full_text (TrackerDBInterface *iface,
- const gchar *str_file_id,
- const gchar *text,
- gint length)
+ const gchar *str_file_id,
+ const gchar *text,
+ gint length)
{
- gchar *compressed, *value = NULL;
- gint bytes_compressed;
+ gchar *compressed, *value = NULL;
+ gint bytes_compressed;
const gchar *field_id;
compressed = compress_string (text, length, &bytes_compressed);
@@ -243,9 +243,9 @@
const gchar *new_value)
{
TrackerDBPrivate *private;
- GHashTable *old_table;
- GHashTable *new_table;
- gint sid;
+ GHashTable *old_table;
+ GHashTable *new_table;
+ gint sid;
g_return_if_fail (TRACKER_IS_FIELD (def));
@@ -260,9 +260,9 @@
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_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_delimited (def));
}
@@ -273,9 +273,9 @@
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_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_delimited (def));
}
@@ -292,10 +292,10 @@
static gchar *
get_backup_id (TrackerDBInterface *iface,
- const gchar *id)
+ const gchar *id)
{
TrackerDBResultSet *result_set;
- gchar *backup_id = NULL;
+ gchar *backup_id = NULL;
result_set = tracker_db_exec_proc (iface,
"GetBackupServiceByID",
@@ -323,9 +323,9 @@
static inline void
backup_non_embedded_metadata (TrackerDBInterface *iface,
- const gchar *id,
- const gchar *key_id,
- const gchar *value)
+ const gchar *id,
+ const gchar *key_id,
+ const gchar *value)
{
gchar *backup_id;
@@ -344,9 +344,9 @@
static inline void
backup_delete_non_embedded_metadata_value (TrackerDBInterface *iface,
- const gchar *id,
- const gchar *key_id,
- const gchar *value)
+ const gchar *id,
+ const gchar *key_id,
+ const gchar *value)
{
gchar *backup_id;
@@ -365,8 +365,8 @@
static inline void
backup_delete_non_embedded_metadata (TrackerDBInterface *iface,
- const gchar *id,
- const gchar *key_id)
+ const gchar *id,
+ const gchar *key_id)
{
gchar *backup_id;
@@ -387,8 +387,8 @@
const gchar *del_str)
{
GString *s = NULL;
- gchar **p;
- gchar **strv;
+ gchar **p;
+ gchar **strv;
strv = g_strsplit (str, "|", -1);
@@ -418,13 +418,13 @@
/* Deprecated */
static guint32
db_create_event (TrackerDBInterface *iface,
- const gchar *service_id_str,
- const gchar *type)
+ const gchar *service_id_str,
+ const gchar *type)
{
TrackerDBResultSet *result_set;
- gchar *eid;
- gint i;
- guint32 id = 0;
+ gchar *eid;
+ gint i;
+ guint32 id = 0;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), 0);
@@ -474,11 +474,11 @@
GArray *
tracker_db_create_array_of_services (const gchar *service,
- gboolean basic_services)
+ gboolean basic_services)
{
- GArray *array;
- gint services[12];
- gint count;
+ GArray *array;
+ gint services[12];
+ gint count;
gboolean add_files;
gboolean add_emails;
gboolean add_conversations;
@@ -544,7 +544,7 @@
}
void
-tracker_db_init (TrackerConfig *config,
+tracker_db_init (TrackerConfig *config,
TrackerLanguage *language,
TrackerDBIndex *file_index,
TrackerDBIndex *email_index)
@@ -590,11 +590,11 @@
gboolean
tracker_db_exec_no_reply (TrackerDBInterface *iface,
- const gchar *query,
+ const gchar *query,
...)
{
TrackerDBResultSet *result_set;
- va_list args;
+ va_list args;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), FALSE);
g_return_val_if_fail (query != NULL, FALSE);
@@ -616,11 +616,11 @@
TrackerDBResultSet *
tracker_db_exec (TrackerDBInterface *iface,
- const gchar *query,
+ const gchar *query,
...)
{
TrackerDBResultSet *result_set;
- va_list args;
+ va_list args;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (query != NULL, NULL);
@@ -641,11 +641,11 @@
TrackerDBResultSet *
tracker_db_exec_proc (TrackerDBInterface *iface,
- const gchar *procedure,
+ const gchar *procedure,
...)
{
TrackerDBResultSet *result_set;
- va_list args;
+ va_list args;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (procedure != NULL, NULL);
@@ -673,11 +673,11 @@
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");
- if (strcasecmp (meta_name, "File:Mime") == 0) return g_strdup ("Mime");
- if (strcasecmp (meta_name, "File:Size") == 0) return g_strdup ("Size");
- if (strcasecmp (meta_name, "File:Rank") == 0) return g_strdup ("Rank");
+ if (strcasecmp (meta_name, "File:Path") == 0) return g_strdup ("Path");
+ if (strcasecmp (meta_name, "File:Name") == 0) return g_strdup ("Name");
+ if (strcasecmp (meta_name, "File:Mime") == 0) return g_strdup ("Mime");
+ if (strcasecmp (meta_name, "File:Size") == 0) return g_strdup ("Size");
+ if (strcasecmp (meta_name, "File:Rank") == 0) return g_strdup ("Rank");
if (strcasecmp (meta_name, "File:Modified") == 0) return g_strdup ("IndexTime");
return NULL;
@@ -685,25 +685,25 @@
TrackerDBResultSet *
tracker_db_search_text (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *search_string,
- gint offset,
- gint limit,
- gboolean save_results,
- gboolean detailed)
+ const gchar *service,
+ const gchar *search_string,
+ gint offset,
+ gint limit,
+ gboolean save_results,
+ gboolean detailed)
{
TrackerDBPrivate *private;
TrackerQueryTree *tree;
TrackerDBResultSet *result_set, *result;
- gchar **array;
- GArray *hits;
- gint count;
+ gchar **array;
+ GArray *hits;
+ gint count;
gboolean detailed_emails = FALSE, detailed_apps = FALSE;
gint service_array[255];
- const gchar *procedure;
- GArray *services = NULL;
- GSList *duds = NULL;
- guint i = 0;
+ const gchar *procedure;
+ GArray *services = NULL;
+ GSList *duds = NULL;
+ guint i = 0;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (service != NULL, NULL);
@@ -726,7 +726,7 @@
if (result_set) {
gboolean valid = TRUE;
- gint type_id;
+ gint type_id;
while (valid) {
tracker_db_result_set_get (result_set, 0, &type_id, -1);
@@ -760,8 +760,8 @@
count = 0;
for (i = 0; i < hits->len; i++) {
- TrackerDBIndexItemRank rank;
- gchar *str_id;
+ TrackerDBIndexItemRank rank;
+ gchar *str_id;
if (count >= limit) {
break;
@@ -853,7 +853,7 @@
if (duds) {
TrackerDBIndex *file_index;
TrackerDBIndex *email_index;
- GSList *words, *w;
+ GSList *words, *w;
words = tracker_query_tree_get_words (tree);
file_index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
@@ -891,16 +891,16 @@
TrackerDBResultSet *
tracker_db_search_text_and_mime (TrackerDBInterface *iface,
- const gchar *text,
- gchar **mime_array)
+ const gchar *text,
+ gchar **mime_array)
{
TrackerDBPrivate *private;
TrackerQueryTree *tree;
TrackerDBResultSet *result_set1;
- GArray *hits;
- GArray *services;
- gint count = 0;
- guint i;
+ GArray *hits;
+ GArray *services;
+ gint count = 0;
+ guint i;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (text != NULL, NULL);
@@ -920,8 +920,8 @@
for (i = 0, count = 0; i < hits->len; i++) {
TrackerDBResultSet *result_set2;
- TrackerDBIndexItemRank rank;
- gchar *str_id, *mimetype;
+ TrackerDBIndexItemRank rank;
+ gchar *str_id, *mimetype;
rank = g_array_index (hits, TrackerDBIndexItemRank, i);
@@ -988,17 +988,17 @@
TrackerDBResultSet *
tracker_db_search_text_and_location (TrackerDBInterface *iface,
- const gchar *text,
- const gchar *location)
+ const gchar *text,
+ const gchar *location)
{
TrackerDBPrivate *private;
TrackerDBResultSet *result_set1;
TrackerQueryTree *tree;
- GArray *hits;
- GArray *services;
- gchar *location_prefix;
- gint count;
- guint i;
+ GArray *hits;
+ GArray *services;
+ gchar *location_prefix;
+ gint count;
+ guint i;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (text != NULL, NULL);
@@ -1019,8 +1019,8 @@
for (i = 0, count = 0; i < hits->len; i++) {
TrackerDBResultSet *result_set2;
- TrackerDBIndexItemRank rank;
- gchar *str_id, *path;
+ TrackerDBIndexItemRank rank;
+ gchar *str_id, *path;
rank = g_array_index (hits, TrackerDBIndexItemRank, i);
@@ -1088,18 +1088,18 @@
TrackerDBResultSet *
tracker_db_search_text_and_mime_and_location (TrackerDBInterface *iface,
- const gchar *text,
- gchar **mime_array,
- const gchar *location)
+ const gchar *text,
+ gchar **mime_array,
+ const gchar *location)
{
TrackerDBPrivate *private;
TrackerDBResultSet *result_set1;
TrackerQueryTree *tree;
- GArray *hits;
- GArray *services;
- gchar *location_prefix;
- gint count;
- guint i;
+ GArray *hits;
+ GArray *services;
+ gchar *location_prefix;
+ gint count;
+ guint i;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (text != NULL, NULL);
@@ -1120,8 +1120,8 @@
for (i = 0, count = 0; i < hits->len; i++) {
TrackerDBResultSet *result_set2;
- TrackerDBIndexItemRank rank;
- gchar *str_id, *path, *mimetype;
+ TrackerDBIndexItemRank rank;
+ gchar *str_id, *path, *mimetype;
rank = g_array_index (hits, TrackerDBIndexItemRank, i);
@@ -1195,8 +1195,8 @@
TrackerDBResultSet *
tracker_db_metadata_get (TrackerDBInterface *iface,
- const gchar *id,
- const gchar *key)
+ const gchar *id,
+ const gchar *key)
{
TrackerField *def;
const gchar *proc = NULL;
@@ -1247,14 +1247,14 @@
TrackerDBResultSet *
tracker_db_metadata_get_array (TrackerDBInterface *iface,
- const gchar *service_type,
- const gchar *service_id,
- gchar ** keys)
+ const gchar *service_type,
+ const gchar *service_id,
+ gchar ** keys)
{
TrackerDBResultSet *result_set;
- GString *sql, *sql_join;
- gchar *query;
- guint i;
+ GString *sql, *sql_join;
+ gchar *query;
+ guint i;
/* Build SQL select clause */
sql = g_string_new (" SELECT DISTINCT ");
@@ -1320,11 +1320,11 @@
*/
gchar *
tracker_db_metadata_get_delimited (TrackerDBInterface *iface,
- const gchar *id,
- const gchar *key)
+ const gchar *id,
+ const gchar *key)
{
TrackerDBResultSet *result_set;
- GString *s = NULL;
+ GString *s = NULL;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (id != NULL, NULL);
@@ -1333,7 +1333,7 @@
result_set = tracker_db_metadata_get (iface, id, key);
if (result_set) {
- gchar *str;
+ gchar *str;
gboolean valid = TRUE;
while (valid) {
@@ -1361,7 +1361,7 @@
gchar *
tracker_db_metadata_get_related_names (TrackerDBInterface *iface,
- const gchar *name)
+ const gchar *name)
{
TrackerDBResultSet *result_set;
@@ -1377,7 +1377,7 @@
if (result_set) {
GString *s = NULL;
gboolean valid = TRUE;
- gint id;
+ gint id;
while (valid) {
tracker_db_result_set_get (result_set, 1, &id, -1);
@@ -1402,7 +1402,7 @@
TrackerDBResultSet *
tracker_db_xesam_get_metadata_names (TrackerDBInterface *iface,
- const gchar *name)
+ const gchar *name)
{
TrackerDBResultSet *result_set;
@@ -1476,11 +1476,11 @@
void
tracker_db_metadata_set_single (TrackerDBInterface *iface,
- const gchar *service_type,
- const gchar *service_id,
- const gchar *key,
- const gchar *value,
- gboolean do_backup)
+ const gchar *service_type,
+ const gchar *service_id,
+ const gchar *key,
+ const gchar *value,
+ gboolean do_backup)
{
gchar *array[2];
@@ -1498,22 +1498,22 @@
gchar *
tracker_db_metadata_set (TrackerDBInterface *iface,
- const gchar *service_type,
- const gchar *service_id,
- const gchar *key,
- gchar **values,
- gboolean do_backup)
+ const gchar *service_type,
+ const gchar *service_id,
+ const gchar *key,
+ gchar **values,
+ gboolean do_backup)
{
TrackerDBPrivate *private;
- TrackerField *def;
- gchar *old_value;
- gchar *new_value;
- gchar *res_service;
- gboolean update_index;
- gint key_field;
- guint i;
- guint length;
- GString *str;
+ TrackerField *def;
+ gchar *old_value;
+ gchar *new_value;
+ gchar *res_service;
+ gboolean update_index;
+ gint key_field;
+ 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);
@@ -1837,19 +1837,19 @@
void
tracker_db_metadata_delete_value (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *id,
- const gchar *key,
- const gchar *value)
+ const gchar *service,
+ const gchar *id,
+ const gchar *key,
+ const gchar *value)
{
TrackerDBPrivate *private;
- TrackerField *def;
- gchar *old_value;
- gchar *new_value;
- gchar *mvalue;
- gchar *res_service;
- gboolean update_index;
- gint key_field;
+ TrackerField *def;
+ gchar *old_value;
+ gchar *new_value;
+ gchar *mvalue;
+ gchar *res_service;
+ gboolean update_index;
+ gint key_field;
g_return_if_fail (TRACKER_IS_DB_INTERFACE (iface));
g_return_if_fail (service != NULL);
@@ -1870,7 +1870,7 @@
new_value = NULL;
if (!tracker_field_get_embedded (def) &&
- tracker_ontology_service_has_embedded (service)) {
+ tracker_ontology_service_has_embedded (service)) {
backup_delete_non_embedded_metadata_value (iface,
id,
tracker_field_get_id (def),
@@ -1960,7 +1960,7 @@
if (key_field > 0) {
TrackerDBResultSet *result_set;
- gchar *value;
+ gchar *value;
result_set = tracker_db_metadata_get (iface, id, key);
@@ -2014,13 +2014,13 @@
const gchar *service,
const gchar *id,
const gchar *key,
- gboolean update_indexes)
+ gboolean update_indexes)
{
TrackerField *def;
- gchar *old_value = NULL;
- gchar *res_service;
+ gchar *old_value = NULL;
+ gchar *res_service;
gboolean update_index;
- gint key_field;
+ gint key_field;
g_return_if_fail (TRACKER_IS_DB_INTERFACE (iface));
g_return_if_fail (service != NULL);
@@ -2124,7 +2124,7 @@
TrackerDBResultSet *
tracker_db_live_search_get_hit_count (TrackerDBInterface *iface,
- const gchar *search_id)
+ const gchar *search_id)
{
/* SELECT count(*)
* FROM LiveSearches
@@ -2141,10 +2141,10 @@
void
tracker_db_live_search_start (TrackerDBInterface *iface,
- const gchar *from_query,
- const gchar *join_query,
- const gchar *where_query,
- const gchar *search_id)
+ const gchar *from_query,
+ const gchar *join_query,
+ const gchar *where_query,
+ const gchar *search_id)
{
/* INSERT
* INTO LiveSearches
@@ -2172,7 +2172,7 @@
void
tracker_db_live_search_stop (TrackerDBInterface *iface,
- const gchar *search_id)
+ const gchar *search_id)
{
/* DELETE
* FROM LiveSearches as X
@@ -2260,51 +2260,51 @@
result_set = tracker_db_exec (iface,
"SELECT E.ServiceID, E.EventType "
"%s%s cache.LiveSearches as X, Events as E " /* FROM A1 */
- "%s" /* JOINS A2 */
- "%s" /* WHERE A3 */
+ "%s" /* JOINS A2 */
+ "%s" /* WHERE A3 */
"%sX.ServiceID = E.ServiceID "
- "AND X.SearchID = '%s' " /* A4 */
+ "AND X.SearchID = '%s' " /* A4 */
"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 */
+ from_query ? "," : "", /* A1 */
+ query_joins, /* A2 */
where_query ? where_query : "WHERE", /* A3 */
- where_query ? "AND " : "", /* A3 */
- search_id, /* A4 */
+ where_query ? "AND " : "", /* A3 */
+ search_id, /* A4 */
from_query ? from_query : "FROM", /* B1 */
- from_query ? "," : "", /* B1 */
- query_joins, /* B2 */
+ from_query ? "," : "", /* B1 */
+ query_joins, /* B2 */
where_query ? where_query : "WHERE", /* B3 */
- where_query ? "AND " : ""); /* 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" /* WHERE B3 */
+ "SELECT E.ServiceID, '%s' " /* B0 */
+ "%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 */
- query_joins, /* B2 */
- where_query ? where_query : "WHERE", /* B3 */
- where_query ? "AND " : ""); /* B3 */
+ 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 */
return result_set;
}
TrackerDBResultSet*
tracker_db_live_search_get_deleted_ids (TrackerDBInterface *iface,
- const gchar *search_id)
+ const gchar *search_id)
{
/* SELECT E.ServiceID
* FROM Events as E, LiveSearches as X
@@ -2345,10 +2345,10 @@
{
TrackerDBResultSet *result_set;
TrackerFieldData *field_data;
- gboolean field_exists;
- const GSList *l;
- GList *reply;
- gboolean valid;
+ gboolean field_exists;
+ const GSList *l;
+ GList *reply;
+ gboolean valid;
reply = NULL;
field_exists = FALSE;
@@ -2414,15 +2414,15 @@
TrackerDBResultSet *
tracker_db_live_search_get_hit_data (TrackerDBInterface *iface,
- const gchar *search_id,
- GStrv field_names)
+ const gchar *search_id,
+ GStrv field_names)
{
TrackerDBResultSet *result;
- GSList *fields = NULL;
- GSList *l = NULL;
- GString *sql_select;
- GString *sql_join;
- gint i = 0;
+ GSList *fields = NULL;
+ GSList *l = NULL;
+ GString *sql_select;
+ GString *sql_join;
+ gint i = 0;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (search_id != NULL, NULL);
@@ -2497,25 +2497,25 @@
/* Deprecated */
guint32
tracker_db_service_create (TrackerDBInterface *iface,
- const gchar *service,
+ const gchar *service,
TrackerDBFileInfo *info)
{
TrackerDBPrivate *private;
TrackerDBResultSet *result_set;
TrackerDBResultSet *result_set_proc;
- gint i;
- guint32 id = 0;
- gchar *sid;
- gchar *str_mtime;
- const gchar *str_is_dir;
- const gchar *str_is_link;
- gchar *str_filesize;
- gchar *str_offset;
- gchar *str_aux;
- gint service_type_id;
- gchar *str_service_type_id;
- gchar *path = NULL;
- gchar *name = NULL;
+ gint i;
+ guint32 id = 0;
+ gchar *sid;
+ gchar *str_mtime;
+ const gchar *str_is_dir;
+ const gchar *str_is_link;
+ gchar *str_filesize;
+ gchar *str_offset;
+ gchar *str_aux;
+ gint service_type_id;
+ gchar *str_service_type_id;
+ gchar *path = NULL;
+ gchar *name = NULL;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), 0);
g_return_val_if_fail (info, 0);
@@ -2576,7 +2576,7 @@
} else {
g_debug ("service id for %s is %d and sid is %s",
service, service_type_id, sid);
- }
+ }
str_service_type_id = tracker_gint_to_string (service_type_id);
str_aux = tracker_gint_to_string (info->aux_id);
@@ -2620,7 +2620,7 @@
g_object_unref (result_set_proc);
}
- parent = tracker_ontology_get_service_parent (service);
+ parent = tracker_ontology_get_service_parent (service);
if (parent) {
result_set_proc = tracker_db_exec_proc (iface,
@@ -2657,11 +2657,11 @@
*/
gchar *
tracker_db_service_get_by_entity (TrackerDBInterface *iface,
- const gchar *id)
+ const gchar *id)
{
TrackerDBResultSet *result_set;
- gint service_type_id;
- gchar *result = NULL;
+ gint service_type_id;
+ gchar *result = NULL;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (id != NULL, NULL);
@@ -2684,11 +2684,11 @@
guint32
tracker_db_file_get_id (TrackerDBInterface *iface,
- const gchar *uri)
+ const gchar *uri)
{
TrackerDBResultSet *result_set;
- gchar *path, *name;
- guint32 id;
+ gchar *path, *name;
+ guint32 id;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), 0);
g_return_val_if_fail (uri != NULL, 0);
@@ -2716,10 +2716,10 @@
gchar *
tracker_db_file_get_id_as_string (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *uri)
+ const gchar *service,
+ const gchar *uri)
{
- gint service_id;
+ gint service_id;
guint32 id;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
@@ -2743,10 +2743,10 @@
gchar **
tracker_db_files_get (TrackerDBInterface *iface,
- const gchar *uri)
+ const gchar *uri)
{
TrackerDBResultSet *result_set;
- GPtrArray *array;
+ GPtrArray *array;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (uri != NULL, NULL);
@@ -2758,7 +2758,7 @@
array = g_ptr_array_new ();
if (result_set) {
- gchar *name, *prefix;
+ gchar *name, *prefix;
gboolean valid = TRUE;
while (valid) {
@@ -2784,13 +2784,13 @@
TrackerDBResultSet *
tracker_db_files_get_by_service (TrackerDBInterface *iface,
- const gchar *service,
- gint offset,
- gint limit)
+ const gchar *service,
+ gint offset,
+ gint limit)
{
TrackerDBResultSet *result_set;
- gchar *str_limit;
- gchar *str_offset;
+ gchar *str_limit;
+ gchar *str_offset;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (service != NULL, NULL);
@@ -2814,17 +2814,17 @@
TrackerDBResultSet *
tracker_db_files_get_by_mime (TrackerDBInterface *iface,
- gchar **mimes,
- gint n,
- gint offset,
- gint limit,
- gboolean vfs)
+ gchar **mimes,
+ gint n,
+ gint offset,
+ gint limit,
+ gboolean vfs)
{
TrackerDBResultSet *result_set;
- gint i;
- gchar *service;
- gchar *query;
- GString *str;
+ gint i;
+ gchar *service;
+ gchar *query;
+ GString *str;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (mimes != NULL, NULL);
@@ -2860,8 +2860,8 @@
TrackerDBResultSet *
tracker_db_metadata_get_types (TrackerDBInterface *iface,
- const gchar *class,
- gboolean writeable)
+ const gchar *class,
+ gboolean writeable)
{
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (class != NULL, NULL);
@@ -2893,10 +2893,10 @@
TrackerDBResultSet *
tracker_db_keywords_get_list (TrackerDBInterface *iface,
- const gchar *service)
+ const gchar *service)
{
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
- g_return_val_if_fail (service != NULL, NULL);
+ g_return_val_if_fail (service != NULL, NULL);
return tracker_db_exec_proc (iface,
"GetKeywordList",
@@ -2907,14 +2907,14 @@
TrackerFieldData *
tracker_db_get_metadata_field (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *field_name,
- gint field_count,
- gboolean is_select,
- gboolean is_condition)
+ const gchar *service,
+ const gchar *field_name,
+ gint field_count,
+ gboolean is_select,
+ gboolean is_condition)
{
TrackerFieldData *field_data = NULL;
- TrackerField *def;
+ TrackerField *def;
g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
g_return_val_if_fail (service != NULL, NULL);
@@ -2923,10 +2923,10 @@
def = tracker_ontology_get_field_by_name (field_name);
if (def) {
- gchar *alias;
+ gchar *alias;
const gchar *table_name;
- gchar *this_field_name;
- gchar *where_field;
+ gchar *this_field_name;
+ gchar *where_field;
field_data = g_object_new (TRACKER_TYPE_FIELD_DATA,
"is-select", is_select,
@@ -2990,8 +2990,8 @@
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- gchar *str;
- gint value = 0;
+ gchar *str;
+ gint value = 0;
g_return_val_if_fail (option != NULL, 0);
@@ -3022,11 +3022,11 @@
void
tracker_db_set_option_int (const gchar *option,
- gint value)
+ gint value)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- gchar *str;
+ gchar *str;
g_return_if_fail (option != NULL);
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 15:12:19 2008
@@ -40,165 +40,165 @@
G_BEGIN_DECLS
-void tracker_db_init (TrackerConfig *config,
+void tracker_db_init (TrackerConfig *config,
TrackerLanguage *language,
TrackerDBIndex *file_index,
TrackerDBIndex *email_index);
-void tracker_db_shutdown (void);
+void tracker_db_shutdown (void);
-GArray * tracker_db_create_array_of_services (const gchar *service,
- gboolean basic_services);
+GArray * tracker_db_create_array_of_services (const gchar *service,
+ gboolean basic_services);
/* Operations for TrackerDBInterface */
-TrackerDBResultSet *tracker_db_exec_proc (TrackerDBInterface *iface,
- const gchar *procedure,
+TrackerDBResultSet *tracker_db_exec_proc (TrackerDBInterface *iface,
+ const gchar *procedure,
...);
-gboolean tracker_db_exec_no_reply (TrackerDBInterface *iface,
- const gchar *query,
+gboolean tracker_db_exec_no_reply (TrackerDBInterface *iface,
+ const gchar *query,
...);
-TrackerDBResultSet *tracker_db_exec (TrackerDBInterface *iface,
- const char *query,
+TrackerDBResultSet *tracker_db_exec (TrackerDBInterface *iface,
+ const char *query,
...);
-gint tracker_db_get_option_int (const gchar *option);
-void tracker_db_set_option_int (const gchar *option,
- gint value);
+gint tracker_db_get_option_int (const gchar *option);
+void tracker_db_set_option_int (const gchar *option,
+ gint value);
/* Metadata API */
-gchar * tracker_db_metadata_get_related_names (TrackerDBInterface *iface,
- const gchar *name);
-const gchar * tracker_db_metadata_get_table (TrackerFieldType type);
-TrackerDBResultSet *tracker_db_metadata_get (TrackerDBInterface *iface,
- const gchar *id,
- const gchar *key);
-TrackerDBResultSet *tracker_db_metadata_get_array (TrackerDBInterface *iface,
- const gchar *service_type,
- const gchar *service_id,
- gchar **keys);
-gchar * tracker_db_metadata_get_delimited (TrackerDBInterface *iface,
- const gchar *id,
- const gchar *key);
-gchar * tracker_db_metadata_set (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *id,
- const gchar *key,
- gchar **values,
- gboolean do_backup);
-void tracker_db_metadata_set_single (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *id,
- const gchar *key,
- const gchar *value,
- gboolean do_backup);
-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 (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *id,
- const gchar *key,
- gboolean update_indexes);
-TrackerDBResultSet *tracker_db_metadata_get_types (TrackerDBInterface *iface,
- const gchar *class,
- gboolean writeable);
+gchar * tracker_db_metadata_get_related_names (TrackerDBInterface *iface,
+ const gchar *name);
+const gchar * tracker_db_metadata_get_table (TrackerFieldType type);
+TrackerDBResultSet *tracker_db_metadata_get (TrackerDBInterface *iface,
+ const gchar *id,
+ const gchar *key);
+TrackerDBResultSet *tracker_db_metadata_get_array (TrackerDBInterface *iface,
+ const gchar *service_type,
+ const gchar *service_id,
+ gchar **keys);
+gchar * tracker_db_metadata_get_delimited (TrackerDBInterface *iface,
+ const gchar *id,
+ const gchar *key);
+gchar * tracker_db_metadata_set (TrackerDBInterface *iface,
+ const gchar *service,
+ const gchar *id,
+ const gchar *key,
+ gchar **values,
+ gboolean do_backup);
+void tracker_db_metadata_set_single (TrackerDBInterface *iface,
+ const gchar *service,
+ const gchar *id,
+ const gchar *key,
+ const gchar *value,
+ gboolean do_backup);
+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 (TrackerDBInterface *iface,
+ const gchar *service,
+ const gchar *id,
+ const gchar *key,
+ gboolean update_indexes);
+TrackerDBResultSet *tracker_db_metadata_get_types (TrackerDBInterface *iface,
+ const gchar *class,
+ gboolean writeable);
/* Search API */
-TrackerDBResultSet *tracker_db_search_text (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *search_string,
- gint offset,
- gint limit,
- gboolean save_results,
- gboolean detailed);
-TrackerDBResultSet *tracker_db_search_text_and_mime (TrackerDBInterface *iface,
- const gchar *text,
- gchar **mime_array);
-TrackerDBResultSet *tracker_db_search_text_and_location (TrackerDBInterface *iface,
- const gchar *text,
- const gchar *location);
+TrackerDBResultSet *tracker_db_search_text (TrackerDBInterface *iface,
+ const gchar *service,
+ const gchar *search_string,
+ gint offset,
+ gint limit,
+ gboolean save_results,
+ gboolean detailed);
+TrackerDBResultSet *tracker_db_search_text_and_mime (TrackerDBInterface *iface,
+ const gchar *text,
+ gchar **mime_array);
+TrackerDBResultSet *tracker_db_search_text_and_location (TrackerDBInterface *iface,
+ const gchar *text,
+ const gchar *location);
TrackerDBResultSet *tracker_db_search_text_and_mime_and_location (TrackerDBInterface *iface,
- const gchar *text,
- gchar **mime_array,
- const gchar *location);
+ const gchar *text,
+ gchar **mime_array,
+ const gchar *location);
/* Service API */
-guint32 tracker_db_service_create (TrackerDBInterface *iface,
- const gchar *service,
+guint32 tracker_db_service_create (TrackerDBInterface *iface,
+ const gchar *service,
TrackerDBFileInfo *info);
-gchar * tracker_db_service_get_by_entity (TrackerDBInterface *iface,
- const gchar *id);
+gchar * tracker_db_service_get_by_entity (TrackerDBInterface *iface,
+ const gchar *id);
/* Files API */
-gchar ** tracker_db_files_get (TrackerDBInterface *iface,
- const gchar *folder_uri);
-TrackerDBResultSet *tracker_db_files_get_by_service (TrackerDBInterface *iface,
- const gchar *service,
- gint offset,
- gint limit);
-TrackerDBResultSet *tracker_db_files_get_by_mime (TrackerDBInterface *iface,
- gchar **mimes,
- gint n,
- gint offset,
- gint limit,
- gboolean vfs);
-guint32 tracker_db_file_get_id (TrackerDBInterface *iface,
- const gchar *uri);
-gchar * tracker_db_file_get_id_as_string (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *uri);
+gchar ** tracker_db_files_get (TrackerDBInterface *iface,
+ const gchar *folder_uri);
+TrackerDBResultSet *tracker_db_files_get_by_service (TrackerDBInterface *iface,
+ const gchar *service,
+ gint offset,
+ gint limit);
+TrackerDBResultSet *tracker_db_files_get_by_mime (TrackerDBInterface *iface,
+ gchar **mimes,
+ gint n,
+ gint offset,
+ gint limit,
+ gboolean vfs);
+guint32 tracker_db_file_get_id (TrackerDBInterface *iface,
+ const gchar *uri);
+gchar * tracker_db_file_get_id_as_string (TrackerDBInterface *iface,
+ const gchar *service,
+ const gchar *uri);
/* Keywords API */
-TrackerDBResultSet *tracker_db_keywords_get_list (TrackerDBInterface *iface,
- const gchar *service);
+TrackerDBResultSet *tracker_db_keywords_get_list (TrackerDBInterface *iface,
+ const gchar *service);
/* Miscellaneous API */
-GHashTable * tracker_db_get_file_contents_words (TrackerDBInterface *iface,
- guint32 id,
- GHashTable *old_table);
-GHashTable * tracker_db_get_indexable_content_words (TrackerDBInterface *iface,
- guint32 id,
- GHashTable *table,
- gboolean embedded_only);
-gchar * tracker_db_get_field_name (const gchar *service,
- const gchar *meta_name);
-TrackerFieldData * tracker_db_get_metadata_field (TrackerDBInterface *iface,
- const gchar *service,
- const gchar *field_name,
- gint field_count,
- gboolean is_select,
- gboolean is_condition);
+GHashTable * tracker_db_get_file_contents_words (TrackerDBInterface *iface,
+ guint32 id,
+ GHashTable *old_table);
+GHashTable * tracker_db_get_indexable_content_words (TrackerDBInterface *iface,
+ guint32 id,
+ GHashTable *table,
+ gboolean embedded_only);
+gchar * tracker_db_get_field_name (const gchar *service,
+ const gchar *meta_name);
+TrackerFieldData * tracker_db_get_metadata_field (TrackerDBInterface *iface,
+ const gchar *service,
+ const gchar *field_name,
+ gint field_count,
+ gboolean is_select,
+ gboolean is_condition);
/* Live Search API */
-void tracker_db_live_search_start (TrackerDBInterface *iface,
- const gchar *from_query,
- const gchar *join_query,
- const gchar *where_query,
- const gchar *search_id);
-void tracker_db_live_search_stop (TrackerDBInterface *iface,
- const gchar *search_id);
-TrackerDBResultSet *tracker_db_live_search_get_all_ids (TrackerDBInterface *iface,
- const gchar *search_id);
-TrackerDBResultSet *tracker_db_live_search_get_new_ids (TrackerDBInterface *iface,
- const gchar *search_id,
- const gchar *from_query,
- const gchar *query_joins,
- const gchar *where_query);
-TrackerDBResultSet *tracker_db_live_search_get_deleted_ids (TrackerDBInterface *iface,
- const gchar *search_id);
-TrackerDBResultSet *tracker_db_live_search_get_hit_data (TrackerDBInterface *iface,
- const gchar *search_id,
- GStrv fields);
-TrackerDBResultSet *tracker_db_live_search_get_hit_count (TrackerDBInterface *iface,
- const gchar *search_id);
+void tracker_db_live_search_start (TrackerDBInterface *iface,
+ const gchar *from_query,
+ const gchar *join_query,
+ const gchar *where_query,
+ const gchar *search_id);
+void tracker_db_live_search_stop (TrackerDBInterface *iface,
+ const gchar *search_id);
+TrackerDBResultSet *tracker_db_live_search_get_all_ids (TrackerDBInterface *iface,
+ const gchar *search_id);
+TrackerDBResultSet *tracker_db_live_search_get_new_ids (TrackerDBInterface *iface,
+ const gchar *search_id,
+ const gchar *from_query,
+ const gchar *query_joins,
+ const gchar *where_query);
+TrackerDBResultSet *tracker_db_live_search_get_deleted_ids (TrackerDBInterface *iface,
+ const gchar *search_id);
+TrackerDBResultSet *tracker_db_live_search_get_hit_data (TrackerDBInterface *iface,
+ const gchar *search_id,
+ GStrv fields);
+TrackerDBResultSet *tracker_db_live_search_get_hit_count (TrackerDBInterface *iface,
+ const gchar *search_id);
/* XESAM API */
-void tracker_db_xesam_delete_handled_events (TrackerDBInterface *iface);
+void tracker_db_xesam_delete_handled_events (TrackerDBInterface *iface);
TrackerDBResultSet *tracker_db_xesam_get_metadata_names (TrackerDBInterface *iface,
- const char *name);
+ const char *name);
TrackerDBResultSet *tracker_db_xesam_get_all_text_metadata_names (TrackerDBInterface *iface);
-TrackerDBResultSet *tracker_db_xesam_get_service_names (TrackerDBInterface *iface,
- const char *name);
+TrackerDBResultSet *tracker_db_xesam_get_service_names (TrackerDBInterface *iface,
+ const char *name);
G_END_DECLS
#endif /* __TRACKERD_DB_H__ */
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 15:12:19 2008
@@ -51,55 +51,55 @@
static DBusGConnection *connection;
static DBusGProxy *proxy;
static DBusGProxy *proxy_for_indexer;
-static GSList *objects;
-static guint indexer_resume_timeout_id;
+static GSList *objects;
+static guint indexer_resume_timeout_id;
static gboolean
dbus_register_service (DBusGProxy *proxy,
const gchar *name)
{
- GError *error = NULL;
- guint result;
+ GError *error = NULL;
+ guint result;
- g_message ("Registering DBus service...\n"
+ g_message ("Registering DBus service...\n"
" Name:'%s'",
name);
- if (!org_freedesktop_DBus_request_name (proxy,
- name,
- DBUS_NAME_FLAG_DO_NOT_QUEUE,
- &result, &error)) {
- g_critical ("Could not aquire name:'%s', %s",
+ if (!org_freedesktop_DBus_request_name (proxy,
+ name,
+ DBUS_NAME_FLAG_DO_NOT_QUEUE,
+ &result, &error)) {
+ g_critical ("Could not aquire name:'%s', %s",
name,
error ? error->message : "no error given");
- g_error_free (error);
+ g_error_free (error);
- return FALSE;
+ return FALSE;
}
- if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
- g_critical ("DBus service name:'%s' is already taken, "
+ if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ g_critical ("DBus service name:'%s' is already taken, "
"perhaps the daemon is already running?",
name);
- return FALSE;
+ return FALSE;
}
- return TRUE;
+ return TRUE;
}
static void
-dbus_register_object (DBusGConnection *connection,
- DBusGProxy *proxy,
- GObject *object,
- const DBusGObjectInfo *info,
- const gchar *path)
-{
- g_message ("Registering DBus object...");
- g_message (" Path:'%s'", path);
- g_message (" Type:'%s'", G_OBJECT_TYPE_NAME (object));
+dbus_register_object (DBusGConnection *connection,
+ DBusGProxy *proxy,
+ GObject *object,
+ const DBusGObjectInfo *info,
+ const gchar *path)
+{
+ g_message ("Registering DBus object...");
+ g_message (" Path:'%s'", path);
+ g_message (" Type:'%s'", G_OBJECT_TYPE_NAME (object));
- dbus_g_object_type_install_info (G_OBJECT_TYPE (object), info);
- dbus_g_connection_register_g_object (connection, path, object);
+ dbus_g_object_type_install_info (G_OBJECT_TYPE (object), info);
+ dbus_g_connection_register_g_object (connection, path, object);
}
static void
@@ -112,7 +112,7 @@
static gboolean
dbus_register_names (TrackerConfig *config)
{
- GError *error = NULL;
+ GError *error = NULL;
if (connection) {
g_critical ("The DBusGConnection is already set, have we already initialized?");
@@ -124,36 +124,36 @@
return FALSE;
}
- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
- if (!connection) {
- g_critical ("Could not connect to the DBus session bus, %s",
+ if (!connection) {
+ g_critical ("Could not connect to the DBus session bus, %s",
error ? error->message : "no error given.");
g_clear_error (&error);
- return FALSE;
- }
+ return FALSE;
+ }
- /* The definitions below (DBUS_SERVICE_DBUS, etc) are
- * predefined for us to just use (dbus_g_proxy_...)
- */
- proxy = dbus_g_proxy_new_for_name (connection,
- DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS);
-
- /* Register the service name for org.freedesktop.Tracker */
- if (!dbus_register_service (proxy, TRACKER_DAEMON_SERVICE)) {
- return FALSE;
- }
+ /* The definitions below (DBUS_SERVICE_DBUS, etc) are
+ * predefined for us to just use (dbus_g_proxy_...)
+ */
+ proxy = dbus_g_proxy_new_for_name (connection,
+ DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS);
+
+ /* Register the service name for org.freedesktop.Tracker */
+ if (!dbus_register_service (proxy, TRACKER_DAEMON_SERVICE)) {
+ return FALSE;
+ }
/* Register the service name for org.freedesktop.xesam if XESAM is enabled */
- if (tracker_config_get_enable_xesam (config)) {
+ if (tracker_config_get_enable_xesam (config)) {
if (!dbus_register_service (proxy, TRACKER_XESAM_SERVICE)) {
return FALSE;
}
- }
+ }
- return TRUE;
+ return TRUE;
}
static void
@@ -198,7 +198,7 @@
gpointer user_data)
{
DBusGProxy *proxy;
- GError *error = NULL;
+ GError *error = NULL;
gboolean set_paused = TRUE;
if (tracker_status_get () != TRACKER_STATUS_INDEXING) {
@@ -260,12 +260,12 @@
gboolean
tracker_dbus_init (TrackerConfig *config)
{
- g_return_val_if_fail (TRACKER_IS_CONFIG (config), FALSE);
+ g_return_val_if_fail (TRACKER_IS_CONFIG (config), FALSE);
- /* Don't reinitialize */
- if (objects) {
- return TRUE;
- }
+ /* Don't reinitialize */
+ if (objects) {
+ return TRUE;
+ }
/* Register names and get proxy/connection details */
if (!dbus_register_names (config)) {
@@ -283,7 +283,7 @@
void
tracker_dbus_shutdown (void)
{
- if (objects) {
+ if (objects) {
g_slist_foreach (objects, (GFunc) g_object_unref, NULL);
g_slist_free (objects);
objects = NULL;
@@ -303,10 +303,10 @@
}
gboolean
-tracker_dbus_register_objects (TrackerConfig *config,
- TrackerLanguage *language,
- TrackerDBIndex *file_index,
- TrackerDBIndex *email_index,
+tracker_dbus_register_objects (TrackerConfig *config,
+ TrackerLanguage *language,
+ TrackerDBIndex *file_index,
+ TrackerDBIndex *email_index,
TrackerProcessor *processor)
{
gpointer object;
@@ -321,78 +321,78 @@
return FALSE;
}
- /* Add org.freedesktop.Tracker */
+ /* Add org.freedesktop.Tracker */
object = tracker_daemon_new (config, processor);
if (!object) {
g_critical ("Could not create TrackerDaemon object to register");
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_daemon_object_info,
TRACKER_DAEMON_PATH);
- objects = g_slist_prepend (objects, object);
+ objects = g_slist_prepend (objects, object);
- /* Add org.freedesktop.Tracker.Files */
+ /* Add org.freedesktop.Tracker.Files */
object = tracker_files_new (processor);
if (!object) {
g_critical ("Could not create TrackerFiles object to register");
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_files_object_info,
TRACKER_FILES_PATH);
- objects = g_slist_prepend (objects, object);
+ objects = g_slist_prepend (objects, object);
- /* Add org.freedesktop.Tracker.Keywords */
+ /* Add org.freedesktop.Tracker.Keywords */
object = tracker_keywords_new ();
if (!object) {
g_critical ("Could not create TrackerKeywords object to register");
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_keywords_object_info,
TRACKER_KEYWORDS_PATH);
- objects = g_slist_prepend (objects, object);
+ objects = g_slist_prepend (objects, object);
- /* Add org.freedesktop.Tracker.Metadata */
+ /* Add org.freedesktop.Tracker.Metadata */
object = tracker_metadata_new ();
if (!object) {
g_critical ("Could not create TrackerMetadata object to register");
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_metadata_object_info,
TRACKER_METADATA_PATH);
- objects = g_slist_prepend (objects, object);
+ objects = g_slist_prepend (objects, object);
- /* Add org.freedesktop.Tracker.Search */
+ /* Add org.freedesktop.Tracker.Search */
object = tracker_search_new (config, language, file_index, email_index);
if (!object) {
g_critical ("Could not create TrackerSearch object to register");
return FALSE;
}
- dbus_register_object (connection,
+ dbus_register_object (connection,
proxy,
G_OBJECT (object),
&dbus_glib_tracker_search_object_info,
TRACKER_SEARCH_PATH);
- objects = g_slist_prepend (objects, object);
+ objects = g_slist_prepend (objects, object);
/* Register the XESAM object if enabled */
- if (tracker_config_get_enable_xesam (config)) {
+ if (tracker_config_get_enable_xesam (config)) {
object = tracker_xesam_new ();
if (!object) {
g_critical ("Could not create TrackerXesam object to register");
@@ -414,26 +414,26 @@
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);
+ /* Reverse list since we added objects at the top each time */
+ objects = g_slist_reverse (objects);
- return TRUE;
+ return TRUE;
}
GObject *
tracker_dbus_get_object (GType type)
{
- GSList *l;
+ GSList *l;
- for (l = objects; l; l = l->next) {
- if (G_OBJECT_TYPE (l->data) == type) {
- return l->data;
+ for (l = objects; l; l = l->next) {
+ if (G_OBJECT_TYPE (l->data) == type) {
+ return l->data;
}
}
- return NULL;
+ return NULL;
}
DBusGProxy *
@@ -448,7 +448,7 @@
/* 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) {
Modified: branches/indexer-split/src/trackerd/tracker-dbus.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus.h (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus.h Sat Sep 20 15:12:19 2008
@@ -35,14 +35,14 @@
G_BEGIN_DECLS
-gboolean tracker_dbus_init (TrackerConfig *config);
-void tracker_dbus_shutdown (void);
+gboolean tracker_dbus_init (TrackerConfig *config);
+void tracker_dbus_shutdown (void);
gboolean tracker_dbus_register_objects (TrackerConfig *config,
TrackerLanguage *language,
TrackerDBIndex *file_index,
TrackerDBIndex *email_index,
TrackerProcessor *processor);
-GObject *tracker_dbus_get_object (GType type);
+GObject *tracker_dbus_get_object (GType type);
DBusGProxy *tracker_dbus_indexer_get_proxy (void);
G_END_DECLS
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 15:12:19 2008
@@ -42,7 +42,7 @@
#define TRACKER_FILES_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_FILES, TrackerFilesPrivate))
typedef struct {
- TrackerProcessor *processor;
+ TrackerProcessor *processor;
} TrackerFilesPrivate;
static void tracker_files_finalize (GObject *object);
@@ -81,7 +81,7 @@
TrackerFiles *
tracker_files_new (TrackerProcessor *processor)
{
- TrackerFiles *object;
+ TrackerFiles *object;
TrackerFilesPrivate *priv;
g_return_val_if_fail (TRACKER_IS_PROCESSOR (processor), NULL);
@@ -99,16 +99,16 @@
* Functions
*/
void
-tracker_files_exist (TrackerFiles *object,
- const gchar *uri,
- gboolean auto_create,
+tracker_files_exist (TrackerFiles *object,
+ const gchar *uri,
+ gboolean auto_create,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
- guint request_id;
- guint32 file_id;
- gboolean exists;
+ guint request_id;
+ guint32 file_id;
+ gboolean exists;
request_id = tracker_dbus_get_next_request_id ();
@@ -116,7 +116,7 @@
tracker_dbus_request_new (request_id,
"DBus request to see if files exist, "
- "uri:'%s' auto-create:'%d'",
+ "uri:'%s' auto-create:'%d'",
uri, auto_create);
/* This API is broken. The Daemon doesn't do anything in the
@@ -144,23 +144,23 @@
dbus_g_method_return (context, exists);
- tracker_dbus_request_success (request_id);
+ tracker_dbus_request_success (request_id);
}
void
-tracker_files_create (TrackerFiles *object,
- const gchar *uri,
- gboolean is_directory,
- const gchar *mime,
- gint size,
- gint mtime,
+tracker_files_create (TrackerFiles *object,
+ const gchar *uri,
+ gboolean is_directory,
+ const gchar *mime,
+ gint size,
+ gint mtime,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerFilesPrivate *priv;
- GFile *file;
- const gchar *module_name = "files";
- guint request_id;
+ GFile *file;
+ const gchar *module_name = "files";
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -171,13 +171,13 @@
tracker_dbus_request_new (request_id,
"DBus request to create file, "
- "uri:'%s', is directory:%s, mime:'%s', "
- "size:%d, mtime:%d",
- uri,
- is_directory ? "yes" : "no",
- mime,
- size,
- mtime);
+ "uri:'%s', is directory:%s, mime:'%s', "
+ "size:%d, mtime:%d",
+ uri,
+ is_directory ? "yes" : "no",
+ mime,
+ size,
+ mtime);
priv = TRACKER_FILES_GET_PRIVATE (object);
@@ -191,15 +191,15 @@
}
void
-tracker_files_delete (TrackerFiles *object,
- const gchar *uri,
+tracker_files_delete (TrackerFiles *object,
+ const gchar *uri,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerFilesPrivate *priv;
- GFile *file;
- const gchar *module_name = "files";
- guint request_id;
+ GFile *file;
+ const gchar *module_name = "files";
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -227,19 +227,19 @@
}
void
-tracker_files_get_service_type (TrackerFiles *object,
- const gchar *uri,
+tracker_files_get_service_type (TrackerFiles *object,
+ const gchar *uri,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- guint32 file_id;
- gchar *file_id_str;
- gchar *value = NULL;
- const gchar *mime = NULL;
- GError *actual_error = NULL;
+ guint request_id;
+ guint32 file_id;
+ gchar *file_id_str;
+ gchar *value = NULL;
+ const gchar *mime = NULL;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -247,8 +247,8 @@
tracker_dbus_request_new (request_id,
"DBus request to get service type ",
- "uri:'%s'",
- uri);
+ "uri:'%s'",
+ uri);
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
@@ -320,21 +320,21 @@
}
void
-tracker_files_get_text_contents (TrackerFiles *object,
- const gchar *uri,
- gint offset,
- gint max_length,
- DBusGMethodInvocation *context,
- GError **error)
+tracker_files_get_text_contents (TrackerFiles *object,
+ const gchar *uri,
+ gint offset,
+ gint max_length,
+ DBusGMethodInvocation *context,
+ GError **error)
{
- TrackerDBInterface *iface;
+ TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar *service_id;
- gchar *offset_str;
- gchar *max_length_str;
- gchar *value;
- GError *actual_error = NULL;
+ guint request_id;
+ gchar *service_id;
+ gchar *offset_str;
+ gchar *max_length_str;
+ gchar *value;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -345,10 +345,10 @@
tracker_dbus_request_new (request_id,
"DBus request to get text contents, "
- "uri:'%s', offset:%d, max length:%d",
- uri,
- offset,
- max_length);
+ "uri:'%s', offset:%d, max length:%d",
+ uri,
+ offset,
+ max_length);
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
@@ -408,21 +408,21 @@
}
void
-tracker_files_search_text_contents (TrackerFiles *object,
- const gchar *uri,
- const gchar *text,
- gint max_length,
+tracker_files_search_text_contents (TrackerFiles *object,
+ const gchar *uri,
+ const gchar *text,
+ gint max_length,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set = NULL;
- guint request_id;
- gchar *name = NULL;
- gchar *path = NULL;
- gchar *max_length_str;
- gchar *value = NULL;
- GError *actual_error = NULL;
+ guint request_id;
+ gchar *name = NULL;
+ gchar *path = NULL;
+ gchar *max_length_str;
+ gchar *value = NULL;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -432,10 +432,10 @@
tracker_dbus_request_new (request_id,
"DBus request to search text contents, "
- "in uri:'%s' for text:'%s' with max length:%d",
- uri,
- text,
- max_length);
+ "in uri:'%s' for text:'%s' with max length:%d",
+ uri,
+ text,
+ max_length);
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
@@ -444,12 +444,12 @@
max_length_str = tracker_gint_to_string (max_length);
/* result_set = tracker_exec_proc (iface, */
- /* "SearchFileContents", */
- /* 4, */
- /* path, */
- /* name, */
- /* text, */
- /* max_length_str); */
+ /* "SearchFileContents", */
+ /* 4, */
+ /* path, */
+ /* name, */
+ /* text, */
+ /* max_length_str); */
g_free (max_length_str);
@@ -466,28 +466,28 @@
/* Fixme: when this is implemented, we should return TRUE and
* change this function to the success variant.
*/
- tracker_dbus_request_failed (request_id,
+ tracker_dbus_request_failed (request_id,
&actual_error,
- "%s not implemented yet",
- __PRETTY_FUNCTION__);
+ "%s not implemented yet",
+ __PRETTY_FUNCTION__);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
}
void
-tracker_files_get_by_service_type (TrackerFiles *object,
- gint live_query_id,
- const gchar *service,
- gint offset,
- gint max_hits,
+tracker_files_get_by_service_type (TrackerFiles *object,
+ gint live_query_id,
+ const gchar *service,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
- GError *actual_error = NULL;
+ guint request_id;
+ gchar **values = NULL;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -497,17 +497,17 @@
tracker_dbus_request_new (request_id,
"DBus request to get files by service type, "
- "query id:%d, service:'%s', offset:%d, max hits:%d, ",
- live_query_id,
- service,
- offset,
- max_hits);
+ "query id:%d, service:'%s', offset:%d, max hits:%d, ",
+ live_query_id,
+ service,
+ offset,
+ max_hits);
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",
- service);
+ "Service '%s' is invalid or has not been implemented yet",
+ service);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
@@ -535,18 +535,18 @@
}
void
-tracker_files_get_by_mime_type (TrackerFiles *object,
- gint live_query_id,
- gchar **mime_types,
- gint offset,
- gint max_hits,
+tracker_files_get_by_mime_type (TrackerFiles *object,
+ gint live_query_id,
+ gchar **mime_types,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
+ guint request_id;
+ gchar **values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -557,11 +557,11 @@
tracker_dbus_request_new (request_id,
"DBus request to get files by mime types, "
- "query id:%d, mime types:%d, offset:%d, max hits:%d, ",
- live_query_id,
- g_strv_length (mime_types),
- offset,
- max_hits);
+ "query id:%d, mime types:%d, offset:%d, max hits:%d, ",
+ live_query_id,
+ g_strv_length (mime_types),
+ offset,
+ max_hits);
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
@@ -583,22 +583,22 @@
g_strfreev (values);
}
- tracker_dbus_request_success (request_id);
+ tracker_dbus_request_success (request_id);
}
void
-tracker_files_get_by_mime_type_vfs (TrackerFiles *object,
- gint live_query_id,
- gchar **mime_types,
- gint offset,
- gint max_hits,
+tracker_files_get_by_mime_type_vfs (TrackerFiles *object,
+ gint live_query_id,
+ gchar **mime_types,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
+ guint request_id;
+ gchar **values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -609,11 +609,11 @@
tracker_dbus_request_new (request_id,
"DBus request to get files by mime types (VFS), "
- "query id:%d, mime types:%d, offset:%d, max hits:%d, ",
- live_query_id,
- g_strv_length (mime_types),
- offset,
- max_hits);
+ "query id:%d, mime types:%d, offset:%d, max hits:%d, ",
+ live_query_id,
+ g_strv_length (mime_types),
+ offset,
+ max_hits);
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
@@ -638,22 +638,22 @@
g_strfreev (values);
}
- tracker_dbus_request_success (request_id);
+ tracker_dbus_request_success (request_id);
}
void
-tracker_files_get_mtime (TrackerFiles *object,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error)
+tracker_files_get_mtime (TrackerFiles *object,
+ const gchar *uri,
+ DBusGMethodInvocation *context,
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar *path = NULL;
- gchar *name = NULL;
- gint mtime;
- GError *actual_error = NULL;
+ guint request_id;
+ gchar *path = NULL;
+ gchar *name = NULL;
+ gint mtime;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -661,8 +661,8 @@
tracker_dbus_request_new (request_id,
"DBus request for mtime, "
- "uri:'%s'",
- uri);
+ "uri:'%s'",
+ uri);
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
@@ -691,29 +691,29 @@
dbus_g_method_return (context, mtime);
- tracker_dbus_request_success (request_id);
+ tracker_dbus_request_success (request_id);
}
void
-tracker_files_get_metadata_for_files_in_folder (TrackerFiles *object,
- gint live_query_id,
- const gchar *uri,
- gchar **fields,
+tracker_files_get_metadata_for_files_in_folder (TrackerFiles *object,
+ gint live_query_id,
+ const gchar *uri,
+ gchar **fields,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- TrackerField *defs[255];
- guint request_id;
- guint i;
- gchar *uri_filtered;
- guint32 file_id;
- GString *sql;
- gboolean needs_join[255];
- gchar *query;
- GPtrArray *values;
- GError *actual_error = NULL;
+ TrackerField *defs[255];
+ guint request_id;
+ guint i;
+ gchar *uri_filtered;
+ guint32 file_id;
+ GString *sql;
+ gboolean needs_join[255];
+ gchar *query;
+ GPtrArray *values;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -723,10 +723,10 @@
tracker_dbus_request_new (request_id,
"DBus request for metadata for files in folder, "
- "query id:%d, uri:'%s', fields:%d",
- live_query_id,
- uri,
- g_strv_length (fields));
+ "query id:%d, uri:'%s', fields:%d",
+ live_query_id,
+ uri,
+ g_strv_length (fields));
/* Get fields for metadata list provided */
@@ -838,20 +838,20 @@
tracker_dbus_results_ptr_array_free (&values);
- tracker_dbus_request_success (request_id);
+ tracker_dbus_request_success (request_id);
}
void
-tracker_files_search_by_text_and_mime (TrackerFiles *object,
- const gchar *text,
- gchar **mime_types,
+tracker_files_search_by_text_and_mime (TrackerFiles *object,
+ const gchar *text,
+ gchar **mime_types,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
+ guint request_id;
+ gchar **values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -861,9 +861,9 @@
tracker_dbus_request_new (request_id,
"DBus request to search files by text & mime types, "
- "text:'%s', mime types:%d",
- text,
- g_strv_length (mime_types));
+ "text:'%s', mime types:%d",
+ text,
+ g_strv_length (mime_types));
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
@@ -871,9 +871,9 @@
if (result_set) {
gboolean valid = TRUE;
- gchar *prefix, *name;
- gint row_count = 0;
- gint i = 0;
+ gchar *prefix, *name;
+ gint row_count = 0;
+ gint i = 0;
row_count = tracker_db_result_set_get_n_rows (result_set);
values = g_new0 (gchar *, row_count);
@@ -901,20 +901,20 @@
g_strfreev (values);
- tracker_dbus_request_success (request_id);
+ tracker_dbus_request_success (request_id);
}
void
-tracker_files_search_by_text_and_location (TrackerFiles *object,
- const gchar *text,
- const gchar *uri,
+tracker_files_search_by_text_and_location (TrackerFiles *object,
+ const gchar *text,
+ const gchar *uri,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
+ guint request_id;
+ gchar **values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -923,9 +923,9 @@
tracker_dbus_request_new (request_id,
"DBus request to search files by text & location, "
- "text:'%s', uri:'%s'",
- text,
- uri);
+ "text:'%s', uri:'%s'",
+ text,
+ uri);
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
@@ -933,9 +933,9 @@
if (result_set) {
gboolean valid = TRUE;
- gchar *prefix, *name;
- gint row_count;
- gint i = 0;
+ gchar *prefix, *name;
+ gint row_count;
+ gint i = 0;
row_count = tracker_db_result_set_get_n_rows (result_set);
values = g_new0 (gchar *, row_count);
@@ -963,21 +963,21 @@
g_strfreev (values);
- tracker_dbus_request_success (request_id);
+ tracker_dbus_request_success (request_id);
}
void
-tracker_files_search_by_text_and_mime_and_location (TrackerFiles *object,
- const gchar *text,
- gchar **mime_types,
- const gchar *uri,
+tracker_files_search_by_text_and_mime_and_location (TrackerFiles *object,
+ const gchar *text,
+ gchar **mime_types,
+ const gchar *uri,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
+ guint request_id;
+ gchar **values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -988,10 +988,10 @@
tracker_dbus_request_new (request_id,
"DBus request to search files by text & mime types & location, "
- "text:'%s', mime types:%d, uri:'%s'",
- text,
+ "text:'%s', mime types:%d, uri:'%s'",
+ text,
g_strv_length (mime_types),
- uri);
+ uri);
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
@@ -999,9 +999,9 @@
if (result_set) {
gboolean valid = TRUE;
- gchar *prefix, *name;
- gint row_count;
- gint i = 0;
+ gchar *prefix, *name;
+ gint row_count;
+ gint i = 0;
row_count = tracker_db_result_set_get_n_rows (result_set);
values = g_new0 (gchar *, row_count);
@@ -1029,5 +1029,5 @@
g_strfreev (values);
- tracker_dbus_request_success (request_id);
+ tracker_dbus_request_success (request_id);
}
Modified: branches/indexer-split/src/trackerd/tracker-files.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-files.h (original)
+++ branches/indexer-split/src/trackerd/tracker-files.h Sat Sep 20 15:12:19 2008
@@ -24,20 +24,20 @@
#include <glib-object.h>
-#define TRACKER_FILES_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_FILES_PATH "/org/freedesktop/Tracker/Files"
+#define TRACKER_FILES_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_FILES_PATH "/org/freedesktop/Tracker/Files"
#define TRACKER_FILES_INTERFACE "org.freedesktop.Tracker.Files"
G_BEGIN_DECLS
-#define TRACKER_TYPE_FILES (tracker_files_get_type ())
-#define TRACKER_FILES(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_FILES, TrackerFiles))
+#define TRACKER_TYPE_FILES (tracker_files_get_type ())
+#define TRACKER_FILES(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_FILES, TrackerFiles))
#define TRACKER_FILES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_FILES, TrackerFilesClass))
#define TRACKER_IS_FILES(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_FILES))
#define TRACKER_IS_FILES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_FILES))
#define TRACKER_FILES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_FILES, TrackerFilesClass))
-typedef struct TrackerFiles TrackerFiles;
+typedef struct TrackerFiles TrackerFiles;
typedef struct TrackerFilesClass TrackerFilesClass;
struct TrackerFiles {
@@ -48,88 +48,88 @@
GObjectClass parent;
};
-GType tracker_files_get_type (void);
-TrackerFiles *tracker_files_new (TrackerProcessor *processor);
-void tracker_files_exist (TrackerFiles *object,
- const gchar *uri,
- gboolean auto_create,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_create (TrackerFiles *object,
- const gchar *uri,
- gboolean is_directory,
- const gchar *mime,
- gint size,
- gint mtime,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_delete (TrackerFiles *object,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_service_type (TrackerFiles *object,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_text_contents (TrackerFiles *object,
- const gchar *uri,
- gint offset,
- gint max_length,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_search_text_contents (TrackerFiles *object,
- const gchar *uri,
- const gchar *text,
- gint max_length,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_by_service_type (TrackerFiles *object,
- gint live_query_id,
- const gchar *service,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_by_mime_type (TrackerFiles *object,
- gint live_query_id,
- gchar **mime_types,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_by_mime_type_vfs (TrackerFiles *object,
- gint live_query_id,
- gchar **mime_types,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_mtime (TrackerFiles *object,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_metadata_for_files_in_folder (TrackerFiles *object,
- gint live_query_id,
- const gchar *uri,
- gchar **fields,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_search_by_text_and_mime (TrackerFiles *object,
- const gchar *text,
- gchar **mime_types,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_search_by_text_and_location (TrackerFiles *object,
- const gchar *text,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_search_by_text_and_mime_and_location (TrackerFiles *object,
- const gchar *text,
- gchar **mime_types,
- const gchar *uri,
+GType tracker_files_get_type (void);
+TrackerFiles *tracker_files_new (TrackerProcessor *processor);
+void tracker_files_exist (TrackerFiles *object,
+ const gchar *uri,
+ gboolean auto_create,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_create (TrackerFiles *object,
+ const gchar *uri,
+ gboolean is_directory,
+ const gchar *mime,
+ gint size,
+ gint mtime,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_delete (TrackerFiles *object,
+ const gchar *uri,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_get_service_type (TrackerFiles *object,
+ const gchar *uri,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_get_text_contents (TrackerFiles *object,
+ const gchar *uri,
+ gint offset,
+ gint max_length,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_search_text_contents (TrackerFiles *object,
+ const gchar *uri,
+ const gchar *text,
+ gint max_length,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_get_by_service_type (TrackerFiles *object,
+ gint live_query_id,
+ const gchar *service,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_get_by_mime_type (TrackerFiles *object,
+ gint live_query_id,
+ gchar **mime_types,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_get_by_mime_type_vfs (TrackerFiles *object,
+ gint live_query_id,
+ gchar **mime_types,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_get_mtime (TrackerFiles *object,
+ const gchar *uri,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_get_metadata_for_files_in_folder (TrackerFiles *object,
+ gint live_query_id,
+ const gchar *uri,
+ gchar **fields,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_search_by_text_and_mime (TrackerFiles *object,
+ const gchar *text,
+ gchar **mime_types,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_search_by_text_and_location (TrackerFiles *object,
+ const gchar *text,
+ const gchar *uri,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_files_search_by_text_and_mime_and_location (TrackerFiles *object,
+ const gchar *text,
+ gchar **mime_types,
+ const gchar *uri,
DBusGMethodInvocation *context,
- GError **error);
+ GError **error);
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 15:12:19 2008
@@ -42,12 +42,12 @@
} TrackerKeywordsPrivate;
enum {
- KEYWORD_ADDED,
- KEYWORD_REMOVED,
- LAST_SIGNAL
+ KEYWORD_ADDED,
+ KEYWORD_REMOVED,
+ LAST_SIGNAL
};
-static void tracker_keywords_finalize (GObject *object);
+static void tracker_keywords_finalize (GObject *object);
static guint signals[LAST_SIGNAL] = {0};
@@ -62,24 +62,24 @@
object_class->finalize = tracker_keywords_finalize;
- signals[KEYWORD_ADDED] =
- g_signal_new ("keyword-added",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- tracker_marshal_VOID__STRING_STRING_STRING,
- G_TYPE_NONE,
- 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
- signals[KEYWORD_REMOVED] =
- g_signal_new ("keyword-removed",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- tracker_marshal_VOID__STRING_STRING_STRING,
- G_TYPE_NONE,
- 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+ signals[KEYWORD_ADDED] =
+ g_signal_new ("keyword-added",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ tracker_marshal_VOID__STRING_STRING_STRING,
+ G_TYPE_NONE,
+ 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+ signals[KEYWORD_REMOVED] =
+ g_signal_new ("keyword-removed",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ tracker_marshal_VOID__STRING_STRING_STRING,
+ G_TYPE_NONE,
+ 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
g_type_class_add_private (object_class, sizeof (TrackerKeywordsPrivate));
}
@@ -114,15 +114,15 @@
*/
void
tracker_keywords_get_list (TrackerKeywords *object,
- const gchar *service_type,
+ const gchar *service_type,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- GError *actual_error = NULL;
- GPtrArray *values;
+ guint request_id;
+ GError *actual_error = NULL;
+ GPtrArray *values;
request_id = tracker_dbus_get_next_request_id ();
@@ -136,8 +136,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",
- service_type);
+ "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);
return;
@@ -158,18 +158,18 @@
}
void
-tracker_keywords_get (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
+tracker_keywords_get (TrackerKeywords *object,
+ const gchar *service_type,
+ const gchar *uri,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar *id;
- GError *actual_error = NULL;
- gchar **values;
+ guint request_id;
+ gchar *id;
+ GError *actual_error = NULL;
+ gchar **values;
request_id = tracker_dbus_get_next_request_id ();
@@ -185,15 +185,15 @@
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",
- service_type);
+ "Service type '%s' is invalid or has not been implemented yet",
+ service_type);
}
- if (!actual_error && tracker_is_empty_string (uri)) {
+ if (!actual_error && tracker_is_empty_string (uri)) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "URI is empty");
- }
+ "URI is empty");
+ }
if (actual_error) {
dbus_g_method_return_error (context, actual_error);
@@ -234,17 +234,17 @@
}
void
-tracker_keywords_add (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keywords,
+tracker_keywords_add (TrackerKeywords *object,
+ const gchar *service_type,
+ const gchar *uri,
+ gchar **keywords,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
- guint request_id;
- gchar *id;
- GError *actual_error = NULL;
+ guint request_id;
+ gchar *id;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -261,21 +261,21 @@
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",
- service_type);
+ "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);
return;
}
- if (tracker_is_empty_string (uri)) {
+ if (tracker_is_empty_string (uri)) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "URI is empty");
+ "URI is empty");
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
- }
+ }
iface = tracker_db_manager_get_db_interface_by_service (service_type);
id = tracker_db_file_get_id_as_string (iface, service_type, uri);
@@ -313,17 +313,17 @@
}
void
-tracker_keywords_remove (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keywords,
- DBusGMethodInvocation *context,
- GError **error)
+tracker_keywords_remove (TrackerKeywords *object,
+ const gchar *service_type,
+ const gchar *uri,
+ gchar **keywords,
+ DBusGMethodInvocation *context,
+ GError **error)
{
TrackerDBInterface *iface;
- guint request_id;
- gchar *service_id;
- GError *actual_error = NULL;
+ guint request_id;
+ gchar *service_id;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -340,21 +340,21 @@
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",
- service_type);
+ "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);
return;
}
- if (tracker_is_empty_string (uri)) {
+ if (tracker_is_empty_string (uri)) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "URI is empty");
+ "URI is empty");
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
- }
+ }
/* Check the uri exists, so we dont start the indexer in vain */
iface = tracker_db_manager_get_db_interface_by_service (service_type);
@@ -393,17 +393,17 @@
}
void
-tracker_keywords_remove_all (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
+tracker_keywords_remove_all (TrackerKeywords *object,
+ const gchar *service_type,
+ const gchar *uri,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
- guint request_id;
- gchar **values;
- gchar *service_id;
- GError *actual_error = NULL;
+ guint request_id;
+ gchar **values;
+ gchar *service_id;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -419,21 +419,21 @@
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",
- service_type);
+ "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);
return;
}
- if (tracker_is_empty_string (uri)) {
+ if (tracker_is_empty_string (uri)) {
tracker_dbus_request_failed (request_id,
&actual_error,
- "URI is empty");
+ "URI is empty");
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
- }
+ }
/* Check the uri exists, so we dont start the indexer in vain */
iface = tracker_db_manager_get_db_interface_by_service (service_type);
@@ -474,26 +474,26 @@
}
void
-tracker_keywords_search (TrackerKeywords *object,
- gint live_query_id,
- const gchar *service_type,
- const gchar **keywords,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error)
+tracker_keywords_search (TrackerKeywords *object,
+ gint live_query_id,
+ const gchar *service_type,
+ const gchar **keywords,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- const gchar **p;
- GString *search;
- GString *select;
- GString *where;
- gchar *related_metadata;
- gchar *query;
- gchar **values;
- GError *actual_error = NULL;
+ guint request_id;
+ const gchar **p;
+ GString *search;
+ GString *select;
+ GString *where;
+ gchar *related_metadata;
+ gchar *query;
+ gchar **values;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -512,8 +512,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",
- service_type);
+ "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);
return;
@@ -556,7 +556,7 @@
g_string_free (search, TRUE);
g_string_append_printf (where,
- " and (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) ",
+ " and (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) ",
service_type,
service_type);
Modified: branches/indexer-split/src/trackerd/tracker-keywords.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-keywords.h (original)
+++ branches/indexer-split/src/trackerd/tracker-keywords.h Sat Sep 20 15:12:19 2008
@@ -24,20 +24,20 @@
#include <glib-object.h>
-#define TRACKER_KEYWORDS_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_KEYWORDS_PATH "/org/freedesktop/Tracker/Keywords"
-#define TRACKER_KEYWORDS_INTERFACE "org.freedesktop.Tracker.Keywords"
+#define TRACKER_KEYWORDS_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_KEYWORDS_PATH "/org/freedesktop/Tracker/Keywords"
+#define TRACKER_KEYWORDS_INTERFACE "org.freedesktop.Tracker.Keywords"
G_BEGIN_DECLS
-#define TRACKER_TYPE_KEYWORDS (tracker_keywords_get_type ())
-#define TRACKER_KEYWORDS(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_KEYWORDS, TrackerKeywords))
-#define TRACKER_KEYWORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_KEYWORDS, TrackerKeywordsClass))
-#define TRACKER_IS_KEYWORDS(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_KEYWORDS))
+#define TRACKER_TYPE_KEYWORDS (tracker_keywords_get_type ())
+#define TRACKER_KEYWORDS(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_KEYWORDS, TrackerKeywords))
+#define TRACKER_KEYWORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_KEYWORDS, TrackerKeywordsClass))
+#define TRACKER_IS_KEYWORDS(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_KEYWORDS))
#define TRACKER_IS_KEYWORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_KEYWORDS))
#define TRACKER_KEYWORDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_KEYWORDS, TrackerKeywordsClass))
-typedef struct TrackerKeywords TrackerKeywords;
+typedef struct TrackerKeywords TrackerKeywords;
typedef struct TrackerKeywordsClass TrackerKeywordsClass;
struct TrackerKeywords {
@@ -48,42 +48,42 @@
GObjectClass parent;
};
-GType tracker_keywords_get_type (void);
-TrackerKeywords *tracker_keywords_new (void);
-void tracker_keywords_get_list (TrackerKeywords *object,
- const gchar *service_type,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_keywords_get (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_keywords_add (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keywords,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_keywords_remove (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keywords,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_keywords_remove_all (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_keywords_search (TrackerKeywords *object,
- gint live_query_id,
- const gchar *service_type,
- const gchar **keywords,
- gint offset,
- gint max_hits,
+GType tracker_keywords_get_type (void);
+TrackerKeywords *tracker_keywords_new (void);
+void tracker_keywords_get_list (TrackerKeywords *object,
+ const gchar *service_type,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_keywords_get (TrackerKeywords *object,
+ const gchar *service_type,
+ const gchar *uri,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_keywords_add (TrackerKeywords *object,
+ const gchar *service_type,
+ const gchar *uri,
+ gchar **keywords,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_keywords_remove (TrackerKeywords *object,
+ const gchar *service_type,
+ const gchar *uri,
+ gchar **keywords,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_keywords_remove_all (TrackerKeywords *object,
+ const gchar *service_type,
+ const gchar *uri,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_keywords_search (TrackerKeywords *object,
+ gint live_query_id,
+ const gchar *service_type,
+ const gchar **keywords,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error);
+ GError **error);
G_END_DECLS
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 15:12:19 2008
@@ -75,11 +75,11 @@
"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" \
+ "\n" \
" http://www.gnu.org/licenses/gpl.txt\n";
/* Throttle defaults */
-#define THROTTLE_DEFAULT 0
+#define THROTTLE_DEFAULT 0
#define THROTTLE_DEFAULT_ON_BATTERY 5
typedef enum {
@@ -89,35 +89,35 @@
} TrackerRunningLevel;
typedef struct {
- GMainLoop *main_loop;
- gchar *log_filename;
+ GMainLoop *main_loop;
+ gchar *log_filename;
- gchar *data_dir;
- gchar *user_data_dir;
- gchar *sys_tmp_dir;
+ gchar *data_dir;
+ gchar *user_data_dir;
+ gchar *sys_tmp_dir;
- gboolean reindex_on_shutdown;
+ gboolean reindex_on_shutdown;
TrackerProcessor *processor;
} TrackerMainPrivate;
/* Private */
-static GStaticPrivate private_key = G_STATIC_PRIVATE_INIT;
+static GStaticPrivate private_key = G_STATIC_PRIVATE_INIT;
/* Private command line parameters */
-static gint verbosity = -1;
-static gint initial_sleep = -1;
-static gboolean low_memory;
-static gchar **monitors_to_exclude;
-static gchar **monitors_to_include;
-static gchar **crawl_dirs;
-static gchar **disable_modules;
-
-static gboolean force_reindex;
-static gboolean disable_indexing;
-static gchar *language_code;
+static gint verbosity = -1;
+static gint initial_sleep = -1;
+static gboolean low_memory;
+static gchar **monitors_to_exclude;
+static gchar **monitors_to_include;
+static gchar **crawl_dirs;
+static gchar **disable_modules;
+
+static gboolean force_reindex;
+static gboolean disable_indexing;
+static gchar *language_code;
-static GOptionEntry entries_daemon[] = {
+static GOptionEntry entries_daemon[] = {
{ "verbosity", 'v', 0,
G_OPTION_ARG_INT, &verbosity,
N_("Logging, 0 = errors only, "
@@ -192,8 +192,8 @@
get_lock_file (void)
{
TrackerMainPrivate *private;
- gchar *lock_filename;
- gchar *filename;
+ gchar *lock_filename;
+ gchar *filename;
private = g_static_private_get (&private_key);
@@ -212,9 +212,9 @@
TrackerHal *hal)
{
TrackerRunningLevel runlevel;
- gchar *lock_file;
- gboolean use_nfs;
- gint fd;
+ gchar *lock_file;
+ gboolean use_nfs;
+ gint fd;
g_message ("Checking instances running...");
@@ -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);
@@ -314,16 +314,16 @@
tracker_config_get_initial_sleep (config));
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),
@@ -352,12 +352,12 @@
{
static gboolean in_loop = FALSE;
- /* Die if we get re-entrant signals handler calls */
+ /* Die if we get re-entrant signals handler calls */
if (in_loop) {
exit (EXIT_FAILURE);
}
- switch (signo) {
+ switch (signo) {
case SIGSEGV:
/* We are screwed if we get this so exit immediately! */
exit (EXIT_FAILURE);
@@ -386,8 +386,8 @@
initialize_signal_handler (void)
{
#ifndef OS_WIN32
- struct sigaction act;
- sigset_t empty_mask;
+ struct sigaction act;
+ sigset_t empty_mask;
sigemptyset (&empty_mask);
act.sa_handler = signal_handler;
@@ -410,7 +410,7 @@
initialize_locations (void)
{
TrackerMainPrivate *private;
- gchar *filename;
+ gchar *filename;
private = g_static_private_get (&private_key);
@@ -445,7 +445,7 @@
initialize_directories (void)
{
TrackerMainPrivate *private;
- gchar *filename;
+ gchar *filename;
private = g_static_private_get (&private_key);
@@ -460,7 +460,7 @@
g_mkdir_with_parents (private->data_dir, 00755);
/* Remove old tracker dirs */
- filename = g_build_filename (g_get_home_dir (), ".Tracker", NULL);
+ filename = g_build_filename (g_get_home_dir (), ".Tracker", NULL);
if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
tracker_path_remove (filename);
@@ -469,7 +469,7 @@
g_free (filename);
/* Remove database if we are reindexing */
- filename = g_build_filename (private->sys_tmp_dir, "Attachments", NULL);
+ filename = g_build_filename (private->sys_tmp_dir, "Attachments", NULL);
g_mkdir_with_parents (filename, 00700);
g_free (filename);
@@ -631,22 +631,22 @@
gint
main (gint argc, gchar *argv[])
{
- GOptionContext *context = NULL;
- GOptionGroup *group;
- GError *error = NULL;
- TrackerMainPrivate *private;
- TrackerConfig *config;
- TrackerLanguage *language;
- TrackerHal *hal;
- TrackerDBIndex *file_index;
- TrackerDBIndex *file_update_index;
- TrackerDBIndex *email_index;
- TrackerRunningLevel runtime_level;
- TrackerDBManagerFlags flags = 0;
+ GOptionContext *context = NULL;
+ GOptionGroup *group;
+ GError *error = NULL;
+ TrackerMainPrivate *private;
+ TrackerConfig *config;
+ TrackerLanguage *language;
+ TrackerHal *hal;
+ TrackerDBIndex *file_index;
+ TrackerDBIndex *file_update_index;
+ TrackerDBIndex *email_index;
+ TrackerRunningLevel runtime_level;
+ TrackerDBManagerFlags flags = 0;
TrackerDBIndexManagerFlags index_flags = 0;
- gboolean is_first_time_index;
+ gboolean is_first_time_index;
- g_type_init ();
+ g_type_init ();
private = g_new0 (TrackerMainPrivate, 1);
g_static_private_set (&private_key,
@@ -661,13 +661,13 @@
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
/* Set timezone info */
tzset ();
- /* Translators: this messagge will apper immediately after the
+ /* Translators: this messagge will apper immediately after the
* usage string - Usage: COMMAND <THIS_MESSAGE>
*/
context = g_option_context_new (_("- start the tracker daemon"));
@@ -705,26 +705,26 @@
initialize_signal_handler ();
- /* Check XDG spec locations XDG_DATA_HOME _MUST_ be writable. */
- if (!tracker_env_check_xdg_dirs ()) {
- return EXIT_FAILURE;
- }
+ /* Check XDG spec locations XDG_DATA_HOME _MUST_ be writable. */
+ if (!tracker_env_check_xdg_dirs ()) {
+ return EXIT_FAILURE;
+ }
/* Set IO priority */
tracker_ioprio_init ();
- /* nice() uses attribute "warn_unused_result" and so complains
+ /* 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...
*/
- if (nice (19) == -1 && errno) {
- const gchar *str;
+ if (nice (19) == -1 && errno) {
+ const gchar *str;
- str = g_strerror (errno);
- g_message ("Couldn't set nice value to 19, %s",
- str ? str : "no error given");
- }
+ str = g_strerror (errno);
+ 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.
@@ -735,12 +735,12 @@
*/
initialize_locations ();
- /* Initialize major subsystems */
- config = tracker_config_new ();
- language = tracker_language_new (config);
+ /* Initialize major subsystems */
+ config = tracker_config_new ();
+ language = tracker_language_new (config);
#ifdef HAVE_HAL
- hal = tracker_hal_new ();
+ hal = tracker_hal_new ();
g_signal_connect (hal, "notify::battery-in-use",
G_CALLBACK (notify_battery_in_use_cb),
@@ -763,19 +763,19 @@
}
if (monitors_to_exclude) {
- tracker_config_add_no_watch_directory_roots (config, monitors_to_exclude);
+ tracker_config_add_no_watch_directory_roots (config, monitors_to_exclude);
}
if (monitors_to_include) {
- tracker_config_add_watch_directory_roots (config, monitors_to_include);
+ tracker_config_add_watch_directory_roots (config, monitors_to_include);
}
if (crawl_dirs) {
- tracker_config_add_crawl_directory_roots (config, crawl_dirs);
+ tracker_config_add_crawl_directory_roots (config, crawl_dirs);
}
if (disable_modules) {
- tracker_config_add_disabled_modules (config, disable_modules);
+ tracker_config_add_disabled_modules (config, disable_modules);
}
/* Indexer command line arguments */
@@ -803,7 +803,7 @@
return EXIT_FAILURE;
}
- tracker_module_config_init ();
+ tracker_module_config_init ();
flags |= TRACKER_DB_MANAGER_REMOVE_CACHE;
index_flags |= TRACKER_DB_INDEX_MANAGER_READONLY;
@@ -952,7 +952,7 @@
tracker_db_manager_shutdown ();
tracker_db_index_manager_shutdown ();
tracker_db_shutdown ();
- tracker_module_config_shutdown ();
+ tracker_module_config_shutdown ();
tracker_nfs_lock_shutdown ();
tracker_status_shutdown ();
tracker_log_shutdown ();
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 15:12:19 2008
@@ -27,11 +27,11 @@
G_BEGIN_DECLS
-void tracker_shutdown (void);
+void tracker_shutdown (void);
-const gchar *tracker_get_sys_tmp_dir (void);
+const gchar *tracker_get_sys_tmp_dir (void);
-void tracker_set_reindex_on_shutdown (gboolean value);
+void tracker_set_reindex_on_shutdown (gboolean value);
G_END_DECLS
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 15:12:19 2008
@@ -68,79 +68,79 @@
static gint
metadata_sanity_check_max_hits (gint max_hits)
{
- if (max_hits < 1) {
- return DEFAULT_METADATA_MAX_HITS;
- }
+ if (max_hits < 1) {
+ return DEFAULT_METADATA_MAX_HITS;
+ }
- return max_hits;
+ return max_hits;
}
static TrackerFieldData *
tracker_metadata_add_metadata_field (TrackerDBInterface *iface,
const gchar *service,
- GSList **fields,
- const gchar *field_name,
- gboolean is_select,
- gboolean is_condition)
+ GSList **fields,
+ const gchar *field_name,
+ gboolean is_select,
+ gboolean is_condition)
{
TrackerFieldData *field_data;
- gboolean field_exists;
- GSList *l;
+ gboolean field_exists;
+ GSList *l;
field_exists = FALSE;
field_data = NULL;
/* Check if field is already in list */
for (l = *fields; l; l = l->next) {
- const gchar *this_field_name;
+ const gchar *this_field_name;
+
+ this_field_name = tracker_field_data_get_field_name (l->data);
+ if (!this_field_name) {
+ continue;
+ }
- 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;
-
- if (is_condition) {
- tracker_field_data_set_is_condition (field_data, TRUE);
- }
+ if (strcasecmp (this_field_name, field_name) == 0) {
+ field_data = l->data;
+ field_exists = TRUE;
+
+ if (is_condition) {
+ tracker_field_data_set_is_condition (field_data, TRUE);
+ }
- break;
+ break;
}
}
if (!field_exists) {
field_data = tracker_db_get_metadata_field (iface,
- service,
- field_name,
- g_slist_length (*fields),
- is_select,
- is_condition);
+ service,
+ field_name,
+ g_slist_length (*fields),
+ is_select,
+ is_condition);
if (field_data) {
*fields = g_slist_prepend (*fields, field_data);
- }
+ }
}
return field_data;
}
void
-tracker_metadata_get (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keys,
+tracker_metadata_get (TrackerMetadata *object,
+ const gchar *service_type,
+ const gchar *uri,
+ gchar **keys,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar *service_id, *service_result;
- guint i;
- gchar **values;
- GError *actual_error = NULL;
+ guint request_id;
+ gchar *service_id, *service_result;
+ guint i;
+ gchar **values;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -157,8 +157,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",
- service_type);
+ "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);
return;
@@ -167,7 +167,7 @@
iface = tracker_db_manager_get_db_interface_by_service (service_type);
service_id = tracker_db_file_get_id_as_string (iface, service_type, uri);
- if (!service_id) {
+ if (!service_id) {
tracker_dbus_request_failed (request_id,
&actual_error,
"Service URI '%s' not found",
@@ -175,7 +175,7 @@
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
return;
- }
+ }
/* Checking keys */
for (i = 0; i < g_strv_length (keys); i++) {
@@ -198,14 +198,14 @@
*/
service_result = tracker_db_service_get_by_entity (iface, service_id);
if (!service_result) {
- g_free (service_id);
- tracker_dbus_request_failed (request_id,
- &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;
+ g_free (service_id);
+ tracker_dbus_request_failed (request_id,
+ &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);
@@ -231,19 +231,19 @@
}
void
-tracker_metadata_set (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keys,
- gchar **values,
+tracker_metadata_set (TrackerMetadata *object,
+ const gchar *service_type,
+ const gchar *uri,
+ gchar **keys,
+ gchar **values,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
- guint request_id;
- gchar *service_id;
- guint i;
- GError *actual_error = NULL;
+ guint request_id;
+ gchar *service_id;
+ guint i;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -262,8 +262,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",
- service_type);
+ "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);
return;
@@ -273,20 +273,20 @@
/* Check the uri exists, so we dont start the indexer in vain */
service_id = tracker_db_file_get_id_as_string (iface, service_type, uri);
- if (!service_id) {
+ if (!service_id) {
tracker_dbus_request_failed (request_id,
&actual_error,
"Service URI '%s' not found",
uri);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
- return;
- }
+ return;
+ }
/* Checking keys */
for (i = 0; i < g_strv_length (keys); i++) {
TrackerField *field_def;
- gchar **value;
+ gchar **value;
field_def = tracker_ontology_get_field_by_name (keys[i]);
@@ -338,18 +338,18 @@
}
void
-tracker_metadata_get_type_details (TrackerMetadata *object,
- const gchar *metadata,
+tracker_metadata_get_type_details (TrackerMetadata *object,
+ const gchar *metadata,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
- guint request_id;
- TrackerField *def = NULL;
+ guint request_id;
+ TrackerField *def = NULL;
TrackerFieldType field_type;
- gchar *type;
- gboolean is_embedded;
- gboolean is_writable;
- GError *actual_error = NULL;
+ gchar *type;
+ gboolean is_embedded;
+ gboolean is_writable;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -384,16 +384,16 @@
}
void
-tracker_metadata_get_registered_types (TrackerMetadata *object,
- const gchar *service_type,
+tracker_metadata_get_registered_types (TrackerMetadata *object,
+ const gchar *service_type,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
- guint request_id;
- gchar **values = NULL;
- const gchar *requested = NULL;
- GSList *registered = NULL;
- GError *actual_error = NULL;
+ guint request_id;
+ gchar **values = NULL;
+ const gchar *requested = NULL;
+ GSList *registered = NULL;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -408,8 +408,8 @@
!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",
- service_type);
+ "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);
return;
@@ -434,13 +434,13 @@
}
void
-tracker_metadata_get_registered_classes (TrackerMetadata *object,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- gchar **values = NULL;
- GSList *registered = NULL;
+tracker_metadata_get_registered_classes (TrackerMetadata *object,
+ DBusGMethodInvocation *context,
+ GError **error)
+{
+ guint request_id;
+ gchar **values = NULL;
+ GSList *registered = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -464,35 +464,35 @@
}
void
-tracker_metadata_get_unique_values (TrackerMetadata *object,
- const gchar *service_type,
- gchar **fields,
- const gchar *query_condition,
- gboolean order_desc,
- gint offset,
- gint max_hits,
+tracker_metadata_get_unique_values (TrackerMetadata *object,
+ const gchar *service_type,
+ gchar **fields,
+ const gchar *query_condition,
+ gboolean order_desc,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set = NULL;
- guint request_id;
+ guint request_id;
- GPtrArray *values = NULL;
- GSList *field_list = NULL;
- gchar *str_offset, *str_limit;
-
- GString *sql_select;
- GString *sql_from;
- GString *sql_where;
- GString *sql_order;
- gchar *sql;
-
- char *rdf_where;
- char *rdf_from;
- GError *actual_error = NULL;
+ GPtrArray *values = NULL;
+ GSList *field_list = NULL;
+ gchar *str_offset, *str_limit;
+
+ GString *sql_select;
+ GString *sql_from;
+ GString *sql_where;
+ GString *sql_order;
+ gchar *sql;
+
+ char *rdf_where;
+ char *rdf_from;
+ GError *actual_error = NULL;
- guint i;
+ guint i;
request_id = tracker_dbus_get_next_request_id ();
@@ -503,14 +503,14 @@
tracker_dbus_request_new (request_id,
"DBus request to get unique values, "
"service type:'%s', query '%s'",
- service_type,
- query_condition);
+ service_type,
+ query_condition);
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",
- service_type);
+ "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);
return;
@@ -620,37 +620,37 @@
}
void
-tracker_metadata_get_unique_values_with_count (TrackerMetadata *object,
- const gchar *service_type,
- gchar **fields,
- const gchar *query_condition,
- const gchar *count_field,
- gboolean order_desc,
- gint offset,
- gint max_hits,
+tracker_metadata_get_unique_values_with_count (TrackerMetadata *object,
+ const gchar *service_type,
+ gchar **fields,
+ const gchar *query_condition,
+ const gchar *count_field,
+ gboolean order_desc,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set = NULL;
- guint request_id;
+ guint request_id;
- GPtrArray *values = NULL;
- GSList *field_list = NULL;
- gchar *str_offset, *str_limit;
-
- GString *sql_select;
- GString *sql_from;
- GString *sql_where;
- GString *sql_order;
- GString *sql_group;
- gchar *sql;
-
- char *rdf_where;
- char *rdf_from;
- GError *actual_error = NULL;
+ GPtrArray *values = NULL;
+ GSList *field_list = NULL;
+ gchar *str_offset, *str_limit;
+
+ GString *sql_select;
+ GString *sql_from;
+ GString *sql_where;
+ GString *sql_order;
+ GString *sql_group;
+ gchar *sql;
+
+ char *rdf_where;
+ char *rdf_from;
+ GError *actual_error = NULL;
- guint i;
+ guint i;
request_id = tracker_dbus_get_next_request_id ();
@@ -662,15 +662,15 @@
"DBus request to get unique values, "
"service type:'%s', query '%s'"
"count field :'%s'",
- service_type,
- query_condition,
+ service_type,
+ query_condition,
count_field);
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",
- service_type);
+ "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);
return;
@@ -822,29 +822,29 @@
void
-tracker_metadata_get_sum (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *field,
- const gchar *query_condition,
+tracker_metadata_get_sum (TrackerMetadata *object,
+ const gchar *service_type,
+ const gchar *field,
+ const gchar *query_condition,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set = NULL;
- guint request_id;
+ guint request_id;
- gint sum;
- GSList *fields = NULL;
+ gint sum;
+ GSList *fields = NULL;
TrackerFieldData *def = NULL;
TrackerFieldType data_type;
- GString *sql_select;
- GString *sql_from;
- GString *sql_where;
- gchar *sql;
-
- char *rdf_where;
- char *rdf_from;
- GError *actual_error = NULL;
+ GString *sql_select;
+ GString *sql_from;
+ GString *sql_where;
+ gchar *sql;
+
+ char *rdf_where;
+ char *rdf_from;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -855,9 +855,9 @@
tracker_dbus_request_new (request_id,
"DBus request to get sum, "
"service type:'%s', field '%s', query '%s'",
- service_type,
+ service_type,
field,
- query_condition);
+ query_condition);
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
@@ -958,28 +958,28 @@
void
-tracker_metadata_get_count (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *field,
- const gchar *query_condition,
+tracker_metadata_get_count (TrackerMetadata *object,
+ const gchar *service_type,
+ const gchar *field,
+ const gchar *query_condition,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set = NULL;
- guint request_id;
- gint count;
- GSList *fields = NULL;
+ guint request_id;
+ gint count;
+ GSList *fields = NULL;
TrackerFieldData *def = NULL;
- GString *sql_select;
- GString *sql_from;
- GString *sql_where;
- gchar *sql;
-
- char *rdf_where;
- char *rdf_from;
- GError *actual_error = NULL;
+ GString *sql_select;
+ GString *sql_from;
+ GString *sql_where;
+ gchar *sql;
+
+ char *rdf_where;
+ char *rdf_from;
+ GError *actual_error = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -990,9 +990,9 @@
tracker_dbus_request_new (request_id,
"DBus request to get count, "
"service type:'%s', field '%s', query '%s'",
- service_type,
+ service_type,
field,
- query_condition);
+ query_condition);
if (!tracker_ontology_service_is_valid (service_type)) {
tracker_dbus_request_failed (request_id,
Modified: branches/indexer-split/src/trackerd/tracker-metadata.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-metadata.h (original)
+++ branches/indexer-split/src/trackerd/tracker-metadata.h Sat Sep 20 15:12:19 2008
@@ -26,20 +26,20 @@
#include <libtracker-db/tracker-db-index.h>
-#define TRACKER_METADATA_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_METADATA_PATH "/org/freedesktop/Tracker/Metadata"
-#define TRACKER_METADATA_INTERFACE "org.freedesktop.Tracker.Metadata"
+#define TRACKER_METADATA_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_METADATA_PATH "/org/freedesktop/Tracker/Metadata"
+#define TRACKER_METADATA_INTERFACE "org.freedesktop.Tracker.Metadata"
G_BEGIN_DECLS
-#define TRACKER_TYPE_METADATA (tracker_metadata_get_type ())
-#define TRACKER_METADATA(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_METADATA, TrackerMetadata))
-#define TRACKER_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_METADATA, TrackerMetadataClass))
-#define TRACKER_IS_METADATA(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_METADATA))
+#define TRACKER_TYPE_METADATA (tracker_metadata_get_type ())
+#define TRACKER_METADATA(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_METADATA, TrackerMetadata))
+#define TRACKER_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_METADATA, TrackerMetadataClass))
+#define TRACKER_IS_METADATA(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_METADATA))
#define TRACKER_IS_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_METADATA))
#define TRACKER_METADATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_METADATA, TrackerMetadataClass))
-typedef struct TrackerMetadata TrackerMetadata;
+typedef struct TrackerMetadata TrackerMetadata;
typedef struct TrackerMetadataClass TrackerMetadataClass;
struct TrackerMetadata {
@@ -50,64 +50,64 @@
GObjectClass parent;
};
-GType tracker_metadata_get_type (void);
-TrackerMetadata *tracker_metadata_new (void);
-void tracker_metadata_get (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keys,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_set (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keys,
- gchar **metadata,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_type_details (TrackerMetadata *object,
- const gchar *metadata,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_registered_types (TrackerMetadata *object,
- const gchar *service_type,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_registered_classes (TrackerMetadata *object,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_unique_values (TrackerMetadata *object,
- const gchar *service_type,
- gchar **fields,
- const gchar *query_condition,
- gboolean order_desc,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_sum (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *field,
- const gchar *query_condition,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_count (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *field,
- const gchar *query_condition,
- DBusGMethodInvocation *context,
- GError **error);
-
-void tracker_metadata_get_unique_values_with_count (TrackerMetadata *object,
- const gchar *service_type,
- gchar **fields,
- const gchar *query_condition,
- const gchar *count,
- gboolean order_desc,
- gint offset,
- gint max_hits,
+GType tracker_metadata_get_type (void);
+TrackerMetadata *tracker_metadata_new (void);
+void tracker_metadata_get (TrackerMetadata *object,
+ const gchar *service_type,
+ const gchar *uri,
+ gchar **keys,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_metadata_set (TrackerMetadata *object,
+ const gchar *service_type,
+ const gchar *uri,
+ gchar **keys,
+ gchar **metadata,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_metadata_get_type_details (TrackerMetadata *object,
+ const gchar *metadata,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_metadata_get_registered_types (TrackerMetadata *object,
+ const gchar *service_type,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_metadata_get_registered_classes (TrackerMetadata *object,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_metadata_get_unique_values (TrackerMetadata *object,
+ const gchar *service_type,
+ gchar **fields,
+ const gchar *query_condition,
+ gboolean order_desc,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_metadata_get_sum (TrackerMetadata *object,
+ const gchar *service_type,
+ const gchar *field,
+ const gchar *query_condition,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_metadata_get_count (TrackerMetadata *object,
+ const gchar *service_type,
+ const gchar *field,
+ const gchar *query_condition,
+ DBusGMethodInvocation *context,
+ GError **error);
+
+void tracker_metadata_get_unique_values_with_count (TrackerMetadata *object,
+ const gchar *service_type,
+ gchar **fields,
+ const gchar *query_condition,
+ const gchar *count,
+ gboolean order_desc,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error);
+ GError **error);
G_END_DECLS
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 15:12:19 2008
@@ -71,15 +71,15 @@
gboolean enabled;
- guint black_list_timeout_id;
+ guint black_list_timeout_id;
GHashTable *black_list_count;
GHashTable *black_list_timestamps;
- GType monitor_backend;
+ GType monitor_backend;
- guint monitor_limit;
+ guint monitor_limit;
gboolean monitor_limit_warned;
- guint monitors_ignored;
+ guint monitors_ignored;
/* For FAM, the _CHANGES_DONE event is not signalled, so we
* have to just use the _CHANGED event instead.
@@ -87,14 +87,14 @@
gboolean use_changed_event;
/* Timeout id for pausing when we get IO */
- guint unpause_timeout_id;
+ guint unpause_timeout_id;
#ifdef USE_LIBINOTIFY
GHashTable *event_pairs;
GHashTable *event_time_by_cookie;
GHashTable *event_type_by_cookie;
- guint event_check_timeout_id;
+ guint event_check_timeout_id;
#endif /* USE_LIBINOTIFY */
};
@@ -111,23 +111,23 @@
PROP_ENABLED
};
-static void tracker_monitor_finalize (GObject *object);
-static void tracker_monitor_set_property (GObject *object,
- guint prop_id,
+static void tracker_monitor_finalize (GObject *object);
+static void tracker_monitor_set_property (GObject *object,
+ guint prop_id,
const GValue *value,
- GParamSpec *pspec);
-static void tracker_monitor_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static gboolean black_list_check_items_cb (gpointer data);
-static void black_list_print_all (TrackerMonitor *monitor);
-static guint get_inotify_limit (void);
+ GParamSpec *pspec);
+static void tracker_monitor_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static gboolean black_list_check_items_cb (gpointer data);
+static void black_list_print_all (TrackerMonitor *monitor);
+static guint get_inotify_limit (void);
#ifdef USE_LIBINOTIFY
static INotifyHandle *libinotify_monitor_directory (TrackerMonitor *monitor,
- GFile *file);
-static void libinotify_monitor_cancel (gpointer data);
+ GFile *file);
+static void libinotify_monitor_cancel (gpointer data);
#endif /* USE_LIBINOTIFY */
static guint signals[LAST_SIGNAL] = { 0, };
@@ -210,10 +210,10 @@
tracker_monitor_init (TrackerMonitor *object)
{
TrackerMonitorPrivate *priv;
- GFile *file;
- GFileMonitor *monitor;
- GList *all_modules, *l;
- const gchar *name;
+ GFile *file;
+ GFileMonitor *monitor;
+ GList *all_modules, *l;
+ const gchar *name;
object->private = TRACKER_MONITOR_GET_PRIVATE (object);
@@ -412,8 +412,8 @@
}
static void
-tracker_monitor_set_property (GObject *object,
- guint prop_id,
+tracker_monitor_set_property (GObject *object,
+ guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
@@ -429,9 +429,9 @@
}
static void
-tracker_monitor_get_property (GObject *object,
- guint prop_id,
- GValue *value,
+tracker_monitor_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
GParamSpec *pspec)
{
TrackerMonitorPrivate *priv;
@@ -451,10 +451,10 @@
static guint
get_inotify_limit (void)
{
- GError *error = NULL;
+ GError *error = NULL;
const gchar *filename;
- gchar *contents = NULL;
- guint limit;
+ gchar *contents = NULL;
+ guint limit;
filename = "/proc/sys/fs/inotify/max_user_watches";
@@ -479,10 +479,10 @@
static const gchar *
get_queue_from_gfile (GHashTable *modules,
- GFile *file)
+ GFile *file)
{
GHashTable *hash_table;
- GList *all_modules, *l;
+ GList *all_modules, *l;
const gchar *module_name = NULL;
all_modules = g_hash_table_get_keys (modules);
@@ -502,8 +502,8 @@
static const gchar *
get_module_name_from_gfile (TrackerMonitor *monitor,
- GFile *file,
- gboolean *is_directory)
+ GFile *file,
+ gboolean *is_directory)
{
const gchar *module_name;
@@ -553,15 +553,15 @@
black_list_check_items_cb (gpointer data)
{
TrackerMonitor *monitor;
- GHashTableIter iter;
- GTimeVal t;
- gchar *path;
- gpointer key;
- gpointer value;
- gsize seconds;
- gsize seconds_now;
- gsize seconds_diff;
- guint count;
+ GHashTableIter iter;
+ GTimeVal t;
+ gchar *path;
+ gpointer key;
+ gpointer value;
+ gsize seconds;
+ gsize seconds_now;
+ gsize seconds_diff;
+ guint count;
monitor = data;
@@ -633,10 +633,10 @@
static gboolean
black_list_file_check (TrackerMonitor *monitor,
- GFile *file)
+ GFile *file)
{
gpointer data;
- guint count;
+ guint count;
data = g_hash_table_lookup (monitor->private->black_list_count, file);
count = GPOINTER_TO_UINT (data);
@@ -646,12 +646,12 @@
static void
black_list_file_increment (TrackerMonitor *monitor,
- GFile *file)
+ GFile *file)
{
GTimeVal t;
- gchar *path;
+ gchar *path;
gpointer data;
- guint count;
+ guint count;
data = g_hash_table_lookup (monitor->private->black_list_count, file);
count = GPOINTER_TO_UINT (data);
@@ -687,12 +687,12 @@
static void
black_list_print_all (TrackerMonitor *monitor)
{
- GHashTableIter iter;
- gchar *path;
- gpointer key;
- gpointer value;
- guint count;
- gboolean none = TRUE;
+ GHashTableIter iter;
+ gchar *path;
+ gpointer key;
+ gpointer value;
+ guint count;
+ gboolean none = TRUE;
g_message ("Summary of black list: (with >= %d events)",
BLACK_LIST_MAX_HITS);
@@ -730,8 +730,8 @@
static void
indexer_continue_cb (DBusGProxy *proxy,
- GError *error,
- gpointer user_data)
+ GError *error,
+ gpointer user_data)
{
if (error) {
g_message ("Could not continue the indexer, %s",
@@ -845,9 +845,9 @@
libinotify_event_check_timeout_cb (gpointer data)
{
TrackerMonitor *monitor;
- GTimeVal t;
- GHashTableIter iter;
- gpointer key, value;
+ GTimeVal t;
+ GHashTableIter iter;
+ gpointer key, value;
monitor = data;
@@ -857,10 +857,10 @@
g_hash_table_iter_init (&iter, monitor->private->event_time_by_cookie);
while (g_hash_table_iter_next (&iter, &key, &value)) {
- glong seconds;
- glong seconds_then;
+ glong seconds;
+ glong seconds_then;
guint32 event_type;
- GFile *file;
+ GFile *file;
const gchar *module_name;
gboolean is_directory;
gpointer p;
@@ -946,18 +946,18 @@
libinotify_monitor_event_cb (INotifyHandle *handle,
const char *monitor_name,
const char *filename,
- guint32 event_type,
- guint32 cookie,
- gpointer user_data)
+ guint32 event_type,
+ guint32 cookie,
+ gpointer user_data)
{
TrackerMonitor *monitor;
- GFile *file;
- GFile *other_file;
+ GFile *file;
+ GFile *other_file;
const gchar *module_name;
- gchar *str1;
- gchar *str2;
- gboolean is_directory;
- gchar *event_type_str;
+ gchar *str1;
+ gchar *str2;
+ gboolean is_directory;
+ gchar *event_type_str;
monitor = user_data;
@@ -1193,10 +1193,10 @@
static INotifyHandle *
libinotify_monitor_directory (TrackerMonitor *monitor,
- GFile *file)
+ GFile *file)
{
INotifyHandle *handle;
- gchar *path;
+ gchar *path;
guint32 mask;
unsigned long flags;
gboolean is_directory;
@@ -1259,17 +1259,17 @@
}
static void
-monitor_event_cb (GFileMonitor *file_monitor,
- GFile *file,
- GFile *other_file,
+monitor_event_cb (GFileMonitor *file_monitor,
+ GFile *file,
+ GFile *other_file,
GFileMonitorEvent event_type,
- gpointer user_data)
+ gpointer user_data)
{
TrackerMonitor *monitor;
const gchar *module_name;
- gchar *str1;
- gchar *str2;
- gboolean is_directory;
+ gchar *str1;
+ gchar *str2;
+ gboolean is_directory;
monitor = user_data;
@@ -1382,7 +1382,7 @@
TrackerMonitor *
tracker_monitor_new (TrackerConfig *config)
{
- TrackerMonitor *monitor;
+ TrackerMonitor *monitor;
TrackerMonitorPrivate *priv;
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
@@ -1406,7 +1406,7 @@
void
tracker_monitor_set_enabled (TrackerMonitor *monitor,
- gboolean enabled)
+ gboolean enabled)
{
g_return_if_fail (TRACKER_IS_MONITOR (monitor));
@@ -1418,18 +1418,18 @@
gboolean
tracker_monitor_add (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file)
+ GFile *file)
{
#ifdef USE_LIBINOTIFY
INotifyHandle *file_monitor;
#else /* USE_LIBINOTIFY */
GFileMonitor *file_monitor;
- GError *error = NULL;
+ GError *error = NULL;
#endif /* USE_LIBINOTIFY */
GHashTable *monitors;
- GSList *ignored_roots;
- GSList *l;
- gchar *path;
+ GSList *ignored_roots;
+ GSList *l;
+ gchar *path;
g_return_val_if_fail (TRACKER_IS_MONITOR (monitor), FALSE);
g_return_val_if_fail (module_name != NULL, FALSE);
@@ -1533,11 +1533,11 @@
gboolean
tracker_monitor_remove (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file)
+ GFile *file)
{
GFileMonitor *file_monitor;
GHashTable *monitors;
- gchar *path;
+ gchar *path;
g_return_val_if_fail (TRACKER_IS_MONITOR (monitor), FALSE);
g_return_val_if_fail (module_name != NULL, FALSE);
@@ -1579,7 +1579,7 @@
gboolean
tracker_monitor_is_watched (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file)
+ GFile *file)
{
GHashTable *monitors;
@@ -1602,7 +1602,7 @@
const gchar *module_name,
const gchar *path)
{
- GFile *file;
+ GFile *file;
GHashTable *monitors;
gboolean watched;
@@ -1626,7 +1626,7 @@
guint
tracker_monitor_get_count (TrackerMonitor *monitor,
- const gchar *module_name)
+ const gchar *module_name)
{
guint count;
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 15:12:19 2008
@@ -29,46 +29,46 @@
G_BEGIN_DECLS
-#define TRACKER_TYPE_MONITOR (tracker_monitor_get_type ())
-#define TRACKER_MONITOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_MONITOR, TrackerMonitor))
-#define TRACKER_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_MONITOR, TrackerMonitorClass))
-#define TRACKER_IS_MONITOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_MONITOR))
+#define TRACKER_TYPE_MONITOR (tracker_monitor_get_type ())
+#define TRACKER_MONITOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_MONITOR, TrackerMonitor))
+#define TRACKER_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_MONITOR, TrackerMonitorClass))
+#define TRACKER_IS_MONITOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_MONITOR))
#define TRACKER_IS_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_MONITOR))
-#define TRACKER_MONITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_MONITOR, TrackerMonitorClass))
+#define TRACKER_MONITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_MONITOR, TrackerMonitorClass))
-typedef struct _TrackerMonitor TrackerMonitor;
+typedef struct _TrackerMonitor TrackerMonitor;
typedef struct _TrackerMonitorClass TrackerMonitorClass;
typedef struct _TrackerMonitorPrivate TrackerMonitorPrivate;
struct _TrackerMonitor {
- GObject parent;
+ GObject parent;
TrackerMonitorPrivate *private;
};
struct _TrackerMonitorClass {
- GObjectClass parent;
+ GObjectClass parent;
};
-GType tracker_monitor_get_type (void);
-TrackerMonitor *tracker_monitor_new (TrackerConfig *config);
-gboolean tracker_monitor_get_enabled (TrackerMonitor *monitor);
-void tracker_monitor_set_enabled (TrackerMonitor *monitor,
- gboolean enabled);
-gboolean tracker_monitor_add (TrackerMonitor *monitor,
+GType tracker_monitor_get_type (void);
+TrackerMonitor *tracker_monitor_new (TrackerConfig *config);
+gboolean tracker_monitor_get_enabled (TrackerMonitor *monitor);
+void tracker_monitor_set_enabled (TrackerMonitor *monitor,
+ gboolean enabled);
+gboolean tracker_monitor_add (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file);
-gboolean tracker_monitor_remove (TrackerMonitor *monitor,
+ GFile *file);
+gboolean tracker_monitor_remove (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file);
-gboolean tracker_monitor_is_watched (TrackerMonitor *monitor,
+ GFile *file);
+gboolean tracker_monitor_is_watched (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file);
-gboolean tracker_monitor_is_watched_by_string (TrackerMonitor *monitor,
+ GFile *file);
+gboolean tracker_monitor_is_watched_by_string (TrackerMonitor *monitor,
const gchar *module_name,
const gchar *path);
-guint tracker_monitor_get_count (TrackerMonitor *monitor,
+guint tracker_monitor_get_count (TrackerMonitor *monitor,
const gchar *module_name);
-guint tracker_monitor_get_ignored (TrackerMonitor *monitor);
+guint tracker_monitor_get_ignored (TrackerMonitor *monitor);
G_END_DECLS
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 15:12:19 2008
@@ -66,38 +66,38 @@
GHashTable *crawlers;
/* File queues for indexer */
- guint item_queues_handler_id;
+ guint item_queues_handler_id;
GHashTable *items_created_queues;
GHashTable *items_updated_queues;
GHashTable *items_deleted_queues;
GHashTable *items_moved_queues;
- SentType sent_type;
- GStrv sent_items;
+ SentType sent_type;
+ GStrv sent_items;
const gchar *sent_module_name;
/* Status */
- GList *modules;
- GList *current_module;
- gboolean iterated_modules;
- gboolean iterated_removable_media;
+ GList *modules;
+ GList *current_module;
+ gboolean iterated_modules;
+ gboolean iterated_removable_media;
- GTimer *timer;
+ GTimer *timer;
- gboolean interrupted;
- gboolean finished;
+ gboolean interrupted;
+ gboolean finished;
/* Statistics */
- guint directories_found;
- guint directories_ignored;
- guint files_found;
- guint files_ignored;
+ guint directories_found;
+ guint directories_ignored;
+ guint files_found;
+ guint files_ignored;
- guint items_done;
- guint items_remaining;
+ guint items_done;
+ guint items_remaining;
- gdouble seconds_elapsed;
+ gdouble seconds_elapsed;
};
enum {
@@ -105,65 +105,65 @@
LAST_SIGNAL
};
-static void tracker_processor_finalize (GObject *object);
-static void crawler_destroy_notify (gpointer data);
-static void item_queue_destroy_notify (gpointer data);
-static void process_module_next (TrackerProcessor *processor);
-static void indexer_status_cb (DBusGProxy *proxy,
- gdouble seconds_elapsed,
+static void tracker_processor_finalize (GObject *object);
+static void crawler_destroy_notify (gpointer data);
+static void item_queue_destroy_notify (gpointer data);
+static void process_module_next (TrackerProcessor *processor);
+static void indexer_status_cb (DBusGProxy *proxy,
+ gdouble seconds_elapsed,
const gchar *current_module_name,
- guint items_done,
- guint items_remaining,
- gpointer user_data);
-static void indexer_finished_cb (DBusGProxy *proxy,
- gdouble seconds_elapsed,
- guint items_done,
- gboolean interrupted,
- gpointer user_data);
-static void monitor_item_created_cb (TrackerMonitor *monitor,
+ guint items_done,
+ guint items_remaining,
+ gpointer user_data);
+static void indexer_finished_cb (DBusGProxy *proxy,
+ gdouble seconds_elapsed,
+ guint items_done,
+ gboolean interrupted,
+ gpointer user_data);
+static void monitor_item_created_cb (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file,
- gboolean is_directory,
- gpointer user_data);
-static void monitor_item_updated_cb (TrackerMonitor *monitor,
+ GFile *file,
+ gboolean is_directory,
+ gpointer user_data);
+static void monitor_item_updated_cb (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file,
- gboolean is_directory,
- gpointer user_data);
-static void monitor_item_deleted_cb (TrackerMonitor *monitor,
+ GFile *file,
+ gboolean is_directory,
+ gpointer user_data);
+static void monitor_item_deleted_cb (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file,
- gboolean is_directory,
- gpointer user_data);
-static void monitor_item_moved_cb (TrackerMonitor *monitor,
+ GFile *file,
+ gboolean is_directory,
+ gpointer user_data);
+static void monitor_item_moved_cb (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file,
- GFile *other_file,
- gboolean is_directory,
- gpointer user_data);
-static void crawler_processing_file_cb (TrackerCrawler *crawler,
+ GFile *file,
+ GFile *other_file,
+ gboolean is_directory,
+ gpointer user_data);
+static void crawler_processing_file_cb (TrackerCrawler *crawler,
const gchar *module_name,
- GFile *file,
- gpointer user_data);
+ GFile *file,
+ gpointer user_data);
static void crawler_processing_directory_cb (TrackerCrawler *crawler,
const gchar *module_name,
- GFile *file,
- gpointer user_data);
-static void crawler_finished_cb (TrackerCrawler *crawler,
+ GFile *file,
+ gpointer user_data);
+static void crawler_finished_cb (TrackerCrawler *crawler,
const gchar *module_name,
- guint directories_found,
- guint directories_ignored,
- guint files_found,
- guint files_ignored,
- gpointer user_data);
+ guint directories_found,
+ guint directories_ignored,
+ guint files_found,
+ guint files_ignored,
+ gpointer user_data);
#ifdef HAVE_HAL
-static void mount_point_added_cb (TrackerHal *hal,
+static void mount_point_added_cb (TrackerHal *hal,
const gchar *mount_point,
- gpointer user_data);
-static void mount_point_removed_cb (TrackerHal *hal,
+ gpointer user_data);
+static void mount_point_removed_cb (TrackerHal *hal,
const gchar *mount_point,
- gpointer user_data);
+ gpointer user_data);
#endif /* HAVE_HAL */
static guint signals[LAST_SIGNAL] = { 0, };
@@ -193,7 +193,7 @@
tracker_processor_init (TrackerProcessor *object)
{
TrackerProcessorPrivate *priv;
- GList *l;
+ GList *l;
object->private = TRACKER_PROCESSOR_GET_PRIVATE (object);
@@ -334,77 +334,77 @@
static void
get_remote_roots (TrackerProcessor *processor,
- GSList **mounted_directory_roots,
- GSList **removable_device_roots)
+ GSList **mounted_directory_roots,
+ GSList **removable_device_roots)
{
- GSList *l1;
- GSList *l2;
+ GSList *l1;
+ GSList *l2;
#ifdef HAVE_HAL
- l1 = tracker_hal_get_mounted_directory_roots (processor->private->hal);
- l2 = tracker_hal_get_removable_device_roots (processor->private->hal);
+ l1 = tracker_hal_get_mounted_directory_roots (processor->private->hal);
+ l2 = tracker_hal_get_removable_device_roots (processor->private->hal);
#else /* HAVE_HAL */
l1 = NULL;
l2 = NULL;
#endif /* HAVE_HAL */
- /* The options to index removable media and the index mounted
- * directories are both mutually exclusive even though
- * removable media is mounted on a directory.
- *
- * Since we get ALL mounted directories from HAL, we need to
- * remove those which are removable device roots.
- */
- if (l2) {
- GSList *l;
- GSList *list = NULL;
-
- for (l = l1; l; l = l->next) {
- if (g_slist_find_custom (l2, l->data, (GCompareFunc) strcmp)) {
- continue;
- }
-
- list = g_slist_prepend (list, l->data);
- }
-
- *mounted_directory_roots = g_slist_reverse (list);
- } else {
- *mounted_directory_roots = NULL;
- }
+ /* The options to index removable media and the index mounted
+ * directories are both mutually exclusive even though
+ * removable media is mounted on a directory.
+ *
+ * Since we get ALL mounted directories from HAL, we need to
+ * remove those which are removable device roots.
+ */
+ if (l2) {
+ GSList *l;
+ GSList *list = NULL;
+
+ for (l = l1; l; l = l->next) {
+ if (g_slist_find_custom (l2, l->data, (GCompareFunc) strcmp)) {
+ continue;
+ }
+
+ list = g_slist_prepend (list, l->data);
+ }
+
+ *mounted_directory_roots = g_slist_reverse (list);
+ } else {
+ *mounted_directory_roots = NULL;
+ }
- *removable_device_roots = g_slist_copy (l2);
+ *removable_device_roots = g_slist_copy (l2);
}
static gboolean
path_should_be_ignored_for_media (TrackerProcessor *processor,
- const gchar *path)
+ const gchar *path)
{
- GSList *roots = NULL;
- GSList *mounted_directory_roots = NULL;
- GSList *removable_device_roots = NULL;
- GSList *l;
- gboolean ignore_mounted_directories;
- gboolean ignore_removable_devices;
- gboolean ignore = FALSE;
+ GSList *roots = NULL;
+ GSList *mounted_directory_roots = NULL;
+ GSList *removable_device_roots = NULL;
+ GSList *l;
+ gboolean ignore_mounted_directories;
+ gboolean ignore_removable_devices;
+ gboolean ignore = FALSE;
- ignore_mounted_directories =
+ ignore_mounted_directories =
!tracker_config_get_index_mounted_directories (processor->private->config);
- ignore_removable_devices =
+ ignore_removable_devices =
!tracker_config_get_index_removable_devices (processor->private->config);
- if (ignore_mounted_directories || ignore_removable_devices) {
- get_remote_roots (processor,
+ if (ignore_mounted_directories || ignore_removable_devices) {
+ get_remote_roots (processor,
&mounted_directory_roots,
&removable_device_roots);
- }
+ }
+
+ if (ignore_mounted_directories) {
+ roots = g_slist_concat (roots, mounted_directory_roots);
+ }
- if (ignore_mounted_directories) {
- roots = g_slist_concat (roots, mounted_directory_roots);
- }
-
- if (ignore_removable_devices) {
- roots = g_slist_concat (roots, removable_device_roots);
- }
+ if (ignore_removable_devices) {
+ roots = g_slist_concat (roots, removable_device_roots);
+ }
for (l = roots; l && !ignore; l = l->next) {
/* If path matches a mounted or removable device by
@@ -423,7 +423,7 @@
}
}
- g_slist_free (roots);
+ g_slist_free (roots);
return ignore;
}
@@ -504,7 +504,7 @@
static void
item_queue_readd_items (GQueue *queue,
- GStrv strv)
+ GStrv strv)
{
if (queue) {
GStrv p;
@@ -557,7 +557,7 @@
}
item_queue_readd_items (queue, processor->private->sent_items);
- } else {
+ } else {
g_debug ("Sent!");
}
@@ -573,9 +573,9 @@
item_queue_handlers_cb (gpointer user_data)
{
TrackerProcessor *processor;
- GQueue *queue;
- GStrv files;
- gchar *module_name;
+ GQueue *queue;
+ GStrv files;
+ gchar *module_name;
processor = user_data;
@@ -733,7 +733,7 @@
}
static gboolean
-is_path_on_ignore_list (GSList *ignore_list,
+is_path_on_ignore_list (GSList *ignore_list,
const gchar *path)
{
GSList *l;
@@ -755,8 +755,8 @@
process_module_files_add_removable_media (TrackerProcessor *processor)
{
TrackerCrawler *crawler;
- GSList *roots;
- GSList *l;
+ GSList *roots;
+ GSList *l;
const gchar *module_name = "files";
crawler = g_hash_table_lookup (processor->private->crawlers, module_name);
@@ -774,11 +774,11 @@
/* This is dreadfully inefficient */
if (path_should_be_ignored_for_media (processor, l->data)) {
- g_message (" %s (ignored due to config)", (gchar*) l->data);
+ g_message (" %s (ignored due to config)", (gchar*) l->data);
continue;
}
- g_message (" %s", (gchar*) l->data);
+ g_message (" %s", (gchar*) l->data);
file = g_file_new_for_path (l->data);
tracker_monitor_add (processor->private->monitor, module_name, file);
@@ -786,7 +786,7 @@
}
if (g_slist_length (roots) == 0) {
- g_message (" NONE");
+ g_message (" NONE");
}
g_message (" Removable media crawls being added:");
@@ -794,16 +794,16 @@
for (l = roots; l; l = l->next) {
/* This is dreadfully inefficient */
if (path_should_be_ignored_for_media (processor, l->data)) {
- g_message (" %s (ignored due to config)", (gchar*) l->data);
+ g_message (" %s (ignored due to config)", (gchar*) l->data);
continue;
}
- g_message (" %s", (gchar*) l->data);
+ g_message (" %s", (gchar*) l->data);
tracker_crawler_add_path (crawler, l->data);
}
if (g_slist_length (roots) == 0) {
- g_message (" NONE");
+ g_message (" NONE");
}
tracker_crawler_set_use_module_paths (crawler, FALSE);
@@ -813,12 +813,12 @@
process_module_files_add_legacy_options (TrackerProcessor *processor)
{
TrackerCrawler *crawler;
- GSList *no_watch_roots;
- GSList *watch_roots;
- GSList *crawl_roots;
- GSList *l;
- guint watch_root_count;
- guint crawl_root_count;
+ GSList *no_watch_roots;
+ GSList *watch_roots;
+ GSList *crawl_roots;
+ GSList *l;
+ guint watch_root_count;
+ guint crawl_root_count;
const gchar *module_name = "files";
crawler = g_hash_table_lookup (processor->private->crawlers, module_name);
@@ -837,11 +837,11 @@
/* Print ignored locations */
g_message (" User ignored crawls & monitors:");
for (l = no_watch_roots; l; l = l->next) {
- g_message (" %s", (gchar*) l->data);
+ g_message (" %s", (gchar*) l->data);
}
if (g_slist_length (no_watch_roots) == 0) {
- g_message (" NONE");
+ g_message (" NONE");
}
/* Add monitors, from WatchDirectoryRoots config key */
@@ -853,7 +853,7 @@
continue;
}
- g_message (" %s", (gchar*) l->data);
+ g_message (" %s", (gchar*) l->data);
file = g_file_new_for_path (l->data);
tracker_monitor_add (processor->private->monitor, module_name, file);
@@ -863,7 +863,7 @@
}
if (g_slist_length (watch_roots) == 0) {
- g_message (" NONE");
+ g_message (" NONE");
}
/* Add crawls, from WatchDirectoryRoots and
@@ -876,7 +876,7 @@
continue;
}
- g_message (" %s", (gchar*) l->data);
+ g_message (" %s", (gchar*) l->data);
tracker_crawler_add_path (crawler, l->data);
}
@@ -885,7 +885,7 @@
continue;
}
- g_message (" %s", (gchar*) l->data);
+ g_message (" %s", (gchar*) l->data);
tracker_crawler_add_path (crawler, l->data);
crawl_root_count++;
@@ -893,17 +893,17 @@
if (g_slist_length (watch_roots) == 0 &&
g_slist_length (crawl_roots) == 0) {
- g_message (" NONE");
+ g_message (" NONE");
}
}
static void
process_module (TrackerProcessor *processor,
- const gchar *module_name,
- gboolean is_removable_media)
+ const gchar *module_name,
+ gboolean is_removable_media)
{
TrackerCrawler *crawler;
- GSList *disabled_modules;
+ GSList *disabled_modules;
g_message ("Processing module:'%s' %s",
module_name,
@@ -991,19 +991,19 @@
static void
indexer_status_cb (DBusGProxy *proxy,
- gdouble seconds_elapsed,
+ gdouble seconds_elapsed,
const gchar *current_module_name,
- guint items_done,
- guint items_remaining,
- gpointer user_data)
+ guint items_done,
+ guint items_remaining,
+ gpointer user_data)
{
TrackerProcessor *processor;
- TrackerDBIndex *index;
- GQueue *queue;
- GFile *file;
- gchar *path = NULL;
- gchar *str1;
- gchar *str2;
+ TrackerDBIndex *index;
+ GQueue *queue;
+ GFile *file;
+ gchar *path = NULL;
+ gchar *str1;
+ gchar *str2;
processor = user_data;
@@ -1065,15 +1065,15 @@
static void
indexer_finished_cb (DBusGProxy *proxy,
- gdouble seconds_elapsed,
- guint items_done,
- gboolean interrupted,
- gpointer user_data)
+ gdouble seconds_elapsed,
+ guint items_done,
+ gboolean interrupted,
+ gpointer user_data)
{
TrackerProcessor *processor;
- TrackerDBIndex *index;
- GObject *object;
- gchar *str;
+ TrackerDBIndex *index;
+ GObject *object;
+ gchar *str;
processor = user_data;
object = tracker_dbus_get_object (TRACKER_TYPE_DAEMON);
@@ -1128,14 +1128,14 @@
static void
processor_files_check (TrackerProcessor *processor,
- const gchar *module_name,
- GFile *file,
- gboolean is_directory)
+ const gchar *module_name,
+ GFile *file,
+ gboolean is_directory)
{
TrackerCrawler *crawler;
- GQueue *queue;
- gboolean ignored;
- gchar *path;
+ GQueue *queue;
+ gboolean ignored;
+ gchar *path;
path = g_file_get_path (file);
crawler = g_hash_table_lookup (processor->private->crawlers, module_name);
@@ -1159,14 +1159,14 @@
static void
processor_files_update (TrackerProcessor *processor,
- const gchar *module_name,
- GFile *file,
- gboolean is_directory)
+ const gchar *module_name,
+ GFile *file,
+ gboolean is_directory)
{
TrackerCrawler *crawler;
- GQueue *queue;
- gchar *path;
- gboolean ignored;
+ GQueue *queue;
+ gchar *path;
+ gboolean ignored;
path = g_file_get_path (file);
crawler = g_hash_table_lookup (processor->private->crawlers, module_name);
@@ -1190,14 +1190,14 @@
static void
processor_files_delete (TrackerProcessor *processor,
- const gchar *module_name,
- GFile *file,
- gboolean is_directory)
+ const gchar *module_name,
+ GFile *file,
+ gboolean is_directory)
{
TrackerCrawler *crawler;
- GQueue *queue;
- gchar *path;
- gboolean ignored;
+ GQueue *queue;
+ gchar *path;
+ gboolean ignored;
path = g_file_get_path (file);
crawler = g_hash_table_lookup (processor->private->crawlers, module_name);
@@ -1222,16 +1222,16 @@
static void
processor_files_move (TrackerProcessor *processor,
const gchar *module_name,
- GFile *file,
- GFile *other_file,
- gboolean is_directory)
+ GFile *file,
+ GFile *other_file,
+ gboolean is_directory)
{
TrackerCrawler *crawler;
- GQueue *queue;
- gchar *path;
- gchar *other_path;
- gboolean path_ignored;
- gboolean other_path_ignored;
+ GQueue *queue;
+ gchar *path;
+ gchar *other_path;
+ gboolean path_ignored;
+ gboolean other_path_ignored;
path = g_file_get_path (file);
other_path = g_file_get_path (other_file);
@@ -1272,30 +1272,30 @@
static void
monitor_item_created_cb (TrackerMonitor *monitor,
- const gchar *module_name,
- GFile *file,
- gboolean is_directory,
- gpointer user_data)
+ const gchar *module_name,
+ GFile *file,
+ gboolean is_directory,
+ gpointer user_data)
{
tracker_processor_files_check (user_data, module_name, file, is_directory);
}
static void
monitor_item_updated_cb (TrackerMonitor *monitor,
- const gchar *module_name,
- GFile *file,
- gboolean is_directory,
- gpointer user_data)
+ const gchar *module_name,
+ GFile *file,
+ gboolean is_directory,
+ gpointer user_data)
{
processor_files_update (user_data, module_name, file, is_directory);
}
static void
monitor_item_deleted_cb (TrackerMonitor *monitor,
- const gchar *module_name,
- GFile *file,
- gboolean is_directory,
- gpointer user_data)
+ const gchar *module_name,
+ GFile *file,
+ gboolean is_directory,
+ gpointer user_data)
{
processor_files_delete (user_data, module_name, file, is_directory);
}
@@ -1303,8 +1303,8 @@
static void
monitor_item_moved_cb (TrackerMonitor *monitor,
const gchar *module_name,
- GFile *file,
- GFile *other_file,
+ GFile *file,
+ GFile *other_file,
gboolean is_directory,
gpointer user_data)
{
@@ -1314,11 +1314,11 @@
static void
crawler_processing_file_cb (TrackerCrawler *crawler,
const gchar *module_name,
- GFile *file,
- gpointer user_data)
+ GFile *file,
+ gpointer user_data)
{
TrackerProcessor *processor;
- GQueue *queue;
+ GQueue *queue;
processor = user_data;
@@ -1329,13 +1329,13 @@
static void
crawler_processing_directory_cb (TrackerCrawler *crawler,
- const gchar *module_name,
- GFile *file,
- gpointer user_data)
+ const gchar *module_name,
+ GFile *file,
+ gpointer user_data)
{
TrackerProcessor *processor;
- GQueue *queue;
- gboolean add_monitor;
+ GQueue *queue;
+ gboolean add_monitor;
processor = user_data;
@@ -1358,11 +1358,11 @@
static void
crawler_finished_cb (TrackerCrawler *crawler,
const gchar *module_name,
- guint directories_found,
- guint directories_ignored,
- guint files_found,
- guint files_ignored,
- gpointer user_data)
+ guint directories_found,
+ guint directories_ignored,
+ guint files_found,
+ guint files_ignored,
+ gpointer user_data)
{
TrackerProcessor *processor;
@@ -1382,14 +1382,14 @@
static void
mount_point_added_cb (TrackerHal *hal,
const gchar *mount_point,
- gpointer user_data)
+ gpointer user_data)
{
TrackerProcessor *processor;
- TrackerStatus status;
+ TrackerStatus status;
processor = user_data;
- g_message ("** TRAWLING THROUGH NEW MOUNT POINT:'%s'", mount_point);
+ g_message ("** TRAWLING THROUGH NEW MOUNT POINT:'%s'", mount_point);
status = tracker_status_get ();
@@ -1412,11 +1412,11 @@
gpointer user_data)
{
TrackerProcessor *processor;
- GFile *file;
+ GFile *file;
processor = user_data;
- g_message ("** CLEANING UP OLD MOUNT POINT:'%s'", mount_point);
+ g_message ("** CLEANING UP OLD MOUNT POINT:'%s'", mount_point);
/* Remove the monitor? */
file = g_file_new_for_path (mount_point);
@@ -1430,11 +1430,11 @@
tracker_processor_new (TrackerConfig *config,
TrackerHal *hal)
{
- TrackerProcessor *processor;
+ TrackerProcessor *processor;
TrackerProcessorPrivate *priv;
- TrackerCrawler *crawler;
- DBusGProxy *proxy;
- GList *l;
+ TrackerCrawler *crawler;
+ DBusGProxy *proxy;
+ GList *l;
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
@@ -1452,7 +1452,7 @@
#ifdef HAVE_HAL
/* Set up hal */
- priv->hal = g_object_ref (hal);
+ priv->hal = g_object_ref (hal);
g_signal_connect (priv->hal, "mount-point-added",
G_CALLBACK (mount_point_added_cb),
@@ -1523,7 +1523,7 @@
{
g_return_if_fail (TRACKER_IS_PROCESSOR (processor));
- g_message ("Starting to process %d modules...",
+ g_message ("Starting to process %d modules...",
g_list_length (processor->private->modules));
if (processor->private->timer) {
@@ -1598,9 +1598,9 @@
void
tracker_processor_files_check (TrackerProcessor *processor,
- const gchar *module_name,
- GFile *file,
- gboolean is_directory)
+ const gchar *module_name,
+ GFile *file,
+ gboolean is_directory)
{
g_return_if_fail (TRACKER_IS_PROCESSOR (processor));
g_return_if_fail (module_name != NULL);
@@ -1611,9 +1611,9 @@
void
tracker_processor_files_update (TrackerProcessor *processor,
- const gchar *module_name,
- GFile *file,
- gboolean is_directory)
+ const gchar *module_name,
+ GFile *file,
+ gboolean is_directory)
{
g_return_if_fail (TRACKER_IS_PROCESSOR (processor));
g_return_if_fail (module_name != NULL);
@@ -1624,9 +1624,9 @@
void
tracker_processor_files_delete (TrackerProcessor *processor,
- const gchar *module_name,
- GFile *file,
- gboolean is_directory)
+ const gchar *module_name,
+ GFile *file,
+ gboolean is_directory)
{
g_return_if_fail (TRACKER_IS_PROCESSOR (processor));
g_return_if_fail (module_name != NULL);
@@ -1638,9 +1638,9 @@
void
tracker_processor_files_move (TrackerProcessor *processor,
const gchar *module_name,
- GFile *file,
- GFile *other_file,
- gboolean is_directory)
+ GFile *file,
+ GFile *other_file,
+ gboolean is_directory)
{
g_return_if_fail (TRACKER_IS_PROCESSOR (processor));
g_return_if_fail (module_name != NULL);
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 15:12:19 2008
@@ -29,11 +29,11 @@
G_BEGIN_DECLS
-#define TRACKER_TYPE_PROCESSOR (tracker_processor_get_type())
-#define TRACKER_PROCESSOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_PROCESSOR, TrackerProcessor))
-#define TRACKER_PROCESSOR_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_PROCESSOR, TrackerProcessorClass))
+#define TRACKER_TYPE_PROCESSOR (tracker_processor_get_type())
+#define TRACKER_PROCESSOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_PROCESSOR, TrackerProcessor))
+#define TRACKER_PROCESSOR_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_PROCESSOR, TrackerProcessorClass))
#define TRACKER_IS_PROCESSOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_PROCESSOR))
-#define TRACKER_IS_PROCESSOR_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKER_TYPE_PROCESSOR))
+#define TRACKER_IS_PROCESSOR_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKER_TYPE_PROCESSOR))
#define TRACKER_PROCESSOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_PROCESSOR, TrackerProcessorClass))
typedef struct TrackerProcessor TrackerProcessor;
@@ -41,50 +41,50 @@
typedef struct TrackerProcessorPrivate TrackerProcessorPrivate;
struct TrackerProcessor {
- GObject parent;
+ GObject parent;
TrackerProcessorPrivate *private;
};
struct TrackerProcessorClass {
- GObjectClass parent;
+ GObjectClass parent;
void (*finished) (TrackerProcessor *processor);
};
-GType tracker_processor_get_type (void) G_GNUC_CONST;
+GType tracker_processor_get_type (void) G_GNUC_CONST;
-TrackerProcessor *tracker_processor_new (TrackerConfig *config,
+TrackerProcessor *tracker_processor_new (TrackerConfig *config,
TrackerHal *hal);
-void tracker_processor_start (TrackerProcessor *processor);
-void tracker_processor_stop (TrackerProcessor *processor);
+void tracker_processor_start (TrackerProcessor *processor);
+void tracker_processor_stop (TrackerProcessor *processor);
/* Required API for org.freedesktop.Tracker.Files */
-void tracker_processor_files_check (TrackerProcessor *processor,
+void tracker_processor_files_check (TrackerProcessor *processor,
const gchar *module_name,
- GFile *file,
- gboolean is_directory);
-void tracker_processor_files_update (TrackerProcessor *processor,
+ GFile *file,
+ gboolean is_directory);
+void tracker_processor_files_update (TrackerProcessor *processor,
const gchar *module_name,
- GFile *file,
- gboolean is_directory);
-void tracker_processor_files_delete (TrackerProcessor *processor,
+ GFile *file,
+ gboolean is_directory);
+void tracker_processor_files_delete (TrackerProcessor *processor,
const gchar *module_name,
- GFile *file,
- gboolean is_directory);
-void tracker_processor_files_move (TrackerProcessor *processor,
+ GFile *file,
+ gboolean is_directory);
+void tracker_processor_files_move (TrackerProcessor *processor,
const gchar *module_name,
- GFile *file,
- GFile *other_file,
- gboolean is_directory);
+ GFile *file,
+ GFile *other_file,
+ gboolean is_directory);
/* Statistics */
-guint tracker_processor_get_directories_found (TrackerProcessor *processor);
-guint tracker_processor_get_directories_ignored (TrackerProcessor *processor);
-guint tracker_processor_get_directories_total (TrackerProcessor *processor);
-guint tracker_processor_get_files_found (TrackerProcessor *processor);
-guint tracker_processor_get_files_ignored (TrackerProcessor *processor);
-guint tracker_processor_get_files_total (TrackerProcessor *processor);
-gdouble tracker_processor_get_seconds_elapsed (TrackerProcessor *processor);
+guint tracker_processor_get_directories_found (TrackerProcessor *processor);
+guint tracker_processor_get_directories_ignored (TrackerProcessor *processor);
+guint tracker_processor_get_directories_total (TrackerProcessor *processor);
+guint tracker_processor_get_files_found (TrackerProcessor *processor);
+guint tracker_processor_get_files_ignored (TrackerProcessor *processor);
+guint tracker_processor_get_files_total (TrackerProcessor *processor);
+gdouble tracker_processor_get_seconds_elapsed (TrackerProcessor *processor);
G_END_DECLS
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 15:12:19 2008
@@ -21,11 +21,11 @@
/* These defines are required to allow lrintf() without warnings when
* building.
*/
-#define _ISOC9X_SOURCE 1
-#define _ISOC99_SOURCE 1
+#define _ISOC9X_SOURCE 1
+#define _ISOC99_SOURCE 1
-#define __USE_ISOC9X 1
-#define __USE_ISOC99 1
+#define __USE_ISOC9X 1
+#define __USE_ISOC99 1
#include <string.h>
#include <math.h>
@@ -65,15 +65,15 @@
TreeNode *left;
TreeNode *right;
OperationType op;
- gchar *term;
+ gchar *term;
};
struct TrackerQueryTreePrivate {
- gchar *query_str;
- TreeNode *tree;
- TrackerConfig *config;
- TrackerLanguage *language;
- GArray *services;
+ gchar *query_str;
+ TreeNode *tree;
+ TrackerConfig *config;
+ TrackerLanguage *language;
+ GArray *services;
};
struct ComposeHitsData {
@@ -94,16 +94,16 @@
};
static void tracker_query_tree_class_init (TrackerQueryTreeClass *class);
-static void tracker_query_tree_init (TrackerQueryTree *tree);
-static void tracker_query_tree_finalize (GObject *object);
-static void tracker_query_tree_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void tracker_query_tree_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void tracker_query_tree_init (TrackerQueryTree *tree);
+static void tracker_query_tree_finalize (GObject *object);
+static void tracker_query_tree_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void tracker_query_tree_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
G_DEFINE_TYPE (TrackerQueryTree, tracker_query_tree, G_TYPE_OBJECT)
@@ -192,7 +192,7 @@
static void
tracker_query_tree_set_property (GObject *object,
- guint prop_id,
+ guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
@@ -212,7 +212,7 @@
static void
tracker_query_tree_get_property (GObject *object,
- guint prop_id,
+ guint prop_id,
GValue *value,
GParamSpec *pspec)
{
@@ -233,42 +233,42 @@
}
TrackerQueryTree *
-tracker_query_tree_new (const gchar *query_str,
- TrackerConfig *config,
- TrackerLanguage *language,
- GArray *services)
-{
- TrackerQueryTree *object;
- TrackerQueryTreePrivate *priv;
-
- /* We accept one or both index and services, but not NULL for
- * both since we require at least one of them.
- */
+tracker_query_tree_new (const gchar *query_str,
+ TrackerConfig *config,
+ TrackerLanguage *language,
+ GArray *services)
+{
+ TrackerQueryTree *object;
+ TrackerQueryTreePrivate *priv;
+
+ /* We accept one or both index and services, but not NULL for
+ * both since we require at least one of them.
+ */
g_return_val_if_fail (query_str != NULL, NULL);
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
- g_return_val_if_fail (services != NULL, NULL);
+ g_return_val_if_fail (services != NULL, NULL);
- /* NOTE: The "query" has to come AFTER the "config" and
- * "language" properties since setting the query actually
- * uses the priv->config and priv->language settings.
- * Changing this order results in warnings.
- */
+ /* NOTE: The "query" has to come AFTER the "config" and
+ * "language" properties since setting the query actually
+ * uses the priv->config and priv->language settings.
+ * Changing this order results in warnings.
+ */
object = g_object_new (TRACKER_TYPE_QUERY_TREE, NULL);
- priv = TRACKER_QUERY_TREE_GET_PRIVATE (object);
+ priv = TRACKER_QUERY_TREE_GET_PRIVATE (object);
- priv->config = g_object_ref (config);
- priv->language = g_object_ref (language);
+ priv->config = g_object_ref (config);
+ priv->language = g_object_ref (language);
- if (services) {
- tracker_query_tree_set_services (object, services);
- }
+ if (services) {
+ tracker_query_tree_set_services (object, services);
+ }
- tracker_query_tree_set_query (object, query_str);
+ tracker_query_tree_set_query (object, query_str);
- return object;
+ return object;
}
#if 0
@@ -376,12 +376,12 @@
default:
/* search term */
parsed_str = tracker_parser_text_to_string (strings[i],
- priv->language,
- tracker_config_get_max_word_length (priv->config),
- tracker_config_get_min_word_length (priv->config),
- TRUE,
- FALSE,
- FALSE);
+ priv->language,
+ tracker_config_get_max_word_length (priv->config),
+ tracker_config_get_min_word_length (priv->config),
+ TRUE,
+ FALSE,
+ FALSE);
node = tree_node_leaf_new (g_strstrip (parsed_str));
g_queue_push_head (queue, node);
last_element_is_term = TRUE;
@@ -454,7 +454,7 @@
void
tracker_query_tree_set_services (TrackerQueryTree *tree,
- GArray *services)
+ GArray *services)
{
TrackerQueryTreePrivate *priv;
GArray *copy = NULL;
@@ -505,20 +505,20 @@
static gint
get_idf_score (TrackerDBIndexItem *details,
- gfloat idf)
+ gfloat idf)
{
guint32 score;
- gfloat f;
+ gfloat f;
- score = tracker_db_index_item_get_score (details);
- f = idf * score * SCORE_MULTIPLIER;
+ score = tracker_db_index_item_get_score (details);
+ f = idf * score * SCORE_MULTIPLIER;
- return (f > 1.0) ? lrintf (f) : 1;
+ return (f > 1.0) ? lrintf (f) : 1;
}
static gboolean
in_array (GArray *array,
- gint element)
+ gint element)
{
guint i;
@@ -541,15 +541,15 @@
static void
add_search_term_hits_to_hash_table (TrackerDBIndexItem *items,
- guint item_count,
- GArray *services,
- GHashTable *result)
+ guint item_count,
+ GArray *services,
+ GHashTable *result)
{
- guint i;
+ guint i;
for (i = 0; i < item_count; i++) {
SearchHitData *data;
- gint service;
+ gint service;
service = tracker_db_index_item_get_service_type (&items[i]);
@@ -568,58 +568,58 @@
const gchar *term)
{
TrackerQueryTreePrivate *priv;
- TrackerDBIndexItem *items;
- guint item_count;
- GHashTable *result;
- GHashTable *indexes_checked;
- guint i;
+ TrackerDBIndexItem *items;
+ guint item_count;
+ GHashTable *result;
+ GHashTable *indexes_checked;
+ guint i;
priv = TRACKER_QUERY_TREE_GET_PRIVATE (tree);
result = g_hash_table_new_full (NULL,
- NULL,
- NULL,
+ NULL,
+ NULL,
search_hit_data_free);
- if (!priv->services) {
- return result;
- }
-
- /* Make sure we don't get information from the same
- * index more than once.
- */
- 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,
- 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,
- result);
- g_free (items);
- }
+ if (!priv->services) {
+ return result;
+ }
+
+ /* Make sure we don't get information from the same
+ * index more than once.
+ */
+ 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,
+ 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,
+ result);
+ g_free (items);
+ }
- g_hash_table_unref (indexes_checked);
+ g_hash_table_unref (indexes_checked);
return result;
}
@@ -629,7 +629,7 @@
gpointer value,
gpointer user_data)
{
- SearchHitData *hit1, *hit2, *hit;
+ SearchHitData *hit1, *hit2, *hit;
ComposeHitsData *data;
data = (ComposeHitsData *) user_data;
@@ -679,8 +679,8 @@
data.dest_table = g_hash_table_ref (data.other_table);
} else {
data.dest_table = g_hash_table_new_full (NULL,
- NULL,
- NULL,
+ NULL,
+ NULL,
search_hit_data_free);
}
@@ -691,7 +691,7 @@
static GHashTable *
get_node_hits (TrackerQueryTree *tree,
- TreeNode *node)
+ TreeNode *node)
{
GHashTable *left_table, *right_table, *result;
@@ -765,8 +765,8 @@
GArray *
tracker_query_tree_get_hits (TrackerQueryTree *tree,
- guint offset,
- guint limit)
+ guint offset,
+ guint limit)
{
TrackerQueryTreePrivate *priv;
GHashTable *table;
@@ -846,32 +846,32 @@
for (i = 0; i < hits->len; i++) {
TrackerDBIndexItemRank rank;
- gpointer p;
+ gpointer p;
gint count, parent_id;
rank = g_array_index (hits, TrackerDBIndexItemRank, i);
- p = g_hash_table_lookup (table,
- GINT_TO_POINTER (rank.service_type_id));
+ 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),
- GINT_TO_POINTER (count));
+ GINT_TO_POINTER (rank.service_type_id),
+ GINT_TO_POINTER (count));
/* Update service's parent count too (if it has a
- * parent).
- */
+ * parent).
+ */
parent_id = tracker_ontology_get_service_parent_id_by_id (rank.service_type_id);
if (parent_id != -1) {
- p = g_hash_table_lookup (table, GINT_TO_POINTER (parent_id));
+ p = g_hash_table_lookup (table, GINT_TO_POINTER (parent_id));
count = GPOINTER_TO_INT (p);
count++;
g_hash_table_insert (table,
- GINT_TO_POINTER (parent_id),
- GINT_TO_POINTER (count));
+ 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 15:12:19 2008
@@ -30,11 +30,11 @@
#include <libtracker-common/tracker-config.h>
#include <libtracker-common/tracker-language.h>
-#define TRACKER_TYPE_QUERY_TREE (tracker_query_tree_get_type())
-#define TRACKER_QUERY_TREE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_QUERY_TREE, TrackerQueryTree))
-#define TRACKER_QUERY_TREE_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_QUERY_TREE, TrackerQueryTreeClass))
-#define TRACKER_IS_QUERY_TREE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_QUERY_TREE))
-#define TRACKER_IS_QUERY_TREE_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKER_TYPE_QUERY_TREE))
+#define TRACKER_TYPE_QUERY_TREE (tracker_query_tree_get_type())
+#define TRACKER_QUERY_TREE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_QUERY_TREE, TrackerQueryTree))
+#define TRACKER_QUERY_TREE_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_QUERY_TREE, TrackerQueryTreeClass))
+#define TRACKER_IS_QUERY_TREE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_QUERY_TREE))
+#define TRACKER_IS_QUERY_TREE_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKER_TYPE_QUERY_TREE))
#define TRACKER_QUERY_TREE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_QUERY_TREE, TrackerQueryTreeClass))
typedef struct TrackerQueryTree TrackerQueryTree;
@@ -54,24 +54,24 @@
guint count;
};
-GType tracker_query_tree_get_type (void);
-TrackerQueryTree * tracker_query_tree_new (const gchar *query_str,
- TrackerConfig *config,
+GType tracker_query_tree_get_type (void);
+TrackerQueryTree * tracker_query_tree_new (const gchar *query_str,
+ TrackerConfig *config,
TrackerLanguage *language,
- GArray *services);
-G_CONST_RETURN gchar *tracker_query_tree_get_query (TrackerQueryTree *tree);
-void tracker_query_tree_set_query (TrackerQueryTree *tree,
- const gchar *query_str);
-
-GArray * tracker_query_tree_get_services (TrackerQueryTree *tree);
-void tracker_query_tree_set_services (TrackerQueryTree *tree,
- GArray *services);
-GSList * tracker_query_tree_get_words (TrackerQueryTree *tree);
-GArray * tracker_query_tree_get_hits (TrackerQueryTree *tree,
- guint offset,
- guint limit);
-gint tracker_query_tree_get_hit_count (TrackerQueryTree *tree);
-GArray * tracker_query_tree_get_hit_counts (TrackerQueryTree *tree);
+ GArray *services);
+G_CONST_RETURN gchar *tracker_query_tree_get_query (TrackerQueryTree *tree);
+void tracker_query_tree_set_query (TrackerQueryTree *tree,
+ const gchar *query_str);
+
+GArray * tracker_query_tree_get_services (TrackerQueryTree *tree);
+void tracker_query_tree_set_services (TrackerQueryTree *tree,
+ GArray *services);
+GSList * tracker_query_tree_get_words (TrackerQueryTree *tree);
+GArray * tracker_query_tree_get_hits (TrackerQueryTree *tree,
+ guint offset,
+ guint limit);
+gint tracker_query_tree_get_hit_count (TrackerQueryTree *tree);
+GArray * tracker_query_tree_get_hit_counts (TrackerQueryTree *tree);
G_END_DECLS
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 15:12:19 2008
@@ -31,58 +31,58 @@
/* RDF Query Condition
* <rdfq:Condition>
* <rdfq:and>
- * <rdfq:greaterThan>
- * <rdfq:Property name="File:Size" />
- * <rdf:Integer>1000000</rdf:Integer>
- * </rdfq:greaterThan>
- * <rdfq:equals>
- * <rdfq:Property name="File:Path" />
- * <rdf:String>/home/jamie</rdf:String>
- * </rdfq:equals>
+ * <rdfq:greaterThan>
+ * <rdfq:Property name="File:Size" />
+ * <rdf:Integer>1000000</rdf:Integer>
+ * </rdfq:greaterThan>
+ * <rdfq:equals>
+ * <rdfq:Property name="File:Path" />
+ * <rdf:String>/home/jamie</rdf:String>
+ * </rdfq:equals>
* </rdfq:and>
* </rdfq:Condition>
*/
/* Main elements */
-#define ELEMENT_RDF_CONDITION "rdfq:Condition"
-#define ELEMENT_RDF_PROPERTY "rdfq:Property"
+#define ELEMENT_RDF_CONDITION "rdfq:Condition"
+#define ELEMENT_RDF_PROPERTY "rdfq:Property"
/* Operators */
-#define ELEMENT_RDF_AND "rdfq:and"
-#define ELEMENT_RDF_OR "rdfq:or"
-#define ELEMENT_RDF_NOT "rdfq:not"
-#define ELEMENT_RDF_EQUALS "rdfq:equals"
+#define ELEMENT_RDF_AND "rdfq:and"
+#define ELEMENT_RDF_OR "rdfq:or"
+#define ELEMENT_RDF_NOT "rdfq:not"
+#define ELEMENT_RDF_EQUALS "rdfq:equals"
#define ELEMENT_RDF_GREATER_THAN "rdfq:greaterThan"
#define ELEMENT_RDF_GREATER_OR_EQUAL "rdfq:greaterOrEqual"
-#define ELEMENT_RDF_LESS_THAN "rdfq:lessThan"
+#define ELEMENT_RDF_LESS_THAN "rdfq:lessThan"
#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
*/
-#define ELEMENT_RDF_CONTAINS "rdfq:contains"
-#define ELEMENT_RDF_REGEX "rdfq:regex"
-#define ELEMENT_RDF_STARTS_WITH "rdfq:startsWith"
+#define ELEMENT_RDF_CONTAINS "rdfq:contains"
+#define ELEMENT_RDF_REGEX "rdfq:regex"
+#define ELEMENT_RDF_STARTS_WITH "rdfq:startsWith"
#define ELEMENT_RDF_IN_SET "rdfq:inSet"
/* Types */
-#define ELEMENT_RDF_INTEGER "rdf:Integer"
-#define ELEMENT_RDF_DATE "rdf:Date" /* Format can
- * be iso 8601
- * with
- * optional
- * timezone
- * "yyyy-mm-ddThh:mm:ss"
- * or
- * "yyyy-mm-ddThh:mm:ss+hh:mm"
- * - most
- * other
- * formats are
- * supported
- * too
- */
-#define ELEMENT_RDF_STRING "rdf:String"
-#define ELEMENT_RDF_FLOAT "rdf:Float"
+#define ELEMENT_RDF_INTEGER "rdf:Integer"
+#define ELEMENT_RDF_DATE "rdf:Date" /* Format can
+ * be iso 8601
+ * with
+ * optional
+ * timezone
+ * "yyyy-mm-ddThh:mm:ss"
+ * or
+ * "yyyy-mm-ddThh:mm:ss+hh:mm"
+ * - most
+ * other
+ * formats are
+ * supported
+ * too
+ */
+#define ELEMENT_RDF_STRING "rdf:String"
+#define ELEMENT_RDF_FLOAT "rdf:Float"
#define ELEMENT_IS(name) (strcmp (element_name, (name)) == 0)
@@ -151,102 +151,102 @@
typedef struct {
GMarkupParseContext *context;
- GMarkupParser *parser;
- GSList *stack;
- GSList *fields;
- gboolean query_okay;
- gint statement_count;
- LogicOperators current_logic_operator;
- Operators current_operator;
- gchar *current_field;
- gchar *current_value;
+ GMarkupParser *parser;
+ GSList *stack;
+ GSList *fields;
+ gboolean query_okay;
+ gint statement_count;
+ LogicOperators current_logic_operator;
+ Operators current_operator;
+ gchar *current_field;
+ gchar *current_value;
TrackerDBInterface *iface;
- GString *sql_select;
- GString *sql_from;
- GString *sql_where;
- GString *sql_order;
- gchar *service;
+ GString *sql_select;
+ GString *sql_from;
+ GString *sql_where;
+ GString *sql_order;
+ gchar *service;
} ParserData;
static GQuark error_quark;
-static void start_element_handler (GMarkupParseContext *context,
- const gchar *element_name,
- const gchar **attribute_names,
- const gchar **attribute_values,
- gpointer user_data,
- GError **error);
-static void end_element_handler (GMarkupParseContext *context,
- const gchar *element_name,
- gpointer user_data,
- GError **error);
-static void text_handler (GMarkupParseContext *context,
- const gchar *text,
- gsize text_len,
- gpointer user_data,
- GError **error);
-static void error_handler (GMarkupParseContext *context,
- GError *error,
- gpointer user_data);
+static void start_element_handler (GMarkupParseContext *context,
+ const gchar *element_name,
+ const gchar **attribute_names,
+ const gchar **attribute_values,
+ gpointer user_data,
+ GError **error);
+static void end_element_handler (GMarkupParseContext *context,
+ const gchar *element_name,
+ gpointer user_data,
+ GError **error);
+static void text_handler (GMarkupParseContext *context,
+ const gchar *text,
+ gsize text_len,
+ gpointer user_data,
+ GError **error);
+static void error_handler (GMarkupParseContext *context,
+ GError *error,
+ gpointer user_data);
static gboolean
is_operator (ParseState state)
{
return
- state == STATE_EQUALS ||
- state == STATE_GREATER_THAN ||
- state == STATE_LESS_THAN ||
- state == STATE_CONTAINS ||
- state == STATE_IN_SET ||
- state == STATE_LESS_OR_EQUAL ||
- state == STATE_GREATER_OR_EQUAL ||
- state == STATE_STARTS_WITH ||
- state == STATE_REGEX;
+ state == STATE_EQUALS ||
+ state == STATE_GREATER_THAN ||
+ state == STATE_LESS_THAN ||
+ state == STATE_CONTAINS ||
+ state == STATE_IN_SET ||
+ state == STATE_LESS_OR_EQUAL ||
+ 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 ||
- state == STATE_END_LESS_THAN ||
- 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_REGEX;
+ 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_LESS_OR_EQUAL ||
+ 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 ||
- state == STATE_NOT;
+ 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 ||
- state == STATE_END_OR;
+ state == STATE_END_AND ||
+ state == STATE_END_NOT ||
+ state == STATE_END_OR;
}
static void
-set_error (GError **err,
- GMarkupParseContext *context,
- gint error_code,
- const gchar *format,
- ...)
+set_error (GError **err,
+ GMarkupParseContext *context,
+ gint error_code,
+ const gchar *format,
+ ...)
{
- gint line, ch;
+ gint line, ch;
va_list args;
- gchar *str;
+ gchar *str;
g_markup_parse_context_get_position (context, &line, &ch);
@@ -255,19 +255,19 @@
va_end (args);
g_set_error (err,
- error_quark,
- error_code,
- "Line %d character %d: %s",
- line, ch, str);
+ error_quark,
+ error_code,
+ "Line %d character %d: %s",
+ line, ch, str);
g_free (str);
}
static gboolean
-set_error_on_fail (gboolean condition,
- GMarkupParseContext *context,
- const gchar *msg,
- GError **err)
+set_error_on_fail (gboolean condition,
+ GMarkupParseContext *context,
+ const gchar *msg,
+ GError **err)
{
if (!condition) {
set_error (err, context, 1, msg);
@@ -298,11 +298,11 @@
static const gchar *
get_attribute_value_required (GMarkupParseContext *context,
- const gchar *tag,
- const gchar *name,
- const gchar **names,
- const gchar **values,
- GError **error)
+ const gchar *tag,
+ const gchar *name,
+ const gchar **names,
+ const gchar **values,
+ GError **error)
{
const gchar *value;
@@ -310,8 +310,8 @@
if (!value) {
set_error (error,
- context,
- PARSE_ERROR,
+ context,
+ PARSE_ERROR,
"%s must have \"%s\" attribute",
tag, name);
}
@@ -356,62 +356,62 @@
}
static TrackerFieldData *
-add_metadata_field (ParserData *data,
- const gchar *field_name,
- gboolean is_select,
- gboolean is_condition)
+add_metadata_field (ParserData *data,
+ const gchar *field_name,
+ gboolean is_select,
+ gboolean is_condition)
{
TrackerFieldData *field_data;
- gboolean field_exists;
- GSList *l;
+ gboolean field_exists;
+ GSList *l;
field_exists = FALSE;
field_data = NULL;
/* Check if field is already in list */
for (l = data->fields; l; l = l->next) {
- const gchar *this_field_name;
+ const gchar *this_field_name;
- this_field_name = tracker_field_data_get_field_name (l->data);
+ 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;
-
- if (is_condition) {
- tracker_field_data_set_is_condition (field_data, TRUE);
- }
-
- 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",
- tracker_field_data_get_select_field (field_data));
- }
- }
+ if (!this_field_name) {
+ continue;
+ }
+
+ if (strcasecmp (this_field_name, field_name) == 0) {
+ field_data = l->data;
+ field_exists = TRUE;
+
+ if (is_condition) {
+ tracker_field_data_set_is_condition (field_data, TRUE);
+ }
+
+ 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",
+ tracker_field_data_get_select_field (field_data));
+ }
+ }
- break;
+ break;
}
}
if (!field_exists) {
field_data = tracker_db_get_metadata_field (data->iface,
- data->service,
- field_name,
- g_slist_length (data->fields),
- is_select,
- is_condition);
+ 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",
- tracker_field_data_get_select_field (field_data));
+ tracker_field_data_get_select_field (field_data));
}
- }
+ }
}
return field_data;
@@ -422,7 +422,7 @@
const gchar *element_name,
const gchar **attribute_names,
const gchar **attribute_values,
- gpointer user_data,
+ gpointer user_data,
GError **error)
{
ParserData *data;
@@ -433,9 +433,9 @@
if (ELEMENT_IS (ELEMENT_RDF_CONDITION)) {
if (set_error_on_fail (state == STATE_START,
- context,
- "Condition element not expected here",
- error)) {
+ context,
+ "Condition element not expected here",
+ error)) {
return;
}
@@ -445,14 +445,14 @@
const char *name;
if (set_error_on_fail (is_operator (state),
- context,
- "Property element not expected here",
- error)) {
+ context,
+ "Property element not expected here",
+ error)) {
return;
}
name = get_attribute_value_required (context,
- "<rdfq:Property>", "name",
+ "<rdfq:Property>", "name",
attribute_names, attribute_values,
error);
@@ -461,10 +461,10 @@
} else {
if (data->current_operator == OP_NONE) {
set_error (error,
- context,
- PARSE_ERROR,
- "no operator found for Property \"%s\"",
- name);
+ context,
+ PARSE_ERROR,
+ "no operator found for Property \"%s\"",
+ name);
return;
}
@@ -474,23 +474,23 @@
}
} else if (ELEMENT_IS (ELEMENT_RDF_AND)) {
if (set_error_on_fail (state == STATE_CONDITION ||
- is_logic (state) ||
- is_end_logic (state) ||
- is_end_operator (state),
+ is_logic (state) ||
+ is_end_logic (state) ||
+ is_end_operator (state),
context,
- "AND element not expected here",
- error)) {
+ "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,
- " AND ");
+ " AND ");
} else {
if (data->current_logic_operator == LOP_OR) {
data->sql_where = g_string_append (data->sql_where,
- " OR ");
+ " OR ");
}
}
}
@@ -501,23 +501,23 @@
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) ||
- is_end_operator (state),
+ is_logic (state) ||
+ is_end_logic (state) ||
+ is_end_operator (state),
context,
- "OR element not expected here",
- error)) {
+ "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 ");
+ " AND ");
} else {
if (data->current_logic_operator == LOP_OR) {
data->sql_where = g_string_append (data->sql_where,
- " OR ");
+ " OR ");
}
}
}
@@ -529,23 +529,23 @@
} else if (ELEMENT_IS (ELEMENT_RDF_NOT)) {
if (set_error_on_fail (state == STATE_CONDITION ||
- is_logic (state) ||
- is_end_logic (state) ||
- is_end_operator (state),
+ is_logic (state) ||
+ is_end_logic (state) ||
+ is_end_operator (state),
context,
- "NOT element not expected here",
- error)) {
+ "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,
- " AND ");
+ " AND ");
} else {
if (data->current_logic_operator == LOP_OR) {
data->sql_where = g_string_append (data->sql_where,
- " OR ");
+ " OR ");
}
}
}
@@ -556,13 +556,13 @@
} 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_OR) &&
- is_end_operator (state)),
- context,
- "EQUALS element not expected here",
- error)) {
+ 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",
+ error)) {
return;
}
@@ -572,13 +572,13 @@
} else if (ELEMENT_IS (ELEMENT_RDF_GREATER_THAN)) {
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,
- "GREATERTHAN element not expected here",
- error)) {
+ is_logic (state) ||
+ ((data->current_logic_operator == LOP_AND ||
+ data->current_logic_operator == LOP_OR) &&
+ is_end_operator (state)),
+ context,
+ "GREATERTHAN element not expected here",
+ error)) {
return;
}
@@ -586,13 +586,13 @@
push_stack (data, STATE_GREATER_THAN);
} else if (ELEMENT_IS (ELEMENT_RDF_GREATER_OR_EQUAL)) {
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,
- "GREATEROREQUAL element not expected here",
- error)) {
+ is_logic (state) ||
+ ((data->current_logic_operator == LOP_AND ||
+ data->current_logic_operator == LOP_OR) &&
+ is_end_operator (state)),
+ context,
+ "GREATEROREQUAL element not expected here",
+ error)) {
return;
}
@@ -600,13 +600,13 @@
push_stack (data, STATE_GREATER_OR_EQUAL);
} else if (ELEMENT_IS (ELEMENT_RDF_LESS_THAN )) {
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,
- "LESSTHAN element not expected here",
- error)) {
+ is_logic (state) ||
+ ((data->current_logic_operator == LOP_AND ||
+ data->current_logic_operator == LOP_OR) &&
+ is_end_operator (state)),
+ context,
+ "LESSTHAN element not expected here",
+ error)) {
return;
}
@@ -614,13 +614,13 @@
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 ||
- data->current_logic_operator == LOP_OR) &&
- is_end_operator (state)),
- context,
- "LESSOREQUAL element not expected here",
- error)) {
+ 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",
+ error)) {
return;
}
@@ -628,13 +628,13 @@
push_stack (data, STATE_LESS_OR_EQUAL);
} else if (ELEMENT_IS (ELEMENT_RDF_CONTAINS)) {
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,
- "CONTAINS element not expected here",
- error)) {
+ is_logic (state) ||
+ ((data->current_logic_operator == LOP_AND ||
+ data->current_logic_operator == LOP_OR) &&
+ is_end_operator (state)),
+ context,
+ "CONTAINS element not expected here",
+ error)) {
return;
}
@@ -642,13 +642,13 @@
push_stack (data, STATE_CONTAINS);
} else if (ELEMENT_IS (ELEMENT_RDF_REGEX)) {
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,
- "REGEX element not expected here",
- error)) {
+ is_logic (state) ||
+ ((data->current_logic_operator == LOP_AND ||
+ data->current_logic_operator == LOP_OR) &&
+ is_end_operator (state)),
+ context,
+ "REGEX element not expected here",
+ error)) {
return;
}
@@ -656,13 +656,13 @@
push_stack (data, STATE_REGEX);
} else if (ELEMENT_IS (ELEMENT_RDF_STARTS_WITH)) {
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,
- "STARTSWITH element not expected here",
- error)) {
+ is_logic (state) ||
+ ((data->current_logic_operator == LOP_AND ||
+ data->current_logic_operator == LOP_OR) &&
+ is_end_operator (state)),
+ context,
+ "STARTSWITH element not expected here",
+ error)) {
return;
}
@@ -670,13 +670,13 @@
push_stack (data, STATE_STARTS_WITH);
} else if (ELEMENT_IS (ELEMENT_RDF_IN_SET)) {
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",
- error)) {
+ 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",
+ error)) {
return;
}
@@ -684,36 +684,36 @@
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",
- error)) {
+ 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",
- error)) {
+ 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",
- error)) {
+ 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,
- context,
- "FLOAT element not expected here",
- error)) {
+ context,
+ "FLOAT element not expected here",
+ error)) {
return;
}
@@ -735,16 +735,16 @@
build_sql (ParserData *data)
{
TrackerFieldData *field_data;
- ParseState state;
- gchar *avalue, *value, *sub;
- const gchar *where_field;
- GString *str;
- gchar **s;
+ ParseState state;
+ gchar *avalue, *value, *sub;
+ const gchar *where_field;
+ GString *str;
+ gchar **s;
g_return_val_if_fail (data->current_field &&
- data->current_operator != OP_NONE &&
- data->current_value,
- FALSE);
+ data->current_operator != OP_NONE &&
+ data->current_value,
+ FALSE);
str = g_string_new ("");
@@ -753,8 +753,8 @@
state = peek_state (data);
avalue = get_value (data->current_value, (state != STATE_END_DATE &&
- state != STATE_END_INTEGER &&
- state != STATE_END_FLOAT));
+ state != STATE_END_INTEGER &&
+ state != STATE_END_FLOAT));
field_data = add_metadata_field (data, data->current_field, FALSE, TRUE);
@@ -791,104 +791,104 @@
}
}
- where_field = tracker_field_data_get_where_field (field_data);
+ where_field = tracker_field_data_get_where_field (field_data);
switch (data->current_operator) {
- case OP_EQUALS:
- sub = strchr (data->current_value, '*');
- if (sub) {
- g_string_append_printf (str, " (%s glob '%s') ",
- where_field,
- data->current_value);
- } else {
- TrackerFieldType data_type;
+ case OP_EQUALS:
+ sub = strchr (data->current_value, '*');
+ if (sub) {
+ 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_type = tracker_field_data_get_data_type (field_data);
g_string_append_printf (str, " (%s = %s) ",
where_field,
value);
- }
- break;
+ }
+ break;
+
+ case OP_GREATER:
+ g_string_append_printf (str, " (%s > %s) ",
+ where_field,
+ value);
+ break;
+
+ case OP_GREATER_EQUAL:
+ g_string_append_printf (str, " (%s >= %s) ",
+ where_field,
+ value);
+ break;
+
+ case OP_LESS:
+ g_string_append_printf (str, " (%s < %s) ",
+ where_field,
+ value);
+ break;
+
+ case OP_LESS_EQUAL:
+ 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,
+ data->current_value);
+ } else {
+ 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,
+ data->current_value);
+ } else {
+ 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,
+ data->current_value);
+ break;
+
+ case OP_SET:
+ s = g_strsplit (data->current_value, ",", 0);
+
+ if (s && s[0]) {
+ gchar **p;
- case OP_GREATER:
- g_string_append_printf (str, " (%s > %s) ",
- where_field,
- value);
- break;
-
- case OP_GREATER_EQUAL:
- g_string_append_printf (str, " (%s >= %s) ",
- where_field,
- value);
- break;
-
- case OP_LESS:
- g_string_append_printf (str, " (%s < %s) ",
- where_field,
- value);
- break;
-
- case OP_LESS_EQUAL:
- 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,
- data->current_value);
- } else {
- 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,
- data->current_value);
- } else {
- 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,
- 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,
- s[0]);
-
- for (p = s + 1; *p; p++) {
- g_string_append_printf (str, ",'%s'", *p);
- }
-
- g_string_append_printf (str, ") ) " );
- }
- break;
+ 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);
+ }
- default:
- break;
+ g_string_append_printf (str, ") ) " );
+ }
+ break;
+
+ default:
+ break;
}
data->sql_where = g_string_append (data->sql_where, str->str);
@@ -1131,32 +1131,32 @@
gchar *
tracker_rdf_query_to_sql (TrackerDBInterface *iface,
- const gchar *query,
- const gchar *service,
- gchar **fields,
- gint field_count,
- const gchar *search_text,
- const gchar *keyword,
- gboolean sort_by_service,
- gchar **sort_fields,
- gint sort_field_count,
- gboolean sort_desc,
- gint offset,
- gint limit,
- GError **error)
+ const gchar *query,
+ const gchar *service,
+ gchar **fields,
+ gint field_count,
+ const gchar *search_text,
+ const gchar *keyword,
+ gboolean sort_by_service,
+ gchar **sort_fields,
+ gint sort_field_count,
+ gboolean sort_desc,
+ gint offset,
+ gint limit,
+ GError **error)
{
static gboolean inited = FALSE;
- ParserData data;
- gchar *result;
- gchar *table_name;
- gboolean do_search = FALSE;
-
- g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
- g_return_val_if_fail (query != NULL, NULL);
- g_return_val_if_fail (service != NULL, NULL);
- g_return_val_if_fail (fields != NULL, NULL);
- g_return_val_if_fail (search_text != NULL, NULL);
- g_return_val_if_fail (keyword != NULL, NULL);
+ ParserData data;
+ gchar *result;
+ gchar *table_name;
+ gboolean do_search = FALSE;
+
+ g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
+ g_return_val_if_fail (query != NULL, NULL);
+ g_return_val_if_fail (service != NULL, NULL);
+ g_return_val_if_fail (fields != NULL, NULL);
+ g_return_val_if_fail (search_text != NULL, NULL);
+ g_return_val_if_fail (keyword != NULL, NULL);
if (!inited) {
error_quark = g_quark_from_static_string ("RDF-parser-error-quark");
@@ -1178,15 +1178,15 @@
field_data = add_metadata_field (&data, fields[i], TRUE, FALSE);
if (!field_data) {
- g_set_error (error,
+ g_set_error (error,
error_quark,
PARSE_ERROR,
"RDF Query failed, field:'%s' not found",
sort_fields[i]);
g_slist_foreach (data.fields,
- (GFunc) g_object_unref,
- NULL);
+ (GFunc) g_object_unref,
+ NULL);
g_slist_free (data.fields);
g_string_free (data.sql_select, TRUE);
@@ -1202,23 +1202,23 @@
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 ",
- table_name);
+ "\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 ",
- table_name);
+ "\n FROM %s S ",
+ table_name);
}
if (!tracker_is_empty_string (keyword)) {
gchar *keyword_metadata;
- keyword_metadata = tracker_db_metadata_get_related_names (iface,
- "DC:Keywords");
+ 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,
- keyword);
+ "\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);
}
@@ -1226,14 +1226,14 @@
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,
- service);
+ "\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,
- service);
+ "\n WHERE (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) AND ",
+ service,
+ service);
}
if (limit < 1) {
@@ -1244,7 +1244,7 @@
if (sort_by_service) {
if (do_search) {
- g_string_append_printf (data.sql_order,"M.Score desc, S.ServiceTypeID, uri ");
+ g_string_append_printf (data.sql_order,"M.Score desc, S.ServiceTypeID, uri ");
} else {
g_string_append_printf (data.sql_order,"S.ServiceTypeID, uri ");
}
@@ -1258,7 +1258,7 @@
}
if (sort_field_count>0) {
- gint i;
+ gint i;
for (i = 0; i < sort_field_count; i++) {
TrackerFieldData *field_data;
@@ -1266,14 +1266,14 @@
field_data = add_metadata_field (&data, sort_fields[i], FALSE, FALSE);
if (!field_data) {
- g_set_error (error,
+ g_set_error (error,
error_quark,
PARSE_ERROR,
"RDF Query failed, sort field:'%s' not found",
sort_fields[i]);
g_slist_foreach (data.fields,
- (GFunc) g_object_unref,
- NULL);
+ (GFunc) g_object_unref,
+ NULL);
g_slist_free (data.fields);
g_string_free (data.sql_select, TRUE);
g_string_free (data.sql_where, TRUE);
@@ -1290,7 +1290,7 @@
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 ");
@@ -1328,37 +1328,37 @@
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),
- tracker_field_data_get_alias (l->data),
- tracker_field_data_get_alias (l->data),
- tracker_field_data_get_alias (l->data),
- tracker_field_data_get_id_field (l->data));
+ "\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),
+ tracker_field_data_get_id_field (l->data));
}
} else {
gchar *related_metadata;
- related_metadata = tracker_db_metadata_get_related_names (iface,
- tracker_field_data_get_field_name (l->data));
+ 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),
- tracker_field_data_get_alias (l->data),
- tracker_field_data_get_alias (l->data),
- tracker_field_data_get_alias (l->data),
- related_metadata);
+ "\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),
+ related_metadata);
g_free (related_metadata);
}
}
result = g_strconcat (data.sql_select->str,
- " ",
- data.sql_from->str,
- " ",
- data.sql_where->str,
- " ",
- data.sql_order->str,
- NULL);
+ " ",
+ 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);
@@ -1394,20 +1394,20 @@
void
tracker_rdf_filter_to_sql (TrackerDBInterface *iface,
- const char *query,
- const char *service,
- GSList **fields,
- char **from,
- char **where,
- GError **error)
+ const char *query,
+ const char *service,
+ GSList **fields,
+ char **from,
+ char **where,
+ GError **error)
{
static gboolean inited = FALSE;
- ParserData data;
+ ParserData data;
g_return_if_fail (TRACKER_IS_DB_INTERFACE (iface));
- g_return_if_fail (service != NULL);
- g_return_if_fail (from != NULL);
- g_return_if_fail (where != NULL);
+ g_return_if_fail (service != NULL);
+ g_return_if_fail (from != NULL);
+ g_return_if_fail (where != NULL);
if (!inited) {
error_quark = g_quark_from_static_string ("RDF-parser-error-quark");
@@ -1446,38 +1446,38 @@
if ( (query != NULL) && (!g_markup_parse_context_parse (data.context, query, -1, error))) {
- *from = NULL;
+ *from = NULL;
*where = NULL;
g_string_free (data.sql_from, TRUE);
g_string_free (data.sql_where, TRUE);
} else {
- GSList *l;
+ GSList *l;
- for (l = data.fields; l; l = l->next) {
+ 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),
- tracker_field_data_get_alias (l->data),
- tracker_field_data_get_alias (l->data),
- tracker_field_data_get_alias (l->data),
- tracker_field_data_get_id_field (l->data));
+ "\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),
+ tracker_field_data_get_id_field (l->data));
}
} else {
gchar *related_metadata;
- related_metadata = tracker_db_metadata_get_related_names (iface,
- tracker_field_data_get_field_name (l->data));
+ 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),
- tracker_field_data_get_alias (l->data),
- tracker_field_data_get_alias (l->data),
- tracker_field_data_get_alias (l->data),
- related_metadata);
+ "\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),
+ related_metadata);
g_free (related_metadata);
}
}
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 15:12:19 2008
@@ -28,27 +28,27 @@
G_BEGIN_DECLS
gchar *tracker_rdf_query_to_sql (TrackerDBInterface *iface,
- const gchar *query,
- const gchar *service,
- gchar **fields,
- gint field_count,
- const gchar *search_text,
- const gchar *keyword,
- gboolean sort_by_service,
- gchar **sort_fields,
- gint sort_field_count,
- gboolean sort_desc,
- gint offset,
- gint limit,
- GError **error);
+ const gchar *query,
+ const gchar *service,
+ gchar **fields,
+ gint field_count,
+ const gchar *search_text,
+ const gchar *keyword,
+ gboolean sort_by_service,
+ gchar **sort_fields,
+ gint sort_field_count,
+ gboolean sort_desc,
+ gint offset,
+ gint limit,
+ GError **error);
-void tracker_rdf_filter_to_sql (TrackerDBInterface *iface,
- const gchar *query,
- const gchar *service,
- GSList **fields,
- gchar **from,
- gchar **where,
- GError **error);
+void tracker_rdf_filter_to_sql (TrackerDBInterface *iface,
+ const gchar *query,
+ const gchar *service,
+ GSList **fields,
+ gchar **from,
+ gchar **where,
+ GError **error);
G_END_DECLS
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 15:12:19 2008
@@ -47,10 +47,10 @@
#define DEFAULT_SEARCH_MAX_HITS 1024
typedef struct {
- TrackerConfig *config;
+ TrackerConfig *config;
TrackerLanguage *language;
- TrackerDBIndex *file_index;
- TrackerDBIndex *email_index;
+ TrackerDBIndex *file_index;
+ TrackerDBIndex *email_index;
} TrackerSearchPrivate;
static void tracker_search_finalize (GObject *object);
@@ -95,7 +95,7 @@
TrackerDBIndex *file_index,
TrackerDBIndex *email_index)
{
- TrackerSearch *object;
+ TrackerSearch *object;
TrackerSearchPrivate *priv;
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
@@ -121,19 +121,19 @@
static gint
search_sanity_check_max_hits (gint max_hits)
{
- if (max_hits < 1) {
- return DEFAULT_SEARCH_MAX_HITS;
- }
+ if (max_hits < 1) {
+ return DEFAULT_SEARCH_MAX_HITS;
+ }
- return max_hits;
+ return max_hits;
}
static const gchar *
search_utf8_p_from_offset_skipping_decomp (const gchar *str,
- gint offset)
+ gint offset)
{
const gchar *p, *q;
- gchar *casefold, *normal;
+ gchar *casefold, *normal;
g_return_val_if_fail (str != NULL, NULL);
@@ -154,17 +154,17 @@
static const char *
search_utf8_strcasestr_array (const gchar *haystack,
- gchar **needles)
+ gchar **needles)
{
- gsize needle_len;
- gsize haystack_len;
+ gsize needle_len;
+ gsize haystack_len;
const gchar *ret = NULL;
const gchar *needle;
- gchar **array;
- gchar *p;
- gchar *casefold;
- gchar *caseless_haystack;
- gint i;
+ gchar **array;
+ gchar *p;
+ gchar *casefold;
+ gchar *caseless_haystack;
+ gint i;
g_return_val_if_fail (haystack != NULL, NULL);
@@ -215,7 +215,7 @@
search_get_word_break (const char *a)
{
gchar **words;
- gint value;
+ gint value;
words = g_strsplit_set (a, "\t\n\v\f\r !\"#$%&'()*/<=>?[\\]^`{|}~+,.:;@\"[]" , -1);
@@ -234,7 +234,7 @@
search_is_word_break (const char a)
{
const gchar *breaks = "\t\n\v\f\r !\"#$%&'()*/<=>?[\\]^`{|}~+,.:;@\"[]";
- gint i;
+ gint i;
for (i = 0; breaks[i]; i++) {
if (a == breaks[i]) {
@@ -247,13 +247,13 @@
static char *
search_highlight_terms (const gchar *text,
- gchar **terms)
+ gchar **terms)
{
- GStrv p;
+ GStrv p;
GString *s;
const gchar *str;
- gchar *text_copy;
- gint term_len;
+ gchar *text_copy;
+ gint term_len;
if (!text || !terms) {
return NULL;
@@ -264,7 +264,7 @@
for (p = terms; *p; p++) {
const gchar *text_p;
- gchar **single_term;
+ gchar **single_term;
single_term = g_new (gchar*, 2);
single_term[0] = g_strdup (*p);
@@ -303,14 +303,14 @@
static gchar *
search_get_snippet (const gchar *text,
- gchar **terms,
- gint length)
+ gchar **terms,
+ gint length)
{
const gchar *ptr = NULL;
const gchar *end_ptr;
const gchar *tmp;
- gint i;
- gint text_len;
+ gint i;
+ gint text_len;
if (!text || !terms) {
return NULL;
@@ -428,17 +428,17 @@
}
void
-tracker_search_get_hit_count (TrackerSearch *object,
- const gchar *service,
- const gchar *search_text,
+tracker_search_get_hit_count (TrackerSearch *object,
+ const gchar *service,
+ const gchar *search_text,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerSearchPrivate *priv;
TrackerQueryTree *tree;
- GError *actual_error = NULL;
- GArray *array;
- guint request_id;
+ GError *actual_error = NULL;
+ GArray *array;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -489,20 +489,20 @@
}
void
-tracker_search_get_hit_count_all (TrackerSearch *object,
- const gchar *search_text,
+tracker_search_get_hit_count_all (TrackerSearch *object,
+ const gchar *search_text,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
TrackerSearchPrivate *priv;
TrackerDBResultSet *result_set = NULL;
TrackerQueryTree *tree;
- GError *actual_error = NULL;
- GArray *hit_counts;
- guint request_id;
- guint i;
- GArray *array;
- GPtrArray *values = NULL;
+ GError *actual_error = NULL;
+ GArray *hit_counts;
+ guint request_id;
+ guint i;
+ GArray *array;
+ GPtrArray *values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -536,7 +536,7 @@
for (i = 0; i < hit_counts->len; i++) {
TrackerHitCount count;
- GValue value = { 0, };
+ GValue value = { 0, };
if (G_UNLIKELY (!result_set)) {
result_set = _tracker_db_result_set_new (2);
@@ -575,20 +575,20 @@
}
void
-tracker_search_text (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- const gchar *search_text,
- gint offset,
- gint max_hits,
+tracker_search_text (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *service,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
- GError *actual_error = NULL;
+ GError *actual_error = NULL;
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar **strv = NULL;
+ guint request_id;
+ gchar **strv = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -637,10 +637,10 @@
FALSE);
if (result_set) {
- gchar *prefix, *name;
+ gchar *prefix, *name;
gboolean valid = TRUE;
- gint row_count;
- gint i;
+ gint row_count;
+ gint i;
row_count = tracker_db_result_set_get_n_rows (result_set) + 1;
strv = g_new (gchar*, row_count);
@@ -679,20 +679,20 @@
}
void
-tracker_search_text_detailed (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- const gchar *search_text,
- gint offset,
- gint max_hits,
+tracker_search_text_detailed (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *service,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
- GError *actual_error = NULL;
+ GError *actual_error = NULL;
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- GPtrArray *values = NULL;
+ guint request_id;
+ GPtrArray *values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -754,19 +754,19 @@
}
void
-tracker_search_get_snippet (TrackerSearch *object,
- const gchar *service,
- const gchar *id,
- const gchar *search_text,
+tracker_search_get_snippet (TrackerSearch *object,
+ const gchar *service,
+ const gchar *id,
+ const gchar *search_text,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
- GError *actual_error = NULL;
+ GError *actual_error = NULL;
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar *snippet = NULL;
- gchar *service_id;
+ guint request_id;
+ gchar *snippet = NULL;
+ gchar *service_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -824,8 +824,8 @@
if (result_set) {
TrackerSearchPrivate *priv;
- gchar **strv;
- gchar *text;
+ gchar **strv;
+ gchar *text;
priv = TRACKER_SEARCH_GET_PRIVATE (object);
@@ -857,19 +857,19 @@
}
void
-tracker_search_files_by_text (TrackerSearch *object,
- gint live_query_id,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- gboolean group_results,
+tracker_search_files_by_text (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
+ gboolean group_results,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
/* TrackerDBInterface *iface; */
TrackerDBResultSet *result_set;
- guint request_id;
- GHashTable *values = NULL;
+ guint request_id;
+ GHashTable *values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -894,10 +894,10 @@
result_set = NULL;
/* result_set = tracker_db_search_files_by_text (iface, */
- /* search_text, */
- /* offset, */
- /* search_sanity_check_max_hits (max_hits), */
- /* group_results); */
+ /* search_text, */
+ /* offset, */
+ /* search_sanity_check_max_hits (max_hits), */
+ /* group_results); */
values = tracker_dbus_query_result_to_hash_table (result_set);
@@ -913,20 +913,20 @@
}
void
-tracker_search_metadata (TrackerSearch *object,
- const gchar *service,
- const gchar *field,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error)
+tracker_search_metadata (TrackerSearch *object,
+ const gchar *service,
+ const gchar *field,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error)
{
- GError *actual_error = NULL;
+ GError *actual_error = NULL;
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values;
+ guint request_id;
+ gchar **values;
/* FIXME: This function is completely redundant */
@@ -966,11 +966,11 @@
result_set = NULL;
/* result_set = tracker_db_search_metadata (iface, */
- /* service, */
- /* field, */
- /* text, */
- /* offset, */
- /* search_sanity_check_max_hits (max_hits)); */
+ /* service, */
+ /* field, */
+ /* text, */
+ /* offset, */
+ /* search_sanity_check_max_hits (max_hits)); */
values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
@@ -986,18 +986,18 @@
}
void
-tracker_search_matching_fields (TrackerSearch *object,
- const gchar *service,
- const gchar *id,
- const gchar *search_text,
+tracker_search_matching_fields (TrackerSearch *object,
+ const gchar *service,
+ const gchar *id,
+ const gchar *search_text,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
- GError *actual_error = NULL;
+ GError *actual_error = NULL;
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- GHashTable *values = NULL;
+ guint request_id;
+ GHashTable *values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -1042,9 +1042,9 @@
result_set = NULL;
/* result_set = tracker_db_search_matching_metadata (iface, */
- /* service, */
- /* id, */
- /* search_text); */
+ /* service, */
+ /* id, */
+ /* search_text); */
values = tracker_dbus_query_result_to_hash_table (result_set);
@@ -1060,26 +1060,26 @@
}
void
-tracker_search_query (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- gchar **fields,
- const gchar *search_text,
- const gchar *keyword,
- const gchar *query_condition,
- gboolean sort_by_service,
- gchar **sort_fields,
- gboolean sort_desc,
- gint offset,
- gint max_hits,
+tracker_search_query (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *service,
+ gchar **fields,
+ const gchar *search_text,
+ const gchar *keyword,
+ const gchar *query_condition,
+ gboolean sort_by_service,
+ gchar **sort_fields,
+ gboolean sort_desc,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
- GError *actual_error = NULL;
+ GError *actual_error = NULL;
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- guint request_id;
- GPtrArray *values = NULL;
+ guint request_id;
+ GPtrArray *values = NULL;
request_id = tracker_dbus_get_next_request_id ();
@@ -1196,16 +1196,16 @@
}
void
-tracker_search_suggest (TrackerSearch *object,
- const gchar *search_text,
- gint max_dist,
+tracker_search_suggest (TrackerSearch *object,
+ const gchar *search_text,
+ gint max_dist,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
- GError *actual_error = NULL;
+ GError *actual_error = NULL;
TrackerSearchPrivate *priv;
- guint request_id;
- gchar *value;
+ guint request_id;
+ gchar *value;
request_id = tracker_dbus_get_next_request_id ();
Modified: branches/indexer-split/src/trackerd/tracker-search.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-search.h (original)
+++ branches/indexer-split/src/trackerd/tracker-search.h Sat Sep 20 15:12:19 2008
@@ -28,20 +28,20 @@
#include <libtracker-db/tracker-db-index.h>
-#define TRACKER_SEARCH_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_SEARCH_PATH "/org/freedesktop/Tracker/Search"
+#define TRACKER_SEARCH_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_SEARCH_PATH "/org/freedesktop/Tracker/Search"
#define TRACKER_SEARCH_INTERFACE "org.freedesktop.Tracker.Search"
G_BEGIN_DECLS
-#define TRACKER_TYPE_SEARCH (tracker_search_get_type ())
-#define TRACKER_SEARCH(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_SEARCH, TrackerSearch))
+#define TRACKER_TYPE_SEARCH (tracker_search_get_type ())
+#define TRACKER_SEARCH(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_SEARCH, TrackerSearch))
#define TRACKER_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_SEARCH, TrackerSearchClass))
#define TRACKER_IS_SEARCH(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_SEARCH))
#define TRACKER_IS_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_SEARCH))
#define TRACKER_SEARCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_SEARCH, TrackerSearchClass))
-typedef struct TrackerSearch TrackerSearch;
+typedef struct TrackerSearch TrackerSearch;
typedef struct TrackerSearchClass TrackerSearchClass;
struct TrackerSearch {
@@ -52,83 +52,83 @@
GObjectClass parent;
};
-GType tracker_search_get_type (void);
-TrackerSearch *tracker_search_new (TrackerConfig *config,
- TrackerLanguage *language,
- TrackerDBIndex *file_index,
- TrackerDBIndex *email_index);
-void tracker_search_get_hit_count (TrackerSearch *object,
- const gchar *service,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_get_hit_count_all (TrackerSearch *object,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error_in);
-void tracker_search_text (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error_in);
-void tracker_search_text_detailed (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_get_snippet (TrackerSearch *object,
- const gchar *service,
- const gchar *id,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_files_by_text (TrackerSearch *object,
- gint live_query_id,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- gboolean group_results,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_metadata (TrackerSearch *object,
- const gchar *service,
- const gchar *field,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_matching_fields (TrackerSearch *object,
- const gchar *service,
- const gchar *id,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_query (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- gchar **fields,
- const gchar *search_text,
- const gchar *keyword,
- const gchar *query_condition,
- gboolean sort_by_service,
- gchar **sort_fields,
- gint sort_field_count,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_suggest (TrackerSearch *object,
- const gchar *search_text,
- gint max_dist,
- DBusGMethodInvocation *context,
- GError **error);
+GType tracker_search_get_type (void);
+TrackerSearch *tracker_search_new (TrackerConfig *config,
+ TrackerLanguage *language,
+ TrackerDBIndex *file_index,
+ TrackerDBIndex *email_index);
+void tracker_search_get_hit_count (TrackerSearch *object,
+ const gchar *service,
+ const gchar *search_text,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_get_hit_count_all (TrackerSearch *object,
+ const gchar *search_text,
+ DBusGMethodInvocation *context,
+ GError **error_in);
+void tracker_search_text (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *service,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error_in);
+void tracker_search_text_detailed (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *service,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_get_snippet (TrackerSearch *object,
+ const gchar *service,
+ const gchar *id,
+ const gchar *search_text,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_files_by_text (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
+ gboolean group_results,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_metadata (TrackerSearch *object,
+ const gchar *service,
+ const gchar *field,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_matching_fields (TrackerSearch *object,
+ const gchar *service,
+ const gchar *id,
+ const gchar *search_text,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_query (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *service,
+ gchar **fields,
+ const gchar *search_text,
+ const gchar *keyword,
+ const gchar *query_condition,
+ gboolean sort_by_service,
+ gchar **sort_fields,
+ gint sort_field_count,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_suggest (TrackerSearch *object,
+ const gchar *search_text,
+ gint max_dist,
+ DBusGMethodInvocation *context,
+ GError **error);
G_END_DECLS
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 15:12:19 2008
@@ -63,7 +63,7 @@
gboolean
tracker_status_init (TrackerConfig *config)
{
- GType type;
+ GType type;
TrackerStatusPrivate *private;
g_return_val_if_fail (TRACKER_IS_CONFIG (config), FALSE);
@@ -125,56 +125,56 @@
GType
tracker_status_get_type (void)
{
- static GType type = 0;
+ static GType type = 0;
- if (type == 0) {
- static const GEnumValue values[] = {
- { TRACKER_STATUS_INITIALIZING,
- "TRACKER_STATUS_INITIALIZING",
- "Initializing" },
- { TRACKER_STATUS_WATCHING,
- "TRACKER_STATUS_WATCHING",
- "Watching" },
- { TRACKER_STATUS_INDEXING,
- "TRACKER_STATUS_INDEXING",
- "Indexing" },
- { TRACKER_STATUS_PENDING,
- "TRACKER_STATUS_PENDING",
- "Pending" },
- { TRACKER_STATUS_OPTIMIZING,
- "TRACKER_STATUS_OPTIMIZING",
- "Optimizing" },
- { TRACKER_STATUS_IDLE,
- "TRACKER_STATUS_IDLE",
- "Idle" },
- { TRACKER_STATUS_SHUTDOWN,
- "TRACKER_STATUS_SHUTDOWN",
- "Shutdown" },
- { 0, NULL, NULL }
- };
+ if (type == 0) {
+ static const GEnumValue values[] = {
+ { TRACKER_STATUS_INITIALIZING,
+ "TRACKER_STATUS_INITIALIZING",
+ "Initializing" },
+ { TRACKER_STATUS_WATCHING,
+ "TRACKER_STATUS_WATCHING",
+ "Watching" },
+ { TRACKER_STATUS_INDEXING,
+ "TRACKER_STATUS_INDEXING",
+ "Indexing" },
+ { TRACKER_STATUS_PENDING,
+ "TRACKER_STATUS_PENDING",
+ "Pending" },
+ { TRACKER_STATUS_OPTIMIZING,
+ "TRACKER_STATUS_OPTIMIZING",
+ "Optimizing" },
+ { TRACKER_STATUS_IDLE,
+ "TRACKER_STATUS_IDLE",
+ "Idle" },
+ { TRACKER_STATUS_SHUTDOWN,
+ "TRACKER_STATUS_SHUTDOWN",
+ "Shutdown" },
+ { 0, NULL, NULL }
+ };
- type = g_enum_register_static ("TrackerStatus", values);
- }
+ type = g_enum_register_static ("TrackerStatus", values);
+ }
- return type;
+ return type;
}
const gchar *
tracker_status_to_string (TrackerStatus status)
{
- GType type;
- GEnumClass *enum_class;
- GEnumValue *enum_value;
-
- 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);
- }
+ GType type;
+ GEnumClass *enum_class;
+ GEnumValue *enum_value;
+
+ 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);
+ }
- return enum_value->value_nick;
+ return enum_value->value_nick;
}
TrackerStatus
@@ -185,7 +185,7 @@
private = g_static_private_get (&private_key);
g_return_val_if_fail (private != NULL, TRACKER_STATUS_INITIALIZING);
- return private->status;
+ return private->status;
}
const gchar *
@@ -196,7 +196,7 @@
private = g_static_private_get (&private_key);
g_return_val_if_fail (private != NULL, tracker_status_to_string (TRACKER_STATUS_INITIALIZING));
- return tracker_status_to_string (private->status);
+ return tracker_status_to_string (private->status);
}
void
@@ -207,20 +207,20 @@
private = g_static_private_get (&private_key);
g_return_if_fail (private != NULL);
- private->status = new_status;
+ private->status = new_status;
}
void
tracker_status_signal (void)
{
TrackerStatusPrivate *private;
- GObject *object;
- gboolean pause_on_battery;
+ GObject *object;
+ gboolean pause_on_battery;
private = g_static_private_get (&private_key);
g_return_if_fail (private != NULL);
- object = tracker_dbus_get_object (TRACKER_TYPE_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DAEMON);
/* There are times on startup whe we haven't initialized the
* DBus objects yet so signalling status is not practical.
@@ -229,22 +229,22 @@
return;
}
- if (private->is_first_time_index) {
- pause_on_battery =
+ if (private->is_first_time_index) {
+ pause_on_battery =
tracker_config_get_disable_indexing_on_battery_init (private->config);
- } else {
+ } else {
pause_on_battery =
tracker_config_get_disable_indexing_on_battery (private->config);
}
- 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,
+ 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,
!private->is_readonly);
}
@@ -252,22 +252,22 @@
tracker_status_set_and_signal (TrackerStatus new_status)
{
TrackerStatusPrivate *private;
- gboolean emit;
+ gboolean emit;
private = g_static_private_get (&private_key);
g_return_if_fail (private != NULL);
- emit = private->status != new_status;
+ emit = private->status != new_status;
- if (!emit) {
- return;
- }
+ if (!emit) {
+ return;
+ }
g_message ("State change from '%s' --> '%s'",
tracker_status_to_string (private->status),
tracker_status_to_string (new_status));
- tracker_status_set (new_status);
+ tracker_status_set (new_status);
tracker_status_signal ();
}
@@ -286,7 +286,7 @@
tracker_status_set_is_readonly (gboolean value)
{
TrackerStatusPrivate *private;
- gboolean emit;
+ gboolean emit;
private = g_static_private_get (&private_key);
g_return_if_fail (private != NULL);
@@ -319,7 +319,7 @@
tracker_status_set_is_running (gboolean value)
{
TrackerStatusPrivate *private;
- gboolean emit;
+ gboolean emit;
private = g_static_private_get (&private_key);
g_return_if_fail (private != NULL);
@@ -352,7 +352,7 @@
tracker_status_set_is_first_time_index (gboolean value)
{
TrackerStatusPrivate *private;
- gboolean emit;
+ gboolean emit;
private = g_static_private_get (&private_key);
g_return_if_fail (private != NULL);
@@ -385,7 +385,7 @@
tracker_status_set_in_merge (gboolean value)
{
TrackerStatusPrivate *private;
- gboolean emit;
+ gboolean emit;
private = g_static_private_get (&private_key);
g_return_if_fail (private != NULL);
@@ -418,7 +418,7 @@
tracker_status_set_is_paused_manually (gboolean value)
{
TrackerStatusPrivate *private;
- gboolean emit;
+ gboolean emit;
private = g_static_private_get (&private_key);
g_return_if_fail (private != NULL);
@@ -451,7 +451,7 @@
tracker_status_set_is_paused_for_io (gboolean value)
{
TrackerStatusPrivate *private;
- gboolean emit;
+ gboolean emit;
private = g_static_private_get (&private_key);
g_return_if_fail (private != NULL);
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 15:12:19 2008
@@ -31,44 +31,44 @@
#define TRACKER_TYPE_STATUS (tracker_status_get_type ())
typedef enum {
- TRACKER_STATUS_INITIALIZING,
- TRACKER_STATUS_WATCHING,
- TRACKER_STATUS_INDEXING,
- TRACKER_STATUS_PENDING,
- TRACKER_STATUS_OPTIMIZING,
- TRACKER_STATUS_IDLE,
- TRACKER_STATUS_SHUTDOWN
+ TRACKER_STATUS_INITIALIZING,
+ TRACKER_STATUS_WATCHING,
+ TRACKER_STATUS_INDEXING,
+ TRACKER_STATUS_PENDING,
+ TRACKER_STATUS_OPTIMIZING,
+ TRACKER_STATUS_IDLE,
+ TRACKER_STATUS_SHUTDOWN
} TrackerStatus;
-gboolean tracker_status_init (TrackerConfig *config);
-void tracker_status_shutdown (void);
+gboolean tracker_status_init (TrackerConfig *config);
+void tracker_status_shutdown (void);
-GType tracker_status_get_type (void) G_GNUC_CONST;
-const gchar * tracker_status_to_string (TrackerStatus status);
-TrackerStatus tracker_status_get (void);
-const gchar * tracker_status_get_as_string (void);
-void tracker_status_set (TrackerStatus new_status);
-void tracker_status_set_and_signal (TrackerStatus new_status);
-void tracker_status_signal (void);
+GType tracker_status_get_type (void) G_GNUC_CONST;
+const gchar * tracker_status_to_string (TrackerStatus status);
+TrackerStatus tracker_status_get (void);
+const gchar * tracker_status_get_as_string (void);
+void tracker_status_set (TrackerStatus new_status);
+void tracker_status_set_and_signal (TrackerStatus new_status);
+void tracker_status_signal (void);
-gboolean tracker_status_get_is_readonly (void);
-void tracker_status_set_is_readonly (gboolean value);
+gboolean tracker_status_get_is_readonly (void);
+void tracker_status_set_is_readonly (gboolean value);
-gboolean tracker_status_get_is_running (void);
-void tracker_status_set_is_running (gboolean value);
+gboolean tracker_status_get_is_running (void);
+void tracker_status_set_is_running (gboolean value);
-void tracker_status_set_is_first_time_index (gboolean value);
+void tracker_status_set_is_first_time_index (gboolean value);
gboolean tracker_status_get_is_first_time_index (void);
-gboolean tracker_status_get_in_merge (void);
-void tracker_status_set_in_merge (gboolean value);
+gboolean tracker_status_get_in_merge (void);
+void tracker_status_set_in_merge (gboolean value);
gboolean tracker_status_get_is_paused_manually (void);
-void tracker_status_set_is_paused_manually (gboolean value);
+void tracker_status_set_is_paused_manually (gboolean value);
gboolean tracker_status_get_is_paused_for_io (void);
-void tracker_status_set_is_paused_for_io (gboolean value);
+void tracker_status_set_is_paused_for_io (gboolean value);
G_END_DECLS
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 15:12:19 2008
@@ -27,13 +27,13 @@
G_BEGIN_DECLS
-gchar * tracker_get_radix_by_suffix (const gchar *str,
- const gchar *suffix);
-void tracker_notify_file_data_available (void);
-void tracker_add_metadata_to_table (GHashTable *meta_table,
- const char *key,
- const char *value);
-void tracker_add_io_grace (const char *uri);
+gchar * tracker_get_radix_by_suffix (const gchar *str,
+ const gchar *suffix);
+void tracker_notify_file_data_available (void);
+void tracker_add_metadata_to_table (GHashTable *meta_table,
+ const char *key,
+ const char *value);
+void tracker_add_io_grace (const char *uri);
G_END_DECLS
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 15:12:19 2008
@@ -32,13 +32,13 @@
struct _TrackerXesamLiveSearchPriv {
TrackerXesamSession *session;
- gchar *search_id;
- gboolean active;
- gboolean closed;
- gchar *query;
- gchar *from_sql;
- gchar *where_sql;
- gchar *join_sql;
+ gchar *search_id;
+ gboolean active;
+ gboolean closed;
+ gchar *query;
+ gchar *from_sql;
+ gchar *where_sql;
+ gchar *join_sql;
};
enum {
@@ -69,7 +69,7 @@
void
tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
- gpointer session)
+ gpointer session)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
@@ -89,7 +89,7 @@
void
tracker_xesam_live_search_set_xml_query (TrackerXesamLiveSearch *self,
- const gchar *query)
+ const gchar *query)
{
TrackerXesamLiveSearchPriv *priv;
@@ -107,10 +107,10 @@
}
static void
-xesam_search_set_property (GObject *object,
- guint param_id,
+xesam_search_set_property (GObject *object,
+ guint param_id,
const GValue *value,
- GParamSpec *pspec)
+ GParamSpec *pspec)
{
switch (param_id) {
case PROP_XMLQUERY:
@@ -174,7 +174,7 @@
**/
void
tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self,
- guint count)
+ guint count)
{
GObject *xesam;
@@ -200,7 +200,7 @@
**/
void
tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self,
- GArray *hit_ids)
+ GArray *hit_ids)
{
GObject *xesam;
@@ -227,7 +227,7 @@
**/
void
tracker_xesam_live_search_emit_hits_modified (TrackerXesamLiveSearch *self,
- GArray *hit_ids)
+ GArray *hit_ids)
{
GObject *xesam;
@@ -270,14 +270,14 @@
/* Created and Modified items */
static void
get_hits_added_modified (TrackerXesamLiveSearch *self,
- MatchWithEventsFlags flags,
- TrackerDBInterface *iface,
- GArray **added,
- GArray **modified)
-{
- gboolean ls_valid = TRUE;
- GArray *m_added = NULL;
- GArray *m_modified = NULL;
+ MatchWithEventsFlags flags,
+ 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
@@ -294,9 +294,9 @@
}
while (ls_valid) {
- GValue ls_value = { 0, };
- GValue ev_type = { 0, };
- gint ls_i_value;
+ GValue ls_value = { 0, };
+ GValue ev_type = { 0, };
+ gint ls_i_value;
const gchar *str;
_tracker_db_result_set_get_value (result_set, 0, &ls_value);
@@ -308,7 +308,7 @@
if (!strcmp (str, "Update")) {
gboolean noadd = FALSE;
- guint i;
+ guint i;
if (m_modified == NULL) {
m_modified = g_array_new (FALSE, TRUE, sizeof (guint32));
@@ -343,10 +343,10 @@
static void
get_all_hits (TrackerXesamLiveSearch *self,
TrackerDBInterface *iface,
- GArray **hits)
+ GArray **hits)
{
TrackerDBResultSet *result_set;
- gboolean valid;
+ gboolean valid;
g_return_if_fail (hits != NULL);
@@ -394,9 +394,9 @@
void
tracker_xesam_live_search_match_with_events (TrackerXesamLiveSearch *self,
MatchWithEventsFlags flags,
- GArray **added,
- GArray **removed,
- GArray **modified)
+ GArray **added,
+ GArray **removed,
+ GArray **modified)
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
@@ -463,7 +463,7 @@
**/
void
tracker_xesam_live_search_close (TrackerXesamLiveSearch *self,
- GError **error)
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv;
@@ -505,8 +505,8 @@
**/
void
tracker_xesam_live_search_get_hit_count (TrackerXesamLiveSearch *self,
- guint *count,
- GError **error)
+ guint *count,
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv;
@@ -523,7 +523,7 @@
} else {
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- GValue value = {0, };
+ GValue value = {0, };
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
@@ -544,7 +544,7 @@
static inline gpointer
rows_lookup (GPtrArray *rows, gint key)
{
- guint i;
+ guint i;
gpointer value = NULL;
for (i = 0; i < rows->len; i++) {
@@ -618,25 +618,25 @@
static void
get_hit_data (TrackerXesamLiveSearch *self,
TrackerDBResultSet *result_set,
- GPtrArray **hit_data,
- GStrv fields)
+ GPtrArray **hit_data,
+ GStrv fields)
{
GPtrArray *result = g_ptr_array_new ();
GPtrArray *rows = g_ptr_array_new ();
gboolean valid = TRUE;
- guint field_count;
+ guint field_count;
field_count = g_strv_length (fields);
while (valid) {
- guint column;
- GPtrArray *row;
- GValue value_in = {0, };
- gboolean insert = FALSE;
- gint key;
+ guint column;
+ GPtrArray *row;
+ GValue value_in = {0, };
+ gboolean insert = FALSE;
+ gint key;
TrackerFieldType data_type;
- TrackerField *field_def;
+ TrackerField *field_def;
_tracker_db_result_set_get_value (result_set, 0, &value_in);
@@ -691,7 +691,7 @@
switch (data_type) {
case TRACKER_FIELD_TYPE_DATE:
case TRACKER_FIELD_TYPE_STRING: {
- GValue *variant;
+ GValue *variant;
GPtrArray *my_array;
if (row->len <= (unsigned int) column) {
@@ -720,7 +720,7 @@
case TRACKER_FIELD_TYPE_INTEGER: {
GValue *variant;
GArray *my_array;
- gint int_val;
+ gint int_val;
if (row->len <= (unsigned int) column) {
variant = g_new0 (GValue, 1);
@@ -746,9 +746,9 @@
}
case TRACKER_FIELD_TYPE_DOUBLE: {
- GValue *variant;
- GArray *my_array;
- gfloat float_val;
+ GValue *variant;
+ GArray *my_array;
+ gfloat float_val;
if (row->len <= (unsigned int) column) {
variant = g_new0 (GValue, 1);
@@ -826,9 +826,9 @@
**/
void
tracker_xesam_live_search_get_hits (TrackerXesamLiveSearch *self,
- guint count,
- GPtrArray **hits,
- GError **error)
+ guint count,
+ GPtrArray **hits,
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv;
@@ -843,8 +843,8 @@
"Search is not active");
else {
TrackerXesamSession *session;
- GValue *value;
- GError *tmp_error = NULL;
+ GValue *value;
+ GError *tmp_error = NULL;
session = priv->session;
@@ -861,7 +861,7 @@
if (value) {
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- GStrv fields;
+ GStrv fields;
fields = g_value_get_boxed (value);
@@ -893,10 +893,10 @@
void
tracker_xesam_live_search_get_range_hits (TrackerXesamLiveSearch *self,
- guint a,
- guint b,
- GPtrArray **hits,
- GError **error)
+ guint a,
+ guint b,
+ GPtrArray **hits,
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv;
@@ -914,8 +914,8 @@
TrackerXesamSession *session = priv->session;
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- GValue *value;
- GError *tmp_error = NULL;
+ GValue *value;
+ GError *tmp_error = NULL;
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
@@ -984,11 +984,11 @@
* 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,
- GError **error)
+tracker_xesam_live_search_get_hit_data (TrackerXesamLiveSearch *self,
+ GArray *hit_ids,
+ GStrv fields,
+ GPtrArray **hit_data,
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv;
@@ -1029,11 +1029,11 @@
void
tracker_xesam_live_search_get_range_hit_data (TrackerXesamLiveSearch *self,
- guint a,
- guint b,
- GStrv fields,
- GPtrArray **hit_data,
- GError **error)
+ guint a,
+ guint b,
+ GStrv fields,
+ GPtrArray **hit_data,
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv;
@@ -1102,7 +1102,7 @@
**/
void
tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self,
- GError **error)
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
@@ -1112,7 +1112,7 @@
"Search is closed");
else {
TrackerDBInterface *iface;
- GArray *hits;
+ GArray *hits;
iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_XESAM_SERVICE);
@@ -1174,7 +1174,7 @@
**/
void
tracker_xesam_live_search_set_id (TrackerXesamLiveSearch *self,
- const gchar *search_id)
+ const gchar *search_id)
{
TrackerXesamLiveSearchPriv *priv;
@@ -1222,13 +1222,13 @@
**/
gboolean
tracker_xesam_live_search_parse_query (TrackerXesamLiveSearch *self,
- GError **error)
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv;
- TrackerDBInterface *iface;
- GObject *xesam;
- GError *parse_error = NULL;
- gchar *orig_from, *orig_join, *orig_where;
+ TrackerDBInterface *iface;
+ GObject *xesam;
+ GError *parse_error = NULL;
+ gchar *orig_from, *orig_join, *orig_where;
g_return_val_if_fail (TRACKER_IS_XESAM_LIVE_SEARCH (self), FALSE);
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 15:12:19 2008
@@ -57,63 +57,63 @@
};
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,
- const gchar *search_id);
-const gchar* tracker_xesam_live_search_get_id (TrackerXesamLiveSearch *self);
-const gchar* tracker_xesam_live_search_get_where_query (TrackerXesamLiveSearch *self);
-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,
- const gchar *xml_query);
-void tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
- gpointer session);
-void tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
- gpointer session);
-void tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self,
- GError **error);
-gboolean tracker_xesam_live_search_is_active (TrackerXesamLiveSearch *self);
-gboolean tracker_xesam_live_search_parse_query (TrackerXesamLiveSearch *self,
- GError **error);
-void tracker_xesam_live_search_get_hit_data (TrackerXesamLiveSearch *self,
- GArray *hit_ids,
- GStrv fields,
- GPtrArray **hit_data,
- GError **error);
-void tracker_xesam_live_search_get_hits (TrackerXesamLiveSearch *self,
- guint count,
- GPtrArray **hits,
- GError **error);
-void tracker_xesam_live_search_get_range_hit_data (TrackerXesamLiveSearch *self,
- guint a,
- guint b,
- GStrv fields,
- GPtrArray **hit_data,
- GError **error);
-void tracker_xesam_live_search_get_range_hits (TrackerXesamLiveSearch *self,
- guint a,
- guint b,
- GPtrArray **hits,
- GError **error);
-void tracker_xesam_live_search_get_hit_count (TrackerXesamLiveSearch *self,
- guint *count,
- GError **error);
-void tracker_xesam_live_search_close (TrackerXesamLiveSearch *self,
- GError **error);
-void tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self,
- guint count);
-void tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self,
- GArray *hit_ids);
-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,
+ 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,
+ const gchar *search_id);
+const gchar* tracker_xesam_live_search_get_id (TrackerXesamLiveSearch *self);
+const gchar* tracker_xesam_live_search_get_where_query (TrackerXesamLiveSearch *self);
+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,
+ const gchar *xml_query);
+void tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
+ gpointer session);
+void tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self,
+ gpointer session);
+void tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self,
+ GError **error);
+gboolean tracker_xesam_live_search_is_active (TrackerXesamLiveSearch *self);
+gboolean tracker_xesam_live_search_parse_query (TrackerXesamLiveSearch *self,
+ GError **error);
+void tracker_xesam_live_search_get_hit_data (TrackerXesamLiveSearch *self,
+ GArray *hit_ids,
+ GStrv fields,
+ GPtrArray **hit_data,
+ GError **error);
+void tracker_xesam_live_search_get_hits (TrackerXesamLiveSearch *self,
+ guint count,
+ GPtrArray **hits,
+ GError **error);
+void tracker_xesam_live_search_get_range_hit_data (TrackerXesamLiveSearch *self,
+ guint a,
+ guint b,
+ GStrv fields,
+ GPtrArray **hit_data,
+ GError **error);
+void tracker_xesam_live_search_get_range_hits (TrackerXesamLiveSearch *self,
+ guint a,
+ guint b,
+ GPtrArray **hits,
+ GError **error);
+void tracker_xesam_live_search_get_hit_count (TrackerXesamLiveSearch *self,
+ guint *count,
+ GError **error);
+void tracker_xesam_live_search_close (TrackerXesamLiveSearch *self,
+ GError **error);
+void tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self,
+ guint count);
+void tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self,
+ GArray *hit_ids);
+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,
MatchWithEventsFlags flags,
- GArray **added,
- GArray **removed,
- GArray **modified);
+ 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 15:12:19 2008
@@ -33,27 +33,27 @@
#include "tracker-dbus.h"
#include "tracker-main.h"
-static gboolean initialized;
+static gboolean initialized;
static TrackerDBInterface *xesam_db_iface;
-static GHashTable *xesam_sessions;
-static gchar *xesam_dir;
-static gboolean indexing_finished;
-static guint live_search_handler_id;
+static GHashTable *xesam_sessions;
+static gchar *xesam_dir;
+static gboolean indexing_finished;
+static guint live_search_handler_id;
static void
indexer_status_cb (DBusGProxy *proxy,
- gdouble seconds_elapsed,
+ gdouble seconds_elapsed,
const gchar *current_module_name,
- guint items_done,
- guint items_remaining,
- gpointer user_data)
+ guint items_done,
+ guint items_remaining,
+ gpointer user_data)
{
tracker_xesam_manager_wakeup ();
}
static void
indexer_started_cb (DBusGProxy *proxy,
- gpointer user_data)
+ gpointer user_data)
{
/* So now when we get status updates we DO NOT process live
* events and update live searches. The indexer is using the cache.
@@ -64,10 +64,10 @@
static void
indexer_finished_cb (DBusGProxy *proxy,
- gdouble seconds_elapsed,
- guint items_done,
- gboolean interrupted,
- gpointer user_data)
+ gdouble seconds_elapsed,
+ guint items_done,
+ gboolean interrupted,
+ gpointer user_data)
{
/* So now when we get status updates we can process live
* events and update live searches.
@@ -181,8 +181,8 @@
TrackerXesamSession *
tracker_xesam_manager_create_session (TrackerXesam *xesam,
- gchar **session_id,
- GError **error)
+ gchar **session_id,
+ GError **error)
{
TrackerXesamSession *session;
@@ -202,7 +202,7 @@
void
tracker_xesam_manager_close_session (const gchar *session_id,
- GError **error)
+ GError **error)
{
gpointer inst = g_hash_table_lookup (xesam_sessions, session_id);
@@ -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);
@@ -235,12 +235,12 @@
}
TrackerXesamSession *
-tracker_xesam_manager_get_session_for_search (const gchar *search_id,
+tracker_xesam_manager_get_session_for_search (const gchar *search_id,
TrackerXesamLiveSearch **search_in,
- GError **error)
+ GError **error)
{
TrackerXesamSession *session = NULL;
- GList *sessions;
+ GList *sessions;
sessions = g_hash_table_get_values (xesam_sessions);
@@ -278,10 +278,10 @@
TrackerXesamLiveSearch *
tracker_xesam_manager_get_live_search (const gchar *search_id,
- GError **error)
+ GError **error)
{
TrackerXesamLiveSearch *search = NULL;
- GList *sessions;
+ GList *sessions;
sessions = g_hash_table_get_values (xesam_sessions);
@@ -314,7 +314,7 @@
static gboolean
live_search_handler (gpointer data)
{
- GList *sessions;
+ GList *sessions;
gboolean reason_to_live = FALSE;
sessions = g_hash_table_get_values (xesam_sessions);
@@ -329,9 +329,9 @@
while (searches) {
TrackerXesamLiveSearch *search;
- GArray *added = NULL;
- GArray *removed = NULL;
- GArray *modified = NULL;
+ GArray *added = NULL;
+ GArray *removed = NULL;
+ GArray *modified = NULL;
g_debug ("Search being handled, ID :%s",
tracker_xesam_live_search_get_id (searches->data));
@@ -436,8 +436,8 @@
tracker_xesam_manager_generate_unique_key (void)
{
static guint serial = 0;
- gchar *key;
- guint t, ut, p, u, r;
+ gchar *key;
+ guint t, ut, p, u, r;
GTimeVal tv;
g_get_current_time (&tv);
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 15:12:19 2008
@@ -40,30 +40,30 @@
TRACKER_XESAM_ERROR_PARSING_FAILED,
} TrackerXesamError;
-GQuark tracker_xesam_manager_error_quark (void);
+GQuark tracker_xesam_manager_error_quark (void);
-void tracker_xesam_manager_init (void);
-void tracker_xesam_manager_shutdown (void);
+void tracker_xesam_manager_init (void);
+void tracker_xesam_manager_shutdown (void);
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);
+ 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*
- tracker_xesam_manager_get_session (const gchar *session_id,
- GError **error);
+ tracker_xesam_manager_get_session (const gchar *session_id,
+ GError **error);
TrackerXesamSession*
- tracker_xesam_manager_get_session_for_search (const gchar *search_id,
+ tracker_xesam_manager_get_session_for_search (const gchar *search_id,
TrackerXesamLiveSearch **search_in,
- GError **error);
+ GError **error);
TrackerXesamLiveSearch*
- tracker_xesam_manager_get_live_search (const gchar *search_id,
- GError **error);
+ tracker_xesam_manager_get_live_search (const gchar *search_id,
+ GError **error);
gchar * tracker_xesam_manager_generate_unique_key (void);
-gboolean tracker_xesam_manager_is_uri_in_xesam_dir (const gchar *uri);
-void tracker_xesam_manager_wakeup (void);
+gboolean tracker_xesam_manager_is_uri_in_xesam_dir (const gchar *uri);
+void tracker_xesam_manager_wakeup (void);
G_END_DECLS
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 15:12:19 2008
@@ -53,49 +53,49 @@
/* XESAM Query Condition
* <query>
* <and>
- * <greaterThan>
- * <field name="File:Size" />
- * <integer>1000000<integer>
- * </greaterThan>
- * <equals>
- * <field name="File:Path" />
- * <string>/home/jamie<string>
- * </equals>
+ * <greaterThan>
+ * <field name="File:Size" />
+ * <integer>1000000<integer>
+ * </greaterThan>
+ * <equals>
+ * <field name="File:Path" />
+ * <string>/home/jamie<string>
+ * </equals>
* </and>
* </query>
*/
/* Main elements */
-#define ELEMENT_XESAM_QUERY "query"
-#define ELEMENT_XESAM_USER_QUERY "userQuery"
-#define ELEMENT_XESAM_FIELD "field"
-#define ELEMENT_XESAM_FULL_TEXT_FIELDS "fullTextFields"
-#define ELEMENT_XESAM_REQUEST "request"
+#define ELEMENT_XESAM_QUERY "query"
+#define ELEMENT_XESAM_USER_QUERY "userQuery"
+#define ELEMENT_XESAM_FIELD "field"
+#define ELEMENT_XESAM_FULL_TEXT_FIELDS "fullTextFields"
+#define ELEMENT_XESAM_REQUEST "request"
/* Operators */
-#define ELEMENT_XESAM_AND "and"
-#define ELEMENT_XESAM_OR "or"
-#define ELEMENT_XESAM_EQUALS "equals"
+#define ELEMENT_XESAM_AND "and"
+#define ELEMENT_XESAM_OR "or"
+#define ELEMENT_XESAM_EQUALS "equals"
#define ELEMENT_XESAM_GREATER_THAN "greaterThan"
#define ELEMENT_XESAM_GREATER_OR_EQUAL "greaterOrEqual"
-#define ELEMENT_XESAM_LESS_THAN "lessThan"
+#define ELEMENT_XESAM_LESS_THAN "lessThan"
#define ELEMENT_XESAM_LESS_OR_EQUAL "lessOrEqual"
/* Extension operators - "contains" does a substring or full text
* match, "in_Set" does string in list match
*/
-#define ELEMENT_XESAM_CONTAINS "contains"
-#define ELEMENT_XESAM_REGEX "regex"
-#define ELEMENT_XESAM_STARTS_WITH "startsWith"
+#define ELEMENT_XESAM_CONTAINS "contains"
+#define ELEMENT_XESAM_REGEX "regex"
+#define ELEMENT_XESAM_STARTS_WITH "startsWith"
#define ELEMENT_XESAM_IN_SET "inSet"
-#define ELEMENT_XESAM_FULL_TEXT "fullText"
+#define ELEMENT_XESAM_FULL_TEXT "fullText"
/* Types */
-#define ELEMENT_XESAM_INTEGER "integer"
-#define ELEMENT_XESAM_DATE "date"
-#define ELEMENT_XESAM_STRING "string"
-#define ELEMENT_XESAM_FLOAT "float"
-#define ELEMENT_XESAM_BOOLEAN "boolean"
+#define ELEMENT_XESAM_INTEGER "integer"
+#define ELEMENT_XESAM_DATE "date"
+#define ELEMENT_XESAM_STRING "string"
+#define ELEMENT_XESAM_FLOAT "float"
+#define ELEMENT_XESAM_BOOLEAN "boolean"
#define ELEMENT_IS(name) (strcmp (element_name, (name)) == 0)
@@ -170,42 +170,42 @@
typedef struct {
GMarkupParseContext *context;
- GMarkupParser *parser;
- GSList *stack;
- GSList *fields;
- gboolean query_okay;
- gint statement_count;
- LogicOperators current_logic_operator;
- Operators current_operator;
- gchar *current_field;
- gchar *current_value;
+ GMarkupParser *parser;
+ GSList *stack;
+ GSList *fields;
+ gboolean query_okay;
+ gint statement_count;
+ LogicOperators current_logic_operator;
+ Operators current_operator;
+ gchar *current_field;
+ gchar *current_value;
TrackerDBInterface *iface;
- GString *sql_select;
- GString *sql_from;
- GString *sql_where;
- GString *sql_order;
- GString *sql_join;
- gchar *service;
+ GString *sql_select;
+ GString *sql_from;
+ GString *sql_where;
+ GString *sql_order;
+ GString *sql_join;
+ gchar *service;
} ParserData;
-static void start_element_handler (GMarkupParseContext *context,
- const gchar *element_name,
- const gchar **attribute_names,
- const gchar **attribute_values,
- gpointer user_data,
- GError **error);
-static void end_element_handler (GMarkupParseContext *context,
- const gchar *element_name,
- gpointer user_data,
- GError **error);
-static void text_handler (GMarkupParseContext *context,
- const gchar *text,
- gsize text_len,
- gpointer user_data,
- GError **error);
-static void error_handler (GMarkupParseContext *context,
- GError *error,
- gpointer user_data);
+static void start_element_handler (GMarkupParseContext *context,
+ const gchar *element_name,
+ const gchar **attribute_names,
+ const gchar **attribute_values,
+ gpointer user_data,
+ GError **error);
+static void end_element_handler (GMarkupParseContext *context,
+ const gchar *element_name,
+ gpointer user_data,
+ GError **error);
+static void text_handler (GMarkupParseContext *context,
+ const gchar *text,
+ gsize text_len,
+ gpointer user_data,
+ GError **error);
+static void error_handler (GMarkupParseContext *context,
+ GError *error,
+ gpointer user_data);
static GQuark error_quark;
@@ -259,15 +259,15 @@
}
static void
-set_error (GError **err,
- GMarkupParseContext *context,
- int error_code,
- const char *format,
- ...)
+set_error (GError **err,
+ GMarkupParseContext *context,
+ int error_code,
+ const char *format,
+ ...)
{
- gint line, ch;
+ gint line, ch;
va_list args;
- gchar *str;
+ gchar *str;
g_markup_parse_context_get_position (context, &line, &ch);
@@ -287,10 +287,10 @@
}
static gboolean
-set_error_on_fail (gboolean condition,
- GMarkupParseContext *context,
- const gchar *msg,
- GError **err)
+set_error_on_fail (gboolean condition,
+ GMarkupParseContext *context,
+ const gchar *msg,
+ GError **err)
{
if (!condition) {
set_error (err, context, 1, msg);
@@ -321,11 +321,11 @@
static const gchar *
get_attribute_value_required (GMarkupParseContext *context,
- const gchar *tag,
- const gchar *name,
- const gchar **names,
- const gchar **values,
- GError **error)
+ const gchar *tag,
+ const gchar *name,
+ const gchar **names,
+ const gchar **values,
+ GError **error)
{
const gchar *value;
@@ -377,17 +377,17 @@
}
static GList *
-add_metadata_field (ParserData *data,
+add_metadata_field (ParserData *data,
const gchar *xesam_name,
- gboolean is_select,
- gboolean is_condition)
+ gboolean is_select,
+ gboolean is_condition)
{
TrackerDBResultSet *result_set;
TrackerFieldData *field_data;
- gboolean field_exists;
- const GSList *l;
- GList *reply;
- gboolean valid;
+ gboolean field_exists;
+ const GSList *l;
+ GList *reply;
+ gboolean valid;
reply = NULL;
field_exists = FALSE;
@@ -569,7 +569,7 @@
push_stack (data, STATE_FIELD); /* We don't need to differentiate */
} else if (ELEMENT_IS (ELEMENT_XESAM_AND)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -604,7 +604,7 @@
data->current_logic_operator = LOP_AND;
push_stack (data, STATE_AND);
} else if (ELEMENT_IS (ELEMENT_XESAM_OR)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -639,7 +639,7 @@
data->current_logic_operator = LOP_OR;
push_stack (data, STATE_OR);
} else if (ELEMENT_IS (ELEMENT_XESAM_EQUALS)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -663,7 +663,7 @@
data->current_operator = OP_EQUALS;
push_stack (data, STATE_EQUALS);
} else if (ELEMENT_IS (ELEMENT_XESAM_GREATER_THAN)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -687,7 +687,7 @@
data->current_operator = OP_GREATER;
push_stack (data, STATE_GREATER_THAN);
} else if (ELEMENT_IS (ELEMENT_XESAM_GREATER_OR_EQUAL)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -711,7 +711,7 @@
data->current_operator = OP_GREATER_EQUAL;
push_stack (data, STATE_GREATER_OR_EQUAL);
} else if (ELEMENT_IS (ELEMENT_XESAM_LESS_THAN)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -734,7 +734,7 @@
data->current_operator = OP_LESS;
push_stack (data, STATE_LESS_THAN);
} else if (ELEMENT_IS (ELEMENT_XESAM_LESS_OR_EQUAL)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -758,7 +758,7 @@
data->current_operator = OP_LESS_EQUAL;
push_stack (data, STATE_LESS_OR_EQUAL);
} else if (ELEMENT_IS (ELEMENT_XESAM_CONTAINS)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -782,7 +782,7 @@
data->current_operator = OP_CONTAINS;
push_stack (data, STATE_CONTAINS);
} else if (ELEMENT_IS (ELEMENT_XESAM_REGEX)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -805,7 +805,7 @@
data->current_operator = OP_REGEX;
push_stack (data, STATE_REGEX);
} else if (ELEMENT_IS (ELEMENT_XESAM_STARTS_WITH)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -829,7 +829,7 @@
data->current_operator = OP_STARTS;
push_stack (data, STATE_STARTS_WITH);
} else if (ELEMENT_IS (ELEMENT_XESAM_IN_SET)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -853,7 +853,7 @@
data->current_operator = OP_SET;
push_stack (data, STATE_IN_SET);
} else if (ELEMENT_IS (ELEMENT_XESAM_FULL_TEXT)) {
- const gchar *negate;
+ const gchar *negate;
if (set_error_on_fail (state == STATE_QUERY ||
is_logic (state) ||
@@ -949,11 +949,11 @@
build_sql (ParserData *data)
{
ParseState state;
- gchar *avalue, *value, *sub;
- GList *field_data;
- GList *field_data_list;
+ gchar *avalue, *value, *sub;
+ GList *field_data;
+ GList *field_data_list;
GString *str;
- gint i;
+ gint i;
g_return_val_if_fail (data->current_field &&
data->current_operator != OP_NONE &&
@@ -992,7 +992,7 @@
while (field_data) {
const gchar *where_field;
- gchar **s;
+ gchar **s;
i++;
str = g_string_new ("");
@@ -1353,7 +1353,7 @@
case STATE_STRING:
case STATE_DATE:
case STATE_FLOAT:
- case STATE_BOOLEAN:
+ case STATE_BOOLEAN:
data->current_value = g_strstrip (g_strndup (text, text_len));
break;
@@ -1373,23 +1373,23 @@
}
void
-tracker_xesam_query_to_sql (TrackerDBInterface *iface,
- const gchar *query,
- gchar **from,
- gchar **join,
- gchar **where,
- GError **error)
+tracker_xesam_query_to_sql (TrackerDBInterface *iface,
+ const gchar *query,
+ gchar **from,
+ gchar **join,
+ gchar **where,
+ GError **error)
{
static gboolean inited = FALSE;
- ParserData data;
- gchar *result;
- gchar *table_name;
-
- g_return_if_fail (TRACKER_IS_DB_INTERFACE (iface));
- g_return_if_fail (query != NULL);
- g_return_if_fail (from != NULL);
- g_return_if_fail (join != NULL);
- g_return_if_fail (where != NULL);
+ ParserData data;
+ gchar *result;
+ gchar *table_name;
+
+ g_return_if_fail (TRACKER_IS_DB_INTERFACE (iface));
+ g_return_if_fail (query != NULL);
+ g_return_if_fail (from != NULL);
+ g_return_if_fail (join != NULL);
+ g_return_if_fail (where != NULL);
if (!inited) {
error_quark = g_quark_from_static_string ("XESAM-parser-error-quark");
Modified: branches/indexer-split/src/trackerd/tracker-xesam-query.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-query.h (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-query.h Sat Sep 20 15:12:19 2008
@@ -29,11 +29,11 @@
G_BEGIN_DECLS
void tracker_xesam_query_to_sql (TrackerDBInterface *iface,
- const gchar *query,
- gchar **from,
- gchar **join,
- gchar **where,
- GError **error);
+ const gchar *query,
+ gchar **from,
+ gchar **join,
+ gchar **where,
+ GError **error);
G_END_DECLS
#endif /* __TRACKERD_XESAM_QUERY_H__ */
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 15:12:19 2008
@@ -28,7 +28,7 @@
struct _TrackerXesamSessionPriv {
GHashTable *searches;
GHashTable *props;
- gchar *session_id;
+ gchar *session_id;
};
G_DEFINE_TYPE (TrackerXesamSession, tracker_xesam_session, G_TYPE_OBJECT)
@@ -209,7 +209,7 @@
**/
void
tracker_xesam_session_set_id (TrackerXesamSession *self,
- const gchar *session_id)
+ const gchar *session_id)
{
TrackerXesamSessionPriv *priv = self->priv;
@@ -279,10 +279,10 @@
**/
void
tracker_xesam_session_set_property (TrackerXesamSession *self,
- const gchar *prop,
- const GValue *val,
- GValue **new_val,
- GError **error)
+ 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",
@@ -332,9 +332,9 @@
**/
void
tracker_xesam_session_get_property (TrackerXesamSession *self,
- const gchar *prop,
- GValue **value,
- GError **error)
+ const gchar *prop,
+ GValue **value,
+ GError **error)
{
TrackerXesamSessionPriv *priv = self->priv;
@@ -373,11 +373,11 @@
**/
TrackerXesamLiveSearch*
tracker_xesam_session_create_search (TrackerXesamSession *self,
- const gchar *query_xml,
- gchar **search_id,
- GError **error)
+ const gchar *query_xml,
+ gchar **search_id,
+ GError **error)
{
- TrackerXesamLiveSearch *search;
+ TrackerXesamLiveSearch *search;
TrackerXesamSessionPriv *priv = self->priv;
g_debug ("Creating search for xesam session: \n %s", query_xml);
@@ -419,8 +419,8 @@
**/
TrackerXesamLiveSearch*
tracker_xesam_session_get_search (TrackerXesamSession *self,
- const gchar *search_id,
- GError **error)
+ const gchar *search_id,
+ GError **error)
{
TrackerXesamSessionPriv *priv = self->priv;
TrackerXesamLiveSearch *search = g_hash_table_lookup (priv->searches, search_id);
Modified: branches/indexer-split/src/trackerd/tracker-xesam-session.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-session.h (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-session.h Sat Sep 20 15:12:19 2008
@@ -39,7 +39,7 @@
#define TRACKER_TYPE_XESAM_STRV_ARRAY (dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRV))
-typedef struct _TrackerXesamSession TrackerXesamSession;
+typedef struct _TrackerXesamSession TrackerXesamSession;
typedef struct _TrackerXesamSessionClass TrackerXesamSessionClass;
typedef struct _TrackerXesamSessionPriv TrackerXesamSessionPriv;
@@ -52,29 +52,29 @@
GObjectClass parent_class;
};
-void tracker_xesam_session_set_property (TrackerXesamSession *self,
- const gchar *prop,
- const GValue *val,
- GValue **new_val,
- GError **error);
-void tracker_xesam_session_get_property (TrackerXesamSession *self,
- const gchar *prop,
- GValue **value,
- GError **error);
+void tracker_xesam_session_set_property (TrackerXesamSession *self,
+ const gchar *prop,
+ const GValue *val,
+ GValue **new_val,
+ GError **error);
+void tracker_xesam_session_get_property (TrackerXesamSession *self,
+ const gchar *prop,
+ GValue **value,
+ GError **error);
TrackerXesamLiveSearch* tracker_xesam_session_create_search (TrackerXesamSession *self,
- const gchar *query_xml,
- gchar **search_id,
- GError **error);
+ const gchar *query_xml,
+ gchar **search_id,
+ GError **error);
TrackerXesamLiveSearch* tracker_xesam_session_get_search (TrackerXesamSession *self,
- const gchar *search_id,
- GError **error);
-GList * tracker_xesam_session_get_searches (TrackerXesamSession *self);
-void tracker_xesam_session_set_id (TrackerXesamSession *self,
- const gchar *session_id);
-const gchar* tracker_xesam_session_get_id (TrackerXesamSession *self);
-TrackerXesamSession* tracker_xesam_session_new (void);
-GType tracker_xesam_session_get_type (void);
-GHashTable* tracker_xesam_session_get_props (TrackerXesamSession *self);
+ const gchar *search_id,
+ GError **error);
+GList * tracker_xesam_session_get_searches (TrackerXesamSession *self);
+void tracker_xesam_session_set_id (TrackerXesamSession *self,
+ const gchar *session_id);
+const gchar* tracker_xesam_session_get_id (TrackerXesamSession *self);
+TrackerXesamSession* tracker_xesam_session_new (void);
+GType tracker_xesam_session_get_type (void);
+GHashTable* tracker_xesam_session_get_props (TrackerXesamSession *self);
G_END_DECLS
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 15:12:19 2008
@@ -50,7 +50,7 @@
};
static GHashTable *sessions = NULL;
-static guint signals[XESAM_LAST_SIGNAL] = {0};
+static guint signals[XESAM_LAST_SIGNAL] = {0};
G_DEFINE_TYPE(TrackerXesam, tracker_xesam, G_TYPE_OBJECT)
@@ -130,7 +130,7 @@
static void
tracker_xesam_close_session_interal (const gchar *session_id,
- GError **error)
+ GError **error)
{
TrackerXesamSession *session;
@@ -193,14 +193,14 @@
* Functions
*/
void
-tracker_xesam_new_session (TrackerXesam *object,
+tracker_xesam_new_session (TrackerXesam *object,
DBusGMethodInvocation *context)
{
- GList *my_sessions;
- GError *error = NULL;
- gchar *session_id = NULL;
- guint request_id;
- gchar *key;
+ GList *my_sessions;
+ GError *error = NULL;
+ gchar *session_id = NULL;
+ guint request_id;
+ gchar *key;
gboolean insert = FALSE;
request_id = tracker_dbus_get_next_request_id ();
@@ -248,13 +248,13 @@
}
void
-tracker_xesam_close_session (TrackerXesam *object,
- const gchar *session_id,
+tracker_xesam_close_session (TrackerXesam *object,
+ const gchar *session_id,
DBusGMethodInvocation *context)
{
GError *error = NULL;
gchar *key;
- guint request_id;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -297,15 +297,15 @@
}
void
-tracker_xesam_set_property (TrackerXesam *object,
- const gchar *session_id,
- const gchar *prop,
- GValue *val,
+tracker_xesam_set_property (TrackerXesam *object,
+ const gchar *session_id,
+ const gchar *prop,
+ GValue *val,
DBusGMethodInvocation *context)
{
TrackerXesamSession *session;
- GError *error = NULL;
- guint request_id;
+ GError *error = NULL;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
session = tracker_xesam_manager_get_session (session_id, &error);
@@ -342,14 +342,14 @@
}
void
-tracker_xesam_get_property (TrackerXesam *object,
- const gchar *session_id,
- const gchar *prop,
+tracker_xesam_get_property (TrackerXesam *object,
+ const gchar *session_id,
+ const gchar *prop,
DBusGMethodInvocation *context)
{
TrackerXesamSession *session;
- GError *error = NULL;
- guint request_id;
+ GError *error = NULL;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
session = tracker_xesam_manager_get_session (session_id, &error);
@@ -387,14 +387,14 @@
}
void
-tracker_xesam_new_search (TrackerXesam *object,
- const gchar *session_id,
- const gchar *query_xml,
+tracker_xesam_new_search (TrackerXesam *object,
+ const gchar *session_id,
+ const gchar *query_xml,
DBusGMethodInvocation *context)
{
TrackerXesamSession *session;
- GError *error = NULL;
- guint request_id;
+ GError *error = NULL;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -402,7 +402,7 @@
if (session) {
TrackerXesamLiveSearch *search;
- gchar *search_id = NULL;
+ gchar *search_id = NULL;
g_clear_error (&error);
@@ -415,7 +415,7 @@
dbus_g_method_return_error (context, error);
g_error_free (error);
} else {
- g_debug ("Created new xesam search: %s for session: %s",
+ g_debug ("Created new xesam search: %s for session: %s",
search_id, session_id);
dbus_g_method_return (context, search_id);
}
@@ -437,13 +437,13 @@
}
void
-tracker_xesam_start_search (TrackerXesam *object,
- const gchar *search_id,
+tracker_xesam_start_search (TrackerXesam *object,
+ const gchar *search_id,
DBusGMethodInvocation *context)
{
TrackerXesamLiveSearch *search;
- GError *error = NULL;
- guint request_id;
+ GError *error = NULL;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -472,13 +472,13 @@
}
void
-tracker_xesam_get_hit_count (TrackerXesam *object,
- const gchar *search_id,
+tracker_xesam_get_hit_count (TrackerXesam *object,
+ const gchar *search_id,
DBusGMethodInvocation *context)
{
TrackerXesamLiveSearch *search;
- GError *error = NULL;
- guint request_id;
+ GError *error = NULL;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -530,14 +530,14 @@
}
void
-tracker_xesam_get_hits (TrackerXesam *object,
- const gchar *search_id,
- guint count,
+tracker_xesam_get_hits (TrackerXesam *object,
+ const gchar *search_id,
+ guint count,
DBusGMethodInvocation *context)
{
TrackerXesamLiveSearch *search;
- GError *error = NULL;
- guint request_id;
+ GError *error = NULL;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -574,15 +574,15 @@
}
void
-tracker_xesam_get_range_hits (TrackerXesam *object,
- const gchar *search_id,
- guint a,
- guint b,
+tracker_xesam_get_range_hits (TrackerXesam *object,
+ const gchar *search_id,
+ guint a,
+ guint b,
DBusGMethodInvocation *context)
{
TrackerXesamLiveSearch *search;
- GError *error = NULL;
- guint request_id;
+ GError *error = NULL;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -602,7 +602,7 @@
if (error) {
dbus_g_method_return_error (context, error);
g_error_free (error);
- } else {
+ } else {
dbus_g_method_return (context, hits);
}
@@ -621,15 +621,15 @@
void
-tracker_xesam_get_hit_data (TrackerXesam *object,
- const gchar *search_id,
- GArray *hit_ids,
- GStrv fields,
+tracker_xesam_get_hit_data (TrackerXesam *object,
+ const gchar *search_id,
+ GArray *hit_ids,
+ GStrv fields,
DBusGMethodInvocation *context)
{
TrackerXesamLiveSearch *search;
- GError *error = NULL;
- guint request_id;
+ GError *error = NULL;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -667,16 +667,16 @@
}
void
-tracker_xesam_get_range_hit_data (TrackerXesam *object,
- const gchar *search_id,
- guint a,
- guint b,
- GStrv fields,
+tracker_xesam_get_range_hit_data (TrackerXesam *object,
+ const gchar *search_id,
+ guint a,
+ guint b,
+ GStrv fields,
DBusGMethodInvocation *context)
{
TrackerXesamLiveSearch *search;
- GError *error = NULL;
- guint request_id;
+ GError *error = NULL;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -715,13 +715,13 @@
}
void
-tracker_xesam_close_search (TrackerXesam *object,
- const gchar *search_id,
+tracker_xesam_close_search (TrackerXesam *object,
+ const gchar *search_id,
DBusGMethodInvocation *context)
{
TrackerXesamLiveSearch *search;
- GError *error = NULL;
- guint request_id;
+ GError *error = NULL;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -750,12 +750,12 @@
}
void
-tracker_xesam_get_state (TrackerXesam *object,
+tracker_xesam_get_state (TrackerXesam *object,
DBusGMethodInvocation *context)
{
- GStrv strv;
+ GStrv strv;
const gchar *state;
- guint request_id;
+ guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -787,7 +787,7 @@
**/
void
tracker_xesam_emit_state_changed (TrackerXesam *self,
- GStrv state_info)
+ GStrv state_info)
{
g_signal_emit (self, signals[XESAM_STATE_CHANGED], 0, state_info);
}
Modified: branches/indexer-split/src/trackerd/tracker-xesam.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.h (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.h Sat Sep 20 15:12:19 2008
@@ -30,20 +30,20 @@
#include "tracker-db.h"
-#define TRACKER_XESAM_SERVICE "org.freedesktop.xesam.searcher"
-#define TRACKER_XESAM_PATH "/org/freedesktop/xesam/searcher/main"
+#define TRACKER_XESAM_SERVICE "org.freedesktop.xesam.searcher"
+#define TRACKER_XESAM_PATH "/org/freedesktop/xesam/searcher/main"
#define TRACKER_XESAM_INTERFACE "org.freedesktop.xesam.Search"
G_BEGIN_DECLS
-#define TRACKER_TYPE_XESAM (tracker_xesam_get_type ())
-#define TRACKER_XESAM(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_XESAM, TrackerXesam))
+#define TRACKER_TYPE_XESAM (tracker_xesam_get_type ())
+#define TRACKER_XESAM(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_XESAM, TrackerXesam))
#define TRACKER_XESAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_XESAM, TrackerXesamClass))
#define TRACKER_IS_XESAM(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_XESAM))
#define TRACKER_IS_XESAM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_XESAM))
#define TRACKER_XESAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_XESAM, TrackerXesamClass))
-typedef struct TrackerXesam TrackerXesam;
+typedef struct TrackerXesam TrackerXesam;
typedef struct TrackerXesamClass TrackerXesamClass;
struct TrackerXesam {
@@ -54,64 +54,64 @@
GObjectClass parent;
};
-GType tracker_xesam_get_type (void);
-TrackerXesam *tracker_xesam_new (void);
-void tracker_xesam_new_session (TrackerXesam *object,
- DBusGMethodInvocation *context);
-void tracker_xesam_set_property (TrackerXesam *object,
- const gchar *session_id,
- const gchar *prop,
- GValue *val,
- DBusGMethodInvocation *context);
-void tracker_xesam_get_property (TrackerXesam *object,
- const gchar *session_id,
- const gchar *prop,
- DBusGMethodInvocation *context);
-void tracker_xesam_close_session (TrackerXesam *object,
- const gchar *session_id,
- DBusGMethodInvocation *context);
-void tracker_xesam_new_search (TrackerXesam *object,
- const gchar *session_id,
- const gchar *query_xml,
- DBusGMethodInvocation *context);
-void tracker_xesam_start_search (TrackerXesam *object,
- const gchar *search_id,
- DBusGMethodInvocation *context);
-void tracker_xesam_get_hit_count (TrackerXesam *object,
- const gchar *search_id,
- DBusGMethodInvocation *context);
-void tracker_xesam_get_hits (TrackerXesam *object,
- const gchar *search_id,
- guint count,
- DBusGMethodInvocation *context);
-void tracker_xesam_get_range_hits (TrackerXesam *object,
- const gchar *search_id,
- guint a,
- guint b,
- DBusGMethodInvocation *context);
-void tracker_xesam_get_hit_data (TrackerXesam *object,
- const gchar *search_id,
- GArray *hit_ids,
- GStrv fields,
- DBusGMethodInvocation *context);
-void tracker_xesam_get_range_hit_data (TrackerXesam *object,
- const gchar *search_id,
- guint a,
- guint b,
- GStrv fields,
- DBusGMethodInvocation *context);
-void tracker_xesam_close_search (TrackerXesam *object,
- const gchar *search_id,
- DBusGMethodInvocation *context);
-void tracker_xesam_get_state (TrackerXesam *object,
- DBusGMethodInvocation *context);
-void tracker_xesam_emit_state_changed (TrackerXesam *self,
- GStrv state_info);
-void tracker_xesam_name_owner_changed (DBusGProxy *proxy,
- const char *name,
- const char *prev_owner,
- const char *new_owner,
- TrackerXesam *self);
+GType tracker_xesam_get_type (void);
+TrackerXesam *tracker_xesam_new (void);
+void tracker_xesam_new_session (TrackerXesam *object,
+ DBusGMethodInvocation *context);
+void tracker_xesam_set_property (TrackerXesam *object,
+ const gchar *session_id,
+ const gchar *prop,
+ GValue *val,
+ DBusGMethodInvocation *context);
+void tracker_xesam_get_property (TrackerXesam *object,
+ const gchar *session_id,
+ const gchar *prop,
+ DBusGMethodInvocation *context);
+void tracker_xesam_close_session (TrackerXesam *object,
+ const gchar *session_id,
+ DBusGMethodInvocation *context);
+void tracker_xesam_new_search (TrackerXesam *object,
+ const gchar *session_id,
+ const gchar *query_xml,
+ DBusGMethodInvocation *context);
+void tracker_xesam_start_search (TrackerXesam *object,
+ const gchar *search_id,
+ DBusGMethodInvocation *context);
+void tracker_xesam_get_hit_count (TrackerXesam *object,
+ const gchar *search_id,
+ DBusGMethodInvocation *context);
+void tracker_xesam_get_hits (TrackerXesam *object,
+ const gchar *search_id,
+ guint count,
+ DBusGMethodInvocation *context);
+void tracker_xesam_get_range_hits (TrackerXesam *object,
+ const gchar *search_id,
+ guint a,
+ guint b,
+ DBusGMethodInvocation *context);
+void tracker_xesam_get_hit_data (TrackerXesam *object,
+ const gchar *search_id,
+ GArray *hit_ids,
+ GStrv fields,
+ DBusGMethodInvocation *context);
+void tracker_xesam_get_range_hit_data (TrackerXesam *object,
+ const gchar *search_id,
+ guint a,
+ guint b,
+ GStrv fields,
+ DBusGMethodInvocation *context);
+void tracker_xesam_close_search (TrackerXesam *object,
+ const gchar *search_id,
+ DBusGMethodInvocation *context);
+void tracker_xesam_get_state (TrackerXesam *object,
+ DBusGMethodInvocation *context);
+void tracker_xesam_emit_state_changed (TrackerXesam *self,
+ GStrv state_info);
+void tracker_xesam_name_owner_changed (DBusGProxy *proxy,
+ const char *name,
+ const char *prev_owner,
+ const char *new_owner,
+ TrackerXesam *self);
G_END_DECLS
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 15:12:19 2008
@@ -25,7 +25,7 @@
tracker_test_helpers_cmpstr_equal (const gchar *obtained,
const gchar *expected)
{
- gboolean result;
+ gboolean result;
if (expected == obtained) {
return TRUE;
@@ -33,12 +33,12 @@
if (expected && obtained) {
result = !g_utf8_collate (expected, obtained);
- if (!result) {
- g_warning ("Expected %s - obtained %s", expected, obtained);
- }
- return result;
+ if (!result) {
+ g_warning ("Expected %s - obtained %s", expected, obtained);
+ }
+ return result;
} else {
- g_warning ("\n Only one of the strings is NULL\n");
+ g_warning ("\n Only one of the strings is NULL\n");
return FALSE;
}
}
@@ -46,14 +46,14 @@
const gchar *
tracker_test_helpers_get_nonutf8 (void)
{
- GMappedFile *file = NULL;
+ GMappedFile *file = NULL;
- if (!nonutf8_str) {
- file = g_mapped_file_new (TEST_TEXT, FALSE, NULL);
- nonutf8_str = g_strdup (g_mapped_file_get_contents (file));
- nonutf8_str [g_mapped_file_get_length (file) -1] = '\0';
- g_mapped_file_free (file);
- }
+ if (!nonutf8_str) {
+ file = g_mapped_file_new (TEST_TEXT, FALSE, NULL);
+ nonutf8_str = g_strdup (g_mapped_file_get_contents (file));
+ nonutf8_str [g_mapped_file_get_length (file) -1] = '\0';
+ g_mapped_file_free (file);
+ }
return nonutf8_str;
}
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 15:12:19 2008
@@ -27,7 +27,7 @@
gboolean tracker_test_helpers_cmpstr_equal (const gchar *obtained,
const gchar *expected);
const gchar *tracker_test_helpers_get_nonutf8 (void);
-void tracker_test_helpers_free_nonutf8 (void);
+void tracker_test_helpers_free_nonutf8 (void);
G_END_DECLS
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 15:12:19 2008
@@ -26,68 +26,68 @@
static void
slist_to_strv (gboolean utf8)
{
- GSList *input = NULL;
- gint i;
- gchar **input_as_strv;
- gint strings = 5;
-
- for (i = 0; i < strings; i++) {
- if (utf8) {
- input = g_slist_prepend (input, g_strdup_printf ("%d", i));
- } else {
- input = g_slist_prepend (input, g_strdup (tracker_test_helpers_get_nonutf8 ()));
- }
- }
- g_assert_cmpint (g_slist_length (input), ==, strings);
+ GSList *input = NULL;
+ gint i;
+ gchar **input_as_strv;
+ gint strings = 5;
+
+ for (i = 0; i < strings; i++) {
+ if (utf8) {
+ input = g_slist_prepend (input, g_strdup_printf ("%d", i));
+ } else {
+ input = g_slist_prepend (input, g_strdup (tracker_test_helpers_get_nonutf8 ()));
+ }
+ }
+ g_assert_cmpint (g_slist_length (input), ==, strings);
- input_as_strv = tracker_dbus_slist_to_strv (input);
+ input_as_strv = tracker_dbus_slist_to_strv (input);
- g_assert_cmpint (g_strv_length (input_as_strv), ==, (utf8 ? strings : 0));
+ g_assert_cmpint (g_strv_length (input_as_strv), ==, (utf8 ? strings : 0));
- g_slist_foreach (input, (GFunc)g_free, NULL);
- g_slist_free (input);
+ g_slist_foreach (input, (GFunc)g_free, NULL);
+ g_slist_free (input);
- g_strfreev (input_as_strv);
+ g_strfreev (input_as_strv);
}
static void
test_slist_to_strv (void)
{
- slist_to_strv (TRUE);
+ slist_to_strv (TRUE);
}
static void
test_slist_to_strv_nonutf8 (void)
{
- slist_to_strv (FALSE);
+ slist_to_strv (FALSE);
}
static void
async_queue_to_strv (gboolean utf8)
{
- GQueue *queue;
- gint i;
- gchar **queue_as_strv;
- gint strings = 5;
-
- queue = g_queue_new ();
-
- for (i = 0; i < strings; i++) {
- if (utf8) {
- g_queue_push_tail (queue, g_strdup_printf ("%d", i));
- } else {
- g_queue_push_tail (queue, g_strdup (tracker_test_helpers_get_nonutf8 ()));
- }
- }
- g_assert_cmpint (g_queue_get_length (queue), ==, strings);
-
- queue_as_strv = tracker_dbus_queue_str_to_strv (queue, g_queue_get_length (queue));
-
- g_assert_cmpint (g_strv_length (queue_as_strv), ==, (utf8 ? strings : 0));
-
- // Queue empty by tracker_dbus_async_queue_to_strv
- g_queue_free (queue);
- g_strfreev (queue_as_strv);
+ GQueue *queue;
+ gint i;
+ gchar **queue_as_strv;
+ gint strings = 5;
+
+ queue = g_queue_new ();
+
+ for (i = 0; i < strings; i++) {
+ if (utf8) {
+ g_queue_push_tail (queue, g_strdup_printf ("%d", i));
+ } else {
+ g_queue_push_tail (queue, g_strdup (tracker_test_helpers_get_nonutf8 ()));
+ }
+ }
+ g_assert_cmpint (g_queue_get_length (queue), ==, strings);
+
+ queue_as_strv = tracker_dbus_queue_str_to_strv (queue, g_queue_get_length (queue));
+
+ g_assert_cmpint (g_strv_length (queue_as_strv), ==, (utf8 ? strings : 0));
+
+ // Queue empty by tracker_dbus_async_queue_to_strv
+ g_queue_free (queue);
+ g_strfreev (queue_as_strv);
}
@@ -95,13 +95,13 @@
static void
test_async_queue_to_strv (void)
{
- async_queue_to_strv (TRUE);
+ async_queue_to_strv (TRUE);
}
static void
test_async_queue_to_strv_nonutf8 (void)
{
- async_queue_to_strv (FALSE);
+ async_queue_to_strv (FALSE);
}
static void
@@ -133,14 +133,14 @@
GError *error = NULL;
/* Default case: we set the error */
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
tracker_dbus_request_failed (1, &error, "Test Error message");
}
g_test_trap_assert_stderr ("*Test Error message*");
/* Second common case: we have already the error and want only the log line */
error = g_error_new (1000, -1, "The indexer founded an error");
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
tracker_dbus_request_failed (1, &error, NULL);
}
g_test_trap_assert_stderr ("*The indexer founded an error*");
@@ -149,7 +149,7 @@
/* Wrong use: error set and we add a new message */
error = g_error_new (1000, -1, "The indexer founded an error");
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
tracker_dbus_request_failed (1, &error, "Dont do this");
}
g_test_trap_assert_stderr ("*GError set over the top of a previous GError or uninitialized memory*");
@@ -157,7 +157,7 @@
error = NULL;
/* Wrong use: no error, no message */
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
tracker_dbus_request_failed (1, &error, NULL);
}
g_test_trap_assert_stderr ("*Unset error and no error message*");
@@ -166,22 +166,22 @@
int
main (int argc, char **argv) {
- int result;
+ int result;
g_type_init ();
- g_thread_init (NULL);
+ g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/libtracker-common/tracker-dbus/slist_to_strv_ok", test_slist_to_strv);
- g_test_add_func ("/libtracker-common/tracker-dbus/slist_to_strv_nonutf8", test_slist_to_strv_nonutf8);
- g_test_add_func ("/libtracker-common/tracker-dbus/async_queue_to_strv_ok", test_async_queue_to_strv);
- g_test_add_func ("/libtracker-common/tracker-dbus/async_queue_to_strv_nonutf8", test_async_queue_to_strv_nonutf8);
+ g_test_add_func ("/libtracker-common/tracker-dbus/slist_to_strv_ok", test_slist_to_strv);
+ g_test_add_func ("/libtracker-common/tracker-dbus/slist_to_strv_nonutf8", test_slist_to_strv_nonutf8);
+ g_test_add_func ("/libtracker-common/tracker-dbus/async_queue_to_strv_ok", test_async_queue_to_strv);
+ g_test_add_func ("/libtracker-common/tracker-dbus/async_queue_to_strv_nonutf8", test_async_queue_to_strv_nonutf8);
g_test_add_func ("/libtracker-common/tracker-dbus/free_ptr_array", test_results_ptr_array_free);
g_test_add_func ("/libtracker-common/tracker-dbus/dbus_request_failed", test_dbus_request_failed);
- result = g_test_run ();
+ result = g_test_run ();
tracker_test_helpers_free_nonutf8 ();
- return result;
+ 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 15:12:19 2008
@@ -6,71 +6,71 @@
static void
test_type_to_string ()
{
- const gchar *result;
- TrackerFieldType type;
+ const gchar *result;
+ TrackerFieldType type;
- type = TRACKER_FIELD_TYPE_KEYWORD;
- result = tracker_field_type_to_string (type);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "keyword"));
+ type = TRACKER_FIELD_TYPE_KEYWORD;
+ result = tracker_field_type_to_string (type);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "keyword"));
type = TRACKER_FIELD_TYPE_INDEX;
- result = tracker_field_type_to_string (type);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "index"));
+ result = tracker_field_type_to_string (type);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "index"));
type = TRACKER_FIELD_TYPE_FULLTEXT;
- result = tracker_field_type_to_string (type);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "fulltext"));
+ result = tracker_field_type_to_string (type);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "fulltext"));
type = TRACKER_FIELD_TYPE_STRING;
- result = tracker_field_type_to_string (type);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "string"));
+ result = tracker_field_type_to_string (type);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "string"));
- type = TRACKER_FIELD_TYPE_INTEGER;
- result = tracker_field_type_to_string (type);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "integer"));
+ type = TRACKER_FIELD_TYPE_INTEGER;
+ result = tracker_field_type_to_string (type);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "integer"));
type = TRACKER_FIELD_TYPE_DOUBLE;
- result = tracker_field_type_to_string (type);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "double"));
+ result = tracker_field_type_to_string (type);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "double"));
type = TRACKER_FIELD_TYPE_DATE;
- result = tracker_field_type_to_string (type);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "date"));
+ result = tracker_field_type_to_string (type);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "date"));
- type = TRACKER_FIELD_TYPE_BLOB;
- result = tracker_field_type_to_string (type);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "blob"));
-
- type = TRACKER_FIELD_TYPE_STRUCT;
- result = tracker_field_type_to_string (type);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "struct"));
-
- type = TRACKER_FIELD_TYPE_LINK;
- result = tracker_field_type_to_string (type);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "link"));
+ type = TRACKER_FIELD_TYPE_BLOB;
+ result = tracker_field_type_to_string (type);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "blob"));
+
+ type = TRACKER_FIELD_TYPE_STRUCT;
+ result = tracker_field_type_to_string (type);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "struct"));
+
+ type = TRACKER_FIELD_TYPE_LINK;
+ result = tracker_field_type_to_string (type);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "link"));
}
int
main (int argc, char **argv) {
- int result;
+ int result;
g_type_init ();
g_test_init (&argc, &argv, NULL);
- /* Something is not initialized without these lines */
- TrackerField *field = tracker_field_new ();
- g_object_unref (field);
+ /* Something is not initialized without these lines */
+ TrackerField *field = tracker_field_new ();
+ g_object_unref (field);
- /* Init */
+ /* Init */
- g_test_add_func ("/libtracker-common/tracker-field/type_to_string",
- test_type_to_string);
+ g_test_add_func ("/libtracker-common/tracker-field/type_to_string",
+ test_type_to_string);
- result = g_test_run ();
+ result = g_test_run ();
- /* End */
+ /* End */
- return result;
+ 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 15:12:19 2008
@@ -31,74 +31,74 @@
static GSList *
array_as_list (gchar **array)
{
- gint i;
- GSList *result = NULL;
+ gint i;
+ GSList *result = NULL;
- for (i = 0; array[i] != NULL; i++) {
- result = g_slist_prepend (result, g_strdup(array[i]));
+ for (i = 0; array[i] != NULL; i++) {
+ result = g_slist_prepend (result, g_strdup(array[i]));
- }
+ }
- return result;
+ return result;
}
static gboolean
string_in_list (GSList *list, const gchar *string)
{
- GSList *it;
- for ( it = list; it != NULL; it = it->next) {
- if (strcmp (it->data, string) == 0) {
- return TRUE;
- }
- }
- return FALSE;
+ GSList *it;
+ for ( it = list; it != NULL; it = it->next) {
+ if (strcmp (it->data, string) == 0) {
+ return TRUE;
+ }
+ }
+ return FALSE;
}
static void
test_path_list_filter_duplicates (void)
{
- gchar *input_roots [] = {"/home", "/home/ivan", "/tmp", "/usr/", "/usr/share/local", NULL};
+ gchar *input_roots [] = {"/home", "/home/ivan", "/tmp", "/usr/", "/usr/share/local", NULL};
- GSList *input_as_list = NULL;
- GSList *result;
+ GSList *input_as_list = NULL;
+ GSList *result;
- input_as_list = array_as_list (input_roots);
+ input_as_list = array_as_list (input_roots);
- result = tracker_path_list_filter_duplicates (input_as_list);
- g_assert_cmpint (3, ==, g_slist_length (result));
+ 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"));
+ g_assert (string_in_list (result, "/home"));
+ g_assert (string_in_list (result, "/tmp"));
+ g_assert (string_in_list (result, "/usr"));
- g_slist_foreach (input_as_list, (GFunc) g_free, NULL);
+ g_slist_foreach (input_as_list, (GFunc) g_free, NULL);
}
static void
test_path_evaluate_name (void)
{
- gchar *result, *expected;
+ gchar *result, *expected;
- const gchar *home = g_getenv ("HOME");
- const gchar *pwd = g_getenv ("PWD");
+ const gchar *home = g_getenv ("HOME");
+ const gchar *pwd = g_getenv ("PWD");
- const gchar *test = "/one/two";
- gchar *parent_dir;
+ const gchar *test = "/one/two";
+ gchar *parent_dir;
- g_setenv ("TEST_TRACKER_DIR", test, TRUE);
+ 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);
+ 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!
- * Must it remove the end '/' or not?
- */
- result = tracker_path_evaluate_name ("/home/user/all/dir/");
- tracker_test_helpers_cmpstr_equal (result, "/home/user/all/dir");
- g_free (result);
+ /* 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/");
+ tracker_test_helpers_cmpstr_equal (result, "/home/user/all/dir");
+ g_free (result);
/*
@@ -106,81 +106,81 @@
*/
result = tracker_path_evaluate_name ("~/all/dir/");
expected = g_build_path (G_DIR_SEPARATOR_S, home, "/all/dir/", NULL);
- tracker_test_helpers_cmpstr_equal (result, expected);
+ tracker_test_helpers_cmpstr_equal (result, expected);
- g_free (result);
+ g_free (result);
g_free (expected);
- result = tracker_path_evaluate_name ("$HOME/all/dir/");
+ result = tracker_path_evaluate_name ("$HOME/all/dir/");
expected = g_build_path (G_DIR_SEPARATOR_S, home, "/all/dir", NULL);
- tracker_test_helpers_cmpstr_equal (result, expected);
+ tracker_test_helpers_cmpstr_equal (result, expected);
- g_free (result);
+ g_free (result);
g_free (expected);
- result = tracker_path_evaluate_name ("${HOME}/all/dir/");
+ result = tracker_path_evaluate_name ("${HOME}/all/dir/");
expected = g_build_path (G_DIR_SEPARATOR_S, home, "/all/dir", NULL);
tracker_test_helpers_cmpstr_equal (result, expected);
- g_free (result);
+ g_free (result);
g_free (expected);
- result = tracker_path_evaluate_name ("./test/current/dir");
+ result = tracker_path_evaluate_name ("./test/current/dir");
expected = g_build_path (G_DIR_SEPARATOR_S, pwd, "/test/current/dir", NULL);
- tracker_test_helpers_cmpstr_equal (result, expected);
+ tracker_test_helpers_cmpstr_equal (result, expected);
- g_free (result);
+ g_free (result);
g_free (expected);
- result = tracker_path_evaluate_name ("$TEST_TRACKER_DIR/test/dir");
+ result = tracker_path_evaluate_name ("$TEST_TRACKER_DIR/test/dir");
expected = g_build_path (G_DIR_SEPARATOR_S, test, "/test/dir", NULL);
- tracker_test_helpers_cmpstr_equal (result, expected);
+ tracker_test_helpers_cmpstr_equal (result, expected);
- g_free (result);
+ g_free (result);
g_free (expected);
- result = tracker_path_evaluate_name ("../test/dir");
- parent_dir = g_path_get_dirname (pwd);
+ result = tracker_path_evaluate_name ("../test/dir");
+ parent_dir = g_path_get_dirname (pwd);
expected = g_build_path (G_DIR_SEPARATOR_S, parent_dir, "/test/dir", NULL);
- tracker_test_helpers_cmpstr_equal (result, expected);
+ tracker_test_helpers_cmpstr_equal (result, expected);
- g_free (result);
- g_free (parent_dir);
+ g_free (result);
+ g_free (parent_dir);
g_free (expected);
- result = tracker_path_evaluate_name ("");
- g_assert (!result);
+ result = tracker_path_evaluate_name ("");
+ g_assert (!result);
- result = tracker_path_evaluate_name (NULL);
- g_assert (!result);
+ result = tracker_path_evaluate_name (NULL);
+ g_assert (!result);
- result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ());
- tracker_test_helpers_cmpstr_equal (result,
- tracker_test_helpers_get_nonutf8 ());
+ result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ());
+ tracker_test_helpers_cmpstr_equal (result,
+ tracker_test_helpers_get_nonutf8 ());
- g_unsetenv ("TEST_TRACKER_DIR");
+ g_unsetenv ("TEST_TRACKER_DIR");
}
static void
test_file_get_mime_type (void)
{
- gchar *dir_name, *result;
- GFile *dir;
+ gchar *dir_name, *result;
+ GFile *dir;
- /* Create test directory */
- dir_name = g_build_filename (g_get_tmp_dir (), "tracker-test", NULL);
- dir = g_file_new_for_path (dir_name);
- g_file_make_directory (dir, NULL, NULL);
-
- result = tracker_file_get_mime_type (dir_name);
-
- g_assert (tracker_test_helpers_cmpstr_equal (result, "inode/directory"));
-
- /* Remove test directory */
- g_file_delete (dir, NULL, NULL);
- g_object_unref (dir);
- g_free (dir_name);
+ /* Create test directory */
+ dir_name = g_build_filename (g_get_tmp_dir (), "tracker-test", NULL);
+ dir = g_file_new_for_path (dir_name);
+ g_file_make_directory (dir, NULL, NULL);
+
+ result = tracker_file_get_mime_type (dir_name);
+
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "inode/directory"));
+
+ /* Remove test directory */
+ g_file_delete (dir, NULL, NULL);
+ g_object_unref (dir);
+ g_free (dir_name);
}
static void
@@ -214,7 +214,7 @@
name = NULL;
path = NULL;
/*
- * TODO: Fix this case
+ * TODO: Fix this case
*
tracker_file_get_path_and_name ("file:///home/ivan//test/file.txt",
&path,
@@ -235,25 +235,25 @@
int
main (int argc, char **argv)
{
- int result;
+ int result;
g_type_init ();
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/tracker/libtracker-common/tracker-file-utils/path_evaluate_name",
- test_path_evaluate_name);
+ g_test_add_func ("/tracker/libtracker-common/tracker-file-utils/path_evaluate_name",
+ test_path_evaluate_name);
- g_test_add_func ("/tracker/libtracker-common/tracker-file-utils/path_list_filter_duplicates",
- test_path_list_filter_duplicates);
+ g_test_add_func ("/tracker/libtracker-common/tracker-file-utils/path_list_filter_duplicates",
+ test_path_list_filter_duplicates);
- g_test_add_func ("/tracker/libtracker-common/tracker-file-utils/file_get_mime_type",
- test_file_get_mime_type);
+ g_test_add_func ("/tracker/libtracker-common/tracker-file-utils/file_get_mime_type",
+ test_file_get_mime_type);
g_test_add_func ("/libtracker_common/tracker-file-utils/file_get_path_and_name",
test_file_get_path_and_name);
- result = g_test_run ();
+ result = g_test_run ();
- return result;
+ return 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 15:12:19 2008
@@ -31,7 +31,7 @@
static gboolean
test_cmp_servicedef_equals (TrackerService *one,
- TrackerService *two)
+ TrackerService *two)
{
if (one && !two) {
return FALSE;
@@ -63,46 +63,46 @@
static GSList *
array_to_list (char **array)
{
- GSList *list = NULL;
- int i;
+ GSList *list = NULL;
+ int i;
- for (i = 0; array[i] != NULL; 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,
- TrackerFieldType data_type,
- const gchar *field_name,
- gboolean multiple_values,
- GSList *child_ids)
-{
- TrackerField *field;
-
- field = tracker_field_new ();
-
- tracker_field_set_id (field, id);
- tracker_field_set_name (field, name);
- tracker_field_set_data_type (field, data_type);
- tracker_field_set_field_name (field, field_name);
- tracker_field_set_multiple_values (field, multiple_values);
- tracker_field_set_child_ids (field, child_ids);
+ const gchar *name,
+ TrackerFieldType data_type,
+ const gchar *field_name,
+ gboolean multiple_values,
+ GSList *child_ids)
+{
+ TrackerField *field;
+
+ field = tracker_field_new ();
+
+ tracker_field_set_id (field, id);
+ tracker_field_set_name (field, name);
+ tracker_field_set_data_type (field, data_type);
+ tracker_field_set_field_name (field, field_name);
+ tracker_field_set_multiple_values (field, multiple_values);
+ tracker_field_set_child_ids (field, child_ids);
- return field;
+ return field;
}
static TrackerService *
-create_service_definition (gint id,
+create_service_definition (gint id,
const gchar *name,
const gchar *parent,
const gchar *prefix,
- gboolean embedded)
+ gboolean embedded)
{
- TrackerService *def;
+ TrackerService *def;
/* array_to_list use prepend, so use reverse order here */
gchar *key_metadata [] = {
"Key:Metadata2",
@@ -110,17 +110,17 @@
NULL
};
- def = tracker_service_new ();
- tracker_service_set_id (def, id);
- tracker_service_set_name (def, name);
- tracker_service_set_parent (def, parent);
+ def = tracker_service_new ();
+ tracker_service_set_id (def, id);
+ tracker_service_set_name (def, name);
+ tracker_service_set_parent (def, parent);
tracker_service_set_property_prefix (def, prefix);
- tracker_service_set_db_type (def, TRACKER_DB_TYPE_CONTENT);
- tracker_service_set_enabled (def, FALSE);
- tracker_service_set_embedded (def, embedded);
- tracker_service_set_has_thumbs (def, TRUE);
- tracker_service_set_has_full_text (def, TRUE);
- tracker_service_set_has_metadata (def, FALSE);
+ tracker_service_set_db_type (def, TRACKER_DB_TYPE_CONTENT);
+ tracker_service_set_enabled (def, FALSE);
+ tracker_service_set_embedded (def, embedded);
+ tracker_service_set_has_thumbs (def, TRUE);
+ tracker_service_set_has_full_text (def, TRUE);
+ tracker_service_set_has_metadata (def, FALSE);
tracker_service_set_key_metadata (def, array_to_list (key_metadata));
return def;
@@ -137,25 +137,25 @@
tracker_services_general_setup ()
{
TrackerService *def, *parent_def, *other_def;
- TrackerService *conv_def, *gaim_def, *gossip_def, *new_gaim_def;
- TrackerField *field_title;
+ TrackerService *conv_def, *gaim_def, *gossip_def, *new_gaim_def;
+ TrackerField *field_title;
GSList *mimes, *mime_prefixes;
def = create_service_definition (0, "Test service", "Parent service", NULL, TRUE);
parent_def = create_service_definition (1, "Parent service", NULL, NULL, FALSE);
- other_def = create_service_definition (2, "Applications", NULL, "App", FALSE);
- conv_def = create_service_definition (3, "Conversations", NULL, NULL, FALSE);
- gaim_def = create_service_definition (4, "GaimConversations", "Conversations", NULL, FALSE);
- 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",
- TRACKER_FIELD_TYPE_INDEX,
- "Title",
- TRUE,
- NULL);
+ other_def = create_service_definition (2, "Applications", NULL, "App", FALSE);
+ conv_def = create_service_definition (3, "Conversations", NULL, NULL, FALSE);
+ gaim_def = create_service_definition (4, "GaimConversations", "Conversations", NULL, FALSE);
+ 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",
+ TRACKER_FIELD_TYPE_INDEX,
+ "Title",
+ TRUE,
+ NULL);
char * m[] = {"application/rtf", "text/joke", "test/1", NULL};
mimes = array_to_list (m);
@@ -164,19 +164,19 @@
mime_prefixes = array_to_list (mp);
tracker_ontology_init ();
- expected_results = g_new0 (ExpectedResults, 1);
- expected_results->def = def;
+ 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 (parent_def, mimes, mime_prefixes);
- tracker_ontology_service_add (other_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);
+ tracker_ontology_field_add (field_title);
g_slist_free (mimes);
g_slist_free (mime_prefixes);
@@ -317,11 +317,11 @@
static void
test_field_in_ontology (void)
{
- TrackerField *field;
+ TrackerField *field;
- field = tracker_ontology_get_field_by_name ("App.Title");
- g_assert (field);
- g_assert (!tracker_ontology_get_field_by_name ("nooooo"));
+ field = tracker_ontology_get_field_by_name ("App.Title");
+ g_assert (field);
+ g_assert (!tracker_ontology_get_field_by_name ("nooooo"));
}
static void
@@ -387,39 +387,39 @@
int
main (int argc, char **argv)
{
- int result;
+ int result;
g_type_init ();
g_test_init (&argc, &argv, NULL);
- tracker_services_general_setup ();
+ tracker_services_general_setup ();
g_test_add_func ("/libtracker-common/tracker-ontology/get_id_for_service",
- test_get_id_for_service);
+ test_get_id_for_service);
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);
+ 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",
- test_get_parent_id_for_service_id);
+ test_get_parent_id_for_service_id);
g_test_add_func ("/libtracker-common/tracker-ontology/get_parent_service",
- test_get_parent_service);
+ test_get_parent_service);
g_test_add_func ("/libtracker-common/tracker-ontology/get_service_type_for_mime",
- test_get_service_type_for_mime);
+ test_get_service_type_for_mime);
g_test_add_func ("/libtracker-common/tracker-ontology/get_service",
- test_get_service);
+ test_get_service);
g_test_add_func ("/libtracker-common/tracker-ontology/get_db_for_service",
- test_get_db_for_service);
+ test_get_db_for_service);
g_test_add_func ("/libtracker-common/tracker-ontology/is_service_embedded",
- test_is_service_embedded);
+ test_is_service_embedded);
g_test_add_func ("/libtracker-common/tracker-ontology/has_thumbnails",
- test_has_thumbnails);
+ test_has_thumbnails);
g_test_add_func ("/libtracker-common/tracker-ontology/has_text",
- test_has_text);
+ test_has_text);
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);
+ test_has_metadata);
+ g_test_add_func ("/libtracker-common/tracker-ontology/test_field_in_ontology",
+ test_field_in_ontology);
g_test_add_func ("/libtracker-common/tracker-ontology/test_get_all_registered_service_types",
test_get_registered_service_types);
@@ -429,9 +429,9 @@
g_test_add_func ("/libtracker-common/tracker-ontology/test_metadata_key_in_service",
test_metadata_key_in_service);
- result = g_test_run ();
+ result = g_test_run ();
- tracker_ontology_shutdown ();
+ tracker_ontology_shutdown ();
- return result;
+ 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 15:12:19 2008
@@ -19,9 +19,9 @@
static void
assert_key_length (gpointer key, gpointer value, gpointer user_data)
{
- gint max_length = GPOINTER_TO_INT (user_data);
+ gint max_length = GPOINTER_TO_INT (user_data);
- g_assert_cmpint (strlen (key), <=, max_length);
+ g_assert_cmpint (strlen (key), <=, max_length);
}
/*
@@ -30,20 +30,20 @@
static void
test_parser_text_max_words_to_index (void)
{
- GHashTable *result = NULL;
+ GHashTable *result = NULL;
- result = tracker_parser_text (result,
- SAMPLE_TEXT,
- 1,
- language,
- 5, /* max words to index */
- 18, /* max length of the word */
- 3, /* min length of the word */
- FALSE, FALSE); /* Filter / Delimit */
+ result = tracker_parser_text (result,
+ SAMPLE_TEXT,
+ 1,
+ language,
+ 5, /* max words to index */
+ 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_assert_cmpint (g_hash_table_size (result), ==, 5);
- g_hash_table_unref (result);
+ g_hash_table_unref (result);
}
/*
@@ -52,22 +52,22 @@
static void
test_parser_text_max_length (void)
{
- GHashTable *result = NULL;
- gint max_length;
+ GHashTable *result = NULL;
+ gint max_length;
- max_length = 6;
- result = tracker_parser_text (result,
- SAMPLE_TEXT,
- 1,
- language,
- 10, /* max words to index */
- max_length, /* max length of the word */
- 3, /* min length of the word */
- FALSE, FALSE); /* Filter / Delimit */
- g_hash_table_foreach (result, assert_key_length, GINT_TO_POINTER (max_length));
- g_assert_cmpint (g_hash_table_size (result), ==, 8);
+ max_length = 6;
+ result = tracker_parser_text (result,
+ SAMPLE_TEXT,
+ 1,
+ language,
+ 10, /* max words to index */
+ max_length, /* max length of the word */
+ 3, /* min length of the word */
+ FALSE, FALSE); /* Filter / Delimit */
+ g_hash_table_foreach (result, assert_key_length, GINT_TO_POINTER (max_length));
+ g_assert_cmpint (g_hash_table_size (result), ==, 8);
- g_hash_table_unref (result);
+ g_hash_table_unref (result);
}
/*
@@ -76,119 +76,119 @@
static void
test_parser_text_filter_numbers_stop_words (void)
{
- GHashTable *result = NULL;
+ GHashTable *result = NULL;
- /* Filtering numbers */
- result = tracker_parser_text (result,
- SAMPLE_TEXT,
- 1,
- language,
- 100, /* max words to index */
- 100, /* max length of the word */
- 0, /* min length of the word */
- TRUE, FALSE); /* Filter / Delimit */
-
- g_assert (!g_hash_table_lookup (result, "12345678"));
-
- g_assert_cmpint (g_hash_table_size (result), ==, 4);
-
- g_hash_table_unref (result);
- result = NULL;
-
- /* No filter */
- result = tracker_parser_text (result,
- SAMPLE_TEXT,
- 1,
- language,
- 100, /* max words to index */
- 100, /* max length of the word */
- 0, /* min length of the word */
- FALSE, FALSE); /* Filter / Delimit */
+ /* Filtering numbers */
+ result = tracker_parser_text (result,
+ SAMPLE_TEXT,
+ 1,
+ language,
+ 100, /* max words to index */
+ 100, /* max length of the word */
+ 0, /* min length of the word */
+ TRUE, FALSE); /* Filter / Delimit */
+
+ g_assert (!g_hash_table_lookup (result, "12345678"));
+
+ g_assert_cmpint (g_hash_table_size (result), ==, 4);
+
+ g_hash_table_unref (result);
+ result = NULL;
+
+ /* No filter */
+ result = tracker_parser_text (result,
+ SAMPLE_TEXT,
+ 1,
+ language,
+ 100, /* max words to index */
+ 100, /* max length of the word */
+ 0, /* min length of the word */
+ FALSE, FALSE); /* Filter / Delimit */
- g_assert_cmpint (g_hash_table_size (result), ==, 11);
+ g_assert_cmpint (g_hash_table_size (result), ==, 11);
- g_assert (g_hash_table_lookup (result, "12345678"));
+ g_assert (g_hash_table_lookup (result, "12345678"));
- g_hash_table_unref (result);
- result = NULL;
+ g_hash_table_unref (result);
+ result = NULL;
}
static void
test_parser_stop_words (void)
{
- GHashTable *stop_words, *result = NULL;
+ GHashTable *stop_words, *result = NULL;
- /* Check we have the default stop words */
- stop_words = tracker_language_get_stop_words (language);
- g_assert (stop_words);
- g_assert_cmpint (g_hash_table_size (stop_words), >, 1);
-
- /* Set specific stop words to test */
- tracker_config_set_language (config, "en");
- g_assert (g_hash_table_lookup (stop_words, "after"));
-
- result = tracker_parser_text (result,
- SAMPLE_TEXT,
- 1,
- language,
- 100, /* max words to index */
- 100, /* max length of the word */
- 1, /* min length of the word */
- TRUE, FALSE); /* Filter / Delimit */
+ /* Check we have the default stop words */
+ stop_words = tracker_language_get_stop_words (language);
+ g_assert (stop_words);
+ g_assert_cmpint (g_hash_table_size (stop_words), >, 1);
+
+ /* Set specific stop words to test */
+ tracker_config_set_language (config, "en");
+ g_assert (g_hash_table_lookup (stop_words, "after"));
+
+ result = tracker_parser_text (result,
+ SAMPLE_TEXT,
+ 1,
+ language,
+ 100, /* max words to index */
+ 100, /* max length of the word */
+ 1, /* min length of the word */
+ TRUE, FALSE); /* Filter / Delimit */
}
static void
test_parser_text_fast (void)
{
- GHashTable *result = NULL;
- const gchar *contents = "one two three four five six seven eight";
+ GHashTable *result = NULL;
+ const gchar *contents = "one two three four five six seven eight";
- result = tracker_parser_text_fast (result, NULL, 1);
+ result = tracker_parser_text_fast (result, NULL, 1);
- g_assert (result);
- g_assert_cmpint (g_hash_table_size (result), ==, 0);
+ g_assert (result);
+ g_assert_cmpint (g_hash_table_size (result), ==, 0);
- result = tracker_parser_text_fast (result, contents, 1);
- g_assert_cmpint (g_hash_table_size (result), ==, 8);
+ result = tracker_parser_text_fast (result, contents, 1);
+ g_assert_cmpint (g_hash_table_size (result), ==, 8);
- result = tracker_parser_text_fast (result, contents, 1);
- g_assert_cmpint (g_hash_table_size (result), ==, 8);
+ result = tracker_parser_text_fast (result, contents, 1);
+ g_assert_cmpint (g_hash_table_size (result), ==, 8);
}
int
main (int argc, char **argv) {
- int result;
+ int result;
g_type_init ();
- g_thread_init (NULL);
+ g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- /* Init */
- config = tracker_config_new ();
- language = tracker_language_new (config);
+ /* Init */
+ config = tracker_config_new ();
+ language = tracker_language_new (config);
- g_test_add_func ("/libtracker-common/tracker-parser/parser_text/max_words_to_index",
- test_parser_text_max_words_to_index);
+ g_test_add_func ("/libtracker-common/tracker-parser/parser_text/max_words_to_index",
+ test_parser_text_max_words_to_index);
- g_test_add_func ("/libtracker-common/tracker-parser/parser_text/max_length",
- test_parser_text_max_length);
+ g_test_add_func ("/libtracker-common/tracker-parser/parser_text/max_length",
+ test_parser_text_max_length);
- g_test_add_func ("/libtracker-common/tracker-parser/parser_text/filter_numbers",
- test_parser_text_filter_numbers_stop_words);
+ g_test_add_func ("/libtracker-common/tracker-parser/parser_text/filter_numbers",
+ test_parser_text_filter_numbers_stop_words);
- g_test_add_func ("/libtracker-common/tracker-parser/stop_words",
- test_parser_stop_words);
+ g_test_add_func ("/libtracker-common/tracker-parser/stop_words",
+ test_parser_stop_words);
- g_test_add_func ("/libtracker-common/tracker-parser/parser_text_fast",
- test_parser_text_fast);
+ g_test_add_func ("/libtracker-common/tracker-parser/parser_text_fast",
+ test_parser_text_fast);
- result = g_test_run ();
+ result = g_test_run ();
- /* End */
- g_object_unref (config);
- g_object_unref (language);
+ /* End */
+ g_object_unref (config);
+ g_object_unref (language);
- return result;
+ return result;
}
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 15:12:19 2008
@@ -32,136 +32,136 @@
static void
test_date_format ()
{
- gchar *result;
+ gchar *result;
- result = tracker_date_format ("");
- g_assert (result == NULL);
+ result = tracker_date_format ("");
+ g_assert (result == NULL);
- /* Fails
- result = tracker_date_format ("1978"); //Audio.ReleaseDate
- g_assert (tracker_test_helpers_cmpstr_equal (result, "1978-01-01T00:00:00"));
- */
+ /* Fails
+ result = tracker_date_format ("1978"); //Audio.ReleaseDate
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "1978-01-01T00:00:00"));
+ */
- result = tracker_date_format ("2008-06-14");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "2008-06-14T00:00:00"));
- g_free (result);
+ result = tracker_date_format ("2008-06-14");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "2008-06-14T00:00:00"));
+ g_free (result);
- result = tracker_date_format ("20080614000000");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "2008-06-14T00:00:00"));
- g_free (result);
+ result = tracker_date_format ("20080614000000");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "2008-06-14T00:00:00"));
+ g_free (result);
- result = tracker_date_format ("20080614000000Z");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "2008-06-14T00:00:00Z"));
- g_free (result);
+ result = tracker_date_format ("20080614000000Z");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "2008-06-14T00:00:00Z"));
+ g_free (result);
- result = tracker_date_format ("Mon Jun 14 04:20:20 2008"); //MS Office
- g_assert (tracker_test_helpers_cmpstr_equal (result, "2008-06-14T04:20:20"));
- g_free (result);
+ result = tracker_date_format ("Mon Jun 14 04:20:20 2008"); //MS Office
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "2008-06-14T04:20:20"));
+ g_free (result);
- result = tracker_date_format ("2008:06:14 04:20:20"); //Exif style
- g_assert (tracker_test_helpers_cmpstr_equal (result, "2008-06-14T04:20:20"));
- g_free (result);
+ result = tracker_date_format ("2008:06:14 04:20:20"); //Exif style
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "2008-06-14T04:20:20"));
+ g_free (result);
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- result = tracker_date_format (NULL);
- }
- g_test_trap_assert_failed ();
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ result = tracker_date_format (NULL);
+ }
+ g_test_trap_assert_failed ();
}
static void
test_string_to_date ()
{
- GDate *expected;
- GDate *result;
- time_t result_time_t;
- gchar *input = "2008-06-16T11:10:10+0600";
+ GDate *expected;
+ GDate *result;
+ time_t result_time_t;
+ 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_time_t = tracker_string_to_date (input);
result = g_date_new ();
g_date_set_time_t (result, result_time_t);
- g_assert_cmpint (g_date_get_year (expected), ==, g_date_get_year (result));
- g_assert_cmpint (g_date_get_day (expected), ==, g_date_get_day (result));
- g_assert_cmpint (g_date_get_month (expected), ==, g_date_get_month (result));
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- result_time_t = tracker_string_to_date (NULL);
- }
- g_test_trap_assert_failed ();
-
- result_time_t = tracker_string_to_date ("");
- g_assert_cmpint (result_time_t, ==, -1);
-
- 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);
- */
+ g_assert_cmpint (g_date_get_year (expected), ==, g_date_get_year (result));
+ g_assert_cmpint (g_date_get_day (expected), ==, g_date_get_day (result));
+ g_assert_cmpint (g_date_get_month (expected), ==, g_date_get_month (result));
+
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ result_time_t = tracker_string_to_date (NULL);
+ }
+ g_test_trap_assert_failed ();
+
+ result_time_t = tracker_string_to_date ("");
+ g_assert_cmpint (result_time_t, ==, -1);
+
+ 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);
+ */
}
static void
test_date_to_string ()
{
- struct tm *original;
- time_t input;
- gchar *result;
-
- original = g_new0 (struct tm, 1);
- original->tm_sec = 10;
- original->tm_min = 53;
- original->tm_hour = 23;
- original->tm_mday = 16;
- original->tm_mon = 5;
- original->tm_year = 108;
- original->tm_isdst = 1;
+ struct tm *original;
+ time_t input;
+ gchar *result;
+
+ original = g_new0 (struct tm, 1);
+ original->tm_sec = 10;
+ original->tm_min = 53;
+ original->tm_hour = 23;
+ original->tm_mday = 16;
+ original->tm_mon = 5;
+ original->tm_year = 108;
+ original->tm_isdst = 1;
- input = mktime (original);
+ input = mktime (original);
- result = tracker_date_to_string (input);
+ result = tracker_date_to_string (input);
- g_assert (result != NULL && strncmp (result, "2008-06-16T23:53:10", 19) == 0);
+ g_assert (result != NULL && strncmp (result, "2008-06-16T23:53:10", 19) == 0);
}
static void
test_long_to_string ()
{
- glong n;
- gchar *result;
+ glong n;
+ gchar *result;
- n = 10050;
- result = tracker_glong_to_string (n);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "10050"));
- g_free (result);
-
- n = -9950;
- result = tracker_glong_to_string (n);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "-9950"));
- g_free (result);
+ n = 10050;
+ result = tracker_glong_to_string (n);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "10050"));
+ g_free (result);
+
+ n = -9950;
+ result = tracker_glong_to_string (n);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "-9950"));
+ g_free (result);
}
static void
test_int_to_string ()
{
- gint n;
- gchar *result;
+ gint n;
+ gchar *result;
- n = 654;
- result = tracker_gint_to_string (n);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "654"));
- g_free (result);
-
- n = -963;
- result = tracker_gint_to_string (n);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "-963"));
- g_free (result);
+ n = 654;
+ result = tracker_gint_to_string (n);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "654"));
+ g_free (result);
+
+ n = -963;
+ result = tracker_gint_to_string (n);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "-963"));
+ g_free (result);
}
@@ -169,30 +169,30 @@
static void
test_uint_to_string ()
{
- guint n;
- gchar *result;
+ guint n;
+ gchar *result;
- n = 100;
- result = tracker_guint_to_string (n);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "100"));
- g_free (result);
+ n = 100;
+ result = tracker_guint_to_string (n);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "100"));
+ g_free (result);
}
static void
test_gint32_to_string ()
{
- gint32 n;
- gchar *result;
+ gint32 n;
+ gchar *result;
- n = 100;
- result = tracker_gint32_to_string (n);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "100"));
- g_free (result);
-
- n = -96;
- result = tracker_gint32_to_string (n);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "-96"));
- g_free (result);
+ n = 100;
+ result = tracker_gint32_to_string (n);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "100"));
+ g_free (result);
+
+ n = -96;
+ result = tracker_gint32_to_string (n);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "-96"));
+ g_free (result);
}
@@ -200,13 +200,13 @@
static void
test_guint32_to_string ()
{
- guint32 n;
- gchar *result;
+ guint32 n;
+ gchar *result;
- n = 100;
- result = tracker_guint32_to_string (n);
- g_assert (tracker_test_helpers_cmpstr_equal (result, "100"));
- g_free (result);
+ n = 100;
+ result = tracker_guint32_to_string (n);
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "100"));
+ g_free (result);
}
@@ -214,211 +214,211 @@
static void
test_string_to_uint ()
{
- guint num_result, rc;
+ guint num_result, rc;
- rc = tracker_string_to_uint ("10", &num_result);
+ rc = tracker_string_to_uint ("10", &num_result);
- g_assert (rc);
- g_assert_cmpint (num_result, ==, 10);
+ g_assert (rc);
+ g_assert_cmpint (num_result, ==, 10);
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- rc = tracker_string_to_uint (NULL, &num_result);
- }
- g_test_trap_assert_failed ();
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ rc = tracker_string_to_uint (NULL, &num_result);
+ }
+ g_test_trap_assert_failed ();
- // ???? FIXME
- rc = tracker_string_to_uint ("-20", &num_result);
- // ????
+ // ???? FIXME
+ rc = tracker_string_to_uint ("-20", &num_result);
+ // ????
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- tracker_string_to_uint (NULL, &num_result);
- }
- g_test_trap_assert_failed ();
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ tracker_string_to_uint (NULL, &num_result);
+ }
+ g_test_trap_assert_failed ();
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- tracker_string_to_uint ("199", NULL);
- }
- g_test_trap_assert_failed ();
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ tracker_string_to_uint ("199", NULL);
+ }
+ g_test_trap_assert_failed ();
- rc = tracker_string_to_uint ("i am not a number", &num_result);
- g_assert (!rc);
- g_assert_cmpint (rc, ==, 0);
+ rc = tracker_string_to_uint ("i am not a number", &num_result);
+ g_assert (!rc);
+ g_assert_cmpint (rc, ==, 0);
}
static void
test_string_in_string_list ()
{
- gchar *complete = "This is an extract of text with different terms an props like Audio:Title ...";
- gchar **pieces;
+ gchar *complete = "This is an extract of text with different terms an props like Audio:Title ...";
+ gchar **pieces;
- pieces = g_strsplit (complete, " ", -1);
+ pieces = g_strsplit (complete, " ", -1);
- g_assert_cmpint (tracker_string_in_string_list ("is", pieces), ==, 1);
- g_assert_cmpint (tracker_string_in_string_list ("Audio:Title", pieces), ==, 12);
+ g_assert_cmpint (tracker_string_in_string_list ("is", pieces), ==, 1);
+ g_assert_cmpint (tracker_string_in_string_list ("Audio:Title", pieces), ==, 12);
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- g_assert_cmpint (tracker_string_in_string_list (NULL, pieces), ==, -1);
- }
- g_test_trap_assert_failed ();
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- g_assert_cmpint (tracker_string_in_string_list ("terms", NULL), ==, -1);
- }
- g_test_trap_assert_failed ();
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ g_assert_cmpint (tracker_string_in_string_list (NULL, pieces), ==, -1);
+ }
+ g_test_trap_assert_failed ();
+
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ g_assert_cmpint (tracker_string_in_string_list ("terms", NULL), ==, -1);
+ }
+ g_test_trap_assert_failed ();
}
static void
test_gslist_to_string_list ()
{
- GSList *input = NULL;
- gchar **result;
+ GSList *input = NULL;
+ gchar **result;
- input = g_slist_prepend (input, "four");
- input = g_slist_prepend (input, "three");
- input = g_slist_prepend (input, "two");
- input = g_slist_prepend (input, "one");
-
- result = tracker_gslist_to_string_list (input);
-
- g_assert (tracker_test_helpers_cmpstr_equal (result[0], "one")
- && tracker_test_helpers_cmpstr_equal (result[1], "two")
- && tracker_test_helpers_cmpstr_equal (result[2], "three")
- && tracker_test_helpers_cmpstr_equal (result[3], "four"));
-
- g_strfreev (result);
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- result = tracker_gslist_to_string_list (NULL);
- }
- g_test_trap_assert_failed ();
+ input = g_slist_prepend (input, "four");
+ input = g_slist_prepend (input, "three");
+ input = g_slist_prepend (input, "two");
+ input = g_slist_prepend (input, "one");
+
+ result = tracker_gslist_to_string_list (input);
+
+ g_assert (tracker_test_helpers_cmpstr_equal (result[0], "one")
+ && tracker_test_helpers_cmpstr_equal (result[1], "two")
+ && tracker_test_helpers_cmpstr_equal (result[2], "three")
+ && tracker_test_helpers_cmpstr_equal (result[3], "four"));
+
+ g_strfreev (result);
+
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ result = tracker_gslist_to_string_list (NULL);
+ }
+ g_test_trap_assert_failed ();
}
static void
test_string_list_to_string ()
{
- gchar *input = "one two three four";
- gchar **pieces;
- gchar *result;
+ gchar *input = "one two three four";
+ gchar **pieces;
+ gchar *result;
- pieces = g_strsplit (input, " ", 4);
+ 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);
+ result = tracker_string_list_to_string (pieces, 4, ' ');
+ g_assert (tracker_test_helpers_cmpstr_equal (input, result));
+ g_free (result);
- result = tracker_string_list_to_string (pieces, 3, '_');
- g_assert (tracker_test_helpers_cmpstr_equal ("one_two_three", result));
- g_free (result);
+ result = tracker_string_list_to_string (pieces, 3, '_');
+ g_assert (tracker_test_helpers_cmpstr_equal ("one_two_three", result));
+ g_free (result);
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- result = tracker_string_list_to_string (NULL, 6, 'x');
- }
- g_test_trap_assert_failed ();
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ result = tracker_string_list_to_string (NULL, 6, 'x');
+ }
+ g_test_trap_assert_failed ();
- result = tracker_string_list_to_string (pieces, -1, ' ');
- g_assert (tracker_test_helpers_cmpstr_equal (input, result));
- g_free (result);
+ result = tracker_string_list_to_string (pieces, -1, ' ');
+ g_assert (tracker_test_helpers_cmpstr_equal (input, result));
+ g_free (result);
- result = tracker_string_list_to_string (pieces, 6, ' ');
- g_assert (tracker_test_helpers_cmpstr_equal (input, result));
- g_free (result);
+ result = tracker_string_list_to_string (pieces, 6, ' ');
+ g_assert (tracker_test_helpers_cmpstr_equal (input, result));
+ g_free (result);
- g_strfreev (pieces);
+ g_strfreev (pieces);
}
static void
test_boolean_as_text_to_number ()
{
- gchar *result;
+ gchar *result;
- /* Correct true values */
- result = tracker_string_boolean_to_string_gint ("True");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "1"));
- g_free (result);
+ /* Correct true values */
+ result = tracker_string_boolean_to_string_gint ("True");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "1"));
+ g_free (result);
- result = tracker_string_boolean_to_string_gint ("TRUE");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "1"));
- g_free (result);
+ result = tracker_string_boolean_to_string_gint ("TRUE");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "1"));
+ g_free (result);
- result = tracker_string_boolean_to_string_gint ("true");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "1"));
- g_free (result);
+ result = tracker_string_boolean_to_string_gint ("true");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "1"));
+ g_free (result);
- /* Correct false values */
- result = tracker_string_boolean_to_string_gint ("False");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "0"));
- g_free (result);
+ /* Correct false values */
+ result = tracker_string_boolean_to_string_gint ("False");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "0"));
+ g_free (result);
- result = tracker_string_boolean_to_string_gint ("FALSE");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "0"));
- g_free (result);
+ result = tracker_string_boolean_to_string_gint ("FALSE");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "0"));
+ g_free (result);
- result = tracker_string_boolean_to_string_gint ("false");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "0"));
- g_free (result);
+ result = tracker_string_boolean_to_string_gint ("false");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "0"));
+ g_free (result);
- /* Invalid values */
- result = tracker_string_boolean_to_string_gint ("Thrue");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "Thrue"));
- g_free (result);
+ /* Invalid values */
+ result = tracker_string_boolean_to_string_gint ("Thrue");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "Thrue"));
+ g_free (result);
- result = tracker_string_boolean_to_string_gint ("Falsez");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "Falsez"));
- g_free (result);
+ result = tracker_string_boolean_to_string_gint ("Falsez");
+ g_assert (tracker_test_helpers_cmpstr_equal (result, "Falsez"));
+ g_free (result);
- result = tracker_string_boolean_to_string_gint ("Other invalid value");
- g_assert (tracker_test_helpers_cmpstr_equal (result, "Other invalid value"));
- g_free (result);
+ result = tracker_string_boolean_to_string_gint ("Other invalid value");
+ 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);
- }
- g_test_trap_assert_failed ();
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ result = tracker_string_boolean_to_string_gint (NULL);
+ }
+ g_test_trap_assert_failed ();
}
int
main (int argc, char **argv) {
- int result;
+ int result;
g_type_init ();
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/libtracker-common/tracker-type-utils/boolean_as_text_to_number",
- test_boolean_as_text_to_number);
- g_test_add_func ("/libtracker-common/tracker-type-utils/string_list_as_list",
- test_string_list_to_string);
- g_test_add_func ("/libtracker-common/tracker-type-utils/gslist_to_string_list",
- test_gslist_to_string_list);
- g_test_add_func ("/libtracker-common/tracker-type-utils/string_in_string_list",
- test_string_in_string_list);
- g_test_add_func ("/libtracker-common/tracker-type-utils/string_to_uint",
- test_string_to_uint);
- g_test_add_func ("/libtracker-common/tracker-type-utils/guint32_to_string",
- test_guint32_to_string);
- g_test_add_func ("/libtracker-common/tracker-type-utils/gint32_to_string",
- test_gint32_to_string);
- g_test_add_func ("/libtracker-common/tracker-type-utils/uint_to_string",
- test_uint_to_string);
- g_test_add_func ("/libtracker-common/tracker-type-utils/int_to_string",
- test_int_to_string);
- g_test_add_func ("/libtracker-common/tracker-type-utils/long_to_string",
- test_long_to_string);
- g_test_add_func ("/libtracker-common/tracker-type-utils/date_format",
- test_date_format);
- g_test_add_func ("/libtracker-common/tracker-type-utils/date_to_string",
- test_date_to_string);
- g_test_add_func ("/libtracker-common/tracker-type-utils/string_to_date",
- test_string_to_date);
- result = g_test_run ();
+ g_test_add_func ("/libtracker-common/tracker-type-utils/boolean_as_text_to_number",
+ test_boolean_as_text_to_number);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/string_list_as_list",
+ test_string_list_to_string);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/gslist_to_string_list",
+ test_gslist_to_string_list);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/string_in_string_list",
+ test_string_in_string_list);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/string_to_uint",
+ test_string_to_uint);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/guint32_to_string",
+ test_guint32_to_string);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/gint32_to_string",
+ test_gint32_to_string);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/uint_to_string",
+ test_uint_to_string);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/int_to_string",
+ test_int_to_string);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/long_to_string",
+ test_long_to_string);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/date_format",
+ test_date_format);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/date_to_string",
+ test_date_to_string);
+ g_test_add_func ("/libtracker-common/tracker-type-utils/string_to_date",
+ test_string_to_date);
+ result = g_test_run ();
- return result;
+ 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 15:12:19 2008
@@ -27,31 +27,31 @@
static TrackerDBResultSet *
get_mock_tracker_db_result (gint results, gint columns, gboolean set_null) {
- TrackerDBResultSet *mock;
- gint i, j;
+ TrackerDBResultSet *mock;
+ gint i, j;
- mock = _tracker_db_result_set_new (columns);
+ mock = _tracker_db_result_set_new (columns);
- for (i = 0; i < results; i++) {
- _tracker_db_result_set_append (mock);
+ for (i = 0; i < results; i++) {
+ _tracker_db_result_set_append (mock);
- for (j = 0; j < columns; j++) {
+ for (j = 0; j < columns; j++) {
- GValue value = {0,};
+ GValue value = {0,};
gchar * text = g_strdup_printf ("value %d", i);
- g_value_init (&value, G_TYPE_STRING);
- g_value_set_string (&value, (set_null ? NULL : text));
- _tracker_db_result_set_set_value (mock, j, &value);
+ g_value_init (&value, G_TYPE_STRING);
+ g_value_set_string (&value, (set_null ? NULL : text));
+ _tracker_db_result_set_set_value (mock, j, &value);
g_value_unset (&value);
g_free (text);
- }
- }
+ }
+ }
- tracker_db_result_set_rewind (mock);
+ tracker_db_result_set_rewind (mock);
- return mock;
+ return mock;
}
@@ -61,51 +61,51 @@
test_dbus_query_result_to_strv ()
{
- TrackerDBResultSet *result_set = NULL;
- gchar **result;
- gint count;
+ TrackerDBResultSet *result_set = NULL;
+ gchar **result;
+ gint count;
+
+ /* NULL */
+ result = tracker_dbus_query_result_to_strv (result_set, 0, &count);
+ g_assert (result == NULL);
+
+ /* 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);
- /* NULL */
- result = tracker_dbus_query_result_to_strv (result_set, 0, &count);
- g_assert (result == NULL);
+ g_assert_cmpint (count, ==, 5);
+ g_assert_cmpint (g_strv_length (result), ==, 5);
- /* 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_strfreev (result);
+ g_object_unref (result_set);
- g_assert_cmpint (count, ==, 5);
- g_assert_cmpint (g_strv_length (result), ==, 5);
-
- g_strfreev (result);
- g_object_unref (result_set);
-
- /* 0 results, 1 columns */
- result_set = get_mock_tracker_db_result (0, 1, FALSE);
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- result = tracker_dbus_query_result_to_strv (result_set, 0, &count);
- }
- g_test_trap_assert_failed ();
- /* Should raise g_critical (priv->array...); */
+ /* 0 results, 1 columns */
+ result_set = get_mock_tracker_db_result (0, 1, FALSE);
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ result = tracker_dbus_query_result_to_strv (result_set, 0, &count);
+ }
+ g_test_trap_assert_failed ();
+ /* Should raise g_critical (priv->array...); */
- g_object_unref (result_set);
+ 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);
+ /* 1 result ... NULL */
+ result_set = get_mock_tracker_db_result (1, 1, TRUE);
+ result = tracker_dbus_query_result_to_strv (result_set, 0, &count);
- g_assert_cmpint (count, ==, 0);
+ g_assert_cmpint (count, ==, 0);
- g_strfreev (result);
- g_object_unref (result_set);
+ g_strfreev (result);
+ g_object_unref (result_set);
}
static void
test_dbus_query_result_to_hash_table ()
{
- /* TODO: Implement */
- g_print ("- Unimplemented -\n");
+ /* TODO: Implement */
+ g_print ("- Unimplemented -\n");
}
static void
@@ -118,63 +118,63 @@
static void
test_dbus_query_result_to_ptr_array ()
{
- TrackerDBResultSet *result_set = NULL;
- GPtrArray *result = NULL;
+ TrackerDBResultSet *result_set = NULL;
+ GPtrArray *result = NULL;
- /* NULL */
- result = tracker_dbus_query_result_to_ptr_array (result_set);
- g_assert_cmpint (result->len, ==, 0);
+ /* NULL */
+ 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);
+ /* 5 results, 1 column */
+ result_set = get_mock_tracker_db_result (5, 1, FALSE);
+ result = tracker_dbus_query_result_to_ptr_array (result_set);
- g_assert_cmpint (result->len, ==, 5);
+ g_assert_cmpint (result->len, ==, 5);
free_string_ptr_array (result);
- g_object_unref (result_set);
+ g_object_unref (result_set);
/* 0 results, 1 columns */
- result_set = get_mock_tracker_db_result (0, 1, FALSE);
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
- result = tracker_dbus_query_result_to_ptr_array (result_set);
+ result_set = get_mock_tracker_db_result (0, 1, FALSE);
+ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+ result = tracker_dbus_query_result_to_ptr_array (result_set);
free_string_ptr_array (result);
- }
- g_test_trap_assert_failed ();
- /* Should raise g_critical (priv->array...); */
+ }
+ g_test_trap_assert_failed ();
+ /* Should raise g_critical (priv->array...); */
- g_object_unref (result_set);
+ 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);
- g_assert_cmpint (result->len, ==, 1);
+ result_set = get_mock_tracker_db_result (1, 1, TRUE);
+ result = tracker_dbus_query_result_to_ptr_array (result_set);
+ g_assert_cmpint (result->len, ==, 1);
free_string_ptr_array (result);
- g_object_unref (result_set);
+ g_object_unref (result_set);
}
gint
main (gint argc, gchar **argv)
{
- int result;
+ int result;
g_type_init ();
- g_thread_init (NULL);
+ g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_to_strv",
- test_dbus_query_result_to_strv);
- g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_to_hash_table",
- test_dbus_query_result_to_hash_table);
- g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_to_ptr_array",
- test_dbus_query_result_to_ptr_array);
+ g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_to_strv",
+ test_dbus_query_result_to_strv);
+ g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_to_hash_table",
+ test_dbus_query_result_to_hash_table);
+ g_test_add_func ("/libtracker-db/tracker-db-dbus/query_result_to_ptr_array",
+ test_dbus_query_result_to_ptr_array);
- result = g_test_run ();
+ result = g_test_run ();
- /* End */
+ /* End */
- return result;
+ 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 15:12:19 2008
@@ -22,29 +22,29 @@
gboolean
test_assert_query_run (TrackerDB db, const gchar *query)
{
- TrackerDBInterface *iface;
+ TrackerDBInterface *iface;
- iface = tracker_db_manager_get_db_interface (db);
+ iface = tracker_db_manager_get_db_interface (db);
- return test_assert_query_run_on_iface (iface, query);
+ return test_assert_query_run_on_iface (iface, query);
}
gboolean
test_assert_query_run_on_iface (TrackerDBInterface *iface, const gchar *query)
{
- TrackerDBResultSet *result_set;
- GError *error = NULL;
+ TrackerDBResultSet *result_set;
+ GError *error = NULL;
- result_set = tracker_db_interface_execute_query (iface,
- &error,
- query);
-
- if (error && error->message) {
- g_warning ("Error loading query:'%s' - %s", query, error->message);
- g_error_free (error);
- return FALSE;
- }
+ result_set = tracker_db_interface_execute_query (iface,
+ &error,
+ query);
+
+ if (error && error->message) {
+ g_warning ("Error loading query:'%s' - %s", query, error->message);
+ g_error_free (error);
+ return FALSE;
+ }
- return TRUE;
+ return TRUE;
}
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 15:12:19 2008
@@ -25,9 +25,9 @@
typedef enum {
- NO_INIT,
- INIT_NO_REINDEX,
- INIT_REINDEX
+ NO_INIT,
+ INIT_NO_REINDEX,
+ INIT_REINDEX
} Status;
static gboolean db_manager_status = NO_INIT;
@@ -35,39 +35,39 @@
void
ensure_db_manager_is_reindex (gboolean must_reindex)
{
- gint first;
+ gint first;
- if (db_manager_status == NO_INIT) {
- if (must_reindex) {
- tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
- &first);
- db_manager_status = INIT_REINDEX;
- } else {
- tracker_db_manager_init (0, &first);
- db_manager_status = INIT_NO_REINDEX;
- }
- return;
- }
-
- if (db_manager_status == INIT_NO_REINDEX && !must_reindex) {
- // tracker_db_manager is already correctly initialised
- return;
- }
-
- if (db_manager_status == INIT_REINDEX && must_reindex) {
- // tracker_db_manager is already correctly initialised
- return ;
- }
-
- tracker_db_manager_shutdown ();
- if (must_reindex) {
- tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
- &first);
- db_manager_status = INIT_REINDEX;
- } else {
- tracker_db_manager_init (0, &first);
- db_manager_status = INIT_NO_REINDEX;
- }
+ if (db_manager_status == NO_INIT) {
+ if (must_reindex) {
+ tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
+ &first);
+ db_manager_status = INIT_REINDEX;
+ } else {
+ tracker_db_manager_init (0, &first);
+ db_manager_status = INIT_NO_REINDEX;
+ }
+ return;
+ }
+
+ if (db_manager_status == INIT_NO_REINDEX && !must_reindex) {
+ // tracker_db_manager is already correctly initialised
+ return;
+ }
+
+ if (db_manager_status == INIT_REINDEX && must_reindex) {
+ // tracker_db_manager is already correctly initialised
+ return ;
+ }
+
+ tracker_db_manager_shutdown ();
+ if (must_reindex) {
+ tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
+ &first);
+ db_manager_status = INIT_REINDEX;
+ } else {
+ tracker_db_manager_init (0, &first);
+ db_manager_status = INIT_NO_REINDEX;
+ }
}
@@ -77,84 +77,84 @@
void
test_assert_tables_in_db (TrackerDB db, gchar *query)
{
- g_assert (test_assert_query_run (db, query));
+ g_assert (test_assert_query_run (db, query));
}
static void
test_creation_common_db_no_reindex ()
{
- ensure_db_manager_is_reindex (FALSE);
- test_assert_tables_in_db (TRACKER_DB_COMMON, "SELECT * FROM MetaDataTypes");
+ ensure_db_manager_is_reindex (FALSE);
+ test_assert_tables_in_db (TRACKER_DB_COMMON, "SELECT * FROM MetaDataTypes");
}
static void
test_creation_xesam_db_no_reindex_multiple_interfaces ()
{
- TrackerDBInterface *iface;
+ TrackerDBInterface *iface;
- ensure_db_manager_is_reindex (FALSE);
+ ensure_db_manager_is_reindex (FALSE);
- iface = tracker_db_manager_get_db_interfaces (2,
- TRACKER_DB_XESAM,
- TRACKER_DB_COMMON);
+ iface = tracker_db_manager_get_db_interfaces (2,
+ TRACKER_DB_XESAM,
+ TRACKER_DB_COMMON);
- test_assert_query_run_on_iface (iface, "SELECT * FROM XesamServiceTypes");
+ test_assert_query_run_on_iface (iface, "SELECT * FROM XesamServiceTypes");
}
static void
test_creation_xesam_db_no_reindex ()
{
- ensure_db_manager_is_reindex (FALSE);
- test_assert_tables_in_db (TRACKER_DB_XESAM, "SELECT * FROM XesamServiceTypes");
+ ensure_db_manager_is_reindex (FALSE);
+ test_assert_tables_in_db (TRACKER_DB_XESAM, "SELECT * FROM XesamServiceTypes");
}
static void
test_creation_file_meta_db_no_reindex ()
{
- ensure_db_manager_is_reindex (FALSE);
- test_assert_tables_in_db (TRACKER_DB_FILE_METADATA, "SELECT * FROM ServiceMetaData");
+ ensure_db_manager_is_reindex (FALSE);
+ test_assert_tables_in_db (TRACKER_DB_FILE_METADATA, "SELECT * FROM ServiceMetaData");
}
static void
test_creation_file_contents_db_no_reindex ()
{
- ensure_db_manager_is_reindex (FALSE);
- test_assert_tables_in_db (TRACKER_DB_FILE_CONTENTS, "SELECT * FROM ServiceContents");
+ ensure_db_manager_is_reindex (FALSE);
+ test_assert_tables_in_db (TRACKER_DB_FILE_CONTENTS, "SELECT * FROM ServiceContents");
}
int
main (int argc, char **argv) {
- int result;
+ int result;
g_type_init ();
- g_thread_init (NULL);
+ g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- // Tests with attach and no-reindex
- g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/common_db_tables",
- test_creation_common_db_no_reindex);
+ // Tests with attach and no-reindex
+ g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/common_db_tables",
+ test_creation_common_db_no_reindex);
- g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/xesam_db_tables",
- test_creation_xesam_db_no_reindex);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/xesam_db_tables",
+ test_creation_xesam_db_no_reindex);
- g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/xesam_db_tables/multiple_interfaces",
- test_creation_xesam_db_no_reindex_multiple_interfaces);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/xesam_db_tables/multiple_interfaces",
+ test_creation_xesam_db_no_reindex_multiple_interfaces);
- g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/file_meta_db_tables",
- test_creation_file_meta_db_no_reindex);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/file_meta_db_tables",
+ test_creation_file_meta_db_no_reindex);
- g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/file_contents_db_tables",
- test_creation_file_contents_db_no_reindex);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/attach/no-reindex/file_contents_db_tables",
+ test_creation_file_contents_db_no_reindex);
- result = g_test_run ();
+ result = g_test_run ();
- /* End */
+ /* End */
- return result;
+ 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 15:12:19 2008
@@ -27,34 +27,34 @@
void
test_assert_tables_in_db (TrackerDBInterface *iface, gchar *query)
{
- g_assert (test_assert_query_run_on_iface (iface, query));
+ g_assert (test_assert_query_run_on_iface (iface, query));
}
static void
test_custom_common_filemeta_filecontents ()
{
- TrackerDBInterface *iface;
+ TrackerDBInterface *iface;
- iface = tracker_db_manager_get_db_interfaces (3,
- TRACKER_DB_COMMON,
- TRACKER_DB_FILE_METADATA,
- TRACKER_DB_FILE_CONTENTS);
-
- test_assert_tables_in_db (iface, "SELECT * FROM MetadataTypes");
- test_assert_tables_in_db (iface, "SELECT * FROM ServiceMetadata");
- test_assert_tables_in_db (iface, "SELECT * FROM ServiceContents");
+ iface = tracker_db_manager_get_db_interfaces (3,
+ TRACKER_DB_COMMON,
+ TRACKER_DB_FILE_METADATA,
+ TRACKER_DB_FILE_CONTENTS);
+
+ test_assert_tables_in_db (iface, "SELECT * FROM MetadataTypes");
+ test_assert_tables_in_db (iface, "SELECT * FROM ServiceMetadata");
+ test_assert_tables_in_db (iface, "SELECT * FROM ServiceContents");
}
static void
test_custom_xesam_no_common ()
{
- TrackerDBInterface *iface;
+ TrackerDBInterface *iface;
- iface = tracker_db_manager_get_db_interfaces (1,
- TRACKER_DB_XESAM);
+ iface = tracker_db_manager_get_db_interfaces (1,
+ TRACKER_DB_XESAM);
- test_assert_tables_in_db (iface, "SELECT * FROM XesamMetaDataTypes");
+ test_assert_tables_in_db (iface, "SELECT * FROM XesamMetaDataTypes");
}
@@ -62,27 +62,27 @@
int
main (int argc, char **argv) {
- int result;
- gint first_time;
+ int result;
+ gint first_time;
g_type_init ();
- g_thread_init (NULL);
+ g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- /* Init */
- tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
- &first_time);
+ /* Init */
+ tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
+ &first_time);
- g_test_add_func ("/libtracker-db/tracker-db-manager/custom/common_filemeta_filecontents",
- test_custom_common_filemeta_filecontents);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/custom/common_filemeta_filecontents",
+ test_custom_common_filemeta_filecontents);
- g_test_add_func ("/libtracker-db/tracker-db-manager/custom/xesam_no_common",
- test_custom_xesam_no_common);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/custom/xesam_no_common",
+ test_custom_xesam_no_common);
- result = g_test_run ();
+ result = g_test_run ();
- /* End */
- tracker_db_manager_shutdown ();
+ /* End */
+ tracker_db_manager_shutdown ();
- return result;
+ return result;
}
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 15:12:19 2008
@@ -27,84 +27,84 @@
void
test_assert_tables_in_db (TrackerDB db, gchar *query)
{
- g_assert (test_assert_query_run (db, query));
+ g_assert (test_assert_query_run (db, query));
}
static void
test_creation_common_db ()
{
- test_assert_tables_in_db (TRACKER_DB_COMMON, "SELECT * FROM MetaDataTypes");
+ test_assert_tables_in_db (TRACKER_DB_COMMON, "SELECT * FROM MetaDataTypes");
}
static void
test_creation_cache_db ()
{
- test_assert_tables_in_db (TRACKER_DB_CACHE, "SELECT * FROM FilePending");
+ test_assert_tables_in_db (TRACKER_DB_CACHE, "SELECT * FROM FilePending");
}
static void
test_creation_file_meta_db ()
{
- test_assert_tables_in_db (TRACKER_DB_FILE_METADATA, "SELECT * FROM ServiceMetaData");
+ test_assert_tables_in_db (TRACKER_DB_FILE_METADATA, "SELECT * FROM ServiceMetaData");
}
static void
test_creation_file_contents_db ()
{
- test_assert_tables_in_db (TRACKER_DB_FILE_CONTENTS, "SELECT * FROM ServiceContents");
+ test_assert_tables_in_db (TRACKER_DB_FILE_CONTENTS, "SELECT * FROM ServiceContents");
}
static void
test_creation_email_meta_db ()
{
- test_assert_tables_in_db (TRACKER_DB_EMAIL_METADATA, "SELECT * FROM ServiceMetadata");
+ test_assert_tables_in_db (TRACKER_DB_EMAIL_METADATA, "SELECT * FROM ServiceMetadata");
}
static void
test_creation_email_contents_db ()
{
- test_assert_tables_in_db (TRACKER_DB_FILE_CONTENTS, "SELECT * FROM ServiceContents");
+ test_assert_tables_in_db (TRACKER_DB_FILE_CONTENTS, "SELECT * FROM ServiceContents");
}
int
main (int argc, char **argv) {
- int result;
- gint first_time;
+ int result;
+ gint first_time;
g_type_init ();
- g_thread_init (NULL);
+ g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- /* Init */
- tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
- &first_time);
+ /* Init */
+ tracker_db_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
+ &first_time);
- g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/common_db_tables",
- test_creation_common_db);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/common_db_tables",
+ test_creation_common_db);
- // XESAM is not available
+ // XESAM is not available
- g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/cache_db_tables",
- test_creation_cache_db);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/cache_db_tables",
+ test_creation_cache_db);
- g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/file_meta_db_tables",
- test_creation_file_meta_db);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/file_meta_db_tables",
+ test_creation_file_meta_db);
- g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/file_contents_db_tables",
- test_creation_file_contents_db);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/file_contents_db_tables",
+ test_creation_file_contents_db);
- g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/email_meta_db_tables",
- test_creation_email_meta_db);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/email_meta_db_tables",
+ test_creation_email_meta_db);
- g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/email_contents_db_tables",
- test_creation_email_contents_db);
+ g_test_add_func ("/libtracker-db/tracker-db-manager/unattach/email_contents_db_tables",
+ test_creation_email_contents_db);
- result = g_test_run ();
+ result = g_test_run ();
- /* End */
- tracker_db_manager_shutdown ();
+ /* End */
+ tracker_db_manager_shutdown ();
- return result;
+ return result;
}
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 15:12:19 2008
@@ -13,121 +13,121 @@
static void
test_get_suggestion ()
{
- TrackerDBIndex *index;
- gchar *suggestion;
+ TrackerDBIndex *index;
+ gchar *suggestion;
- index = tracker_db_index_new ("./example.index",
- DEFAULT_MIN_BUCKET_COUNT,
- DEFAULT_MAX_BUCKET_COUNT,
- TRUE);
+ index = tracker_db_index_new ("./example.index",
+ DEFAULT_MIN_BUCKET_COUNT,
+ DEFAULT_MAX_BUCKET_COUNT,
+ TRUE);
- g_assert (!tracker_db_index_get_reload (index));
+ g_assert (!tracker_db_index_get_reload (index));
- suggestion = tracker_db_index_get_suggestion (index, "Thiz", 9);
+ suggestion = tracker_db_index_get_suggestion (index, "Thiz", 9);
- g_assert (tracker_test_helpers_cmpstr_equal (suggestion, "this"));
+ g_assert (tracker_test_helpers_cmpstr_equal (suggestion, "this"));
- g_free (suggestion);
+ g_free (suggestion);
- g_object_unref (index);
+ g_object_unref (index);
}
static void
test_reloading ()
{
- TrackerDBIndex *index;
- TrackerDBIndexItem *hits = NULL;
- guint count;
-
- 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 */
-
- hits = tracker_db_index_get_word_hits (index, "this", &count);
- g_assert (hits);
- g_free (hits);
+ TrackerDBIndex *index;
+ TrackerDBIndexItem *hits = NULL;
+ guint count;
+
+ 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 */
+
+ hits = tracker_db_index_get_word_hits (index, "this", &count);
+ g_assert (hits);
+ g_free (hits);
- g_assert (!tracker_db_index_get_reload (index)); /* Trivial check of get/set */
+ g_assert (!tracker_db_index_get_reload (index)); /* Trivial check of get/set */
}
static void
test_bad_index ()
{
- TrackerDBIndex *index;
- guint count;
+ TrackerDBIndex *index;
+ guint count;
- index = tracker_db_index_new ("unknown-index",
- DEFAULT_MIN_BUCKET_COUNT,
- DEFAULT_MAX_BUCKET_COUNT,
- TRUE);
+ index = tracker_db_index_new ("unknown-index",
+ DEFAULT_MIN_BUCKET_COUNT,
+ DEFAULT_MAX_BUCKET_COUNT,
+ TRUE);
- /* Reload true: the index doesnt exists */
- g_assert (tracker_db_index_get_reload (index));
+ /* Reload true: the index doesnt exists */
+ g_assert (tracker_db_index_get_reload (index));
- /* Return NULL, the index cannot reload the file */
- g_assert (!tracker_db_index_get_word_hits (index, "this", &count));
+ /* Return NULL, the index cannot reload the file */
+ g_assert (!tracker_db_index_get_word_hits (index, "this", &count));
- /* Return NULL, the index cannot reload the file */
- g_assert (!tracker_db_index_get_suggestion (index, "Thiz", 9));
+ /* Return NULL, the index cannot reload the file */
+ g_assert (!tracker_db_index_get_suggestion (index, "Thiz", 9));
}
static void
test_created_file_in_the_mean_time ()
{
- TrackerDBIndex *index;
- GFile *good, *bad;
- guint count;
+ TrackerDBIndex *index;
+ GFile *good, *bad;
+ guint count;
- index = tracker_db_index_new ("./unknown-index",
- DEFAULT_MIN_BUCKET_COUNT,
- DEFAULT_MAX_BUCKET_COUNT,
- TRUE);
+ index = tracker_db_index_new ("./unknown-index",
+ DEFAULT_MIN_BUCKET_COUNT,
+ DEFAULT_MAX_BUCKET_COUNT,
+ TRUE);
- /* Reload true: the index doesnt exists */
- g_assert (tracker_db_index_get_reload (index));
+ /* Reload true: the index doesnt exists */
+ g_assert (tracker_db_index_get_reload (index));
- good = g_file_new_for_path ("./example.index");
- bad = g_file_new_for_path ("./unknown-index");
+ good = g_file_new_for_path ("./example.index");
+ bad = g_file_new_for_path ("./unknown-index");
- g_file_copy (good, bad, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, NULL);
+ g_file_copy (good, bad, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, NULL);
- /* Now the first operation reload the index */
- g_assert (tracker_db_index_get_word_hits (index, "this", &count));
+ /* 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));
+ /* Reload false: It is already reloaded */
+ g_assert (!tracker_db_index_get_reload (index));
- g_file_delete (bad, NULL, NULL);
+ g_file_delete (bad, NULL, NULL);
}
int
main (int argc, char **argv) {
- int result;
+ int result;
g_type_init ();
- g_thread_init (NULL);
+ g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- /* Init */
+ /* Init */
- g_test_add_func ("/libtracker-db/tracker-index/get_suggestion",
- test_get_suggestion );
- g_test_add_func ("/libtracker-db/tracker-index/reloading",
- test_reloading );
- g_test_add_func ("/libtracker-db/tracker-index/bad_index",
- test_bad_index );
- 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 ();
+ g_test_add_func ("/libtracker-db/tracker-index/get_suggestion",
+ test_get_suggestion );
+ g_test_add_func ("/libtracker-db/tracker-index/reloading",
+ test_reloading );
+ g_test_add_func ("/libtracker-db/tracker-index/bad_index",
+ test_bad_index );
+ 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 */
+ /* End */
- return result;
+ 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 15:12:19 2008
@@ -35,317 +35,317 @@
static gint
get_number_words_in_index (const gchar *index_file)
{
- DEPOT *index;
- gint words;
+ DEPOT *index;
+ gint words;
- index = dpopen (index_file, DP_OREADER, MAX_BUCKET_COUNT);
+ index = dpopen (index_file, DP_OREADER, MAX_BUCKET_COUNT);
- words = dprnum (index);
+ words = dprnum (index);
- dpclose (index);
+ dpclose (index);
- return words;
+ return words;
}
static gint
get_results_for_word (const gchar *index_file, const gchar *word)
{
- DEPOT *index;
- gint result;
+ DEPOT *index;
+ gint result;
- index = dpopen (index_file, DP_OREADER, MAX_BUCKET_COUNT);
+ index = dpopen (index_file, DP_OREADER, MAX_BUCKET_COUNT);
- result = dpvsiz (index, word, -1);
+ result = dpvsiz (index, word, -1);
- dpclose (index);
+ dpclose (index);
- return result / sizeof (TrackerDBIndexItem);
+ return result / sizeof (TrackerDBIndexItem);
}
static gint
get_score_for_word (const gchar *index_file, const gchar *word)
{
- DEPOT *index;
- gint tsiz;
- TrackerDBIndexItem *results;
- gint score;
+ DEPOT *index;
+ gint tsiz;
+ TrackerDBIndexItem *results;
+ gint score;
- index = dpopen (index_file, DP_OREADER, MAX_BUCKET_COUNT);
+ index = dpopen (index_file, DP_OREADER, MAX_BUCKET_COUNT);
- results = (TrackerDBIndexItem *)dpget (index, word, -1, 0, -1, &tsiz);
+ results = (TrackerDBIndexItem *)dpget (index, word, -1, 0, -1, &tsiz);
- dpclose (index);
+ dpclose (index);
- g_return_val_if_fail ((tsiz / sizeof (TrackerDBIndexItem)) == 1, -1);
- g_return_val_if_fail (results, -1);
+ g_return_val_if_fail ((tsiz / sizeof (TrackerDBIndexItem)) == 1, -1);
+ g_return_val_if_fail (results, -1);
- score = tracker_db_index_item_get_score (&results[0]);
+ score = tracker_db_index_item_get_score (&results[0]);
- g_free (results);
- return score;
+ g_free (results);
+ return score;
}
static void
test_add_one_word (void)
{
- TrackerDBIndex *index;
- const gchar *indexname = "test-add-one-word.index";
+ TrackerDBIndex *index;
+ const gchar *indexname = "test-add-one-word.index";
- g_remove (indexname);
- index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
+ 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);
+ tracker_db_index_add_word (index, "word1", 1, 1, 1);
+ tracker_db_index_flush (index);
+ g_object_unref (index);
- g_assert_cmpint (get_number_words_in_index (indexname), ==, 1);
- g_assert_cmpint (get_results_for_word (indexname, "word1"), ==, 1);
+ g_assert_cmpint (get_number_words_in_index (indexname), ==, 1);
+ g_assert_cmpint (get_results_for_word (indexname, "word1"), ==, 1);
- g_remove (indexname);
+ g_remove (indexname);
}
static void
test_add_n_words ()
{
- TrackerDBIndex *index;
- const gchar *indexname = "test-add-n-words.index";
- gint i;
- gchar *word;
-
- g_remove (indexname);
-
- 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);
- g_free (word);
- }
-
- tracker_db_index_flush (index);
- g_object_unref (index);
-
- g_assert_cmpint (get_number_words_in_index (indexname), ==, 20);
- g_assert_cmpint (get_results_for_word (indexname, "word5"), ==, 1);
- g_remove (indexname);
+ TrackerDBIndex *index;
+ const gchar *indexname = "test-add-n-words.index";
+ gint i;
+ gchar *word;
+
+ g_remove (indexname);
+
+ 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);
+ g_free (word);
+ }
+
+ tracker_db_index_flush (index);
+ g_object_unref (index);
+
+ g_assert_cmpint (get_number_words_in_index (indexname), ==, 20);
+ g_assert_cmpint (get_results_for_word (indexname, "word5"), ==, 1);
+ g_remove (indexname);
}
static void
test_add_word_n_times ()
{
- TrackerDBIndex *index;
- gint i;
- const gchar *indexname = "test-add-word-n-times.index";
+ TrackerDBIndex *index;
+ gint i;
+ const gchar *indexname = "test-add-word-n-times.index";
- g_remove (indexname);
- index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
+ 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);
- }
+ for ( i = 0; i < 20; i++) {
+ tracker_db_index_add_word (index, "test-word", i, 1, 1);
+ }
- tracker_db_index_flush (index);
- g_object_unref (index);
+ tracker_db_index_flush (index);
+ g_object_unref (index);
- g_assert_cmpint (get_number_words_in_index (indexname), ==, 1);
- g_assert_cmpint (get_results_for_word (indexname, "test-word"), ==, 20);
+ g_assert_cmpint (get_number_words_in_index (indexname), ==, 1);
+ g_assert_cmpint (get_results_for_word (indexname, "test-word"), ==, 20);
- g_remove (indexname);
+ g_remove (indexname);
}
static void
test_add_word_multiple_occurrences ()
{
- TrackerDBIndex *index;
- gint i;
- const gchar *indexname = "test-word-multiple-ocurrences.index";
+ TrackerDBIndex *index;
+ gint i;
+ const gchar *indexname = "test-word-multiple-ocurrences.index";
- g_remove (indexname);
- index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
+ 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);
- }
+ for ( i = 0; i < 20; i++) {
+ tracker_db_index_add_word (index, "test-word", 1, 1, 1);
+ }
- tracker_db_index_flush (index);
- g_object_unref (index);
+ tracker_db_index_flush (index);
+ g_object_unref (index);
- g_assert_cmpint (get_number_words_in_index (indexname), ==, 1);
+ g_assert_cmpint (get_number_words_in_index (indexname), ==, 1);
- // There must be only ONE result with a high score
- g_assert_cmpint (get_results_for_word (indexname, "test-word"), ==, 1);
- g_assert_cmpint (get_score_for_word (indexname, "test-word"), ==, 20);
+ // There must be only ONE result with a high score
+ g_assert_cmpint (get_results_for_word (indexname, "test-word"), ==, 1);
+ g_assert_cmpint (get_score_for_word (indexname, "test-word"), ==, 20);
- g_remove (indexname);
+ g_remove (indexname);
}
static gint
insert_in_index (TrackerDBIndex *index, const gchar *text)
{
- gchar **pieces;
- gint i;
- static gint doc = 0;
-
- doc += 1;
-
- pieces = g_strsplit (text, " ", -1);
- for (i = 0; pieces[i] != NULL; i++) {
- tracker_db_index_add_word (index, pieces[i], doc, 1, 1);
- }
- g_strfreev (pieces);
+ gchar **pieces;
+ gint i;
+ static gint doc = 0;
+
+ doc += 1;
+
+ pieces = g_strsplit (text, " ", -1);
+ for (i = 0; pieces[i] != NULL; i++) {
+ tracker_db_index_add_word (index, pieces[i], doc, 1, 1);
+ }
+ g_strfreev (pieces);
- return doc;
+ return doc;
}
static void
test_add_with_flushs ()
{
- TrackerDBIndex *index;
- const gchar *indexname = "test-add-with-flush.index";
+ TrackerDBIndex *index;
+ const gchar *indexname = "test-add-with-flush.index";
- 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";
+ 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);
+ g_remove (indexname);
+ index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
- /* Text 1 */
- insert_in_index (index, text1);
- tracker_db_index_flush (index);
-
- /* Text 2 */
- insert_in_index (index, text2);
- tracker_db_index_flush (index);
-
- g_object_unref (index);
-
- g_assert_cmpint (get_number_words_in_index (indexname), ==, 18);
- g_assert_cmpint (get_results_for_word (indexname, "this"), ==, 2);
- g_assert_cmpint (get_results_for_word (indexname, "common"), ==, 1);
- g_assert_cmpint (get_score_for_word (indexname, "a"), ==, 2);
- g_remove (indexname);
+ /* Text 1 */
+ insert_in_index (index, text1);
+ tracker_db_index_flush (index);
+
+ /* Text 2 */
+ insert_in_index (index, text2);
+ tracker_db_index_flush (index);
+
+ g_object_unref (index);
+
+ g_assert_cmpint (get_number_words_in_index (indexname), ==, 18);
+ g_assert_cmpint (get_results_for_word (indexname, "this"), ==, 2);
+ g_assert_cmpint (get_results_for_word (indexname, "common"), ==, 1);
+ g_assert_cmpint (get_score_for_word (indexname, "a"), ==, 2);
+ g_remove (indexname);
}
static void
remove_in_index (TrackerDBIndex *index, const gchar *text, gint docid)
{
- gchar **pieces;
- gint i;
- static gint doc = 1;
-
- pieces = g_strsplit (text, " ", -1);
- for (i = 0; pieces[i] != NULL; i++) {
- tracker_db_index_add_word (index, pieces[i], docid, 1, -1);
- }
- g_strfreev (pieces);
+ gchar **pieces;
+ gint i;
+ static gint doc = 1;
+
+ pieces = g_strsplit (text, " ", -1);
+ for (i = 0; pieces[i] != NULL; i++) {
+ tracker_db_index_add_word (index, pieces[i], docid, 1, -1);
+ }
+ g_strfreev (pieces);
- doc += 1;
+ doc += 1;
}
static void
test_remove_document (void)
{
- TrackerDBIndex *index;
- const gchar *indexname = "test-remove-document.index";
- gint id1, id2;
+ TrackerDBIndex *index;
+ const gchar *indexname = "test-remove-document.index";
+ gint id1, id2;
- 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";
+ 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);
+ g_remove (indexname);
- index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
+ index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
- /* Doc 1 */
- id1 = insert_in_index (index, doc1);
- tracker_db_index_flush (index);
+ /* Doc 1 */
+ id1 = insert_in_index (index, doc1);
+ tracker_db_index_flush (index);
- /* Doc 2 */
- id2 = insert_in_index (index, doc2);
- tracker_db_index_flush (index);
+ /* Doc 2 */
+ id2 = insert_in_index (index, doc2);
+ tracker_db_index_flush (index);
- g_object_unref (index);
+ g_object_unref (index);
- g_assert_cmpint (get_number_words_in_index (indexname), ==, 18);
+ g_assert_cmpint (get_number_words_in_index (indexname), ==, 18);
- index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
+ 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);
+ /* Remove doc1 */
+ remove_in_index (index, doc1, id1);
+ tracker_db_index_flush (index);
- g_object_unref (index);
+ g_object_unref (index);
- g_assert_cmpint (get_number_words_in_index (indexname), ==, 8);
+ g_assert_cmpint (get_number_words_in_index (indexname), ==, 8);
- g_remove (indexname);
+ g_remove (indexname);
}
static void
test_remove_before_flush (void)
{
- TrackerDBIndex *index;
- const gchar *indexname = "test-remove-before-flush.index";
- gint id1;
+ TrackerDBIndex *index;
+ const gchar *indexname = "test-remove-before-flush.index";
+ gint id1;
- const gchar *doc1 = "this is a text";
+ const gchar *doc1 = "this is a text";
- g_remove (indexname);
+ g_remove (indexname);
- index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
+ index = tracker_db_index_new (indexname, MIN_BUCKET_COUNT, MAX_BUCKET_COUNT, FALSE);
- /* Doc 1 */
- id1 = insert_in_index (index, doc1);
+ /* Doc 1 */
+ id1 = insert_in_index (index, doc1);
- /* Remove before flush */
- remove_in_index (index, doc1, id1);
+ /* Remove before flush */
+ remove_in_index (index, doc1, id1);
- tracker_db_index_flush (index);
+ tracker_db_index_flush (index);
- g_object_unref (index);
+ g_object_unref (index);
- g_assert_cmpint (get_number_words_in_index (indexname), ==, 0);
+ g_assert_cmpint (get_number_words_in_index (indexname), ==, 0);
- g_remove (indexname);
+ g_remove (indexname);
}
int
main (int argc, char **argv)
{
- int result;
+ int result;
g_type_init ();
- g_thread_init (NULL);
+ g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/libtracker-db/tracker-index/add_word",
- test_add_one_word);
+ g_test_add_func ("/libtracker-db/tracker-index/add_word",
+ test_add_one_word);
- g_test_add_func ("/libtracker-db/tracker-index/add_n_words",
- test_add_n_words);
+ g_test_add_func ("/libtracker-db/tracker-index/add_n_words",
+ test_add_n_words);
- g_test_add_func ("/libtracker-db/tracker-index/add_word_n_times",
- test_add_word_n_times);
+ g_test_add_func ("/libtracker-db/tracker-index/add_word_n_times",
+ test_add_word_n_times);
- g_test_add_func ("/libtracker-db/tracker-index/add_word_multiple_occurrences",
- test_add_word_multiple_occurrences);
+ g_test_add_func ("/libtracker-db/tracker-index/add_word_multiple_occurrences",
+ test_add_word_multiple_occurrences);
- g_test_add_func ("/libtracker-db/tracker-index/add_with_flush",
- test_add_with_flushs);
+ g_test_add_func ("/libtracker-db/tracker-index/add_with_flush",
+ test_add_with_flushs);
- g_test_add_func ("/libtracker-db/tracker-index/remove_document",
- test_remove_document);
+ g_test_add_func ("/libtracker-db/tracker-index/remove_document",
+ test_remove_document);
- g_test_add_func ("/libtracker-db/tracker-index/remove_before_flush",
- test_remove_before_flush);
+ g_test_add_func ("/libtracker-db/tracker-index/remove_before_flush",
+ test_remove_before_flush);
- result = g_test_run ();
+ result = g_test_run ();
- return result;
+ 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 15:12:19 2008
@@ -30,7 +30,7 @@
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- GError *error = NULL;
+ GError *error = NULL;
iface = tracker_db_manager_get_db_interfaces (7, TRACKER_DB_COMMON,
TRACKER_DB_XESAM,
@@ -80,7 +80,7 @@
{
TrackerDBInterface *iface;
TrackerDBResultSet *result_set;
- GError *error = NULL;
+ GError *error = NULL;
iface = tracker_db_manager_get_db_interfaces (7, TRACKER_DB_COMMON,
TRACKER_DB_XESAM,
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 15:12:19 2008
@@ -28,48 +28,48 @@
#include <glib-object.h>
static gint
-callback (void *NotUsed,
- gint argc,
- gchar **argv,
- gchar **azColName)
+callback (void *NotUsed,
+ gint argc,
+ gchar **argv,
+ gchar **azColName)
{
gint i;
- for (i = 0; i < argc; i++) {
- printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
- }
+ for (i = 0; i < argc; i++) {
+ printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
+ }
- printf("\n");
+ printf("\n");
- return 0;
+ return 0;
}
static void
exec_sql (sqlite3 *db,
- const gchar *sql)
+ const gchar *sql)
{
gchar *zErrMsg;
gint rc;
- rc = sqlite3_exec (db, sql , callback, 0, &zErrMsg);
+ rc = sqlite3_exec (db, sql , callback, 0, &zErrMsg);
- if (rc != SQLITE_OK) {
- g_printerr ("SQL error: %s\n", zErrMsg);
- sqlite3_free (zErrMsg);
- }
+ if (rc != SQLITE_OK) {
+ g_printerr ("SQL error: %s\n", zErrMsg);
+ sqlite3_free (zErrMsg);
+ }
}
int
main (int argc, char **argv)
{
sqlite3 *db;
- gint rc;
+ gint rc;
gboolean db_exists = FALSE;
- gchar *st = NULL;
- gchar *sql;
+ gchar *st = NULL;
+ gchar *sql;
g_type_init ();
- g_thread_init (NULL);
+ g_thread_init (NULL);
if (argc != 2) {
g_printerr ("Usage: %s MATCH_TERM\n", argv[0]);
Modified: branches/indexer-split/tests/tracker-indexer/tracker-metadata-utils-test.c
==============================================================================
--- branches/indexer-split/tests/tracker-indexer/tracker-metadata-utils-test.c (original)
+++ branches/indexer-split/tests/tracker-indexer/tracker-metadata-utils-test.c Sat Sep 20 15:12:19 2008
@@ -2,5 +2,5 @@
main (int argc,
char **argv)
{
- return 0;
+ return 0;
}
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 15:12:19 2008
@@ -36,7 +36,7 @@
init_dbus_glib_types (void)
{
DBusGConnection *connection;
- GError *error;
+ GError *error;
error = NULL;
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
dbus_g_connection_unref (connection);
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 15:12:19 2008
@@ -2,7 +2,7 @@
/*
* gtestextensions
* Copyright (C) Mikkel Kamstrup Erlandsen 2008 <mikkel kamstrup gmail com>
- * Scott Asofyet 2008 (wait_for_signal code)
+ * 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
@@ -16,9 +16,9 @@
*
* 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.,
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301, USA.
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#include <gobject/gvaluecollector.h>
@@ -97,21 +97,21 @@
static void
wait_for_signal_closure_marshal (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ GValue *return_value,
+ guint n_param_values,
+ 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);
+ g_value_array_append (wfsclosure->param_values, param_values + i);
if (return_value)
- g_value_copy (wfsclosure->return_value, return_value);
+ g_value_copy (wfsclosure->return_value, return_value);
gtx_quit_main_loop (wfsclosure->loop);
@@ -121,11 +121,11 @@
static gboolean
wait_for_signal_values (GObject * object,
- gint max_wait_ms,
- guint signal_id,
- GQuark detail,
- GValue * return_value,
- GValueArray ** param_values)
+ gint max_wait_ms,
+ guint signal_id,
+ GQuark detail,
+ GValue * return_value,
+ GValueArray ** param_values)
{
WaitForSignalClosure * wfs;
guint handler_id;
@@ -133,7 +133,7 @@
gboolean timed_out = FALSE;
wfs = (WaitForSignalClosure *)
- g_closure_new_simple (sizeof (WaitForSignalClosure), NULL);
+ g_closure_new_simple (sizeof (WaitForSignalClosure), NULL);
wfs->loop = g_main_loop_new (NULL, FALSE);
wfs->return_value = return_value;
wfs->param_values = NULL;
@@ -141,7 +141,7 @@
g_closure_set_marshal (&wfs->closure, wait_for_signal_closure_marshal);
handler_id = g_signal_connect_closure_by_id (object, signal_id, detail,
- &wfs->closure, FALSE);
+ &wfs->closure, FALSE);
max_timeout_id = g_timeout_add (max_wait_ms, (GSourceFunc)gtx_quit_main_loop,
wfs->loop);
@@ -151,15 +151,15 @@
g_closure_invalidate (&wfs->closure);
if (wfs->param_values) {
- if (param_values)
- *param_values = wfs->param_values;
- else
- g_value_array_free (wfs->param_values);
+ if (param_values)
+ *param_values = wfs->param_values;
+ else
+ g_value_array_free (wfs->param_values);
- wfs->param_values = NULL;
+ wfs->param_values = NULL;
} else {
- timed_out = TRUE;
+ timed_out = TRUE;
}
g_main_loop_unref (wfs->loop);
@@ -177,23 +177,23 @@
* gtx_wait_for_signal
* @object: The object
* @max_wait_ms: Maximum number of milliseconds to wait before giving up
- * and failing; passed directly to g_timeout_add().
+ * and failing; passed directly to g_timeout_add().
* @detailed_signal: Detailed signal name for which to wait.
* @...: If @detailed_signal has a return value, the first vararg should
- * be the value to return from the signal handler. The rest of the
- * varargs should be pointers to variables in which to store the
- * parameters passed to the signal. Pass NULL for any param in
- * which you are not interested. The caller is responsible for
- * freeing or unreffing any strings or objects returned here.
+ * be the value to return from the signal handler. The rest of the
+ * varargs should be pointers to variables in which to store the
+ * parameters passed to the signal. Pass NULL for any param in
+ * which you are not interested. The caller is responsible for
+ * freeing or unreffing any strings or objects returned here.
*
* returns: True if the signal was received, false if the timeout was
- * reached without the signal firing.
+ * reached without the signal firing.
*/
gboolean
gtx_wait_for_signal (GObject * object,
- gint max_wait_ms,
- const gchar * detailed_signal,
- ...)
+ gint max_wait_ms,
+ const gchar * detailed_signal,
+ ...)
{
GSignalQuery query;
GValue * return_value = NULL, the_return_value = { 0, };
@@ -204,176 +204,176 @@
va_list ap;
if (! g_signal_parse_name (detailed_signal, G_OBJECT_TYPE (object),
- &signal_id, &detail, FALSE))
- g_error ("Signal %s is invalid for object type %s",
- detailed_signal, g_type_name (G_OBJECT_TYPE (object)));
+ &signal_id, &detail, FALSE))
+ g_error ("Signal %s is invalid for object type %s",
+ detailed_signal, g_type_name (G_OBJECT_TYPE (object)));
g_signal_query (signal_id, &query);
va_start (ap, detailed_signal);
if (query.return_type != G_TYPE_NONE) {
- GType t = query.return_type & ~G_SIGNAL_TYPE_STATIC_SCOPE;
- gboolean static_scope = t & G_SIGNAL_TYPE_STATIC_SCOPE;
- gchar * error;
- g_value_init (&the_return_value, t);
- return_value = &the_return_value;
- G_VALUE_COLLECT (return_value, ap,
- static_scope ? G_VALUE_NOCOPY_CONTENTS : 0,
- &error);
- if (error)
- g_error ("%s: %s", G_STRLOC, error);
+ GType t = query.return_type & ~G_SIGNAL_TYPE_STATIC_SCOPE;
+ gboolean static_scope = t & G_SIGNAL_TYPE_STATIC_SCOPE;
+ gchar * error;
+ g_value_init (&the_return_value, t);
+ return_value = &the_return_value;
+ G_VALUE_COLLECT (return_value, ap,
+ static_scope ? G_VALUE_NOCOPY_CONTENTS : 0,
+ &error);
+ if (error)
+ g_error ("%s: %s", G_STRLOC, error);
}
ret = wait_for_signal_values (object,
- max_wait_ms,
- signal_id,
- detail,
- return_value,
- ¶m_values);
+ max_wait_ms,
+ signal_id,
+ detail,
+ return_value,
+ ¶m_values);
if (param_values) {
- guint i;
+ guint i;
- /* Skip the instance */
- for (i = 1 ; i < param_values->n_values ; i++) {
- GValue * v = g_value_array_get_nth (param_values, i);
- switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (v))) {
- case G_TYPE_INVALID:
- case G_TYPE_NONE:
- case G_TYPE_INTERFACE:
- break;
-
- case G_TYPE_CHAR:
- {
- gchar * p = va_arg (ap, gchar *);
- if (p)
- *p = g_value_get_char (v);
- }
- break;
- case G_TYPE_UCHAR:
- {
- guchar * p = va_arg (ap, guchar *);
- if (p)
- *p = g_value_get_uchar (v);
- }
- break;
- case G_TYPE_BOOLEAN:
- {
- gboolean * p = va_arg (ap, gboolean *);
- if (p)
- *p = g_value_get_boolean (v);
- }
- break;
- case G_TYPE_INT:
- {
- gint * p = va_arg (ap, gint *);
- if (p)
- *p = g_value_get_int (v);
- }
- break;
- case G_TYPE_UINT:
- {
- guint * p = va_arg (ap, guint *);
- if (p)
- *p = g_value_get_uint (v);
- }
- break;
- case G_TYPE_LONG:
- {
- glong * p = va_arg (ap, glong *);
- if (p)
- *p = g_value_get_long (v);
- }
- break;
- case G_TYPE_ULONG:
- {
- gulong * p = va_arg (ap, gulong *);
- if (p)
- *p = g_value_get_ulong (v);
- }
- break;
- case G_TYPE_INT64:
- {
- gint64 * p = va_arg (ap, gint64 *);
- if (p)
- *p = g_value_get_int64 (v);
- }
- break;
- case G_TYPE_UINT64:
- {
- guint64 * p = va_arg (ap, guint64 *);
- if (p)
- *p = g_value_get_uint64 (v);
- }
- break;
- case G_TYPE_ENUM:
- {
- gint * p = va_arg (ap, gint *);
- if (p)
- *p = g_value_get_int (v);
- }
- break;
- case G_TYPE_FLAGS:
- {
- guint * p = va_arg (ap, guint *);
- if (p)
- *p = g_value_get_uint (v);
- }
- break;
- case G_TYPE_FLOAT:
- {
- gfloat * p = va_arg (ap, gfloat *);
- if (p)
- *p = g_value_get_float (v);
- }
- break;
- case G_TYPE_DOUBLE:
- {
- gdouble * p = va_arg (ap, gdouble *);
- if (p)
- *p = g_value_get_double (v);
- }
- break;
- case G_TYPE_STRING:
- {
- gchar ** p = va_arg (ap, gchar **);
- if (p)
- *p = g_value_dup_string (v);
- }
- break;
- case G_TYPE_POINTER:
- {
- gpointer * p = va_arg (ap, gpointer *);
- if (p)
- *p = g_value_get_pointer (v);
- }
- break;
- case G_TYPE_BOXED:
- {
- gpointer * p = va_arg (ap, gpointer *);
- if (p)
- *p = g_value_dup_boxed (v);
- }
- break;
- case G_TYPE_PARAM:
- {
- GParamSpec ** p = va_arg (ap, GParamSpec **);
- if (p)
- *p = g_value_dup_param (v);
- }
- break;
- case G_TYPE_OBJECT:
- {
- GObject ** p = va_arg (ap, GObject **);
- if (p)
- *p = g_value_dup_object (v);
- }
- break;
- }
- }
+ /* Skip the instance */
+ for (i = 1 ; i < param_values->n_values ; i++) {
+ GValue * v = g_value_array_get_nth (param_values, i);
+ switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (v))) {
+ case G_TYPE_INVALID:
+ case G_TYPE_NONE:
+ case G_TYPE_INTERFACE:
+ break;
+
+ case G_TYPE_CHAR:
+ {
+ gchar * p = va_arg (ap, gchar *);
+ if (p)
+ *p = g_value_get_char (v);
+ }
+ break;
+ case G_TYPE_UCHAR:
+ {
+ guchar * p = va_arg (ap, guchar *);
+ if (p)
+ *p = g_value_get_uchar (v);
+ }
+ break;
+ case G_TYPE_BOOLEAN:
+ {
+ gboolean * p = va_arg (ap, gboolean *);
+ if (p)
+ *p = g_value_get_boolean (v);
+ }
+ break;
+ case G_TYPE_INT:
+ {
+ gint * p = va_arg (ap, gint *);
+ if (p)
+ *p = g_value_get_int (v);
+ }
+ break;
+ case G_TYPE_UINT:
+ {
+ guint * p = va_arg (ap, guint *);
+ if (p)
+ *p = g_value_get_uint (v);
+ }
+ break;
+ case G_TYPE_LONG:
+ {
+ glong * p = va_arg (ap, glong *);
+ if (p)
+ *p = g_value_get_long (v);
+ }
+ break;
+ case G_TYPE_ULONG:
+ {
+ gulong * p = va_arg (ap, gulong *);
+ if (p)
+ *p = g_value_get_ulong (v);
+ }
+ break;
+ case G_TYPE_INT64:
+ {
+ gint64 * p = va_arg (ap, gint64 *);
+ if (p)
+ *p = g_value_get_int64 (v);
+ }
+ break;
+ case G_TYPE_UINT64:
+ {
+ guint64 * p = va_arg (ap, guint64 *);
+ if (p)
+ *p = g_value_get_uint64 (v);
+ }
+ break;
+ case G_TYPE_ENUM:
+ {
+ gint * p = va_arg (ap, gint *);
+ if (p)
+ *p = g_value_get_int (v);
+ }
+ break;
+ case G_TYPE_FLAGS:
+ {
+ guint * p = va_arg (ap, guint *);
+ if (p)
+ *p = g_value_get_uint (v);
+ }
+ break;
+ case G_TYPE_FLOAT:
+ {
+ gfloat * p = va_arg (ap, gfloat *);
+ if (p)
+ *p = g_value_get_float (v);
+ }
+ break;
+ case G_TYPE_DOUBLE:
+ {
+ gdouble * p = va_arg (ap, gdouble *);
+ if (p)
+ *p = g_value_get_double (v);
+ }
+ break;
+ case G_TYPE_STRING:
+ {
+ gchar ** p = va_arg (ap, gchar **);
+ if (p)
+ *p = g_value_dup_string (v);
+ }
+ break;
+ case G_TYPE_POINTER:
+ {
+ gpointer * p = va_arg (ap, gpointer *);
+ if (p)
+ *p = g_value_get_pointer (v);
+ }
+ break;
+ case G_TYPE_BOXED:
+ {
+ gpointer * p = va_arg (ap, gpointer *);
+ if (p)
+ *p = g_value_dup_boxed (v);
+ }
+ break;
+ case G_TYPE_PARAM:
+ {
+ GParamSpec ** p = va_arg (ap, GParamSpec **);
+ if (p)
+ *p = g_value_dup_param (v);
+ }
+ break;
+ case G_TYPE_OBJECT:
+ {
+ GObject ** p = va_arg (ap, GObject **);
+ if (p)
+ *p = g_value_dup_object (v);
+ }
+ break;
+ }
+ }
- g_value_array_free (param_values);
+ g_value_array_free (param_values);
}
va_end (ap);
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 15:12:19 2008
@@ -15,9 +15,9 @@
*
* 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.,
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301, USA.
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef __G_TEST_EXTENSIONS_H__
@@ -34,11 +34,11 @@
typedef struct {
gpointer fixture;
gconstpointer test_data;
- GtxTestFunc test_func;
+ GtxTestFunc test_func;
GMainLoop *loop;
} GtxTestContext;
-gboolean gtx_wait_for_signal (GObject *object,
+gboolean gtx_wait_for_signal (GObject *object,
gint max_wait_ms,
const gchar *detailed_signal,
...);
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 15:12:19 2008
@@ -27,7 +27,7 @@
#ifndef XESAM_G_LOG_DOMAIN
#define XESAM_G_LOG_DOMAIN "XesamGLib"
-#endif /* XESAM_G_LOG_DOMAIN */
+#endif /* XESAM_G_LOG_DOMAIN */
/*
* Make xesam_g_debug a noop if ENABLE_DEBUG is not defined
@@ -35,13 +35,13 @@
#ifdef ENABLE_DEBUG
# ifdef G_HAVE_ISO_VARARGS
-# define xesam_g_debug(...) g_log (XESAM_G_LOG_DOMAIN, \
+# define xesam_g_debug(...) g_log (XESAM_G_LOG_DOMAIN, \
G_LOG_LEVEL_DEBUG, \
__VA_ARGS__)
# define xesam_g_debug_object(object, ...) xesam_g_debug_object_real (object, __VA_ARGS__)
# elif defined(G_HAVE_GNUC_VARARGS)
-# define xesam_g_debug(format...) g_log (XESAM_G_LOG_DOMAIN, \
+# define xesam_g_debug(format...) g_log (XESAM_G_LOG_DOMAIN, \
G_LOG_LEVEL_DEBUG, \
format)
# define xesam_g_debug_object(object, format...) xesam_g_debug_object_real (object, format)
@@ -71,7 +71,7 @@
#else /* NO DEBUGGING OUTPUT */
# ifdef G_HAVE_ISO_VARARGS
-# define xesam_g_debug(...) G_STMT_START{ (void)0; }G_STMT_END
+# define xesam_g_debug(...) G_STMT_START{ (void)0; }G_STMT_END
# define xesam_g_debug_object(object, ...) G_STMT_START{ (void)0; }G_STMT_END
# elif defined(G_HAVE_GNUC_VARARGS)
# define xesam_g_debug(format...) G_STMT_START{ (void)0; }G_STMT_END
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 15:12:19 2008
@@ -29,24 +29,24 @@
G_BEGIN_DECLS
-XesamGSearch* xesam_g_search_new (XesamGSession *session,
- XesamGQuery *query);
+XesamGSearch* xesam_g_search_new (XesamGSession *session,
+ XesamGQuery *query);
-XesamGSearch* xesam_g_search_new_from_text (XesamGSession *session,
- gchar *search_text);
+XesamGSearch* xesam_g_search_new_from_text (XesamGSession *session,
+ gchar *search_text);
-XesamGHit* xesam_g_hit_new (guint id,
- GHashTable *field_map,
- GPtrArray *field_data);
+XesamGHit* xesam_g_hit_new (guint id,
+ GHashTable *field_map,
+ GPtrArray *field_data);
-XesamGHits* xesam_g_hits_new (XesamGSearch *search,
- guint batch_offset,
- guint count,
- GPtrArray *hits_data);
+XesamGHits* xesam_g_hits_new (XesamGSearch *search,
+ guint batch_offset,
+ guint count,
+ GPtrArray *hits_data);
-GHashTable* xesam_g_session_get_field_map (XesamGSession *session);
+GHashTable* xesam_g_session_get_field_map (XesamGSession *session);
-GHashTable* xesam_g_search_get_field_map (XesamGSearch *search);
+GHashTable* xesam_g_search_get_field_map (XesamGSearch *search);
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 15:12:19 2008
@@ -15,9 +15,9 @@
*
* 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.,
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301, USA.
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#include "xesam-g-test-query-builder.h"
@@ -78,7 +78,7 @@
GError **error);
static ExpectedElementData*
- expected_element_data_new (guint element_detail,
+ expected_element_data_new (guint element_detail,
const gchar *attr1,
const gchar *attr2,
const gboolean *bool_attr,
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 15:12:19 2008
@@ -15,9 +15,9 @@
*
* 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.,
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301, USA.
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef __XESAM_G_TEST_QUERY_BUILDER_H__
@@ -50,9 +50,9 @@
GObjectClass parent;
};
-XesamGTestQueryBuilder* xesam_g_test_query_builder_new (void);
+XesamGTestQueryBuilder* xesam_g_test_query_builder_new (void);
-GType xesam_g_test_query_builder_get_type (void);
+GType xesam_g_test_query_builder_get_type (void);
void xesam_g_test_query_builder_expect_data (XesamGTestQueryBuilder *self,
XesamGQueryToken token,
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 15:12:19 2008
@@ -15,9 +15,9 @@
*
* 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.,
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301, USA.
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#include "xesam-g-testsearcher.h"
@@ -53,7 +53,7 @@
Properties *props;
};
-static void xesam_g_test_searcher_real_new_session (XesamGSearcher *base,
+static void xesam_g_test_searcher_real_new_session (XesamGSearcher *base,
XesamGSearcherGotHandle callback,
gpointer user_data);
@@ -62,38 +62,38 @@
XesamGSearcherVoidResponse callback,
gpointer user_data);
-static void xesam_g_test_searcher_real_get_property (XesamGSearcher *base,
+static void xesam_g_test_searcher_real_get_property (XesamGSearcher *base,
const gchar *session_handle,
const gchar *prop_name,
XesamGSearcherGotProperty callback,
gpointer user_data);
-static void xesam_g_test_searcher_real_set_property (XesamGSearcher *base,
+static void xesam_g_test_searcher_real_set_property (XesamGSearcher *base,
const gchar *session_handle,
const gchar *prop_name,
const GValue *value,
XesamGSearcherGotProperty callback,
gpointer user_data);
-static void xesam_g_test_searcher_real_new_search (XesamGSearcher *base,
+static void xesam_g_test_searcher_real_new_search (XesamGSearcher *base,
const gchar *session_handle,
const gchar *query,
XesamGSearcherGotHandle callback,
gpointer user_data);
-static void xesam_g_test_searcher_real_start_search (XesamGSearcher *base,
+static void xesam_g_test_searcher_real_start_search (XesamGSearcher *base,
const gchar *search_handle,
XesamGSearcherVoidResponse callback,
gpointer user_data);
-static void xesam_g_test_searcher_real_close_search (XesamGSearcher *base,
+static void xesam_g_test_searcher_real_close_search (XesamGSearcher *base,
const gchar *search_handle,
XesamGSearcherVoidResponse callback,
gpointer user_data);
static void xesam_g_test_searcher_real_get_hits (XesamGSearcher *base,
const gchar *search_handle,
- guint count,
+ guint count,
XesamGSearcherGotHits callback,
gpointer user_data);
@@ -121,7 +121,7 @@
static void
xesam_g_test_searcher_real_new_session (XesamGSearcher *base,
XesamGSearcherGotHandle callback,
- gpointer user_data)
+ gpointer user_data)
{
static int session_num = 0;
@@ -309,7 +309,7 @@
static void
xesam_g_test_searcher_finalize (GObject *obj)
{
- Properties *props;
+ Properties *props;
XesamGTestSearcher *self;
XesamGTestSearcherPrivate *priv;
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 15:12:19 2008
@@ -15,9 +15,9 @@
*
* 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.,
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301, USA.
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
#ifndef __XESAM_G_TESTSEARCHER_H__
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 15:12:19 2008
@@ -15,9 +15,9 @@
*
* 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.,
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301, USA.
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
*/
/*
@@ -32,14 +32,14 @@
G_BEGIN_DECLS
-GValue* init_value_if_null (GValue **value,
+GValue* init_value_if_null (GValue **value,
GType value_type);
-gchar* g_property_to_xesam_property (gchar *g_prop_name);
+gchar* g_property_to_xesam_property (gchar *g_prop_name);
void free_ptr_array_of_values (GPtrArray *array);
-GValue* xesam_g_clone_value (const GValue *orig);
+GValue* xesam_g_clone_value (const GValue *orig);
const gchar* digit_as_const_char (guint digit);
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 15:12:19 2008
@@ -26,7 +26,7 @@
#define USAGE "Usage: print -f qdbm-file\n"
-static gchar *filename;
+static gchar *filename;
static gboolean print_services;
static GOptionEntry entries[] = {
@@ -42,29 +42,29 @@
};
static TrackerDBIndexItem *
-get_word_hits (DEPOT *index,
- const gchar *word,
- guint *count)
+get_word_hits (DEPOT *index,
+ const gchar *word,
+ guint *count)
{
TrackerDBIndexItem *details;
- gint tsiz;
- gchar *tmp;
+ gint tsiz;
+ gchar *tmp;
- g_return_val_if_fail (word != NULL, NULL);
+ g_return_val_if_fail (word != NULL, NULL);
details = NULL;
- if (count) {
- *count = 0;
- }
+ if (count) {
+ *count = 0;
+ }
if ((tmp = dpget (index, word, -1, 0, 100, &tsiz)) != NULL) {
if (tsiz >= (gint) sizeof (TrackerDBIndexItem)) {
details = (TrackerDBIndexItem *) tmp;
- if (count) {
- *count = tsiz / sizeof (TrackerDBIndexItem);
- }
+ if (count) {
+ *count = tsiz / sizeof (TrackerDBIndexItem);
+ }
}
}
@@ -74,19 +74,19 @@
static void
load_terms_from_index (gchar *filename)
{
- DEPOT *depot;
- gchar *key;
- guint hits, i;
+ DEPOT *depot;
+ gchar *key;
+ guint hits, i;
TrackerDBIndexItem *results;
depot = dpopen (filename, DP_OREADER | DP_ONOLCK, -1);
if (depot == NULL) {
g_print ("Unable to open file: %s "
- "(Could be a lock problem: is tracker running?)\n",
- filename);
+ "(Could be a lock problem: is tracker running?)\n",
+ filename);
g_print ("Using version %s of qdbm\n",
- dpversion);
+ dpversion);
return;
}
@@ -95,21 +95,21 @@
key = dpiternext (depot, NULL);
while (key != NULL) {
- g_print (" - %s ", key);
+ g_print (" - %s ", key);
- if (print_services) {
- results = get_word_hits (depot, key, &hits);
- for (i = 0; i < hits; i++) {
- 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]));
- }
- }
-
- g_print ("\n");
- g_free (key);
- key = dpiternext (depot, NULL);
+ if (print_services) {
+ results = get_word_hits (depot, key, &hits);
+ for (i = 0; i < hits; i++) {
+ 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]));
+ }
+ }
+
+ g_print ("\n");
+ g_free (key);
+ key = dpiternext (depot, NULL);
}
g_print ("Total: %d terms.\n", dprnum (depot));
@@ -119,43 +119,43 @@
int
main (gint argc, gchar** argv)
{
- GOptionContext *context;
- GError *error = NULL;
+ GOptionContext *context;
+ GError *error = NULL;
context = g_option_context_new ("- QDBM index printer");
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_parse (context, &argc, &argv, &error);
if (error) {
- gchar *help;
+ gchar *help;
g_printerr ("Invalid arguments, %s\n", error->message);
- help = g_option_context_get_help (context, TRUE, NULL);
- g_printerr (help);
+ help = g_option_context_get_help (context, TRUE, NULL);
+ g_printerr (help);
- g_free (help);
+ g_free (help);
g_clear_error (&error);
- g_option_context_free (context);
+ g_option_context_free (context);
return EXIT_FAILURE;
}
- if (!filename) {
- gchar *help;
+ if (!filename) {
+ gchar *help;
- help = g_option_context_get_help (context, TRUE, NULL);
- g_printerr (help);
+ help = g_option_context_get_help (context, TRUE, NULL);
+ g_printerr (help);
- g_free (help);
- g_option_context_free (context);
+ g_free (help);
+ g_option_context_free (context);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
g_option_context_free (context);
- load_terms_from_index (filename);
+ load_terms_from_index (filename);
- return EXIT_SUCCESS;
+ return EXIT_SUCCESS;
}
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 15:12:19 2008
@@ -24,8 +24,8 @@
#include <libtracker-db/tracker-db-index-item.h>
-static gchar *filename;
-static gchar *word;
+static gchar *filename;
+static gchar *word;
static GOptionEntry entries[] = {
{ "index-file", 'f', 0,
@@ -40,29 +40,29 @@
};
static TrackerDBIndexItem *
-get_word_hits (DEPOT *index,
- const gchar *word,
- guint *count)
+get_word_hits (DEPOT *index,
+ const gchar *word,
+ guint *count)
{
TrackerDBIndexItem *items;
- gchar *tmp;
- gint tsiz;
+ gchar *tmp;
+ gint tsiz;
- g_return_val_if_fail (word != NULL, NULL);
+ g_return_val_if_fail (word != NULL, NULL);
items = NULL;
- if (count) {
- *count = 0;
- }
+ if (count) {
+ *count = 0;
+ }
if ((tmp = dpget (index, word, -1, 0, 1000000, &tsiz)) != NULL) {
if (tsiz >= (gint) sizeof (TrackerDBIndexItem)) {
items = (TrackerDBIndexItem *) tmp;
- if (count) {
- *count = tsiz / sizeof (TrackerDBIndexItem);
- }
+ if (count) {
+ *count = tsiz / sizeof (TrackerDBIndexItem);
+ }
}
}
@@ -71,11 +71,11 @@
static void
show_term_in_index (const gchar *filename,
- const gchar *word)
+ const gchar *word)
{
TrackerDBIndexItem *items;
- DEPOT *depot;
- guint hits, i;
+ DEPOT *depot;
+ guint hits, i;
hits = 0;
@@ -83,26 +83,26 @@
if (depot == NULL) {
g_print ("Unable to open file: %s "
- "(Could be a lock problem: is tracker running?)\n",
- filename);
+ "(Could be a lock problem: is tracker running?)\n",
+ filename);
g_print ("Using version %s of qdbm\n",
- dpversion);
+ dpversion);
return;
}
items = get_word_hits (depot, word, &hits);
if (hits < 1 ) {
- g_print ("No results for %s\n", word);
- return;
+ g_print ("No results for %s\n", word);
+ return;
}
g_print (" - %s ", word);
for (i = 0; i < hits; i++) {
- g_print (" (id:%d t:%d) ",
- items[i].id,
- tracker_db_index_item_get_service_type (&items[i]));
+ g_print (" (id:%d t:%d) ",
+ items[i].id,
+ tracker_db_index_item_get_service_type (&items[i]));
}
g_print ("\n");
@@ -114,43 +114,43 @@
int
main (gint argc, gchar** argv)
{
- GOptionContext *context;
- GError *error = NULL;
+ GOptionContext *context;
+ GError *error = NULL;
context = g_option_context_new ("- QDBM index searcher");
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_parse (context, &argc, &argv, &error);
if (error) {
- gchar *help;
+ gchar *help;
g_printerr ("Invalid arguments, %s\n", error->message);
- help = g_option_context_get_help (context, TRUE, NULL);
- g_printerr (help);
+ help = g_option_context_get_help (context, TRUE, NULL);
+ g_printerr (help);
- g_free (help);
+ g_free (help);
g_clear_error (&error);
- g_option_context_free (context);
+ g_option_context_free (context);
return EXIT_FAILURE;
}
- if (!filename || !word) {
- gchar *help;
+ if (!filename || !word) {
+ gchar *help;
- help = g_option_context_get_help (context, TRUE, NULL);
- g_printerr (help);
+ help = g_option_context_get_help (context, TRUE, NULL);
+ g_printerr (help);
- g_free (help);
- g_option_context_free (context);
+ g_free (help);
+ g_option_context_free (context);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
g_option_context_free (context);
- show_term_in_index (filename, word);
+ show_term_in_index (filename, word);
- return 0;
+ return 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
