Subversion Repositories DevTools

Rev

Rev 13 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 13 Rev 15
Line 95... Line 95...
95
95
96 
	End If
 96 
	End If
97
97
98 
End Sub
 98 
End Sub
99 
'--------------------------------------------------------------------------------------------------------------------------
 99 
'--------------------------------------------------------------------------------------------------------------------------
- 
 
 100 
Sub Javascript()
- 
 
 101 
	NewTextFile.WriteLine("<script language=""JavaScript"" type=""text/javascript"">")
- 
 
 102 
	NewTextFile.WriteLine("function MM_findObj(n, d) { //v4.0")
- 
 
 103 
	NewTextFile.WriteLine("  var p,i,x;")
- 
 
 104 
	NewTextFile.WriteLine("  if(!d) d=document; ")
- 
 
 105 
	NewTextFile.WriteLine("  if((p=n.indexOf(""?""))>0&&parent.frames.length) {")
- 
 
 106 
	NewTextFile.WriteLine("  	d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);")
- 
 
 107 
	NewTextFile.WriteLine("  }")
- 
 
 108 
	NewTextFile.WriteLine("  if(!(x=d[n])&&d.all) x=d.all[n]; ")
- 
 
 109 
	NewTextFile.WriteLine("  for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];")
- 
 
 110 
	NewTextFile.WriteLine("  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);")
- 
 
 111 
	NewTextFile.WriteLine("  if(!x && document.getElementById) x=document.getElementById(n); ")
- 
 
 112 
	NewTextFile.WriteLine("  return x;")
- 
 
 113 
	NewTextFile.WriteLine("}")
- 
 
 114 
	NewTextFile.WriteLine("function DisplaySPAN(show, x) {")
- 
 
 115 
	NewTextFile.WriteLine("	if (show) {")
- 
 
 116 
	NewTextFile.WriteLine("		MM_findObj(""spanHideDetails"" + x).style.display = ""block"";")
- 
 
 117 
	NewTextFile.WriteLine("		MM_findObj(""spanPkgInfo"" + x).style.display = ""block"";")
- 
 
 118 
	NewTextFile.WriteLine("		MM_findObj(""spanShowDetails"" + x).style.display = ""none"";")
- 
 
 119 
	NewTextFile.WriteLine("	} else {")
- 
 
 120 
	NewTextFile.WriteLine("		MM_findObj(""spanHideDetails"" + x).style.display = ""none"";")
- 
 
 121 
	NewTextFile.WriteLine("		MM_findObj(""spanPkgInfo"" + x).style.display = ""none"";")
- 
 
 122 
	NewTextFile.WriteLine("		MM_findObj(""spanShowDetails"" + x).style.display = ""block"";")
- 
 
 123 
	NewTextFile.WriteLine("	}")
- 
 
 124 
	NewTextFile.WriteLine("}")
- 
 
 125 
	NewTextFile.WriteLine("</script>")
- 
 
 126 
End Sub
- 
 
 127 
'--------------------------------------------------------------------------------------------------------------------------
100 
Sub GetFixedIssues(pv_id)
 128 
Sub GetFixedIssues(pv_id)
101 
	Set sqlstrA = OraDatabase.DbCreateDynaset("SELECT iss_db, iss_id, iss_state, notes FROM CQ_ISSUES WHERE pv_id="& pv_id &"  AND iss_state = "& enumISSUES_STATE_FIXED, cint(0))
129 
	Set sqlstrA = OraDatabase.DbCreateDynaset("SELECT iss_db, iss_id, iss_state, notes FROM CQ_ISSUES WHERE pv_id="& pv_id &"  AND iss_state = "& enumISSUES_STATE_FIXED, cint(0))
102
130
103 
		If sqlstrA.RecordCount <> 0 Then
 131 
		If sqlstrA.RecordCount <> 0 Then
104 
			NewTextFile.WriteLine()
 132 
			NewTextFile.WriteLine()
