Merge lp:~unity-team/unity/unity.results-cache into lp:unity

[Tim Penhey]

[lp:~unity-team/unity/unity.results-cache]

1572. By Jason Smith on 2011-09-16

slight correctness, still crashes

Unmerged revisions

1572. By Jason Smith on 2011-09-16

slight correctness, still crashes

1571. By Jason Smith on 2011-09-16

cache results from libdee rather than reload them constantly at a big performance penalty

=== modified file 'UnityCore/Result.cpp'
--- UnityCore/Result.cpp	2011-09-13 22:35:13 +0000
+++ UnityCore/Result.cpp	2011-09-16 03:28:24 +0000
@@ -48,14 +48,66 @@
 
 void Result::SetupGetters()
 {
-  uri.SetGetterFunction(sigc::bind(sigc::mem_fun(this, &RowAdaptorBase::GetStringAt), 0));
-  icon_hint.SetGetterFunction(sigc::bind(sigc::mem_fun(this, &RowAdaptorBase::GetStringAt), 1));
-  category_index.SetGetterFunction(sigc::bind(sigc::mem_fun(this, &RowAdaptorBase::GetUIntAt), 2));
-  mimetype.SetGetterFunction(sigc::bind(sigc::mem_fun(this, &RowAdaptorBase::GetStringAt), 3));
-  name.SetGetterFunction(sigc::bind(sigc::mem_fun(this, &RowAdaptorBase::GetStringAt), 4));
-  comment.SetGetterFunction(sigc::bind(sigc::mem_fun(this, &RowAdaptorBase::GetStringAt), 5));
-  dnd_uri.SetGetterFunction(sigc::bind(sigc::mem_fun(this, &RowAdaptorBase::GetStringAt), 6));
-}
+  _category_index = 9999;
+  
+  uri           .SetGetterFunction(sigc::mem_fun(this, &Result::GetUri));
+  icon_hint     .SetGetterFunction(sigc::mem_fun(this, &Result::GetIconHint));
+  category_index.SetGetterFunction(sigc::mem_fun(this, &Result::GetCategoryIndex));
+  mimetype      .SetGetterFunction(sigc::mem_fun(this, &Result::GetMimetype));
+  name          .SetGetterFunction(sigc::mem_fun(this, &Result::GetName));
+  comment       .SetGetterFunction(sigc::mem_fun(this, &Result::GetComment));
+  dnd_uri       .SetGetterFunction(sigc::mem_fun(this, &Result::GetDndUri));
+}
+
+std::string Result::GetUri()
+{
+  if (_uri.empty())
+    _uri = RowAdaptorBase::GetStringAt(0);
+  return _uri;
+}
+
+std::string Result::GetIconHint()
+{
+  if (_icon_hint.empty())
+    _icon_hint = RowAdaptorBase::GetStringAt(1);
+  return _icon_hint;
+}
+
+std::size_t Result::GetCategoryIndex()
+{
+  if (_category_index == 9999)
+    _category_index = RowAdaptorBase::GetUIntAt(2);
+  return _category_index;
+}
+
+std::string Result::GetMimetype()
+{
+  if (_mimetype.empty())
+    _mimetype = RowAdaptorBase::GetStringAt(3);
+  return _mimetype;
+}
+
+std::string Result::GetName()
+{
+  if (_name.empty())
+    _name = RowAdaptorBase::GetStringAt(4);
+  return _name;
+}
+
+std::string Result::GetComment()
+{
+  if (_comment.empty())
+    _comment = RowAdaptorBase::GetStringAt(5);
+  return _comment;
+}
+
+std::string Result::GetDndUri()
+{
+  if (_dnd_uri.empty())
+    _dnd_uri = RowAdaptorBase::GetStringAt(6);
+  return _dnd_uri;
+}
+
 
 }
 }

=== modified file 'UnityCore/Result.h'
--- UnityCore/Result.h	2011-09-13 22:35:13 +0000
+++ UnityCore/Result.h	2011-09-16 03:28:24 +0000
@@ -53,6 +53,22 @@
 
 private:
   void SetupGetters();
+
+  std::string GetUri();
+  std::string GetIconHint();
+  std::size_t GetCategoryIndex();
+  std::string GetMimetype();
+  std::string GetName();
+  std::string GetComment();
+  std::string GetDndUri();
+
+  std::string _uri;
+  std::string _icon_hint;
+  std::size_t _category_index;
+  std::string _mimetype;
+  std::string _name;
+  std::string _comment;
+  std::string _dnd_uri;
 };
 
 }