emoved duplicate code created by Source Safe Merge function
This commit is contained in:
parent
b8a405d173
commit
d6d29a868a
@ -2108,28 +2108,6 @@ namespace VEPROMS
|
|||||||
ExportROFst(xe, ai.MyROFst, "rofst");
|
ExportROFst(xe, ai.MyROFst, "rofst");
|
||||||
}
|
}
|
||||||
private void ExportAssociation(AssociationInfo ai, string nodename)
|
private void ExportAssociation(AssociationInfo ai, string nodename)
|
||||||
{
|
|
||||||
/*
|
|
||||||
AssociationID
|
|
||||||
VersionID
|
|
||||||
ROFstID
|
|
||||||
Config
|
|
||||||
DTS
|
|
||||||
UserID
|
|
||||||
*/
|
|
||||||
lblExportStatus.Text = "Exporting Association...";
|
|
||||||
Application.DoEvents();
|
|
||||||
XmlElement xe = xn.OwnerDocument.CreateElement(nodename);
|
|
||||||
xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "associationid", ai.AssociationID.ToString()));
|
|
||||||
xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "versionid", ai.VersionID.ToString()));
|
|
||||||
xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "rofstid", ai.ROFstID.ToString()));
|
|
||||||
xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "config", ai.Config));
|
|
||||||
xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "dts", ai.DTS.ToString("MM/dd/yyyy HH:mm:ss.fff")));
|
|
||||||
xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "userid", ai.UserID.ToString()));
|
|
||||||
xn.AppendChild(xe);
|
|
||||||
ExportROFst(xe, ai.MyROFst, "rofst");
|
|
||||||
}
|
|
||||||
private void ExportAssociation(AssociationInfo ai, string nodename)
|
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
AssociationID
|
AssociationID
|
||||||
@ -4008,14 +3986,6 @@ namespace VEPROMS
|
|||||||
return text.Substring(start, firstSlashVeeZero + 3); //everything upto \v0"
|
return text.Substring(start, firstSlashVeeZero + 3); //everything upto \v0"
|
||||||
}
|
}
|
||||||
private void ConvertImportProcedureROsToText(Content content, XmlNode xn)
|
private void ConvertImportProcedureROsToText(Content content, XmlNode xn)
|
||||||
{
|
|
||||||
string txt = text.Substring(start);
|
|
||||||
int firstSlashVeeZero = txt.IndexOf(@"\v0");
|
|
||||||
if (firstSlashVeeZero == 0 && txt.Length > 3 && txt[3] == ' ') //"\v0 "
|
|
||||||
return text.Substring(start, 4);
|
|
||||||
return text.Substring(start, firstSlashVeeZero + 3); //everything upto \v0"
|
|
||||||
}
|
|
||||||
private void ConvertImportProcedureROsToText(Content content, XmlNode xn)
|
|
||||||
{
|
{
|
||||||
foreach (XmlNode nd in xn.SelectNodes("rousage"))
|
foreach (XmlNode nd in xn.SelectNodes("rousage"))
|
||||||
{
|
{
|
||||||
|
@ -177,15 +177,6 @@ namespace VEPROMS
|
|||||||
tnc = tmp;
|
tnc = tmp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
if (tnc != null && tnc.Text != "VEPROMS") // B2020-114 - mad if statement removed: && !IsUsedPath(tnc.FullPath))
|
|
||||||
{
|
|
||||||
TreeNode tmp = tnc.Parent;
|
|
||||||
tnc.Remove();
|
|
||||||
tnc = tmp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return rtnval;
|
return rtnval;
|
||||||
}
|
}
|
||||||
@ -630,21 +621,6 @@ namespace VEPROMS
|
|||||||
DateTime pEnd = DateTime.Now;
|
DateTime pEnd = DateTime.Now;
|
||||||
txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
|
txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
|
||||||
txtProcess.AppendText(Environment.NewLine);
|
txtProcess.AppendText(Environment.NewLine);
|
||||||
if (rowCount > 0)
|
|
||||||
{
|
|
||||||
txtResults.AppendText(string.Format("The database contains {0} unused RO Associations.", rowCount));
|
|
||||||
txtResults.AppendText(Environment.NewLine);
|
|
||||||
txtResults.AppendText(Environment.NewLine);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
txtResults.AppendText("No unused RO Associations Found");// B2017-108 Always output results even if there isn't any
|
|
||||||
txtResults.AppendText(Environment.NewLine);
|
|
||||||
txtResults.AppendText(Environment.NewLine);
|
|
||||||
}
|
|
||||||
DateTime pEnd = DateTime.Now;
|
|
||||||
txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
|
|
||||||
txtProcess.AppendText(Environment.NewLine);
|
|
||||||
txtProcess.AppendText(Environment.NewLine);
|
txtProcess.AppendText(Environment.NewLine);
|
||||||
Application.DoEvents();
|
Application.DoEvents();
|
||||||
this.Cursor = Cursors.Default;
|
this.Cursor = Cursors.Default;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user