claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct retrieval of nullable integers from database.

Browse Source
This commit is contained in:
Natalia Portillo
2018-04-14 04:17:13 +01:00
parent 8646a7078a
commit c2fc4864ab
2 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Cicm.Database/Operations/Computer.cs
View File

@@ -82,7 +82,7 @@ namespace Cicm.Database
public bool GetComputers(out List<Computer> entries, int company)
{
#if DEBUG
System.Console.WriteLine("Getting all computers from company id {0}...", company);
Console.WriteLine("Getting all computers from company id {0}...", company);
#endif
try
@@ -102,8 +102,8 @@ namespace Cicm.Database
}
catch(Exception ex)
{
System.Console.WriteLine("Error getting computers.");
System.Console.WriteLine(ex);
Console.WriteLine("Error getting computers.");
Console.WriteLine(ex);
entries = null;
return false;
}
@@ -439,14 +439,17 @@ namespace Cicm.Database
{
Computer entry = new Computer
{
Id = int.Parse(dataRow["id"].ToString()),
Company = int.Parse(dataRow["company"].ToString()),
Year = int.Parse(dataRow["year"].ToString()),
Model = dataRow["model"].ToString(),
Cpu1 = int.Parse(dataRow["cpu1"].ToString()),
Mhz1 = float.Parse(dataRow["mhz1"].ToString()),
Cpu2 = int.Parse(dataRow["cpu2"].ToString()),
Mhz2 = float.Parse(dataRow["mhz2"].ToString()),
Id = int.Parse(dataRow["id"].ToString()),
Company = int.Parse(dataRow["company"].ToString()),
Year = int.Parse(dataRow["year"].ToString()),
Model = dataRow["model"].ToString(),
Cpu1 = int.Parse(dataRow["cpu1"].ToString()),
Mhz1 = float.Parse(dataRow["mhz1"].ToString()),
Cpu2 = string.IsNullOrEmpty(dataRow["cpu2"].ToString())
? 0
: int.Parse(dataRow["cpu2"].ToString()),
Mhz2 =
string.IsNullOrEmpty(dataRow["mhz2"].ToString()) ? 0 : float.Parse(dataRow["mhz2"].ToString()),
Bits = int.Parse(dataRow["bits"].ToString()),
Ram = int.Parse(dataRow["ram"].ToString()),
Rom = int.Parse(dataRow["rom"].ToString()),
@@ -459,13 +462,19 @@ namespace Cicm.Database
SoundChannels = int.Parse(dataRow["sound_channels"].ToString()),
MusicChannels = int.Parse(dataRow["music_channels"].ToString()),
Hdd1 = int.Parse(dataRow["hdd1"].ToString()),
Hdd2 = int.Parse(dataRow["hdd2"].ToString()),
Hdd3 = int.Parse(dataRow["hdd3"].ToString()),
Disk1 = int.Parse(dataRow["disk1"].ToString()),
Cap1 = dataRow["cap1"].ToString(),
Disk2 = int.Parse(dataRow["disk2"].ToString()),
Cap2 = dataRow["cap2"].ToString(),
Comment = dataRow["comment"].ToString()
Hdd2 = string.IsNullOrEmpty(dataRow["hdd2"].ToString())
? 0
: int.Parse(dataRow["hdd2"].ToString()),
Hdd3 = string.IsNullOrEmpty(dataRow["hdd3"].ToString())
? 0
: int.Parse(dataRow["hdd3"].ToString()),
Disk1 = int.Parse(dataRow["disk1"].ToString()),
Cap1 = dataRow["cap1"].ToString(),
Disk2 = string.IsNullOrEmpty(dataRow["disk2"].ToString())
? 0
: int.Parse(dataRow["disk2"].ToString()),
Cap2 = dataRow["cap2"].ToString(),
Comment = dataRow["comment"].ToString()
};
entries.Add(entry);

19
Cicm.Database/Operations/Console.cs
View File

@@ -418,14 +418,17 @@ namespace Cicm.Database
{
Console entry = new Console
{
Id = int.Parse(dataRow["id"].ToString()),
Company = int.Parse(dataRow["company"].ToString()),
Year = int.Parse(dataRow["year"].ToString()),
Name = dataRow["name"].ToString(),
Cpu1 = int.Parse(dataRow["cpu1"].ToString()),
Mhz1 = float.Parse(dataRow["mhz1"].ToString()),
Cpu2 = int.Parse(dataRow["cpu2"].ToString()),
Mhz2 = float.Parse(dataRow["mhz2"].ToString()),
Id = int.Parse(dataRow["id"].ToString()),
Company = int.Parse(dataRow["company"].ToString()),
Year = int.Parse(dataRow["year"].ToString()),
Name = dataRow["name"].ToString(),
Cpu1 = int.Parse(dataRow["cpu1"].ToString()),
Mhz1 = float.Parse(dataRow["mhz1"].ToString()),
Cpu2 = string.IsNullOrEmpty(dataRow["cpu2"].ToString())
? 0
: int.Parse(dataRow["cpu2"].ToString()),
Mhz2 =
string.IsNullOrEmpty(dataRow["mhz2"].ToString()) ? 0 : float.Parse(dataRow["mhz2"].ToString()),
Bits = int.Parse(dataRow["bits"].ToString()),
Ram = int.Parse(dataRow["ram"].ToString()),
Rom = int.Parse(dataRow["rom"].ToString()),