Almost reverting changes in naming convention: moving "user" name to
front, but still keeping application name. As part of an additional
change, shared folder name in actions is moved just after "action"
keyword
Making AddRemoteAction call exception-free
Change-Id: Ifd0a0c6256940eaf6df8081722ae9d7ed40b12e5
diff --git a/src/object-manager.cc b/src/object-manager.cc
index 7b02e16..fc50488 100644
--- a/src/object-manager.cc
+++ b/src/object-manager.cc
@@ -54,7 +54,7 @@
{
}
-// /<appname>/file/<hash>/<devicename>/<segment>
+// /<devicename>/<appname>/file/<hash>/<segment>
boost::tuple<HashPtr /*object-db name*/, size_t /* number of segments*/>
ObjectManager::localFileToObjects (const fs::path &file, const Ccnx::Name &deviceName)
{
@@ -73,7 +73,7 @@
break;
}
- Name name = Name ("/")(m_appName)("file")(fileHash->GetHash (), fileHash->GetHashBytes ())(deviceName)(segment);
+ Name name = Name ("/")(deviceName)(m_appName)("file")(fileHash->GetHash (), fileHash->GetHashBytes ())(segment);
// cout << *fileHash << endl;
// cout << name << endl;