Line 140... Line 168...
140 
			sqlstrA.Close()
168 
			sqlstrA.Close()
141
169
142 
 
 170 
 
143 
End Sub
 171 
End Sub
144 
'--------------------------------------------------------------------------------------------------------------------------
 172 
'--------------------------------------------------------------------------------------------------------------------------
- 
 
 173 
Sub LastPvIdA(a)
- 
 
 174 
	Dim qryA
- 
 
 175 
	Set qryA = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&a , cint(0))
- 
 
 176
- 
 
 177 
	If a <> qryA("last_pv_id") Then
- 
 
 178 
		a = qryA("last_pv_id")
- 
 
 179 
	Else
- 
 
 180 
		errormsg = true
- 
 
 181 
	End If
- 
 
 182
- 
 
 183 
	qryA.Close()
- 
 
 184 
End Sub
- 
 
 185 
'--------------------------------------------------------------------------------------------------------------------------
- 
 
 186 
Sub LastPvIdB(b)
- 
 
 187 
	Dim qryB
- 
 
 188 
	Set qryB = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&b , cint(0))
- 
 
 189
- 
 
 190 
	If b <> qryB("last_pv_id") Then
- 
 
 191 
		b = qryB("last_pv_id")
- 
 
 192 
	Else
- 
 
 193 
		errormsg = true
- 
 
 194 
	End If
- 
 
 195
- 
 
 196 
	qryB.Close()
- 
 
 197
- 
 
 198 
End Sub
- 
 
 199 
'--------------------------------------------------------------------------------------------------------------------------
- 
 
 200 
Sub PreviousVersions(a, b, versionA, versionB)
- 
 
 201 
	NewTextFile.WriteLine()
- 
 
 202
- 
 
 203
- 
 
 204 
	NewTextFile.WriteLine("<b>Versions Between: "&versionA&" and "&versionB&"</b>")
- 
 
 205
- 
 
 206 
	If a < b Then
- 
 
 207 
		While a < b
- 
 
 208 
			Call LastPvIdB(b)
- 
 
 209 
			If a < b Then
- 
 
 210 
				Call Comments(b)
- 
 
 211 
				Call GetFixedIssues(b)
- 
 
 212 
			End If
- 
 
 213 
		Wend
- 
 
 214 
	End If
- 
 
 215
- 
 
 216 
	If b < a Then
- 
 
 217 
		While b < a
- 
 
 218 
			Call LastPvIdA(a)
- 
 
 219 
			If b < a Then
- 
 
 220 
				Call Comments(a)
- 
 
 221 
				Call GetFixedIssues(a)
- 
 
 222 
			End If
- 
 
 223 
		Wend
- 
 
 224 
	End If
- 
 
 225
- 
 
 226 
 
- 
 
 227 
End Sub
- 
 
 228 
'--------------------------------------------------------------------------------------------------------------------------
145 
Sub GetDependencies(pv_id_a, pv_id_b)
 229 
Sub GetDependencies(pv_id_a, pv_id_b, versionA, versionB)
146 
	Set sqlstrA = OraDatabase.DbCreateDynaset("select * from package_dependencies where pv_id = "& pv_id_b &" and dpv_id NOT IN (SELECT dpv_id from package_dependencies where pv_id ="& pv_id_a &" )", cint(0))
230 
	Set sqlstrA = OraDatabase.DbCreateDynaset("select * from package_dependencies where pv_id = "& pv_id_b &" and dpv_id NOT IN (SELECT dpv_id from package_dependencies where pv_id ="& pv_id_a &" )", cint(0))
147 
		If sqlstrA.RecordCount <> 0 Then
 231 
		If sqlstrA.RecordCount <> 0 Then
148 
			NewTextFile.WriteLine()
 232 
			NewTextFile.WriteLine()
149 
			NewTextFile.WriteLine("<b>Dependencies Changed:</b>")
 233 
			NewTextFile.WriteLine("<b>Dependencies Changed Between "&versionA&" and "&versionB&":</b>")
