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

Outside Transitions logic and annotations for unresolved transitions

Browse Source
This commit is contained in:
Jsj 2008-02-21 16:51:50 +00:00
parent efd8d900b2
commit 68d3ef8861
1 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
PROMS/DataLoader/Steps.cs
View File

@ -16,7 +16,7 @@ namespace DataLoader
{ {
public partial class Loader public partial class Loader
{ {
private Item AddStep(OleDbConnection cn, string StepType, string Textm, string Recid, string stpseq, string structtype, Item FromItem, DateTime dts, string userid, bool conv_caret) private Item AddStep(OleDbConnection cn, string StepType, string Textm, string Recid, string stpseq, string structtype, Item FromItem, DateTime dts, string userid, bool conv_caret, string pth)
{ {
Content content = null; Content content = null;
Item item = null; Item item = null;
@ -37,7 +37,7 @@ namespace DataLoader
else else
stptext = TextConvert.ConvertText(Textm.Substring(0, tok), conv_caret); stptext = TextConvert.ConvertText(Textm.Substring(0, tok), conv_caret);
string seqcvt = TextConvert.ConvertSeq(stpseq); string seqcvt = TextConvert.ConvertSeq(stpseq);
// Figure marker - it should NEVER get here!!! // Figure marker - it should NEVER get here!!!
int tokfig = Textm.IndexOf('\xE8'); int tokfig = Textm.IndexOf('\xE8');
@ -52,7 +52,7 @@ namespace DataLoader
if (cbittst != ' ' && (cbittst & 0x80) > 1) if (cbittst != ' ' && (cbittst & 0x80) > 1)
{ {
ManualPagebreak = true; ManualPagebreak = true;
if (ci==null) ci = new ConfigInfo(null); if (ci == null) ci = new ConfigInfo(null);
ci.AddItem("Step", "ManualPagebreak", "True"); ci.AddItem("Step", "ManualPagebreak", "True");
newstptyp = StepType.Substring(1, 1); newstptyp = StepType.Substring(1, 1);
} }
@ -64,7 +64,7 @@ namespace DataLoader
// Before we save it, handle RO & Transitions tokens. // Before we save it, handle RO & Transitions tokens.
int tokrt = Textm.IndexOf('\x15'); int tokrt = Textm.IndexOf('\x15');
bool txtdirty = false; bool txtdirty = false;
if (tokrt > -1) if (tokrt > -1)
{ {
txtdirty = true; txtdirty = true;
@ -78,10 +78,11 @@ namespace DataLoader
// use the unicode chars. // use the unicode chars.
char[] chrrotrn = { '\x252C', '\x2566' }; char[] chrrotrn = { '\x252C', '\x2566' };
tokrt = Textm.IndexOfAny(chrrotrn); tokrt = Textm.IndexOfAny(chrrotrn);
_TransitionMigrationErrors = new List<string>();
if (tokrt > -1) if (tokrt > -1)
{ {
txtdirty = true; txtdirty = true;
stptext = MigrateTrans(cn, stptext, seqcvt, content); stptext = MigrateTrans(cn, stptext, seqcvt, content, pth);
} }
if (txtdirty) if (txtdirty)
{ {
@ -89,6 +90,9 @@ namespace DataLoader
//content.Save(); //content.Save();
} }
if (!content.IsSavable) ErrorRpt.ErrorReport(content); if (!content.IsSavable) ErrorRpt.ErrorReport(content);
List<string> migrationerrors = null;
if (_ContentMigrationErrors.ContainsKey(content.ContentID))
migrationerrors = _ContentMigrationErrors[content.ContentID];
content.Save(); content.Save();
// check if already created thru new during transition migration... // check if already created thru new during transition migration...
if (dicTrans_ItemIds.ContainsKey(ProcNumber + "|" + seqcvt)) if (dicTrans_ItemIds.ContainsKey(ProcNumber + "|" + seqcvt))
@ -101,18 +105,38 @@ namespace DataLoader
if (!item.IsSavable) ErrorRpt.ErrorReport(item); if (!item.IsSavable) ErrorRpt.ErrorReport(item);
item.Save(); item.Save();
dicTrans_ItemIds.Remove(ProcNumber + "|" + seqcvt); dicTrans_ItemIds.Remove(ProcNumber + "|" + seqcvt);
dicTrans_MigrationErrors.Remove(ProcNumber + "|" + seqcvt);
} }
else else
item = Item.MakeItem(FromItem, content, content.DTS, content.UserID); item = Item.MakeItem(FromItem, content, content.DTS, content.UserID);
if (migrationerrors != null)
{
foreach (string str in migrationerrors)
{
ItemAnnotation ia = item.ItemAnnotations.Add(MigrationErrorType);
ia.SearchText = str;
}
if (!item.IsSavable) ErrorRpt.ErrorReport(item);
item.Save();
}
if (_TransitionMigrationErrors.Count > 0)
{
foreach (string str in _TransitionMigrationErrors)
{
if (!dicTrans_MigrationErrors.ContainsKey(str))
dicTrans_MigrationErrors.Add(str, new List<Item>());
dicTrans_MigrationErrors[str].Add(item);
}
}
dicTrans_ItemDone[ProcNumber + "|" + seqcvt] = item; dicTrans_ItemDone[ProcNumber + "|" + seqcvt] = item;
dicOldStepSequence[content] = seqcvt; dicOldStepSequence[content] = seqcvt;
} }
catch (Exception ex) catch (Exception ex)
{ {
log.Error("Save Step"); log.Error("Save Step");
log.ErrorFormat("oldstepsequence = {0}", stpseq); log.ErrorFormat("oldstepsequence = {0}", stpseq);
log.ErrorFormat("{0}\r\n\r\n{1}", ex.Message, ex.InnerException); log.ErrorFormat("{0}\r\n\r\n{1}", ex.Message, ex.InnerException);
log.ErrorFormat(ex.StackTrace); log.ErrorFormat(ex.StackTrace);
item = null; item = null;
} }
@ -251,7 +275,7 @@ namespace DataLoader
} }
return retval; return retval;
} }
private Item MigrateStep(OleDbConnection cn, DataTable dt, DataRowView drv, Item FromItem, bool conv_caret) private Item MigrateStep(OleDbConnection cn, DataTable dt, DataRowView drv, Item FromItem, bool conv_caret, string pth)
{ {
try try
{ {
@ -259,7 +283,7 @@ namespace DataLoader
Item item = AddStep(cn, drv["Type"].ToString() Item item = AddStep(cn, drv["Type"].ToString()
, (drv["textm"] == DBNull.Value ? drv["Text"].ToString() : drv["Textm"].ToString()) , (drv["textm"] == DBNull.Value ? drv["Text"].ToString() : drv["Textm"].ToString())
, drv["Recid"].ToString(), drv["CStep"].ToString() + drv["CSequence"].ToString(), "S", FromItem // was str , drv["Recid"].ToString(), drv["CStep"].ToString() + drv["CSequence"].ToString(), "S", FromItem // was str
, GetDTS(drv["Date"].ToString(), drv["Time"].ToString()), drv["Initials"].ToString(), conv_caret); , GetDTS(drv["Date"].ToString(), drv["Time"].ToString()), drv["Initials"].ToString(), conv_caret, pth);
//Content cont = Content.MakeContent(null,(drv["textm"] == DBNull.Value ? drv["Text"].ToString() : drv["Textm"].ToString()),drv["Type"]+20000,null,null, //Content cont = Content.MakeContent(null,(drv["textm"] == DBNull.Value ? drv["Text"].ToString() : drv["Textm"].ToString()),drv["Type"]+20000,null,null,
// GetDTS(drv["Date"].ToString(), drv["Time"].ToString()), drv["Initials"].ToString()); // GetDTS(drv["Date"].ToString(), drv["Time"].ToString()), drv["Initials"].ToString());
//Item item = Item.MakeItem(FromItem, cont, cont.DTS, cont.UserID); //Item item = Item.MakeItem(FromItem, cont, cont.DTS, cont.UserID);
@ -312,7 +336,7 @@ namespace DataLoader
, (drvs["textm"] == DBNull.Value ? drvs["Text"].ToString() : drvs["Textm"].ToString()) , (drvs["textm"] == DBNull.Value ? drvs["Text"].ToString() : drvs["Textm"].ToString())
, drv["Recid"].ToString(), drvs["CStep"].ToString() + drvs["CSequence"].ToString() , drv["Recid"].ToString(), drvs["CStep"].ToString() + drvs["CSequence"].ToString()
, GetStructType(drvs["sequence"].ToString()), FrItem , GetStructType(drvs["sequence"].ToString()), FrItem
, GetDTS(drvs["Date"].ToString(), drvs["Time"].ToString()), drvs["Initials"].ToString(), conv_caret); , GetDTS(drvs["Date"].ToString(), drvs["Time"].ToString()), drvs["Initials"].ToString(), conv_caret, pth);
if (FrType > 0 ) if (FrType > 0 )
{ {