Merge pull request #40 from SPauly/iss35

Closes #35

Author: SPauly

GetIntoCPPAgain.exe

@@ -64,13 +64,25 @@ namespace csv
         throw Error("Row: Item not found");
     }
 
+    Row& Row::set_headerptr( Row* _headerptr){
+        mptr_header = _headerptr;
+        return *mptr_header;
+    }
+
     std::string_view Row::operator[] (_HEADER_TYPE &_header) const {
         return this->getvalue(_header);
     };
 
     std::string_view Row::operator[] (std::string_view _header) const {
-        _HEADER_TYPE pos = mptr_header->get_item_position(_header);
-        return m_data.at(pos);
+        if (mptr_header)
+        {
+            _HEADER_TYPE pos = mptr_header->get_item_position(_header);
+            return m_data.at(pos);
+        }
+        else
+        {
+            throw Error("Row: not linked to valid header");
+        }
     };
     //end class Row
 
@@ -90,18 +102,18 @@ namespace csv
     //end class Header
 
     //class CSVParser
-    CSVParser::CSVParser(const std::string *PATH_ptr, Header& _header_structure)
+    CSVParser::CSVParser(const std::string &PATH_ref, Header& _header_structure)
     {
         //initialize important references before exceptions
-        m_CURRENT_FILE = *PATH_ptr;
+        m_CURRENT_FILE = PATH_ref;
         _ptr_header = &_header_structure;
         m_DATABASE.exceptions(std::fstream::failbit);
 
         try
         {
 
             //open csv file
-            m_DATABASE.open(*PATH_ptr, std::ios::in | std::ios::out | std::ios::binary);
+            m_DATABASE.open(PATH_ref, std::ios::in | std::ios::out | std::ios::binary);
 
             //init header of file
             std::string *tmp_line = new std::string;
@@ -170,6 +182,10 @@ namespace csv
     }
 
     bool CSVParser::addRow(Row& _row) {
+        if(_ptr_header)
+            _row.set_headerptr(_ptr_header);
+        else
+            throw Error("CSV: Cannot add row without linking parser to valid header element first");
         try
         {
             if (m_DATABASE.is_open())

src/CSVParser.cpp

@@ -34,6 +34,7 @@ namespace csv
         void add_value(std::string_view);
         std::string_view getvalue(_HEADER_TYPE &) const;
         _HEADER_TYPE& get_item_position(std::string_view);
+        Row& set_headerptr(Row*);
 
 
         std::string_view operator[] (_HEADER_TYPE &) const;
@@ -42,7 +43,7 @@ namespace csv
     protected:
         std::vector<std::string> m_data;
     private:
-        Row* mptr_header;
+        Row* mptr_header = nullptr;
         _HEADER_TYPE m_item_pos = 0;
     };
 
@@ -65,7 +66,7 @@ namespace csv
     {
     public:
         CSVParser() = delete;
-        CSVParser(const std::string *, Header&);
+        CSVParser(const std::string &, Header&);
         ~CSVParser();
 
         const unsigned int size();
@@ -77,8 +78,8 @@ namespace csv
     #endif
 
     public:
-        Header *_ptr_header;
-        bool _csvgood;
+        Header *_ptr_header = nullptr;
+        bool _csvgood = false;
 
     private:
         std::string m_CURRENT_FILE;

src/CSVParser.h

@@ -3,7 +3,7 @@
 Library::Library(User* _ptr_user){
     mptr_user = _ptr_user;
     try{
-        mptr_csv_parser = new csv::CSVParser(&m_inventory_path, m_inventory_structure);
+        mptr_csv_parser = new csv::CSVParser(m_inventory_path, m_inventory_structure);
     }
     catch(csv::Error &e){
             log(e.what());

src/Library.cpp

@@ -172,7 +172,7 @@ User::User(){
 	//longer allocation
 	try
 	{
-		mptr_csv_parser = new csv::CSVParser(&m_path_userfile, m_userfile_header);
+		mptr_csv_parser = new csv::CSVParser(m_path_userfile, m_userfile_header);
 	}
 	catch (csv::Error &e)
 	{