tfoman/CobXml
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JsonFiles to sublib

Browse Source
This commit is contained in:
tfoman
2015-04-28 09:59:58 +02:00
parent 5b90d12efd
commit 83b91ab8fc
3 changed files with 163 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
CobXmlSupport/GenCobCode.cs
View File

@ -173,10 +173,10 @@ namespace CobXmlSupport
private void showRows()
{
codeCompleter Cc = new codeCompleter(cmbLastFile.Text,txtPrefix.Text);
codeCompleter Cc = new codeCompleter(cmbLastFile.Text, txtPrefix.Text);
Cc.TryFill_In_Dic();
Cc.TryFill_Out_Dic();
string fieldInCompl="", fieldOutCompl="";
string fieldInCompl = "", fieldOutCompl = "";
foreach (CobRow rw in rowList)
{
@ -195,16 +195,18 @@ namespace CobXmlSupport
if (Cc.WorkDicIn.TryGetValue(rw.FieldName, out fieldInCompl))
{
rw.MoveCode = fieldInCompl;
//Debug.WriteLine("Existerarnde fält: " + rw.FieldName + " Kod : " + fieldInCompl);
}
else
{
Cc.WorkDicIn.Add(rw.FieldName, "");
//Debug.WriteLine("Upplagt fält: " + rw.FieldName);
}
}
if (rw.MoveCode == null) { rw.MoveCode = " "; }
Cc.WorkDicIn[rw.FieldName] = rw.MoveCode;
if (Cc.WorkDicOut != null && Cc.WorkDicOut.Count > 0)
if (Cc.WorkDicOut != null && Cc.WorkDicOut.Count > 0)
{
if (Cc.WorkDicOut.TryGetValue(rw.FieldName, out fieldOutCompl))
{
@ -1239,10 +1241,10 @@ namespace CobXmlSupport
genExtMoves.CodeShower.Text += "\r\n MOVE ";
if (cr.MoveCode == null || cr.MoveCode.Trim().Length < 1)
genExtMoves.CodeShower.Text += "0";
genExtMoves.CodeShower.Text += "0";
else
genExtMoves.CodeShower.Text += "1";
genExtMoves.CodeShower.Text += "1";
genExtMoves.CodeShower.Text += " TO " + cr.CountIn;
if (occParRows.Length > 0)
@ -1267,7 +1269,7 @@ namespace CobXmlSupport
//---------------- Changed
//if (cr.MoveCode.Length > 1 && cr.MoveCode != " ")
if (cr.MoveCode==null || cr.MoveCode.Trim() == "")
if (cr.MoveCode == null || cr.MoveCode.Trim() == "")
{
if (cr.FieldDef.ToUpper().IndexOf("X") > -1)
{
@ -1483,7 +1485,7 @@ namespace CobXmlSupport
fromMoves.CodeShower.Text += "( " + occParRows + " )";
}
fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "TO ";
if (cr.MoveFromCode.Length > 0)
if (cr.MoveFromCode.Trim().Length > 0)
{
fromMoves.CodeShower.Text += cr.MoveFromCode;
}
@ -1503,13 +1505,23 @@ namespace CobXmlSupport
{
occParRows = "";
CobRow crTmpx = cr;
fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "Move space to " + S.ettingLogVarName + " ";
fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "String ";
if (cr.FieldDef.ToUpper().IndexOf("X") > -1)
if (cr.MoveFromCode.Trim().Length > 0)
{
fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "MoveToStringVar delimited by \" \" ";
fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + cr.MoveFromCode +" delimited by \" \" ";
}
else fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "MoveToNumVar delimited by size";
else
{
if (cr.FieldDef.ToUpper().IndexOf("X") > -1)
{
fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "MoveToStringVar delimited by \" \" ";
}
else fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "MoveToNumVar delimited by size";
}
fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "\" <= \" delimited by size ";
fromMoves.CodeShower.Text += "\r\n " + adjustIf(adj) + "\"" + cr.FieldName + "\" delimited by size ";
while (crTmpx.LevelParent != null)