dont load 'nan' as a string

Author: JorisGoosen

CommonData/column.cpp

@@ -116,6 +116,17 @@ void Column::dbLoadOldIndex(int index)
 		_ints.clear();
 		labelsClear();
 		db().labelsClear(_id);
+		
+		for(int row=0; row<_strs.size() && row < _dbls.size(); row++)
+		{
+			Log::log() << "_strs["<< row << "] == " << _strs[row] << " and  _dbls["<< row << "] == " << _dbls[row]  << std::endl;
+			
+			double dbl;
+			
+			if(ColumnUtils::getDoubleValue(_strs[row], dbl, false) && ((std::isnan(dbl) && std::isnan(_dbls[row])) || _dbls[row] == dbl))
+				_strs[row] = "";
+		}
+		
 	}
 	else
 	{

CommonData/databaseinterface.cpp

@@ -1423,6 +1423,9 @@ void DatabaseInterface::columnGetBasicInfo(int columnId, std::string &name, std:
 
 		colType = colTypeStr.empty() ? columnType::unknown : columnTypeFromString(colTypeStr);
 
+		if(colType == columnType::nominalText)
+			colType = columnType::nominal;
+		
 		Json::Reader().parse(emptyValuesStr, emptyValuesJson);
 	};
 

CommonData/dataset.cpp

@@ -524,15 +524,12 @@ void DataSet::dbLoad(int index, std::function<void(float)> progressCallback, Ver
 
 			_columns[i]->dbLoadOldIndex(i);
 
-			progressCallback(0.2 + (i * colProgressMult * 0.8));
+			progressCallback(0.2 + (i * colProgressMult * 0.6));
 		}
-	}
-
 
-	
-
-	
-	
+		db().dataSetCreateTable(this);
+		db().dataSetBatchedValuesUpdate(this, _columns, [&](float p){ progressCallback(0.8 + (p * 0.2)); });
+	}
 }
 
 void DataSet::upgradeEmptyValsFrom018To019(const Json::Value & emptyVals)