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

Diff of /src/kde/kioslave/kio_recoll/kio_recoll.cpp [543568] .. [0b0385]

Switch to unified view


...
        m_reason = "Internal Error: cant build search";
        error(KIO::ERR_SLAVE_DEFINED, u8s2qs(m_reason));
        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, u8s2qs(m_reason));
        return false;
    }

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