diff --git a/PROMS/DataLoader/App.config b/PROMS/DataLoader/App.config
index 5d4dbd3e..55bfd659 100644
--- a/PROMS/DataLoader/App.config
+++ b/PROMS/DataLoader/App.config
@@ -170,6 +170,9 @@
False
+
+ 0
+
diff --git a/PROMS/DataLoader/Approve.cs b/PROMS/DataLoader/Approve.cs
index 7d6df00f..e96f9943 100644
--- a/PROMS/DataLoader/Approve.cs
+++ b/PROMS/DataLoader/Approve.cs
@@ -12,7 +12,7 @@ namespace DataLoader
{
public bool BuildApprovedRevision()
{
- if(!frmMain.RunScript("PROMSApproveApprove.sql", frmMain.MySettings.DBName)) return false;
+ if(!frmMain.RunScript("PROMSApproveApprove.sql", frmMain.DBName)) return false;
bool rv = false;
using (Stage myStage = GetApprovedStage())
{
@@ -23,7 +23,7 @@ namespace DataLoader
{
if (dvi.Procedures.Count > 0)
{
- if (!frmMain.MySettings.OnlyThisSet || frmMain.MySettings.ProcedureSetPath.ToUpper() == dvi.MyFolder.Title.ToUpper())
+ if (!frmMain.MySettings.OnlyThisSet || frmMain.ProcedureSetPath.ToUpper() == dvi.MyFolder.Title.ToUpper())
{
string approvedFolder = dvi.MyFolder.Title + @"\APPROVED";
//B2012-094 fix
diff --git a/PROMS/DataLoader/DataLoaderSettings.cs b/PROMS/DataLoader/DataLoaderSettings.cs
index 45304d0a..1a0bd2f1 100644
--- a/PROMS/DataLoader/DataLoaderSettings.cs
+++ b/PROMS/DataLoader/DataLoaderSettings.cs
@@ -263,6 +263,15 @@ namespace DataLoader
get { return _Skip; }
set { _Skip = value; }
}
+ private int _HowMany=0; // Skip specified procedures during load.
+ [DisplayName("How Many Procedures should be converted")]
+ [Category("Debugging")]
+ [Description("Only process part of the set.")]
+ public int HowMany
+ {
+ get { return _HowMany; }
+ set { _HowMany = value; }
+ }
#endregion
#region Accessory Pages
private AccPageConversion _ConvertTo;
diff --git a/PROMS/DataLoader/DocVersions.cs b/PROMS/DataLoader/DocVersions.cs
index 2ac7d2eb..f3f86914 100644
--- a/PROMS/DataLoader/DocVersions.cs
+++ b/PROMS/DataLoader/DocVersions.cs
@@ -40,6 +40,12 @@ namespace DataLoader
long lTime = DateTime.Now.Ticks;
string pth = docver.Title;
// if the Title is empty, return because this docversion has already been migrated.
+ bool appending = false;
+ if (frmMain.Automatic && !frmMain.PurgeExistingData)
+ {
+ pth = frmMain.ProcedureSetPath;
+ appending = true;
+ }
if (pth == null || pth == "" || pth == "Title") return TimeSpan.FromTicks(0);
MultiUnitCount = docver.DocVersionConfig.Unit_Count;
if (MultiUnitCount > 0)
@@ -64,11 +70,13 @@ namespace DataLoader
DeleteINFFiles(pth);
_OutTran = new OutsideTransition(cn);
frmMain.AddInfo("Before MigrateROFST{0}\r\n{1}", GC.GetTotalMemory(true), VEPROMS.CSLA.Library.CSLACache.UsageAll);
- MigrateROFST(pth, docver);
+ //if(!appending)
+ MigrateROFST(pth, docver);
GC.Collect();
frmMain.AddInfo("After MigrateROFST{0}\r\n{1}", GC.GetTotalMemory(true), VEPROMS.CSLA.Library.CSLACache.UsageAll);
// Migrate library documents
- MigrateLibDocs(cn, pth);
+ //if(!appending)
+ MigrateLibDocs(cn, pth, appending);
// if migrating bge, save the 'unit' number. This unit number is used in pagelist items and is
// based on the path/directory name of the procedure set.