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

Modified how ROFSTLookup object is obtained

Browse Source
This commit is contained in:
Rich 2014-02-10 21:05:16 +00:00
parent dada7102e7
commit 246cd760e8
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/DataLoader/DocVersions.cs
View File

@ -94,7 +94,7 @@ namespace DataLoader
log.InfoFormat("Completed Migration of {0}", pth); log.InfoFormat("Completed Migration of {0}", pth);
//MessageBox.Show("Completed Migration of " + pth); //jsj commented out to let it run through //MessageBox.Show("Completed Migration of " + pth); //jsj commented out to let it run through
if (rofstinfo != null) rofstinfo.ROFSTLookup.Close(); if (rofstinfo != null) rofstinfo.GetROFSTLookup(DocVersionInfo.Get(docver.VersionID)).Close();
dicTrans_ItemDone.Clear(); dicTrans_ItemDone.Clear();
dicTrans_ItemDone = null; dicTrans_ItemDone = null;
} }

5
PROMS/DataLoader/RefObjs.cs
View File

@ -73,9 +73,10 @@ namespace DataLoader
RoUsage ro = RoUsage.MakeRoUsage(content, ROID, null, DateTime.Now, "Migration", rodb); RoUsage ro = RoUsage.MakeRoUsage(content, ROID, null, DateTime.Now, "Migration", rodb);
try try
{ {
ROFSTLookup.rochild myro = rofstinfo.ROFSTLookup.GetRoChild12(ROID.ToUpper()); ROFSTLookup mylookup = rofstinfo.GetROFSTLookup(DocVersionInfo.Get(docver.VersionID));
ROFSTLookup.rochild myro = mylookup.GetRoChild12(ROID.ToUpper());
rotype = Math.Max(rotype, myro.type); rotype = Math.Max(rotype, myro.type);
string roval = rofstinfo.ROFSTLookup.GetTranslatedRoValue(ROID.ToUpper(), conv_caret); string roval = mylookup.GetTranslatedRoValue(ROID.ToUpper(), conv_caret);
if (textm[tok] == '\x3a6' && roval.IndexOf('\n')>-1) // figure - just get image name if (textm[tok] == '\x3a6' && roval.IndexOf('\n')>-1) // figure - just get image name
{ {
roval = roval.Substring(0, roval.IndexOf('\n')); roval = roval.Substring(0, roval.IndexOf('\n'));

9
PROMS/DataLoader/RoFst.cs
View File

@ -100,14 +100,15 @@ namespace DataLoader
rofst.Dispose(); rofst.Dispose();
// Now load any images in... type 8: // Intergrated Graphics RO type // Now load any images in... type 8: // Intergrated Graphics RO type
if (rofstinfo.ROFSTLookup != null) ROFSTLookup mylookup = rofstinfo.GetROFSTLookup(DocVersionInfo.Get(docver.VersionID));
if (mylookup != null)
{ {
for (int i = 0; i < rofstinfo.ROFSTLookup.myHdr.myDbs.Length; i++) for (int i = 0; i < mylookup.myHdr.myDbs.Length; i++)
{ {
// walk through the rofst 'database' searching for // walk through the rofst 'database' searching for
// all nodes that are integrated graphics, i.e. type 8. // all nodes that are integrated graphics, i.e. type 8.
if (rofstinfo.ROFSTLookup.myHdr.myDbs[i].children != null) if (mylookup.myHdr.myDbs[i].children != null)
MigrateRoFstGraphics(roDbpath, rofstinfo.ROFSTLookup.myHdr.myDbs[i].children, rodb); MigrateRoFstGraphics(roDbpath, mylookup.myHdr.myDbs[i].children, rodb);
} }
} }
ROImageInfo.FlagImagesZipped(); ROImageInfo.FlagImagesZipped();