[tracker/tracker-store: 19/19] Merge branch 'master' into tracker-store
- From: Jürg Billeter <juergbi src gnome org>
- To: svn-commits-list gnome org
- Subject: [tracker/tracker-store: 19/19] Merge branch 'master' into tracker-store
- Date: Wed, 20 May 2009 08:03:29 -0400 (EDT)
commit f38c0d5dea9ba212269f597214c7989bdf66221b
Merge: f98cb9e... 1f7fa22...
Author: Jürg Billeter <j bitron ch>
Date: Wed May 20 13:56:13 2009 +0200
Merge branch 'master' into tracker-store
data/ontologies/11-rdf.ontology | 7 +
data/ontologies/90-tracker.ontology | 7 +-
.../libtracker-common/libtracker-common-docs.sgml | 6 +-
.../libtracker-common-sections.txt | 51 +-
.../libtracker-common/libtracker-common.types | 3 +-
po/et.po | 881 +++--------------
po/hu.po | 1060 +++++++------------
src/libstemmer/libstemmer.c | 12 +-
src/libtracker-common/Makefile.am | 6 +-
src/libtracker-common/tracker-albumart.c | 68 +-
src/libtracker-common/tracker-albumart.h | 6 +-
src/libtracker-common/tracker-class.c | 4 -
src/libtracker-common/tracker-common.h | 3 +-
src/libtracker-common/tracker-config.c | 6 +-
src/libtracker-common/tracker-hal.h | 82 --
src/libtracker-common/tracker-language.c | 4 -
src/libtracker-common/tracker-power-hal.c | 555 ++++++++++
src/libtracker-common/tracker-power.h | 64 ++
.../{tracker-hal.c => tracker-storage-hal.c} | 601 +++---------
src/libtracker-common/tracker-storage.h | 78 ++
src/libtracker-data/tracker-data-manager.c | 4 +-
src/libtracker-data/tracker-data-update.c | 6 +-
src/libtracker-data/tracker-sparql-query.vala | 2 +
src/libtracker-db/tracker-db-manager.c | 20 -
src/libtracker-db/tracker-db-manager.h | 1 -
src/tracker-extract/tracker-main.c | 6 +-
src/tracker-extract/tracker-main.h | 4 +-
src/tracker-extract/tracker-xmp.c | 10 +-
src/tracker-indexer/modules/evolution-imap.c | 5 +
src/tracker-indexer/tracker-indexer.c | 68 +-
src/tracker-store/tracker-daemon.c | 8 +-
src/tracker-store/tracker-main.c | 59 +-
src/tracker-store/tracker-monitor.c | 2 +-
src/tracker-store/tracker-processor.c | 24 +-
src/tracker-store/tracker-processor.h | 4 +-
src/tracker-store/tracker-push-registrar.c | 4 -
src/tracker-store/tracker-status.c | 67 +-
src/tracker-store/tracker-status.h | 4 +-
src/tracker-utils/tracker-processes.c | 4 +-
39 files changed, 1599 insertions(+), 2207 deletions(-)
diff --cc po/hu.po
index b189abd,1526ef4..90ccbd1
--- a/po/hu.po
+++ b/po/hu.po
@@@ -17,8 -18,8 +18,8 @@@ msgstr "
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../data/trackerd.desktop.in.in.h:1
+#: ../data/tracker-store.desktop.in.in.h:1
- #: ../src/tracker-applet/tracker-applet.c:2236
+ #: ../src/tracker-applet/tracker-applet.c:2327
msgid "Tracker"
msgstr "Tracker"
@@@ -740,13 -754,13 +754,13 @@@ msgstr "E-mailek:
msgid "Control and monitor the Tracker search and indexing service"
msgstr "A Tracker keresÅ?- és indexelÅ? szolgáltatás vezérlése és megfigyelése"
- #: ../src/tracker-extract/tracker-main.c:78
- #: ../src/tracker-indexer/tracker-main.c:79 ../src/tracker-store/tracker-main.c:136
+ #: ../src/tracker-extract/tracker-main.c:82
-#: ../src/tracker-indexer/tracker-main.c:84 ../src/trackerd/tracker-main.c:137
++#: ../src/tracker-indexer/tracker-main.c:84 ../src/tracker-store/tracker-main.c:137
msgid "Displays version information"
msgstr "Verzióinformációk megjelenÃtése"
- #: ../src/tracker-extract/tracker-main.c:82
- #: ../src/tracker-indexer/tracker-main.c:83 ../src/tracker-store/tracker-main.c:140
+ #: ../src/tracker-extract/tracker-main.c:86
-#: ../src/tracker-indexer/tracker-main.c:88 ../src/trackerd/tracker-main.c:141
++#: ../src/tracker-indexer/tracker-main.c:88 ../src/tracker-store/tracker-main.c:141
msgid ""
"Logging, 0 = errors only, 1 = minimal, 2 = detailed and 3 = debug (default = "
"0)"
@@@ -2069,41 -1809,23 +1809,23 @@@ msgstr "Nem kérhetÅ?k le a fájl (â??%
msgid "Could not search tags"
msgstr "A cÃmkék nem kereshetÅ?k"
- #: ../src/tracker-utils/tracker-unique.c:56
- msgid "Concatenate different values of this field"
- msgstr "Ezen mezÅ? különbözÅ? értékeinek összefűzése"
-
- #: ../src/tracker-utils/tracker-unique.c:60
- msgid "Count instances of unique fields of this type"
- msgstr "Ezen tÃpusú egyedi mezÅ?k példányainak számolása"
-
- #: ../src/tracker-utils/tracker-unique.c:64
- msgid "Sum the values of this field"
- msgstr "Ezen mezÅ? értékeinek összegzése"
-
- #: ../src/tracker-utils/tracker-unique.c:68
- msgid "Sort to descending order"
- msgstr "Rendezés csökkenÅ? sorrendbe"
-
- #: ../src/tracker-utils/tracker-unique.c:72
- msgid "Required fields"
- msgstr "Szükséges mezÅ?k"
-
- #: ../src/tracker-utils/tracker-unique.c:122
- msgid "Fields are missing"
- msgstr "Hiányzó mezÅ?k"
+ #: ../src/tracker-utils/tracker-tag.c:406
+ msgid "NOTE: Limit was reached, there are more items in the database not listed here"
+ msgstr ""
+ "MEGJEGYZ�S: A korlát elérve, az adatbázisban itt fel nem sorolt elemek is "
+ "vannak"
- #: ../src/tracker-store/tracker-main.c:145
-#: ../src/trackerd/tracker-main.c:146
++#: ../src/tracker-store/tracker-main.c:146
msgid "Seconds to wait before starting any crawling or indexing (default = 45)"
msgstr ""
"Várakozás ennyi másodpercig bejárás vagy indexelés elÅ?tt (alapértelmezett: "
"45)"
- #: ../src/tracker-store/tracker-main.c:149
-#: ../src/trackerd/tracker-main.c:150
++#: ../src/tracker-store/tracker-main.c:150
msgid "Minimizes the use of memory but may slow indexing down"
msgstr "Minimalizálja a memóriahasználatot, de lelassÃthatja az indexelést"
- #: ../src/tracker-store/tracker-main.c:153
-#: ../src/trackerd/tracker-main.c:154
++#: ../src/tracker-store/tracker-main.c:154
msgid ""
"Directories to exclude for file change monitoring (you can do -e <path> -e "
"<path>)"
@@@ -2111,7 -1833,7 +1833,7 @@@ msgstr "
"Fájlváltozások figyelésébÅ?l kihagyandó könyvtárak (használható a -e "
"<útvonal> -e <útvonal> is)"
- #: ../src/tracker-store/tracker-main.c:157
-#: ../src/trackerd/tracker-main.c:158
++#: ../src/tracker-store/tracker-main.c:158
msgid ""
"Directories to include for file change monitoring (you can do -i <path> -i "
"<path>)"
@@@ -2119,25 -1841,25 +1841,25 @@@ msgstr "
"Fájlváltozások figyeléséhez hozzáadandó könyvtárak (használható a -e "
"<útvonal> -e <útvonal> is)"
- #: ../src/tracker-store/tracker-main.c:161
-#: ../src/trackerd/tracker-main.c:162
++#: ../src/tracker-store/tracker-main.c:162
msgid "Directories to crawl to index files (you can do -c <path> -c <path>)"
msgstr ""
"Indexeléshez bejárandó könyvtárak (használható a -c <útvonal> -c <útvonal> "
"is)"
- #: ../src/tracker-store/tracker-main.c:165
-#: ../src/trackerd/tracker-main.c:166
++#: ../src/tracker-store/tracker-main.c:166
msgid "Disable modules from being processed (you can do -d <module> -d <module>)"
msgstr "Feldolgozásból kihagyandó modulok (használható a -d <modul> -d <modul> is)"
- #: ../src/tracker-store/tracker-main.c:171
-#: ../src/trackerd/tracker-main.c:172
++#: ../src/tracker-store/tracker-main.c:172
msgid "Force a re-index of all content"
msgstr "Minden tartalom újraindexelésének kikényszerÃtése"
- #: ../src/tracker-store/tracker-main.c:175
-#: ../src/trackerd/tracker-main.c:176
++#: ../src/tracker-store/tracker-main.c:176
msgid "Disable any indexing and monitoring"
msgstr "Minden indexelés és figyelés letiltása"
- #: ../src/tracker-store/tracker-main.c:178
-#: ../src/trackerd/tracker-main.c:179
++#: ../src/tracker-store/tracker-main.c:179
msgid "Language to use for stemmer and stop words (ISO 639-1 2 characters code)"
msgstr ""
"A tövezÅ?höz és a megállÃtó szavakhoz használandó nyelv (kétbetűs ISO 639-1 "
@@@ -2146,7 -1868,7 +1868,7 @@@
#. Translators: this messagge will apper immediately after the
#. * usage string - Usage: COMMAND <THIS_MESSAGE>
#.
- #: ../src/tracker-store/tracker-main.c:877
-#: ../src/trackerd/tracker-main.c:856
++#: ../src/tracker-store/tracker-main.c:856
msgid "- start the tracker daemon"
msgstr "- a tracker démon elindÃtása"
diff --cc src/tracker-indexer/tracker-indexer.c
index fd09def,2bab6d0..1298d6c
--- a/src/tracker-indexer/tracker-indexer.c
+++ b/src/tracker-indexer/tracker-indexer.c
@@@ -137,10 -137,9 +138,11 @@@ struct TrackerIndexerPrivate
TrackerConfig *config;
TrackerLanguage *language;
- TrackerHal *hal;
+ TrackerPower *hal_power;
+ TrackerStorage *hal_storage;
+ TrackerClient *client;
+
GTimer *timer;
GVolumeMonitor *volume_monitor;
@@@ -566,17 -614,14 +568,18 @@@ tracker_indexer_finalize (GObject *obje
}
#ifdef HAVE_HAL
- g_signal_handlers_disconnect_by_func (priv->hal,
- notify_battery_in_use_cb,
+ g_signal_handlers_disconnect_by_func (priv->hal_power,
+ notify_on_battery_cb,
TRACKER_INDEXER (object));
- g_object_unref (priv->hal);
+ g_object_unref (priv->hal_power);
+ g_object_unref (priv->hal_storage);
#endif /* HAVE_HAL */
+ if (priv->client) {
+ tracker_disconnect (priv->client);
+ }
+
g_object_unref (priv->language);
g_object_unref (priv->config);
@@@ -903,13 -966,12 +902,14 @@@ tracker_indexer_init (TrackerIndexer *i
priv->modules_queue = g_queue_new ();
priv->config = tracker_config_new ();
+ priv->client = tracker_connect (TRUE);
+
#ifdef HAVE_HAL
- priv->hal = tracker_hal_new ();
+ priv->hal_power = tracker_power_new ();
+ priv->hal_storage = tracker_storage_new ();
- g_signal_connect (priv->hal, "notify::battery-in-use",
- G_CALLBACK (notify_battery_in_use_cb),
+ g_signal_connect (priv->hal_power, "notify::on-battery",
+ G_CALLBACK (notify_on_battery_cb),
indexer);
set_up_throttle (indexer);
@@@ -1229,38 -1327,17 +1229,38 @@@ item_move (TrackerIndexer *indexer
return res;
}
- update_file_uri_recursively (source_uri, uri);
+ sparql = g_string_new ("");
+
+ g_string_append_printf (sparql,
+ "DELETE { <%s> nfo:fileName ?o } WHERE { <%s> nfo:fileName ?o }",
+ source_uri, source_uri);
+
+ g_string_append (sparql, " INSERT {");
+
+ file_info = g_file_query_info (info->file,
+ G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+ NULL, NULL);
+
+ escaped_filename = g_strescape (g_file_info_get_display_name (file_info), NULL);
+
+ g_string_append_printf (sparql, " <%s> nfo:fileName \"%s\" .", source_uri, escaped_filename);
+
+ update_file_uri_recursively (indexer, sparql, source_uri, uri);
+
+ g_string_append (sparql, " }");
+
+ tracker_resources_batch_sparql_update (indexer->private->client, sparql->str, NULL);
#ifdef HAVE_HAL
- if (tracker_hal_uri_is_on_removable_device (indexer->private->hal,
- source_uri,
- &mount_point,
- NULL) ) {
- if (tracker_hal_uri_is_on_removable_device (indexer->private->hal,
- uri,
- NULL,
- NULL) ) {
+ if (tracker_storage_uri_is_on_removable_device (indexer->private->hal_storage,
+ source_uri,
+ &mount_point,
+ NULL) ) {
+ if (tracker_storage_uri_is_on_removable_device (indexer->private->hal_storage,
+ uri,
+ NULL,
+ NULL) ) {
tracker_removable_device_add_move (indexer,
mount_point,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