150 
		End If
 234 
		End If
151
235
152 
		For counterA=1 to sqlstrA.RecordCount
 236 
		For counterA=1 to sqlstrA.RecordCount
153 
			Call dependencyComments(sqlstrA("dpv_id"))
 237 
			Call dependencyComments(sqlstrA("dpv_id"))
154
238
Line 158... Line 242...
158 
 
 242 
 
159 
End Sub
 243 
End Sub
160 
'--------------------------------------------------------------------------------------------------------------------------
 244 
'--------------------------------------------------------------------------------------------------------------------------
161 
Sub dependencyComments(pv_id)
 245 
Sub dependencyComments(pv_id)
162 
	Set sqlstrB = OraDatabase.DbCreateDynaset("SELECT * FROM PACKAGE_VERSIONS pv, PACKAGES pkg WHERE pkg.pkg_id = pv.pkg_id AND PV_ID ="&pv_id, cint(0))
246 
	Set sqlstrB = OraDatabase.DbCreateDynaset("SELECT * FROM PACKAGE_VERSIONS pv, PACKAGES pkg WHERE pkg.pkg_id = pv.pkg_id AND PV_ID ="&pv_id, cint(0))
163 
			NewTextFile.Write("<blockquote><blockquote><blockquote>"& sqlstrB("pkg_name") &" "& sqlstrB("pkg_version") &"---->"& sqlstrB("comments") &"</blockquote></blockquote></blockquote>")
247 
			NewTextFile.Write("<blockquote><blockquote><blockquote>"& sqlstrB("pkg_name") &" "& sqlstrB("pkg_version") &"---->"& TextToHTML(sqlstrB("comments")) &"</blockquote></blockquote></blockquote>")
164
248
165 
 
 249 
 
166 
End Sub
 250 
End Sub
167 
'--------------------------------------------------------------------------------------------------------------------------
 251 
'--------------------------------------------------------------------------------------------------------------------------
168 
Sub LastPvIdA(a)
 252 
Sub LastPvIdA(a)
Line 302... Line 386...
302 
 
 386 
 
303 
	OraDatabase.Parameters.Add "SBOM", 	nSourceSBOM,		ORAPARM_INPUT, ORATYPE_NUMBER
387 
	OraDatabase.Parameters.Add "SBOM", 	nSourceSBOM,		ORAPARM_INPUT, ORATYPE_NUMBER
304
388
305 
	query = _
 389 
	query = _
306 
	" SELECT pr.PROJ_NAME ||' &gt; '|| br.BRANCH_NAME ||' &gt; '|| b.BOM_VERSION ||'.'||b.BOM_LIFECYCLE  AS LOCATION, "&_
 390 
	" SELECT pr.PROJ_NAME ||' &gt; '|| br.BRANCH_NAME ||' &gt; '|| b.BOM_VERSION ||'.'||b.BOM_LIFECYCLE  AS LOCATION, "&_
307 
	"        pr.PROJ_ID, b.BOM_ID, br.BRANCH_ID"&_
 391 
	"        pr.PROJ_ID, b.BOM_ID, br.BRANCH_ID, b.IS_READONLY"&_
308 
	"  FROM BRANCHES br,"&_
 392 
	"  FROM BRANCHES br,"&_
309 
	"  		BOMS b,"&_
393 
	"  		BOMS b,"&_
310 
	"  	    DM_PROJECTS pr"&_
 394 
	"  	    DM_PROJECTS pr"&_
311 
	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
 395 
	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
312 
	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_
396 
	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_
Line 316... Line 400...
316
400
317 
	OraDatabase.Parameters.Remove "SBOM"
 401 
	OraDatabase.Parameters.Remove "SBOM"
318
402
319 
	If rsQry.RecordCount > 0 Then
 403 
	If rsQry.RecordCount > 0 Then
320 
		outobjDetails.Item ("location") = rsQry("location")
 404 
		outobjDetails.Item ("location") = rsQry("location")
