diff --git a/skeleton/Program/Build/RaspberryCloud.sdf b/skeleton/Program/Build/RaspberryCloud.sdf index b02189586fc087e4ab4ae27e22e2a36710253432..0d82025a9b336248ddd9621b4381ad9c58f3e20e 100644 Binary files a/skeleton/Program/Build/RaspberryCloud.sdf and b/skeleton/Program/Build/RaspberryCloud.sdf differ diff --git a/skeleton/Program/Build/RaspberryCloud.v12.suo b/skeleton/Program/Build/RaspberryCloud.v12.suo index e88b00ad8041e9b08d41c2bca7937b00532b09eb..402fbf93dbfa87c5e90ec4a3fbb8c1c47c8a4e71 100644 Binary files a/skeleton/Program/Build/RaspberryCloud.v12.suo and b/skeleton/Program/Build/RaspberryCloud.v12.suo differ diff --git a/skeleton/Program/Build/RaspberryCloud/store.dat b/skeleton/Program/Build/RaspberryCloud/store.dat index 5e39d336a9d3bd58d2cda90215f1fb3843eebb7e..a5eeeb2824cad41132d9e145dc213d252d50585d 100644 --- a/skeleton/Program/Build/RaspberryCloud/store.dat +++ b/skeleton/Program/Build/RaspberryCloud/store.dat @@ -1,24 +1,47 @@ -1 -test.jpg -283725 +2 +one.txt +104 10 -frag_000_000.frg +1.txt_000_000.frg localcm -frag_000_001.frg +1.txt_000_001.frg localcm -frag_000_002.frg +1.txt_000_002.frg localcm -frag_000_003.frg +1.txt_000_003.frg localcm -frag_000_004.frg +1.txt_000_004.frg localcm -frag_000_005.frg +1.txt_000_005.frg localcm -frag_000_006.frg +1.txt_000_006.frg localcm -frag_000_007.frg +1.txt_000_007.frg localcm -frag_000_008.frg +1.txt_000_008.frg localcm -frag_000_009.frg +1.txt_000_009.frg +localcm +two.txt +104 +10 +2.txt_000_000.frg +localcm +2.txt_000_001.frg +localcm +2.txt_000_002.frg +localcm +2.txt_000_003.frg +localcm +2.txt_000_004.frg +localcm +2.txt_000_005.frg +localcm +2.txt_000_006.frg +localcm +2.txt_000_007.frg +localcm +2.txt_000_008.frg +localcm +2.txt_000_009.frg localcm diff --git a/skeleton/Program/Source/cloud/LocalCloudAdapter.h b/skeleton/Program/Source/cloud/LocalCloudAdapter.h index 92730f3bc15225bae00bb3c1daf2aaacc1ce4e8a..ec98e8df3a38eb23be36d74c461b67f7d0a8945c 100644 --- a/skeleton/Program/Source/cloud/LocalCloudAdapter.h +++ b/skeleton/Program/Source/cloud/LocalCloudAdapter.h @@ -16,9 +16,9 @@ using namespace std; */ class LocalCloudAdapter : public CloudAdapter { private: - string sourceFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\data\\"; - string fragFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\temp\\"; - string cloudFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\cloud\\"; + string sourceFolder = "C:\\cloud\\raspberrycloud\\skeleton\\Program\\data\\"; + string fragFolder = "C:\\cloud\\raspberrycloud\\skeleton\\Program\\temp\\"; + string cloudFolder = "C:\\cloud\\raspberrycloud\\skeleton\\Program\\cloud\\"; public: LocalCloudAdapter(string _cloudID); diff --git a/skeleton/Program/Source/dataAccess/CloudFileSystem.h b/skeleton/Program/Source/dataAccess/CloudFileSystem.h index 03d846654dbaf7b03f1865b7c356da1cbfbbba9c..1a641044d6801526ef3d61aa73e8895b150b271a 100644 --- a/skeleton/Program/Source/dataAccess/CloudFileSystem.h +++ b/skeleton/Program/Source/dataAccess/CloudFileSystem.h @@ -27,7 +27,7 @@ class Application; */ class CloudFileSystem { private: - string fragFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\temp\\"; + string fragFolder = "C:\\cloud\\raspberrycloud\\skeleton\\Program\\temp\\"; /** * Indicates where is the process running diff --git a/skeleton/Program/Source/dataAccess/Decoder.cpp b/skeleton/Program/Source/dataAccess/Decoder.cpp index 711b3a73ea62c0b6556a58d990308f651749c9ed..d261f5aa39074d44aac65a7d19a7e29d2f1806d5 100644 --- a/skeleton/Program/Source/dataAccess/Decoder.cpp +++ b/skeleton/Program/Source/dataAccess/Decoder.cpp @@ -14,8 +14,8 @@ */ string Decoder::decode(FileDescriptor* fileDescriptor) { - string dataFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\data\\"; - string fragFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\temp\\"; + string dataFolder = "C:\\cloud\\raspberrycloud\\skeleton\\Program\\data\\"; + string fragFolder = "C:\\cloud\\raspberrycloud\\skeleton\\Program\\temp\\"; LOG_ENTER_EXIT; if (fileDescriptor == NULL){ diff --git a/skeleton/Program/Source/dataAccess/Encoder.cpp b/skeleton/Program/Source/dataAccess/Encoder.cpp index eea3992cd010b1cb1da41235ca798cc047ca4ea8..70c6a0370c579ed917ad33922da2ef9d3e0b91bd 100644 --- a/skeleton/Program/Source/dataAccess/Encoder.cpp +++ b/skeleton/Program/Source/dataAccess/Encoder.cpp @@ -15,8 +15,8 @@ FileDescriptor* Encoder::encode(string localFileID, string destinationFileID) { LOG_ENTER_EXIT; - string dataFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\data\\"; - string fragFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\temp\\"; + string dataFolder = "C:\\cloud\\raspberrycloud\\skeleton\\Program\\data\\"; + string fragFolder = "C:\\cloud\\raspberrycloud\\skeleton\\Program\\temp\\"; std::string encode_filename = dataFolder + localFileID; diff --git a/skeleton/Program/cloud/2.txt b/skeleton/Program/cloud/2.txt deleted file mode 100644 index 1e4b71902a6c0ac6f0ad780dd636adecc211cda2..0000000000000000000000000000000000000000 --- a/skeleton/Program/cloud/2.txt +++ /dev/null @@ -1,7 +0,0 @@ -2222222222222222222 -2222222222222 -22222 -222222222222 -2222222222222 -222222222222222222 -222222222222 \ No newline at end of file diff --git a/skeleton/Program/cloud/3.txt b/skeleton/Program/cloud/3.txt deleted file mode 100644 index a05438f7402fb6aa0820b5de32ace7689a796de7..0000000000000000000000000000000000000000 --- a/skeleton/Program/cloud/3.txt +++ /dev/null @@ -1,7 +0,0 @@ -3333333333333333333 -3333333333333 -33333 -333333333333 -3333333333333 -333333333333333333 -333333333333 \ No newline at end of file diff --git a/skeleton/Program/data/old/one.txt b/skeleton/Program/data/old/one.txt deleted file mode 100644 index e2350307b3a67d1677c6aa39f3e9c4847e270dbc..0000000000000000000000000000000000000000 --- a/skeleton/Program/data/old/one.txt +++ /dev/null @@ -1,7 +0,0 @@ -1111111111111111111 -1111111111111 -11111 -111111111111 -1111111111111 -111111111111111111 -111111111111 \ No newline at end of file diff --git a/skeleton/Program/data/old/three.txt b/skeleton/Program/data/old/three.txt deleted file mode 100644 index a05438f7402fb6aa0820b5de32ace7689a796de7..0000000000000000000000000000000000000000 --- a/skeleton/Program/data/old/three.txt +++ /dev/null @@ -1,7 +0,0 @@ -3333333333333333333 -3333333333333 -33333 -333333333333 -3333333333333 -333333333333333333 -333333333333 \ No newline at end of file diff --git a/skeleton/Program/data/old/two.txt b/skeleton/Program/data/old/two.txt deleted file mode 100644 index 1e4b71902a6c0ac6f0ad780dd636adecc211cda2..0000000000000000000000000000000000000000 --- a/skeleton/Program/data/old/two.txt +++ /dev/null @@ -1,7 +0,0 @@ -2222222222222222222 -2222222222222 -22222 -222222222222 -2222222222222 -222222222222222222 -222222222222 \ No newline at end of file