commit e5b551343256a5b436c316c9f43381f94016161f
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Nov 09 23:07:48 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 15:16:08 2014 -0700
tree 18d0170a06bbc7853e0e5643dabcc1129c1dcb3e
parent 711f589ba091301e2ec6f0dade4fc5a1742c4701

Fixing "bug" in browsecontactdialog. Something strange is with OSX Mavericks

src/browsecontactdialog.cpp

diff --git a/src/browsecontactdialog.cpp b/src/browsecontactdialog.cpp
index 1e3cecb..20a23a9 100644
--- a/src/browsecontactdialog.cpp
+++ b/src/browsecontactdialog.cpp
@@ -17,6 +17,7 @@
 #include <boost/tokenizer.hpp>
 #include "logging.h"
 #include "exception.h"
+#include "ndn.cxx/error.h"
 #endif
 
 using namespace std;
@@ -62,10 +63,9 @@
 }
 
 
-vector<string> 
-BrowseContactDialog::getCertName()
+void
+BrowseContactDialog::getCertNames(std::vector<std::string> &names)
 {
-  vector<string> result;
   try{
     using namespace boost::asio::ip;
     tcp::iostream request_stream;
@@ -75,7 +75,7 @@
       {
 	m_warningDialog->setMsg("Fail to fetch certificate directory! #1");
 	m_warningDialog->show();
-	return result;
+	return;
       }
     request_stream << "GET /cert/list/ HTTP/1.0\r\n";
     request_stream << "Host: ndncert.named-data.net\r\n\r\n";
@@ -87,8 +87,9 @@
       {
 	m_warningDialog->setMsg("Fail to fetch certificate directory! #2");
 	m_warningDialog->show();
-	return result;
+	return;
       }
+
     std::stringstream response_stream(line1);
     std::string http_version;
     response_stream >> http_version;
@@ -101,13 +102,13 @@
       {
     	m_warningDialog->setMsg("Fail to fetch certificate directory! #3");
 	m_warningDialog->show();
-	return result;
+	return;
       }
     if (status_code!=200)
       {
     	m_warningDialog->setMsg("Fail to fetch certificate directory! #4");
 	m_warningDialog->show();
-	return result;
+	return;
       }
     vector<string> headers;
     std::string header;
@@ -127,28 +128,29 @@
     try{
       while (it != certItems.end())
         {
-	  result.push_back(*it);
+          if (!it->empty())
+            {
+              names.push_back(*it);
+            }
           it++;
         }
     }catch (exception &e){
       m_warningDialog->setMsg("Fail to fetch certificate directory! #5");
       m_warningDialog->show();
-      return vector<string>();
     }
-    result.pop_back();
-    
-    return result;
+
   }catch(std::exception &e){
     m_warningDialog->setMsg("Fail to fetch certificate directory! #N");
     m_warningDialog->show();
-    return result;
   }
 }
 
 void
 BrowseContactDialog::updateCertificateMap(bool filter)
 {
-  vector<string> certNameList = getCertName();
+  vector<string> certNameList;
+  getCertNames(certNameList);
+  
   if(filter)
     {
       map<Name, Name> certificateMap;
@@ -186,7 +188,13 @@
   
       for(; it != certNameList.end(); it++)
 	{
-	  m_certificateNameList.push_back(*it);
+          try{
+            m_certificateNameList.push_back(Name (*it));
+          }
+          catch(error::Name)
+            {
+              ; // do nothing 
+            }
 	}
     }
 }

src/browsecontactdialog.h

diff --git a/src/browsecontactdialog.h b/src/browsecontactdialog.h
index f74a14f..dfcb64c 100644
--- a/src/browsecontactdialog.h
+++ b/src/browsecontactdialog.h
@@ -44,8 +44,8 @@
   typedef boost::unique_lock<RecLock> UniqueRecLock;
 
 private:
-  std::vector<std::string>
-  getCertName();
+  void
+  getCertNames(std::vector<std::string> &names);
 
   void
   updateCertificateMap(bool filter = false);