recoll / Code / Diff of /src/kde/kioslave/kio_recoll-kde4/kio

Diff of /src/kde/kioslave/kio_recoll-kde4/kio_recoll.cpp [0e0b66] .. [0b0385]

Switch to unified view


...
    m_reason = "Internal Error: cant build search";
    error(KIO::ERR_SLAVE_DEFINED, m_reason.c_str());
    return false;
    }

    std::shared_ptr<Rcl::SearchData> sdata(sd);
    std::shared_ptr<Rcl::Query>query(new Rcl::Query(m_rcldb));
    query->setCollapseDuplicates(prefs.collapseDuplicates);
    if (!query->setQuery(sdata)) {
    m_reason = "Query execute failed. Invalid query or syntax error?";
    error(KIO::ERR_SLAVE_DEFINED, m_reason.c_str());
    return false;
    }

    DocSequenceDb *src = 
    new DocSequenceDb(std::shared_ptr<Rcl::Query>(query), "Query results", sdata);
    if (src == 0) {
    error(KIO::ERR_SLAVE_DEFINED, "Can't build result sequence");
    return false;
    }
    m_source = std::shared_ptr<DocSequence>(src);
    // Reset pager in all cases. Costs nothing, stays at page -1 initially
    // htmldosearch will fetch the first page if needed.
    m_pager.setDocSource(m_source);
    return true;
}

	a/src/kde/kioslave/kio_recoll-kde4/kio_recoll.cpp		b/src/kde/kioslave/kio_recoll-kde4/kio_recoll.cpp
	...		...
330	m_reason = "Internal Error: cant build search";	330	m_reason = "Internal Error: cant build search";
331	error(KIO::ERR_SLAVE_DEFINED, m_reason.c_str());	331	error(KIO::ERR_SLAVE_DEFINED, m_reason.c_str());
332	return false;	332	return false;
333	}	333	}
334		334
335	STD_SHARED_PTR<Rcl::SearchData> sdata(sd);	335	std::shared_ptr<Rcl::SearchData> sdata(sd);
336	STD_SHARED_PTR<Rcl::Query>query(new Rcl::Query(m_rcldb));	336	std::shared_ptr<Rcl::Query>query(new Rcl::Query(m_rcldb));
337	query->setCollapseDuplicates(prefs.collapseDuplicates);	337	query->setCollapseDuplicates(prefs.collapseDuplicates);
338	if (!query->setQuery(sdata)) {	338	if (!query->setQuery(sdata)) {
339	m_reason = "Query execute failed. Invalid query or syntax error?";	339	m_reason = "Query execute failed. Invalid query or syntax error?";
340	error(KIO::ERR_SLAVE_DEFINED, m_reason.c_str());	340	error(KIO::ERR_SLAVE_DEFINED, m_reason.c_str());
341	return false;	341	return false;
342	}	342	}
343		343
344	DocSequenceDb *src =	344	DocSequenceDb *src =
345	new DocSequenceDb(STD_SHARED_PTR<Rcl::Query>(query), "Query results", sdata);	345	new DocSequenceDb(std::shared_ptr<Rcl::Query>(query), "Query results", sdata);
346	if (src == 0) {	346	if (src == 0) {
347	error(KIO::ERR_SLAVE_DEFINED, "Can't build result sequence");	347	error(KIO::ERR_SLAVE_DEFINED, "Can't build result sequence");
348	return false;	348	return false;
349	}	349	}
350	m_source = STD_SHARED_PTR<DocSequence>(src);	350	m_source = std::shared_ptr<DocSequence>(src);
351	// Reset pager in all cases. Costs nothing, stays at page -1 initially	351	// Reset pager in all cases. Costs nothing, stays at page -1 initially
352	// htmldosearch will fetch the first page if needed.	352	// htmldosearch will fetch the first page if needed.
353	m_pager.setDocSource(m_source);	353	m_pager.setDocSource(m_source);
354	return true;	354	return true;
355	}	355	}