diff --git a/PROMS/DataLoader/dlgExportImport.cs b/PROMS/DataLoader/dlgExportImport.cs index 00c840d3..dc1771cf 100644 --- a/PROMS/DataLoader/dlgExportImport.cs +++ b/PROMS/DataLoader/dlgExportImport.cs @@ -180,6 +180,11 @@ namespace DataLoader xd.Load(fn); LoadFormats(xd); Folder ff = AddFolder(Folder.Get(MyFolder.FolderID), xd); + if (ff == null) + { + MessageBox.Show("You can not import the same procedure set more than once", "Duplicate Import Error"); + return; + } _MyNewFolder = FolderInfo.Get(ff.FolderID); AddAnnotationTypes(xd); DocVersionInfo dvi = AddDocVersion(ff, xd); @@ -1825,6 +1830,8 @@ namespace DataLoader DateTime dts = DateTime.Parse(xd.DocumentElement.Attributes.GetNamedItem("dts").InnerText); string formatid = xd.DocumentElement.Attributes.GetNamedItem("formatid").InnerText; Format format = formatid == string.Empty ? null : OldToNewFormat(int.Parse(formatid)); + if (Folder.GetByParentID_Name(p.FolderID, name) != null) + return null; Folder f = Folder.MakeFolder(p, p.MyConnection, name, title, shortname, format, null, dts, usrid); return f; } diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs index e6b1c2fb..8ea37bf5 100644 --- a/PROMS/VEPROMS User Interface/dlgExportImport.cs +++ b/PROMS/VEPROMS User Interface/dlgExportImport.cs @@ -180,6 +180,11 @@ namespace VEPROMS xd.Load(fn); LoadFormats(xd); Folder ff = AddFolder(Folder.Get(MyFolder.FolderID), xd); + if (ff == null) + { + MessageBox.Show("You can not import the same procedure set more than once", "Duplicate Import Error"); + return; + } _MyNewFolder = FolderInfo.Get(ff.FolderID); AddAnnotationTypes(xd); DocVersionInfo dvi = AddDocVersion(ff, xd); @@ -1825,6 +1830,8 @@ namespace VEPROMS DateTime dts = DateTime.Parse(xd.DocumentElement.Attributes.GetNamedItem("dts").InnerText); string formatid = xd.DocumentElement.Attributes.GetNamedItem("formatid").InnerText; Format format = formatid == string.Empty ? null : OldToNewFormat(int.Parse(formatid)); + if (Folder.GetByParentID_Name(p.FolderID, name) != null) + return null; Folder f = Folder.MakeFolder(p, p.MyConnection, name, title, shortname, format, null, dts, usrid); return f; }