Fixed read/write for WsjcppObjTreeNodeBuilding

Author: sea5kg

src/examples/wsjcpp_obj_tree_node_building.cpp

@@ -78,15 +78,43 @@ int WsjcppObjTreeNodeBuilding::getNumberOfFloors() {
 // ---------------------------------------------------------------------
 
 bool WsjcppObjTreeNodeBuilding::writeDataPartToFile(std::ofstream &f, std::string &sError) {
-    sError = "Not implemented";
-    return false;
+    
+    if (!this->writeUInt32(f, m_nNumberOfFloors, sError)) {
+        return false;    
+    }
+
+    if (!this->writeString(f, m_value.getStreetName(), sError)) {
+        return false;    
+    }
+
+    if (!this->writeString(f, m_value.getBuildingNumber(), sError)) {
+        return false;    
+    }
+
+    return true;
 }
 
 // ---------------------------------------------------------------------
 
 bool WsjcppObjTreeNodeBuilding::readDataPartFromFile(std::ifstream &f, std::string &sError) {
-    sError = "Not implemented";
-    return false;
+    uint32_t nFloors = 0;
+    if (!this->readUInt32(f, nFloors, sError)) {
+        return false;
+    }
+    m_nNumberOfFloors = nFloors;
+
+    std::string sStreet;
+    if (!this->readString(f, sStreet, sError)) {
+        return false;
+    }
+
+    std::string sBuilding;
+    if (!this->readString(f, sBuilding, sError)) {
+        return false;
+    }
+    
+    m_value = Address(sStreet, sBuilding);
+    return true;
 }
 
 // ---------------------------------------------------------------------
@@ -97,3 +125,55 @@ std::string WsjcppObjTreeNodeBuilding::toString(const std::string &sIntent) {
         + "\n" + sIntent + "number-of-floors: " + std::to_string(m_nNumberOfFloors);
     ;
 }
+
+// ---------------------------------------------------------------------
+
+bool WsjcppObjTreeNodeBuilding::readUInt32(std::ifstream &f, uint32_t &nVal, std::string &sError) {
+    uint32_t nStringLen = 0;
+    char arrInteger[4];
+    f.read(arrInteger, 4);
+    if (!f) {
+        sError = "WsjcppObjTreeNodeBuilding. Could not read string len. File broken. Can read " + std::to_string(f.gcount());
+        return false;
+    }
+    nVal = *reinterpret_cast<uint32_t*>(arrInteger);
+    return true; 
+}
+
+// ---------------------------------------------------------------------
+
+bool WsjcppObjTreeNodeBuilding::writeUInt32(std::ofstream &f, uint32_t nVal, std::string &sError) {
+    static_assert(sizeof(uint32_t) == 4, "Expected sizeof(uint32_t) == 4");
+    const char *pData = reinterpret_cast<const char *>(&nVal);
+    f.write(pData, 4);
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+bool WsjcppObjTreeNodeBuilding::readString(std::ifstream &f, std::string &sVal, std::string &sError) {
+    uint32_t nStringLen = 0;
+    if (!this->readUInt32(f, nStringLen, sError)) {
+        return false;
+    }
+    char *pStr = new char[nStringLen];
+    f.read(pStr, nStringLen);
+    if (!f) {
+        delete[] pStr;
+        sError = "WsjcppObjTreeNodeBuilding. Could not read string data. File broken. Can read " + std::to_string(f.gcount());
+        return false;
+    }
+    sVal = std::string(pStr, nStringLen);
+    delete[] pStr;
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+bool WsjcppObjTreeNodeBuilding::writeString(std::ofstream &f, std::string sVal, std::string &sError) {
+    if (!writeUInt32(f, sVal.size(), sError)) {
+        return false;
+    }
+    f.write(sVal.c_str(), sVal.size());
+    return true;
+}

src/examples/wsjcpp_obj_tree_node_building.h

@@ -39,6 +39,13 @@ class WsjcppObjTreeNodeBuilding : public WsjcppObjTreeNode {
     private:
         Address m_value;
         int m_nNumberOfFloors;
+
+        bool readUInt32(std::ifstream &f, uint32_t &nVal, std::string &sError);
+        bool writeUInt32(std::ofstream &f, uint32_t nVal, std::string &sError);
+
+        bool readString(std::ifstream &f, std::string &nVal, std::string &sError);
+        bool writeString(std::ofstream &f, std::string nVal, std::string &sError);
+        
 };
 
 WSJCPP_OBJ_TREE_CHAIN_DECLARE_INLINE(Address, WsjcppObjTreeNodeBuilding)