- 
 
 405 
		outobjDetails.Item ("official") = rsQry("IS_READONLY")
321 
		outobjDetails.Item ("proj_id") = rsQry("proj_id")
 406 
		outobjDetails.Item ("proj_id") = rsQry("proj_id")
322 
		outobjDetails.Item ("branch_id") = rsQry("branch_id")
 407 
		outobjDetails.Item ("branch_id") = rsQry("branch_id")
323 
		outobjDetails.Item ("bom_id") = rsQry("bom_id")
408 
		outobjDetails.Item ("bom_id") = rsQry("bom_id")
324 
	Else
 409 
	Else
325 
		Err.Raise 8, "Sub GetFormDetails in "& SCRIPT_NAME, "Empty record set returned. nSourceSBOM="& nSourceSBOM
 410 
		Err.Raise 8, "Sub GetFormDetails in "& SCRIPT_NAME, "Empty record set returned. nSourceSBOM="& nSourceSBOM
326 
	End If
 411 
	End If
327
412
- 
 
 413 
	If outobjDetails.Item ("location") = "" Then
- 
 
 414 
		outobjDetails.Item ("location") = "N"
- 
 
 415 
	End If
- 
 
 416
328 
	rsQry.Close
 417 
	rsQry.Close
329 
	Set rsQry = Nothing
 418 
	Set rsQry = Nothing
330
419
331 
End Sub
 420 
End Sub
332 
'--------------------------------------------------------------------------------------------------------------------------
 421 
'--------------------------------------------------------------------------------------------------------------------------
Line 463... Line 552...
463 
	If objRelCollectorB.Item("official") <> "Y" Then
 552 
	If objRelCollectorB.Item("official") <> "Y" Then
464 
		Call MergePackages ()
 553 
		Call MergePackages ()
465 
	End If
 554 
	End If
466 
End If
 555 
End If
467 
 
 556 
 
468 
'If Request("btn") = "Swap Compare" Then
 557 
If Request("btn") = "Swap Compare" Then
469 
'	Call OpenInWindow ( SCRIPT_NAME &"?bom_id="& parSBOMB &"&bom_id="& parSBOMA )
 558 
	Call OpenInWindow ( SCRIPT_NAME &"?sbomA="& parSBOMB &"&sbomB="& parSBOMA )
470 
'End If
 559 
End If
471 
 
 560 
 
472 
If Request("btn") = "Hide" Then
 561 
If Request("btn") = "Hide" Then
473 
	' Store filter in cookie
 562 
	' Store filter in cookie
474 
	Response.Cookies(enum_RELMGR_COOKIE_DOMAIN)(COOKIE_HIDE_DIFF_FILTER) = Request("difilter")
 563 
	Response.Cookies(enum_RELMGR_COOKIE_DOMAIN)(COOKIE_HIDE_DIFF_FILTER) = Request("difilter")
475 
End If
 564 
End If
Line 819... Line 908...
819
908
820 
				<table width="100%"  border="0" cellspacing="0" cellpadding="5">
 909 
				<table width="100%"  border="0" cellspacing="0" cellpadding="5">
821 
                  <tr>
 910 
                  <tr>
822 
                    <td width="100%" bgcolor="#DAD7C8">
 911 
                    <td width="100%" bgcolor="#DAD7C8">
823 
					<input type="submit" name="btn" value="Compare" class="form_btn_comp" style="margin-right:5px;">
 912 
					<input type="submit" name="btn" value="Compare" class="form_btn_comp" style="margin-right:5px;">
824 
 
 - 
 
- 
 
 913 
					<input type="submit" name="btn" value="Swap Compare" class="form_btn_comp">
825 
					<span class="body_txt">
 914 
					<span class="body_txt">
826 
					<input name="btn" type="submit" class="form_btn" value="Mail Me Report">
 915 
					<input name="btn" type="submit" class="form_btn" value="Mail Me Report">
