Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Removed trailing backslashes on data paths when processing data to merge

Browse Source 
We were not generating the proper extension for some of the 16-bit rtf attachment file names.
This commit is contained in:
John Jenko 2013-08-09 20:51:14 +00:00
parent 38a1b57144
commit fea3d9b1ed
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/DataLoader/LoadTreeDB.cs
View File

@ -62,7 +62,9 @@ namespace DataLoader
Folder fld = null; Folder fld = null;
foreach (FolderInfo fi in fil) foreach (FolderInfo fi in fil)
{ {
if (fi.Name.ToUpper() == name.ToUpper() && fi.Title.ToUpper() == title.ToUpper()) string fi_Title = fi.Title.TrimEnd('\\');
//if (fi.Name.ToUpper() == name.ToUpper() && fi.Title.ToUpper() == title.ToUpper())
if (fi.Name.ToUpper() == name.ToUpper() && fi_Title.ToUpper() == title.ToUpper())
{ {
fld = Folder.Get(fi.FolderID); fld = Folder.Get(fi.FolderID);
return fld; return fld;

11
PROMS/DataLoader/Sections.cs
View File

@ -31,6 +31,7 @@ namespace DataLoader
private Dictionary<string, int> dicOldToNew; private Dictionary<string, int> dicOldToNew;
private Item AddSection(Item procitem, string Number, string Title, string SecType, DateTime Dts, string Userid, ConfigInfo ci, string stpseq, string fmt, int libdocid, string pth, Item FromItem, FormatInfo activeFormat) private Item AddSection(Item procitem, string Number, string Title, string SecType, DateTime Dts, string Userid, ConfigInfo ci, string stpseq, string fmt, int libdocid, string pth, Item FromItem, FormatInfo activeFormat)
{ {
string missingFileName = "";
bool missingDocFile = false; bool missingDocFile = false;
//Console.WriteLine("before UpdateLabels"); //Console.WriteLine("before UpdateLabels");
frmMain.UpdateLabels(0, 1, 0); frmMain.UpdateLabels(0, 1, 0);
@ -124,8 +125,11 @@ namespace DataLoader
else else
{ {
int num = Convert.ToInt32(stpseq[0]) - 64; int num = Convert.ToInt32(stpseq[0]) - 64;
string thenum = num.ToString("d2"); char prefix = 'A';
fname = string.Format("{0}\\rtffiles\\{1}.A{2}", pth, ProcFileName, thenum); prefix += (char)(num / 100);
int numpart = num % 100;
//string thenum = num.ToString("d2");
fname = string.Format("{0}\\rtffiles\\{1}.{2}{3:D02}", pth, ProcFileName, prefix, numpart);
Application.DoEvents(); Application.DoEvents();
string procnum = ""; string procnum = "";
using (ItemInfo ii = ItemInfo.Get(procitem.ItemID)) using (ItemInfo ii = ItemInfo.Get(procitem.ItemID))
@ -142,6 +146,7 @@ namespace DataLoader
} }
Documentid = MissingDocument.DocID; Documentid = MissingDocument.DocID;
missingDocFile = true; missingDocFile = true;
missingFileName = string.Format("{0}.{1}{2:D02}",ProcFileName, prefix, numpart);
} }
} }
} }
@ -204,7 +209,7 @@ namespace DataLoader
if (missingDocFile) if (missingDocFile)
{ {
ItemAnnotation ia = itm.ItemAnnotations.Add(MigrationErrorType); ItemAnnotation ia = itm.ItemAnnotations.Add(MigrationErrorType);
ia.SearchText = "Missing File In Conversion"; ia.SearchText = string.Format("Missing File: {0} In Conversion",missingFileName);
ia.UserID = "Migration"; ia.UserID = "Migration";
itm.Save(); itm.Save();
} }