Switch to unified view

a/src/rcldb/rclquery.h b/src/rcldb/rclquery.h
...
...
17
#ifndef _rclquery_h_included_
17
#ifndef _rclquery_h_included_
18
#define _rclquery_h_included_
18
#define _rclquery_h_included_
19
#include <string>
19
#include <string>
20
#include <vector>
20
#include <vector>
21
21
22
#include "refcntr.h"
22
#include MEMORY_INCLUDE
23
#include "searchdata.h"
23
#include "searchdata.h"
24
24
25
#ifndef NO_NAMESPACES
25
#ifndef NO_NAMESPACES
26
namespace Rcl {
26
namespace Rcl {
27
#endif
27
#endif
...
...
90
90
91
    /** Accept data describing the search and query the index. This can
91
    /** Accept data describing the search and query the index. This can
92
     * be called repeatedly on the same object which gets reinitialized each
92
     * be called repeatedly on the same object which gets reinitialized each
93
     * time.
93
     * time.
94
     */
94
     */
95
    bool setQuery(RefCntr<SearchData> q);
95
    bool setQuery(STD_SHARED_PTR<SearchData> q);
96
96
97
    /** Get results count for current query */
97
    /** Get results count for current query */
98
    int getResCnt();
98
    int getResCnt();
99
99
100
    /** Get document at rank i in current query results. */
100
    /** Get document at rank i in current query results. */
...
...
115
    /** Retrieve page number for first match for "significant" query term 
115
    /** Retrieve page number for first match for "significant" query term 
116
     *  @param term returns the chosen term */
116
     *  @param term returns the chosen term */
117
    int getFirstMatchPage(const Doc &doc, std::string& term);
117
    int getFirstMatchPage(const Doc &doc, std::string& term);
118
118
119
    /** Retrieve a reference to the searchData we are using */
119
    /** Retrieve a reference to the searchData we are using */
120
    RefCntr<SearchData> getSD() 
120
    STD_SHARED_PTR<SearchData> getSD() 
121
    {
121
    {
122
    return m_sd;
122
    return m_sd;
123
    }
123
    }
124
124
125
    /** Expand query to look for documents like the one passed in */
125
    /** Expand query to look for documents like the one passed in */
...
...
141
    void  *m_sorter;
141
    void  *m_sorter;
142
    std::string m_sortField;
142
    std::string m_sortField;
143
    bool   m_sortAscending;
143
    bool   m_sortAscending;
144
    bool   m_collapseDuplicates;     
144
    bool   m_collapseDuplicates;     
145
    int    m_resCnt;
145
    int    m_resCnt;
146
    RefCntr<SearchData> m_sd;
146
    STD_SHARED_PTR<SearchData> m_sd;
147
    int    m_snipMaxPosWalk;
147
    int    m_snipMaxPosWalk;
148
148
149
    /* Copyconst and assignement private and forbidden */
149
    /* Copyconst and assignement private and forbidden */
150
    Query(const Query &) {}
150
    Query(const Query &) {}
151
    Query & operator=(const Query &) {return *this;};
151
    Query & operator=(const Query &) {return *this;};