commit 555c4f1bce551bcf7e59767ab7b067f509a1a916
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Feb 13 16:57:36 2013 -0800
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Feb 13 16:57:36 2013 -0800
tree 7328555c23feb59a982a396ad5b41ffc7413c4a2
parent fbeeef22324a79582a704238a5f0cb012b99d220

fix bug in content server. check whether action interest belong to this group.
non related stuff in dumb-db

Change-Id: Ifef209f91ddbc8b3771e0f9e20438111bfa4b404

Conflicts:
	cmd/dump-db.cc

cmd/dump-db.cc

diff --git a/cmd/dump-db.cc b/cmd/dump-db.cc
index a160ae8..ca8f89b 100644
--- a/cmd/dump-db.cc
+++ b/cmd/dump-db.cc
@@ -177,7 +177,7 @@
   DumpActionData(const Ccnx::Name &deviceName, int64_t seqno)
   {
     sqlite3_stmt *stmt;
-    sqlite3_prepare_v2 (m_db, "SELECT action_content_object FROM ActionLog WHERE device_name = ? and seq_no = ?", -1, &stmt, 0);
+    sqlite3_prepare_v2 (m_db, "SELECT action_content_object, action_name FROM ActionLog WHERE device_name = ? and seq_no = ?", -1, &stmt, 0);
     Ccnx::CcnxCharbufPtr device_name = deviceName.toCcnxCharbuf();
     sqlite3_bind_blob (stmt, 1, device_name->buf(), device_name->length(), SQLITE_STATIC);
     sqlite3_bind_int64 (stmt, 2, seqno);
@@ -185,11 +185,14 @@
     if (sqlite3_step(stmt) == SQLITE_ROW)
     {
       PcoPtr pco = make_shared<ParsedContentObject> (reinterpret_cast<const unsigned char *> (sqlite3_column_blob (stmt, 0)), sqlite3_column_bytes (stmt, 0));
+      Ccnx::Name actionName = Ccnx::Name(sqlite3_column_blob(stmt, 1), sqlite3_column_bytes(stmt, 0));
       if (pco)
       {
         ActionItemPtr action = deserializeMsg<ActionItem> (pco->content());
         if (action)
         {
+          cout << "Action data size : " << pco->content().size() << endl;
+          cout << "Action data name : " << actionName << endl;
           string type = action->action() == ActionItem::UPDATE ? "UPDATE" : "DELETE";
           cout << "Action Type = " << type << endl;
           cout << "Timestamp = " << action->timestamp() << endl;

src/content-server.cc

diff --git a/src/content-server.cc b/src/content-server.cc
index df2b296..7199222 100644
--- a/src/content-server.cc
+++ b/src/content-server.cc
@@ -113,7 +113,11 @@
             }
           else if (type == "action")
             {
-              serve_Action (forwardingHint, name, interest);
+              string folder = name.getCompFromBackAsString (1);
+              if (folder == m_sharedFolderName)
+              {
+                serve_Action (forwardingHint, name, interest);
+              }
             }
         }
     }