summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
35dfee2)
Spotlight initialisation must be perfomed in the session childs.
Wrap all Tracker calls between become_root()/unbecome_root().
Force bus SPARQL backend, as direct connections cause problems
with some SPARQL queries.
#include "auth.h"
#include "fork.h"
#include "dircache.h"
#include "auth.h"
#include "fork.h"
#include "dircache.h"
#ifndef SOL_TCP
#define SOL_TCP IPPROTO_TCP
#ifndef SOL_TCP
#define SOL_TCP IPPROTO_TCP
int flag = 1;
setsockopt(dsi->socket, SOL_TCP, TCP_NODELAY, &flag, sizeof(flag));
int flag = 1;
setsockopt(dsi->socket, SOL_TCP, TCP_NODELAY, &flag, sizeof(flag));
+ /* Initialize Spotlight */
+ if (obj->options.flags & OPTION_SPOTLIGHT)
+ sl_mod_load(_PATH_AFPDUAMPATH "mod_spotlight.so");
+
/* get stuck here until the end */
while (1) {
if (sigsetjmp(recon_jmp, 1) != 0)
/* get stuck here until the end */
while (1) {
if (sigsetjmp(recon_jmp, 1) != 0)
/* Initialize */
cnid_init();
/* Initialize */
cnid_init();
- if (obj.options.flags & OPTION_SPOTLIGHT)
- sl_mod_load(_PATH_AFPDUAMPATH "mod_spotlight.so");
/* watch atp, dsi sockets and ipc parent/child file descriptor. */
/* watch atp, dsi sockets and ipc parent/child file descriptor. */
#endif /* HAVE_CONFIG_H */
#include <string.h>
#endif /* HAVE_CONFIG_H */
#include <string.h>
#include <gio/gio.h>
#include <tracker-sparql.h>
#include <gio/gio.h>
#include <tracker-sparql.h>
#include <atalk/util.h>
#include <atalk/errchk.h>
#include <atalk/logger.h>
#include <atalk/util.h>
#include <atalk/errchk.h>
#include <atalk/logger.h>
GError *error = NULL;
const char *msg = p;
GError *error = NULL;
const char *msg = p;
- LOG(log_note, logtype_sl, "sl_mod_init: %s", msg);
- setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1);
+ LOG(log_info, logtype_sl, "sl_mod_init: %s", msg);
+ setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1);
+ setenv("TRACKER_SPARQL_BACKEND", "bus", 1);
+
+#ifdef DEBUG
+ setenv("TRACKER_VERBOSITY", "3", 1);
+ dup2(type_configs[logtype_sl].fd, 1);
+ dup2(type_configs[logtype_sl].fd, 2);
+#endif
+
+ become_root();
connection = tracker_sparql_connection_get(NULL, &error);
connection = tracker_sparql_connection_get(NULL, &error);
if (!connection) {
LOG(log_error, logtype_sl, "Couldn't obtain a direct connection to the Tracker store: %s",
error ? error->message : "unknown error");
if (!connection) {
LOG(log_error, logtype_sl, "Couldn't obtain a direct connection to the Tracker store: %s",
error ? error->message : "unknown error");
LOG(log_debug, logtype_sl, "query_word_from_sl_query: \"%s\"", sparql_query);
} else if ((word = strstr(slquery, "kMDItemDisplayName=="))) {
/* Filename search */
LOG(log_debug, logtype_sl, "query_word_from_sl_query: \"%s\"", sparql_query);
} else if ((word = strstr(slquery, "kMDItemDisplayName=="))) {
/* Filename search */
- sparql_query_format = "SELECT nie:url(?f) WHERE { ?f nie:url ?url . ?f nfo:fileName ?name . FILTER(fn:starts-with(?url, 'file://%s/') && regex(?name, '%s')) }";
+ sparql_query_format = "SELECT ?url WHERE { ?x nie:url ?url ; nfo:fileName ?name FILTER(fn:starts-with(?url, 'file://%s/') && regex(?name, '%s')) }";
EC_NULL_LOG( word = strchr(word, '"') );
word++;
EC_NULL( word = dalloc_strdup(slq, word) );
EC_NULL_LOG( word = strchr(word, '"') );
word++;
EC_NULL( word = dalloc_strdup(slq, word) );
tracker_sparql_connection_query_async(connection, sparql_query, NULL, tracker_cb, slq);
#endif
tracker_sparql_connection_query_async(connection, sparql_query, NULL, tracker_cb, slq);
#endif
slq->slq_tracker_cursor = tracker_sparql_connection_query(connection, sparql_query, NULL, &error);
slq->slq_tracker_cursor = tracker_sparql_connection_query(connection, sparql_query, NULL, &error);
if (error) {
LOG(log_error, logtype_sl, "Couldn't query the Tracker Store: '%s'",
error ? error->message : "unknown error");
if (error) {
LOG(log_error, logtype_sl, "Couldn't query the Tracker Store: '%s'",
error ? error->message : "unknown error");
sl_filemeta_t *fm;
sl_array_t *fm_array;
uint64_t uint64;
sl_filemeta_t *fm;
sl_array_t *fm_array;
uint64_t uint64;
if (!slq->slq_tracker_cursor) {
LOG(log_debug, logtype_sl, "sl_mod_fetch_result: no results found");
if (!slq->slq_tracker_cursor) {
LOG(log_debug, logtype_sl, "sl_mod_fetch_result: no results found");
LOG(log_debug, logtype_sl, "sl_mod_fetch_result: now interating Tracker results cursor");
LOG(log_debug, logtype_sl, "sl_mod_fetch_result: now interating Tracker results cursor");
- while (i <= MAX_SL_RESULTS && tracker_sparql_cursor_next(slq->slq_tracker_cursor, NULL, &error)) {
+ while (i <= MAX_SL_RESULTS) {
+ become_root();
+ qres = tracker_sparql_cursor_next(slq->slq_tracker_cursor, NULL, &error);
+ unbecome_root();
+
+ if (!qres)
+ break;
+
+ become_root();
uri = tracker_sparql_cursor_get_string(slq->slq_tracker_cursor, 0, NULL);
uri = tracker_sparql_cursor_get_string(slq->slq_tracker_cursor, 0, NULL);
+ unbecome_root();
+
+ LOG(log_debug, logtype_sl, "uri: \"%s\"", uri);
+
EC_NULL_LOG( path = tracker_to_unix_path(uri) );
if ((id = cnid_for_path(slq->slq_vol->v_cdb, slq->slq_vol->v_path, path, &did)) == CNID_INVALID) {
LOG(log_error, logtype_sl, "sl_mod_fetch_result: cnid_for_path error");
goto loop_cleanup;
}
EC_NULL_LOG( path = tracker_to_unix_path(uri) );
if ((id = cnid_for_path(slq->slq_vol->v_cdb, slq->slq_vol->v_path, path, &did)) == CNID_INVALID) {
LOG(log_error, logtype_sl, "sl_mod_fetch_result: cnid_for_path error");
goto loop_cleanup;
}
- LOG(log_debug, logtype_sl, "Result %d: CNID: %" PRIu32 ", path: \"%s\"", i++, ntohl(id), path);
+ LOG(log_debug, logtype_sl, "Result %d: CNID: %" PRIu32 ", path: \"%s\"", i, ntohl(id), path);
uint64 = ntohl(id);
dalloc_add_copy(cnids->ca_cnids, &uint64, uint64_t);
uint64 = ntohl(id);
dalloc_add_copy(cnids->ca_cnids, &uint64, uint64_t);
loop_cleanup:
g_free(path);
loop_cleanup:
g_free(path);
if (error) {
LOG(log_error, logtype_sl, "Couldn't query the Tracker Store: '%s'",
if (error) {
LOG(log_error, logtype_sl, "Couldn't query the Tracker Store: '%s'",