diff --git a/ArmaRAMDb_x64.dll b/ArmaRAMDb_x64.dll index d31fdc8..3728e29 100644 Binary files a/ArmaRAMDb_x64.dll and b/ArmaRAMDb_x64.dll differ diff --git a/ArmaRAMDb_x64.so b/ArmaRAMDb_x64.so index 99e8759..924c0c3 100644 Binary files a/ArmaRAMDb_x64.so and b/ArmaRAMDb_x64.so differ diff --git a/addons/db/functions/fnc_hashSet.sqf b/addons/db/functions/fnc_hashSet.sqf index f14f632..6f62162 100644 --- a/addons/db/functions/fnc_hashSet.sqf +++ b/addons/db/functions/fnc_hashSet.sqf @@ -35,7 +35,7 @@ params [["_keyField", "", [""]], ["_data", [], [[]]]]; diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_hashSet' KeyField: '%1', Data: '%2'", _keyField, _data]; #endif -if (_keyField == "" || isNil "_data") exitWith { +if (_keyField == "" || count _data == 0) exitWith { diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_hashSet' Invalid Input for KeyField '%1' or Data '%2'", _keyField, _data]; }; diff --git a/addons/db/functions/fnc_hashSetBulk.sqf b/addons/db/functions/fnc_hashSetBulk.sqf index eb587fa..3c80f1b 100644 --- a/addons/db/functions/fnc_hashSetBulk.sqf +++ b/addons/db/functions/fnc_hashSetBulk.sqf @@ -34,7 +34,7 @@ params [["_data", [], [[]]]]; diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_hashSetBulk' Data: %1", _data]; #endif -if (isNil "_data") exitWith { +if (count _data == 0) exitWith { diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_hashSetBulk' Invalid Input for Data '%1'", _data]; }; diff --git a/addons/db/functions/fnc_hashSetId.sqf b/addons/db/functions/fnc_hashSetId.sqf index fa0d120..db286c5 100644 --- a/addons/db/functions/fnc_hashSetId.sqf +++ b/addons/db/functions/fnc_hashSetId.sqf @@ -36,7 +36,7 @@ params [["_key", "", [""]], ["_keyField", "", [""]], ["_data", [], [[]]]]; diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_hashSetId' Key: '%1', KeyField: '%2', Data: '%3'", _key, _keyField, _data]; #endif -if (_key == "" || _keyField == "" || isNil "_data") exitWith { +if (_key == "" || _keyField == "" || count _data == 0) exitWith { diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_hashSetId' Invalid Input for Key '%1', KeyField '%2' or Data '%3'", _key, _keyField, _data]; }; diff --git a/addons/db/functions/fnc_hashSetIdBulk.sqf b/addons/db/functions/fnc_hashSetIdBulk.sqf index 2a1b291..eb6ea47 100644 --- a/addons/db/functions/fnc_hashSetIdBulk.sqf +++ b/addons/db/functions/fnc_hashSetIdBulk.sqf @@ -34,7 +34,7 @@ params [["_data", [], [[]]]]; diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_hashSetIdBulk' Data: %1", _data]; #endif -if (isNil "_data") exitWith { +if (count _data == 0) exitWith { diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_hashSetIdBulk' Invalid Input for Data '%1'", _data]; }; diff --git a/addons/db/functions/fnc_listAdd.sqf b/addons/db/functions/fnc_listAdd.sqf index d18c020..475f3c8 100644 --- a/addons/db/functions/fnc_listAdd.sqf +++ b/addons/db/functions/fnc_listAdd.sqf @@ -35,7 +35,7 @@ params [["_key", "", [""]], ["_data", [], [[]]]]; diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_listAdd' Key: '%1', Data: '%2'", _key, _data]; #endif -if (_key == "" || isNil "_data") exitWith { +if (_key == "" || count _data == 0) exitWith { diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_listAdd' Invalid Input for Key '%1' or Data '%2'", _key, _data]; }; diff --git a/addons/db/functions/fnc_listSet.sqf b/addons/db/functions/fnc_listSet.sqf index 0c3a25f..2785e6c 100644 --- a/addons/db/functions/fnc_listSet.sqf +++ b/addons/db/functions/fnc_listSet.sqf @@ -36,7 +36,7 @@ params [["_key", "", [""]], ["_index", -1, [0]], ["_data", [], [[]]]]; diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_listSet' Key: '%1', Index: '%2', Data: '%3'", _key, _index, _data]; #endif -if (_key == "" || isNil "_data") exitWith { +if (_key == "" || count _data == 0) exitWith { diag_log text format ["ArmaRAMDb: 'ramdb_db_fnc_listSet' Invalid Input for Key '%1' or Data '%2'", _key, _data]; }; diff --git a/extension/bin/Release/net8.0/linux-x64/publish/ArmaRAMDb_x64.so b/extension/bin/Release/net8.0/linux-x64/publish/ArmaRAMDb_x64.so index 99e8759..924c0c3 100644 Binary files a/extension/bin/Release/net8.0/linux-x64/publish/ArmaRAMDb_x64.so and b/extension/bin/Release/net8.0/linux-x64/publish/ArmaRAMDb_x64.so differ diff --git a/extension/bin/Release/net8.0/win-x64/publish/ArmaRAMDb_x64.dll b/extension/bin/Release/net8.0/win-x64/publish/ArmaRAMDb_x64.dll index d31fdc8..3728e29 100644 Binary files a/extension/bin/Release/net8.0/win-x64/publish/ArmaRAMDb_x64.dll and b/extension/bin/Release/net8.0/win-x64/publish/ArmaRAMDb_x64.dll differ diff --git a/extension/src/Main.cs b/extension/src/Main.cs index 81e3e96..73b3f21 100644 --- a/extension/src/Main.cs +++ b/extension/src/Main.cs @@ -48,13 +48,13 @@ namespace ArmaRAMDb } if (str == "") - str = "@ramdb\\config.xml"; + str = $"@ramdb{Path.DirectorySeparatorChar}config.xml"; - if (File.Exists(Environment.CurrentDirectory + "\\" + str)) + if (File.Exists(Environment.CurrentDirectory + $"{Path.DirectorySeparatorChar}{str}")) { try { - var configXml = XElement.Load(Environment.CurrentDirectory + "\\" + str); + var configXml = XElement.Load(Environment.CurrentDirectory + $"{Path.DirectorySeparatorChar}{str}"); List settings = [.. configXml.Elements().Select(element => (string)element)]; // Parse existing settings