827 
					</span>					</td>
 916 
					</span>					</td>
828 
                    <td width="1" align="right" bgcolor="#DAD7C8" nowrap>
 917 
                    <td width="1" align="right" bgcolor="#DAD7C8" nowrap>
829 
					<table width="100%"  border="0" cellspacing="0" cellpadding="0">
 918 
					<table width="100%"  border="0" cellspacing="0" cellpadding="0">
Line 875... Line 964...
875 
				If (Request("btn") = "Merge") Then
 964 
				If (Request("btn") = "Merge") Then
876 
					Call Messenger ( "Merge has completed successfully.", 3, "100%" )
965 
					Call Messenger ( "Merge has completed successfully.", 3, "100%" )
877 
				End If
 966 
				End If
878 
 
 967 
 
879 
				Set FSO=Server.CreateObject("Scripting.FileSystemObject")
 968 
				Set FSO=Server.CreateObject("Scripting.FileSystemObject")
880 
				Set NewTextFile=FSO.CreateTextFile(Server.MapPath("docs\compareReleases_"&objAccessControl.UserName&".html"), true)
 969 
				Set NewTextFile=FSO.CreateTextFile(Server.MapPath("docs\compareBoms_"&objAccessControl.UserName&".html"), true)
881 
				Call Header()
970 
				Call Header()
882 
 
 971 
 
883 
				If (parRtagA <> "") AND (parRtagB <> "")Then%>
972 
				If (parRtagA <> "") AND (parRtagB <> "")Then%>
884 
                <table width="100%"  border="0" cellspacing="1" cellpadding="0">
 973 
                <table width="100%"  border="0" cellspacing="1" cellpadding="0">
885 
                  <tr>
 974 
                  <tr>
Line 925... Line 1014...
925 
	"  	    DM_PROJECTS pr"&_
 1014 
	"  	    DM_PROJECTS pr"&_
926 
	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
 1015 
	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
927 
	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_
1016 
	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_
928 
	"   AND b.BOM_ID ="&parSBOMB, cint(0))
 1017 
	"   AND b.BOM_ID ="&parSBOMB, cint(0))
929
1018
- 
 
 1019
- 
 
 1020 
				Call Javascript()
- 
 
 1021
930 
				NewTextFile.WriteLine("<title>Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</title>")
 1022 
				NewTextFile.WriteLine("<title>Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</title>")
931 
				NewTextFile.WriteLine("<div align="&chr(34)&"center"&chr(34)&"><font color="&chr(34)&"red"&chr(34)&" size="&chr(34)&"4"&chr(34)&" face="&chr(34)&"Verdana, Arial, Helvetica, sans-serif"&chr(34)&">Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</font></div><br>")
 1023 
				NewTextFile.WriteLine("<div align="&chr(34)&"center"&chr(34)&"><font color="&chr(34)&"red"&chr(34)&" size="&chr(34)&"4"&chr(34)&" face="&chr(34)&"Verdana, Arial, Helvetica, sans-serif"&chr(34)&">Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</font></div><br>")
932
1024
933 
				While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))
 1025 
				While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))
934 
				errormsg = false
 1026 
				errormsg = false
Line 993... Line 1085...
993 
			pkgname = pkgA
 1085 
			pkgname = pkgA
994 
		Else
 1086 
		Else
995 
			pkgname = pkgB
 1087 
			pkgname = pkgB
996 
		End If
 1088 
		End If
997
1089
998 
		Select Case rsQry("change_type")
1090 
		If rsQry("change_type") = "U" OR rsQry("change_type") = "UW" Then
999 
			Case "U"
- 
 
