diff --git a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.cs b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.cs index f61833c7..aff05936 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.cs @@ -241,6 +241,7 @@ namespace CmpRpt for (int i = cnt - 1; i >= 0; i--) headers.Add(reversehdrs[i]); } + myrodb.MyDBID = tbl; rptele.Show(myrodb, headers, showStat); Application.DoEvents(); headers.Clear(); diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs index 9c7dc452..ac644ff6 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs @@ -683,6 +683,7 @@ namespace RODBInterface XmlTextReader rdr = new XmlTextReader(Info, XmlNodeType.Element, null); XmlNode nd = ROXml.ReadNode(rdr); VlnXmlElement elem = (VlnXmlElement)nd; + elem.MyROID = RecID; root.AppendChild(elem); elem.SetAttribute("RecID", RecID); elem.SetAttribute("ParentID","00000000"); @@ -1271,7 +1272,7 @@ namespace RODBInterface DBE.ReaderClose(); return false; } - + elem.MyROID = RecID; elem.SetAttribute("RecID", RecID); elem.SetAttribute("ParentID",node.GetAttribute("RecID")); elem.SetAttribute("Table", node.GetAttribute("Table")); @@ -1317,6 +1318,7 @@ namespace RODBInterface VlnXmlElement elem = (VlnXmlElement) ro; node.AppendChild(ro); + elem.MyROID = RecID; elem.SetAttribute("RecID", RecID); elem.SetAttribute("ParentID",node.GetAttribute("RecID")); elem.SetAttribute("Table", node.GetAttribute("Table")); @@ -1346,6 +1348,7 @@ namespace RODBInterface //get count for attribute element string RecID = DBE.GetString(0); int RecType = DBE.GetInt32(1); + MyRecID = RecID; string AccPageID = DBE.GetString(2); string Info = DBE.GetString(3); node.SetAttribute("HasChild", "True"); @@ -1366,6 +1369,7 @@ namespace RODBInterface return false; } node.AppendChild(elem); + elem.MyROID = RecID; elem.SetAttribute("RecID", RecID); elem.SetAttribute("ParentID",node.GetAttribute("RecID")); elem.SetAttribute("Table", node.GetAttribute("Table")); @@ -1404,6 +1408,7 @@ namespace RODBInterface } VlnXmlElement elem = (VlnXmlElement) ro; + elem.MyROID = RecID; node.AppendChild(ro); elem.SetAttribute("RecID", RecID); elem.SetAttribute("ParentID",node.GetAttribute("RecID")); @@ -1869,6 +1874,7 @@ namespace RODBInterface int strpos = 0; string recid; recid = FieldsInUse.Substring(strpos,8); + MyRecID = recid; while (recid != null) { // find it in avail list. Remove it from there & add to inuse list @@ -2188,9 +2194,18 @@ namespace RODBInterface ftype = ((ushort) dicFldTypes[Fld]); return ftype; } - - - + private string _MyDBID; + public string MyDBID + { + get { return _MyDBID; } + set { _MyDBID = value; } + } + private string _MyRecID; + public string MyRecID + { + get { return _MyRecID; } + set { _MyRecID = value; } + } // For the given element's table, get all of the RO fields defined in this table. public ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype) { @@ -2211,6 +2226,7 @@ namespace RODBInterface while (DBE.Read()) { RecID = DBE.GetString(0); + MyRecID = RecID; Info = DBE.GetString(1); // it's defined in the local table if the first character is "<" which starts // the schema definition string. diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs index 9622b5ea..3c6a4ae9 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs @@ -239,7 +239,12 @@ namespace RODBInterface public VlnXmlElement( string prefix, string localname, string nsURI, XmlDocument doc ):base( prefix,localname,nsURI, doc ) { } - + private string _MyROID; + public string MyROID + { + get { return _MyROID; } + set { _MyROID = value; } + } private string CvtUserFldToFld(string fldname) { if (fldname.Length < 2) @@ -1013,6 +1018,9 @@ namespace RODBInterface if (InUseList != null) { xmldoc.writeRROBegin(); + xmldoc.writeInt(8); + xmldoc.writeText(myrodb.MyDBID + MyROID); + Console.WriteLine("ROID={0}", myrodb.MyDBID + MyROID); xmldoc.writeInt(7); xmldoc.writeText(this.GetAttribute("AccPageID").Trim()); // add items to the InUseList box.