From 7d1f4f42007992fc2e7c2ff3ec8dc75a7aca0140 Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 4 Dec 2012 22:35:07 +0000 Subject: [PATCH] Added RevDate and ReviewDate properties to FixItem class Added applicability and procedureset elements to ConfigFile class when processing proc.ini file Added masterdir attribute to ConfigFile class when processing proc.ini file Replaced direct call to database with CSLA Command object in ClearData method of Loader class --- PROMS/DataLoader/FixItem.cs | 12 ++++++++++++ PROMS/DataLoader/LoadConfig.cs | 3 +++ PROMS/DataLoader/Loader.cs | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/PROMS/DataLoader/FixItem.cs b/PROMS/DataLoader/FixItem.cs index b06ef021..0888b2da 100644 --- a/PROMS/DataLoader/FixItem.cs +++ b/PROMS/DataLoader/FixItem.cs @@ -65,5 +65,17 @@ namespace DataLoader get { return _Rev; } set { _Rev = value; } } + private string _RevDate; + public string RevDate + { + get { return _RevDate; } + set { _RevDate = value; } + } + private string _ReviewDate; + public string ReviewDate + { + get { return _ReviewDate; } + set { _ReviewDate = value; } + } } } diff --git a/PROMS/DataLoader/LoadConfig.cs b/PROMS/DataLoader/LoadConfig.cs index 377c8a04..2b371cdd 100644 --- a/PROMS/DataLoader/LoadConfig.cs +++ b/PROMS/DataLoader/LoadConfig.cs @@ -52,6 +52,8 @@ namespace Config listIni_EleName.Add("display"); listIni_EleName.Add("backgrounddefaults"); listIni_EleName.Add("unit"); + listIni_EleName.Add("applicability"); + listIni_EleName.Add("procedureset"); // roapp.ini listIni_EleName.Add("roapp"); @@ -110,6 +112,7 @@ namespace Config listIni_AttrName.Add("id"); listIni_AttrName.Add("otherid"); listIni_AttrName.Add("procedurenumber"); + listIni_AttrName.Add("masterdir"); // roapp.ini diff --git a/PROMS/DataLoader/Loader.cs b/PROMS/DataLoader/Loader.cs index ded143ef..8f994444 100644 --- a/PROMS/DataLoader/Loader.cs +++ b/PROMS/DataLoader/Loader.cs @@ -179,7 +179,8 @@ namespace DataLoader } public void ClearData() { - Database.PurgeData(); + int ra = PurgeDataCommand.Execute(); + //Database.PurgeData(); } public static string MakeDate(string src) {