- 
 
 1091 
				NewTextFile.Write("<p><SPAN id=""spanShowDetails"& rowId &""" name=""spanShowDetails""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(true,'"& rowId &"');"">"& pkgname &"</a></SPAN>")
- 
 
 1092 
				NewTextFile.Write("<SPAN id=""spanHideDetails"& rowId &""" name=""spanHideDetails"" style=""display:none;""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(false,'"& rowId &"');"">"& pkgname &"</a></SPAN>")
- 
 
 1093 
				NewTextFile.WriteLine("<SPAN id=""spanPkgInfo"& rowId &""" name=""spanPkgInfo"" style=""display:none;"">")
1000 
				NewTextFile.WriteLine("<b><font face="&chr(34)&"arial"&chr(34)&">Package Name: "&pkgname&"</font></b><br>")
 1094 
				'NewTextFile.WriteLine("<b><font face="&chr(34)&"arial"&chr(34)&">Package Name: "&pkgname&"</font></b><br>")
1001 
				NewTextFile.Write(rsQryA("location")&" uses: "&rsQry("pkg_version_a")&" ")
 1095 
				NewTextFile.Write(rsQryA("location")&" uses: "&rsQry("pkg_version_a")&" ")
1002
1096
1003 
				NewTextFile.WriteLine("<br>")
 1097 
				NewTextFile.WriteLine("<br>")
1004 
				NewTextFile.Write(rsQryB("location")&" uses: "&rsQry("pkg_version_b")&" ")
 1098 
				NewTextFile.Write(rsQryB("location")&" uses: "&rsQry("pkg_version_b")&" ")
1005 
 
 - 
 
1006 
				NewTextFile.WriteLine("<br><br>")
 - 
 
1007 
				NewTextFile.WriteLine()
 - 
 
1008 
				NewTextFile.WriteLine("<b>"&rsQryA("location")&"</b>")
- 
 
1009 
				Call Comments(rsQry("pv_id_a"))
 - 
 
1010 
				Call GetFixedIssues(rsQry("pv_id_a"))
 - 
 
1011 
				'Call GetDependencies(rsQry("pv_id_a"), rsQry("pv_id_b"))
 - 
 
1012
1099
1013 
				NewTextFile.WriteLine("<br><br>")
 1100 
				a = rsQry("pv_id_a")
1014 
				NewTextFile.WriteLine()
 1101 
				b = rsQry("pv_id_b")
1015 
				NewTextFile.WriteLine("<b>"&rsQryB("location")&"</b>")
- 
 
1016 
				Call Comments(rsQry("pv_id_b"))
 1102 
				c = rsQry("pv_id_a")
1017 
				Call GetFixedIssues(rsQry("pv_id_b"))
 1103 
				d = rsQry("pv_id_b")
1018 
				Call GetDependencies(rsQry("pv_id_a"), rsQry("pv_id_b"))
- 
 
1019 
 
 1104
- 
 
 1105 
				'On Error Resume Next
1020
1106
1021 
 
 - 
 
1022
- 
 
1023 
					NewTextFile.WriteLine("****************************************************************************************************************************")
 - 
 
1024
1107
1025 
			Case "UW"
- 
 
1026 
				NewTextFile.WriteLine("<b><font face="&chr(34)&"arial"&chr(34)&">Package Name: "&pkgname&"</font></b><br>")
 - 
 
1027 
				NewTextFile.Write(rsQryA("location")&" uses: "&rsQry("pkg_version_a")&" ")
 - 
 
1028 
 
 - 
 
1029 
				NewTextFile.WriteLine("<br>")
 - 
 
1030 
				NewTextFile.Write(rsQryB("location")&" uses: "&rsQry("pkg_version_b")&" ")
 - 
 
1031 
 
 1108
1032 
				NewTextFile.WriteLine("<br><br>")
 1109 
				NewTextFile.WriteLine("<br><br>")
1033 
				NewTextFile.WriteLine()
 1110 
				NewTextFile.WriteLine()
1034 
				NewTextFile.WriteLine("<b>"&rsQryA("location")&"</b>")
1111 
				NewTextFile.WriteLine("<b>"&rsQryA("location")&"</b>")
1035 
				Call Comments(rsQry("pv_id_a"))
 1112 
				Call Comments(rsQry("pv_id_a"))
1036 
				Call GetFixedIssues(rsQry("pv_id_a"))
 1113 
				Call GetFixedIssues(rsQry("pv_id_a"))
1037 
				'Call GetDependencies(rsQry("pv_id_a"))
 1114 
				'Call GetDependencies(rsQry("pv_id_a"), rsQry("pv_id_b"))
1038
1115
1039 
				NewTextFile.WriteLine("<br><br>")
 1116 
				NewTextFile.WriteLine("<br><br>")
1040 
				NewTextFile.WriteLine()
 1117 
				NewTextFile.WriteLine()
1041 
				NewTextFile.WriteLine("<b>"&rsQryB("location")&"</b>")
1118 
				NewTextFile.WriteLine("<b>"&rsQryB("location")&"</b>")
1042 
				Call Comments(rsQry("pv_id_b"))
 1119 
				Call Comments(rsQry("pv_id_b"))
1043 
				Call GetFixedIssues(rsQry("pv_id_b"))
 1120 
				Call GetFixedIssues(rsQry("pv_id_b"))
1044 
				Call GetDependencies(rsQry("pv_id_a"), rsQry("pv_id_b"))
- 
 
1045
1121
- 
 
 1122 
				Dim rsQryLast
1046
1123
1047
1124
- 
 
 1125 
				Set rsQryLast = OraDatabase.DbCreateDynaset( "SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="& rsQry("pv_id_b"), cint(0))
1048 
 
 1126
- 
 
 1127 
				If rsQryLast("last_pv_id") <> a Then
- 
 
 1128 
					Call PreviousVersions(a, b, rsQry("pkg_version_a"), rsQry("pkg_version_b"))
- 
 
 1129 
				End If
1049
1130
- 
 
 1131 
				a = rsQry("pv_id_a")
- 
 
 1132 
				b = rsQry("pv_id_b")
1050 
				NewTextFile.WriteLine("****************************************************************************************************************************")
 1133 
				Call GetDependencies(a, b, rsQry("pkg_version_a"), rsQry("pkg_version_b"))
- 
 
 1134 
				NewTextFile.WriteLine("</SPAN>")
- 
 
 1135
- 
 
 1136 
				rsQryLast.Close
- 
 
 1137 
				Set rsQryLast = nothing
1051
1138
- 
 
 1139
1052 
		End Select
1140 
		End If
1053
1141
1054 
	End If
 1142 
	End If
1055
1143
1056 
	rsQry.MoveNext
 1144 
	rsQry.MoveNext
1057 
	WEnd
 1145 
	WEnd
Line 1195... Line 1283...
1195 
<%
 1283 
<%
1196 
	If email Then
 1284 
	If email Then
1197
1285
1198 
		Dim myMail, LocalPath
 1286 
		Dim myMail, LocalPath
1199 
		Set myMail=Server.CreateObject("Persits.MailSender")
 1287 
		Set myMail=Server.CreateObject("Persits.MailSender")
1200 
		LocalPath = Server.MapPath("docs\compareReleases_"&objAccessControl.UserName&".html")
 1288 
		LocalPath = Server.MapPath("docs\compareBoms_"&objAccessControl.UserName&".html")
1201
1289
1202 
		myMail.Host = SMTP_HOST
 1290 
		myMail.Host = SMTP_HOST
1203 
		myMail.Subject="Release Comparisons from Release Manager"
 1291 
		myMail.Subject="BOM Comparisons from Deployment Manager"
1204 
		myMail.From="releasem@erggroup.com"
 1292 
		myMail.From="releasem@erggroup.com"
1205 
		myMail.AddAddress objAccessControl.UserEmail
 1293 
		myMail.AddAddress objAccessControl.UserEmail
1206 
		' Attach the file
 1294 
		' Attach the file
1207 
		myMail.AddAttachment LocalPath
 1295 
		myMail.AddAttachment LocalPath
1208 
		myMail.Body = "Your requested report..."
1296 
		myMail.Body = "Your requested report..."