← Back to branch summary

~scope-aggregator/scope-aggregator/vivid-trunk

« back to all changes in this revision

Viewing changes to include/query.h

Tags: 4.7
https://launchpad.net/bugs/1572154
merge branch with many changes:
* in handle_child_scope_results(), check if the query is still
  valid. If not, then return.
* do not save ptrs to categories. Instead, use from shell if already registered, else register and then use it from shell.
* feature testing with some new parts and some fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/query.h
160
160
    std::map<std::string, std::shared_ptr<keyword>> id_keyword_map;//keyword id (the keyword string) to keyword instance
161
161
    std::map<std::string,std::string> keyword_deptTitleMsgid; // keyword to msgid used to look up its title
162
162
    std::map<std::string,std::string> keyword_deptId;
 
163
    std::map<std::string,std::string> keyword_surfaceRdr;
163
164
 
164
165
    void getDeclaredChildScopes();
165
166
    void make_declared_scopes();
179
180
    std::map<std::string,bool> keywordSharedCat_isSecondResult;
180
181
    std::map<std::string,std::string> shared_keyword_cat_titlemsgid; //category to tittle for l10n lookup
181
182
    std::map<std::string,us::Category::SCPtr> catname_catptr;//store pointer to shared category
 
183
    std::map<std::string,us::Category::SCPtr> catname_keyword_catptr;//store pointer to keyword not shared
182
184
    std::map<std::string,bool> sharedcat_catregistered;//stores whether the shared cat's ctegory is registered yet
183
185
    void create_departments(us::SearchReplyProxy const &reply_);
184
186
    void handle_current_child_scopes(bool empty_search, us::SearchReplyProxy const& upstream_reply);