EC_INIT;
slq_t *slq = NULL;
uint64_t *uint64, ctx1, ctx2;
- sl_array_t *array;
/* Context */
EC_NULL_LOG (uint64 = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "uint64_t", 1) );
}
/* Create and pass reply handle */
- array = talloc_zero(reply, sl_array_t);
- uint64_t sl_res = 0;
- dalloc_add_copy(array, &sl_res, uint64_t);
- slq->slq_reply = array;
+ EC_NULL( slq->slq_reply = talloc_zero(reply, sl_array_t) );
- if (slq->slq_state == SLQ_STATE_RUNNING) {
- /* Fetch Tracker results*/
- EC_ZERO( sl_module_export->sl_mod_fetch_result(slq) );
- }
+ /* Fetch Tracker results*/
+ EC_ZERO_LOG( sl_module_export->sl_mod_fetch_result(slq) );
- dalloc_add(reply, array, sl_array_t);
+ dalloc_add(reply, slq->slq_reply, sl_array_t);
EC_CLEANUP:
if (ret != 0) {
/* Get query for context and free it */
EC_NULL_LOG( slq = slq_for_ctx(ctx1, ctx2) );
+ if (slq->slq_state != SLQ_STATE_DONE)
+ LOG(log_warning, logtype_sl, "Closing active query");
sl_module_export->sl_mod_end_search(slq);
slq_remove(slq);
talloc_free(slq);
static int sl_pack_CNID(sl_cnids_t *cnids, char *buf, int offset, char *toc_buf, int *toc_idx)
{
EC_INIT;
- int len = 0, off = 0;
+ int off = 0, len;
int cnid_count = talloc_array_length(cnids->ca_cnids->dd_talloc_array);
uint64_t id;
*toc_idx += 1;
offset += 8;
- EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_CNIDS, 2 + cnid_count, 8 /* unknown meaning, but always 8 */)) );
+ len = cnid_count + 1;
+ if (cnid_count > 0)
+ len ++;
+
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_CNIDS, len, 8 /* unknown meaning, but always 8 */)) );
offset += 8;
if (cnid_count > 0) {
offset += 16;
EC_NEG1( fmlen = sl_pack(fm, buf + offset) );
- offset += fmlen;
+
+ /* Check for empty filemeta array, if it's only 40 bytes, it's only the header but no content */
+ LOG(log_debug, logtype_sl, "fmlen: %d", fmlen);
+ if (fmlen > 40)
+ offset += fmlen;
+ else
+ fmlen = 0;
EC_ZERO( slvalc(buf, saveoff + 8, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_DATA, (fmlen / 8) + 1, 8 /* unknown meaning, but always 8 */)) );
sl_nil_t nil = 0;
int i, metacount;
- if ((metacount = talloc_array_length(reqinfo->dd_talloc_array)) == 0)
- EC_FAIL;
+ if ((metacount = talloc_array_length(reqinfo->dd_talloc_array)) == 0) {
+ dalloc_add_copy(fm_array, &nil, sl_nil_t);
+ goto EC_CLEANUP;
+ }
LOG(log_debug, logtype_sl, "add_filemeta: metadata count: %d", metacount);
sl_cnids_t *cnids;
sl_filemeta_t *fm;
sl_array_t *fm_array;
+ sl_nil_t nil;
uint64_t uint64;
- gboolean qres;
+ gboolean qres, firstmatch = true;
if (!slq->slq_tracker_cursor) {
LOG(log_debug, logtype_sl, "sl_mod_fetch_result: no results found");
fm_array = talloc_zero(fm, sl_array_t);
dalloc_add(fm, fm_array, sl_array_t);
- /* For some reason the list of results always starts with a nil entry */
- sl_nil_t nil;
- dalloc_add_copy(fm_array, &nil, sl_nil_t);
-
LOG(log_debug, logtype_sl, "sl_mod_fetch_result: now interating Tracker results cursor");
- while (i <= MAX_SL_RESULTS) {
+ while ((slq->slq_state == SLQ_STATE_RUNNING) && (i <= MAX_SL_RESULTS)) {
become_root();
qres = tracker_sparql_cursor_next(slq->slq_tracker_cursor, NULL, &error);
unbecome_root();
if (!qres)
break;
+ if (firstmatch) {
+ /* For some reason the list of results always starts with a nil entry */
+ dalloc_add_copy(fm_array, &nil, sl_nil_t);
+ firstmatch = false;
+ }
+
become_root();
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) {
if (i < MAX_SL_RESULTS)
slq->slq_state = SLQ_STATE_DONE;
+ uint64 = (i > 0) ? 35 : 0; /* OS X AFP server returns 35 here if results are found */
+ dalloc_add_copy(slq->slq_reply, &uint64, uint64_t);
dalloc_add(slq->slq_reply, cnids, sl_cnids_t);
dalloc_add(slq->slq_reply, fm, sl_filemeta_t);
EC_CLEANUP:
- if (slq->slq_tracker_cursor) {
- if ((ret != 0) || (slq->slq_state == SLQ_STATE_DONE)) {
+ if (ret != 0) {
+ if (slq->slq_tracker_cursor) {
g_object_unref(slq->slq_tracker_cursor);
slq->slq_tracker_cursor = NULL;
}