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

Browse Source
This commit is contained in:
Kathy Ruffing 2011-10-14 10:18:11 +00:00
parent 5d21567ab9
commit dbba029be1
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PROMS/fmtxml/FmtFileToXml.cs
View File

@ -882,6 +882,7 @@ public struct Step
public string PageBreakOnStep; // PageBreakOnHighLevelStep, PageBreakOnCautions, PageBreakOnNotes public string PageBreakOnStep; // PageBreakOnHighLevelStep, PageBreakOnCautions, PageBreakOnNotes
public string AlignNullTabWSectHead; public string AlignNullTabWSectHead;
public string TextSubFollowsTextStyle; public string TextSubFollowsTextStyle;
public string CautionOrNoteSubstepIndent;
public string TreatAsSequential; // TreatAND_ORasSequential public string TreatAsSequential; // TreatAND_ORasSequential
public string MatchUpRNO; // MatchUpRNOCautNote public string MatchUpRNO; // MatchUpRNOCautNote
public string InPageList; // RNOInPageList, StpCautNoteTabInPageList, HLSTextInPageList public string InPageList; // RNOInPageList, StpCautNoteTabInPageList, HLSTextInPageList
@ -4233,6 +4234,7 @@ namespace fmtxml
string fnm = MyPath + @"\" + fname; string fnm = MyPath + @"\" + fname;
brFmt = new BinaryReader(File.Open(fnm, System.IO.FileMode.Open, System.IO.FileAccess.ReadWrite, FileShare.ReadWrite)); brFmt = new BinaryReader(File.Open(fnm, System.IO.FileMode.Open, System.IO.FileAccess.ReadWrite, FileShare.ReadWrite));
bool success = ReadInFmtFile(ref fmtdata, ref BaseXtraFlags, fname); bool success = ReadInFmtFile(ref fmtdata, ref BaseXtraFlags, fname);
AddPlantSpecific(fname, ref fmtdata);
FixInactiveForHigh(ref fmtdata); FixInactiveForHigh(ref fmtdata);
FixInactiveForSubStep(ref fmtdata); FixInactiveForSubStep(ref fmtdata);
FixInactiveForText(ref fmtdata); FixInactiveForText(ref fmtdata);
@ -4269,6 +4271,7 @@ namespace fmtxml
brFmt = new BinaryReader(File.Open(fnm, System.IO.FileMode.Open, System.IO.FileAccess.ReadWrite, FileShare.ReadWrite)); brFmt = new BinaryReader(File.Open(fnm, System.IO.FileMode.Open, System.IO.FileAccess.ReadWrite, FileShare.ReadWrite));
FormatData subdata = new FormatData(); FormatData subdata = new FormatData();
success = ReadInFmtFile(ref subdata, ref SubXtraFlags, fi.Name); success = ReadInFmtFile(ref subdata, ref SubXtraFlags, fi.Name);
AddPlantSpecific(fi.Name, ref subdata);
//OutputStepFonts(fi.Name, subdata); //OutputStepFonts(fi.Name, subdata);
if (success) if (success)
{ {

7
PROMS/fmtxml/FmtToXml.cs
View File

@ -484,7 +484,7 @@ namespace fmtxml
{ {
MyPath = path; MyPath = path;
fmtName = nm; fmtName = nm;
//if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE" && fmtName.ToUpper() != "WCN2") return; //if (!fmtName.ToUpper().StartsWith("TP") && fmtName.ToUpper() != "BASE") return;
try try
{ {
// get the default base & plant files to use when figuring out inheritance. // get the default base & plant files to use when figuring out inheritance.
@ -496,7 +496,10 @@ namespace fmtxml
if (indx > 0) if (indx > 0)
{ {
LoadPageFile(nm); LoadPageFile(nm);
LoadDocFile(nm); string tmpDocName = fmtName;
tmpDocName = tmpDocName.Remove(indx + 1,1);
tmpDocName = tmpDocName.Insert(indx + 1, "y");
LoadDocFile(tmpDocName);
} }
else else
{ {

2
PROMS/fmtxml/Form1.cs
View File

@ -362,7 +362,7 @@ namespace fmtxml
FmtToXml fx = new FmtToXml(fn, tbFmtPath.Text); FmtToXml fx = new FmtToXml(fn, tbFmtPath.Text);
} }
} }
fis = di.GetFiles("*.y*"); fis = di.GetFiles("*.z*");
foreach (FileInfo fi in fis) foreach (FileInfo fi in fis)
{ {
if (!Excluded(fi)) if (!Excluded(fi))