diff --git a/PROMS/DataLoader/Approve.cs b/PROMS/DataLoader/Approve.cs index d1011112..d26322ac 100644 --- a/PROMS/DataLoader/Approve.cs +++ b/PROMS/DataLoader/Approve.cs @@ -364,12 +364,6 @@ namespace DataLoader get { return _RevDate; } set { _RevDate = value; } } - private string _ReviewDate; - public string ReviewDate - { - get { return _ReviewDate; } - set { _ReviewDate = value; } - } public ProcInfo(DataRow dr, string afpath) { Number = dr["NUMBER"].ToString(); @@ -388,8 +382,9 @@ namespace DataLoader if (fis.Count > 0) { Rev = fis[0].Rev; - RevDate = fis[0].RevDate ?? GetDBFRevDate(afpath); - ReviewDate = fis[0].ReviewDate; + // the following line needs fixed, i.e. should the date come from the set file or + // the datetime stamp of dbf (GetDBFRevDate): + //RevDate = fis[0].RevDate ?? GetDBFRevDate(afpath); } } public System.DateTime GetDTS(string date, string time) diff --git a/PROMS/DataLoader/FixItem.cs b/PROMS/DataLoader/FixItem.cs index 20e20a69..b06ef021 100644 --- a/PROMS/DataLoader/FixItem.cs +++ b/PROMS/DataLoader/FixItem.cs @@ -35,11 +35,8 @@ namespace DataLoader if (str.Contains(" ")) { int index = str.IndexOf(" "); - string [] parts = str.Substring(index + 1).Split("\\".ToCharArray()); _Sequence = str.Substring(0, index); - if (parts.Length > 0) _Rev = parts[0]; - if (parts.Length > 1) _RevDate = parts[1]; - if (parts.Length > 2) _ReviewDate = parts[2]; + _Rev = str.Substring(index + 1); } else _Sequence = str; @@ -68,17 +65,5 @@ 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/Procedures.cs b/PROMS/DataLoader/Procedures.cs index fc48db5c..3b0defb5 100644 --- a/PROMS/DataLoader/Procedures.cs +++ b/PROMS/DataLoader/Procedures.cs @@ -74,8 +74,6 @@ namespace DataLoader { if (ci == null) ci = new ConfigInfo(null); if (fixItems[0].Rev != null && fixItems[0].Rev != "") ci.AddItem("Procedure", "Rev", fixItems[0].Rev); - if (fixItems[0].RevDate != null && fixItems[0].RevDate != "") ci.AddItem("Procedure", "RevDate", fixItems[0].RevDate); - if (fixItems[0].ReviewDate != null && fixItems[0].ReviewDate != "") ci.AddItem("Procedure", "ReviewDate", fixItems[0].ReviewDate); } } // check that there is a "Series" column, i.e. the 10th column, some datasets