Subversion Repositories DevTools

Rev

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

Rev 27 Rev 29
Line 1... Line 1...
1 
<%@LANGUAGE="VBSCRIPT"%>
 1 
<%@LANGUAGE="VBSCRIPT"%>
2 
<%
 2 
<%
3 
'=====================================================
 3 
'=====================================================
4 
'|                                                   |
 4 
'|                                                   |
5 
'|				         DIFF					     |
 5 
'|				        BOM DIFF				     |
6 
'|                                                   |
 6 
'|                                                   |
7 
'=====================================================
 7 
'=====================================================
8 
%>
 8 
%>
9 
<%
 9 
<%
10 
Option explicit
 10 
Option explicit
Line 12... Line 12...
12 
Response.Expires = 0	' always load the page, dont store
 12 
Response.Expires = 0	' always load the page, dont store
13 
%>
 13 
%>
14 
 
 14 
 
15 
<%
 15 
<%
16 
'To enable the script timeout to 5 mins
 16 
'To enable the script timeout to 5 mins
17 
Server.ScriptTimeout=600
 17 
Server.ScriptTimeout=300
18 
%>
 18 
%>
19 
<!--#include file="common/config.asp"-->
 19 
<!--#include file="common/config.asp"-->
20 
<!--#include file="common/globals.asp"-->
 20 
<!--#include file="common/globals.asp"-->
21 
<!--#include file="common/formating.asp"-->
 21 
<!--#include file="common/formating.asp"-->
22 
<!--#include file="common/common_subs.asp"-->
 22 
<!--#include file="common/common_subs.asp"-->
Line 47... Line 47...
47 
Dim email
 47 
Dim email
48 
Dim FSO
 48 
Dim FSO
49 
Dim NewTextFile
 49 
Dim NewTextFile
50 
Dim pkgA, pkgB, pkgname, delimiter, rsQryA, rsQryB, rsQryCommentsA, rsQryCommentsB, sqlstrA, counterA, sqlstrB, sqlstrC, counterB
 50 
Dim pkgA, pkgB, pkgname, delimiter, rsQryA, rsQryB, rsQryCommentsA, rsQryCommentsB, sqlstrA, counterA, sqlstrB, sqlstrC, counterB
51 
Dim SSsql, retVal, rsCQ, DEVIiss, TDSEiss, VT5DMiss, VTSUPiss
51 
Dim SSsql, retVal, rsCQ, DEVIiss, TDSEiss, VT5DMiss, VTSUPiss
52 
Dim a, b, c, d, pkgversion, errormsg, source_change
 52 
Dim a, b, c, d, pkgversion, errormsg
53 
Dim VersionList
 53 
Dim VersionList
54 
 
 54 
 
55 
 
 55 
 
56 
'------------ Constants Declaration -----------
 56 
'------------ Constants Declaration -----------
57 
Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Updated'>"
 57 
Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Updated'>"
Line 91... Line 91...
91 
		aFilterValues = Split( Replace( Request.Cookies(enum_RELMGR_COOKIE_DOMAIN)(COOKIE_HIDE_DIFF_FILTER), " ", ""), ",")
91 
		aFilterValues = Split( Replace( Request.Cookies(enum_RELMGR_COOKIE_DOMAIN)(COOKIE_HIDE_DIFF_FILTER), " ", ""), ",")
92
92
93 
		For Each FilterVal In aFilterValues
 93 
		For Each FilterVal In aFilterValues
94 
			outDepFilter.Item (CStr( FilterVal )) = ""
 94 
			outDepFilter.Item (CStr( FilterVal )) = ""
95 
		Next
 95 
		Next
96
96 
 
97 
	End If
 97 
	End If
98
98
99 
End Sub
 99 
End Sub
100 
'--------------------------------------------------------------------------------------------------------------------------
 100 
'--------------------------------------------------------------------------------------------------------------------------
101 
Sub Javascript()
 101 
Sub Javascript()
Line 120... Line 120...
120 
	NewTextFile.WriteLine("	} else {")
120 
	NewTextFile.WriteLine("	} else {")
121 
	NewTextFile.WriteLine("		MM_findObj(""spanHideDetails"" + x).style.display = ""none"";")
121 
	NewTextFile.WriteLine("		MM_findObj(""spanHideDetails"" + x).style.display = ""none"";")
122 
	NewTextFile.WriteLine("		MM_findObj(""spanPkgInfo"" + x).style.display = ""none"";")
122 
	NewTextFile.WriteLine("		MM_findObj(""spanPkgInfo"" + x).style.display = ""none"";")
123 
	NewTextFile.WriteLine("		MM_findObj(""spanShowDetails"" + x).style.display = ""block"";")
123 
	NewTextFile.WriteLine("		MM_findObj(""spanShowDetails"" + x).style.display = ""block"";")
124 
	NewTextFile.WriteLine("	}")
 124 
	NewTextFile.WriteLine("	}")
125 
	NewTextFile.WriteLine("}")
125 
	NewTextFile.WriteLine("}")
126 
	NewTextFile.WriteLine("</script>")
126 
	NewTextFile.WriteLine("</script>")
127 
End Sub
 127 
End Sub
128 
'--------------------------------------------------------------------------------------------------------------------------
 128 
'--------------------------------------------------------------------------------------------------------------------------
129 
Sub GetFixedIssues(pv_id)
 129 
Sub GetFixedIssues(pv_id, issues)
130 
	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))
- 
 
131
130
132 
		If sqlstrA.RecordCount <> 0 Then
 131 
	If issues <> "Filter Issues" Then
133 
			NewTextFile.WriteLine()
 - 
 
134 
			NewTextFile.WriteLine("<blockquote><blockquote>Fixed Issues:</blockquote></blockquote>")
 - 
 
135 
			NewTextFile.WriteLine("<blockquote><blockquote><blockquote><table width='100%' border='1' cellspacing='0' cellpadding='1'>")
 - 
 
136 
			NewTextFile.WriteLine("<tr>")
 - 
 
137 
			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Issue&nbsp;Id&nbsp;</b></font></td>")
 - 
 
138 
			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Summary</b></font></td>")
 - 
 
139 
			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b></I>Issue&nbsp;Type&nbsp;</b></font></td>")
 - 
 
140 
			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b></P>Priority</b></font></td>")
 - 
 
141 
			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Status</b></font></td>")
 - 
 
142 
			NewTextFile.WriteLine("</tr>")
 - 
 
143
- 
 
144
- 
 
145
- 
 
146 
		While ((NOT sqlstrA.BOF) AND (NOT sqlstrA.EOF))
 - 
 
147 
			DEVIiss = "-1"
 - 
 
148 
			TDSEiss = "-1"
 - 
 
149 
			VT5DMiss = "-1"
 - 
 
150 
			VTSUPiss = "-1"
 - 
 
151
- 
 
152 
			If CInt(sqlstrA("iss_db")) = CInt(enumCLEARQUEST_DEVI_ID) Then
 - 
 
153 
				DEVIiss = DEVIiss &","& sqlstrA("iss_id")
 - 
 
154 
			ElseIf CInt(sqlstrA("iss_db")) = CInt(enumCLEARQUEST_TDSE_ID) Then
 - 
 
155 
				TDSEiss = TDSEiss &","& sqlstrA("iss_id")
 - 
 
156 
			ElseIf CInt(sqlstrA("iss_db")) = CInt(enumCLEARQUEST_VT5DM_ID) Then
 - 
 
157 
				VT5DMiss = VT5DMiss &","& sqlstrA("iss_id")
- 
 
158 
			ElseIf CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_VTSUP_ID) Then
 - 
 
159 
				VTSUPiss = VTSUPiss &","& sqlstrC("iss_id")
- 
 
160 
			End If
 - 
 
161
- 
 
162 
			SSsql = ReadFile( QUERIES_PATH & "\cq_issues.sql" )
 - 
 
163 
			SSsql = Replace( SSsql, "/*enumCLEARQUEST_DEVI_ID*/", enumCLEARQUEST_DEVI_ID)
 - 
 
164 
			SSsql = Replace( SSsql, "/*enumCLEARQUEST_TDSE_ID*/", enumCLEARQUEST_TDSE_ID)
 - 
 
165 
			SSsql = Replace( SSsql, "/*enumCLEARQUEST_VT5DM_ID*/", enumCLEARQUEST_VT5DM_ID)
 - 
 
166 
			SSsql = Replace( SSsql, "/*enumCLEARQUEST_VTSUP_ID*/", enumCLEARQUEST_VTSUP_ID)
- 
 
167 
			SSsql = Replace( SSsql, "/*DEVIiss*/", DEVIiss)
 - 
 
168 
			SSsql = Replace( SSsql, "/*TDSEiss*/", TDSEiss)
 - 
 
169 
			SSsql = Replace( SSsql, "/*VT5DMiss*/", VT5DMiss)
- 
 
170 
			SSsql = Replace( SSsql, "/*VTSUPiss*/", VTSUPiss)
- 
 
171 
			retVal = Get_CQ_Issues ( SSsql, rsCQ )
- 
 
172 
 
 - 
 
173 
			NewTextFile.WriteLine("<tr>")
 - 
 
174 
			NewTextFile.WriteLine("<td nowrap background='#CAC5B8' nowrap class='form_item'><font size='1' color="&chr(34)&"red"&chr(34)&" face='tahoma,sans-serif'><b>"&rsCQ("iss_num")&"</b></font></td>")
 - 
 
175 
			NewTextFile.WriteLine("				   <td nowrap background='#CAC5B8' class='form_item'><font size='1' color="&chr(34)&"red"&chr(34)&" face='tahoma,sans-serif'><b>"&NewLine_To_BR ( To_HTML ( rsCQ("summary") ) )&"</b></font></td>")
 - 
 
176 
			NewTextFile.WriteLine("				  <td nowrap background='#CAC5B8' class='form_item'><font size='1' color="&chr(34)&"red"&chr(34)&" face='tahoma,sans-serif'><b>"&rsCQ("issue_type")&"</b></font></td>")
 132 
		Set sqlstrC = OraDatabase.DbCreateDynaset("SELECT iss_db, iss_id, iss_state, notes FROM CQ_ISSUES WHERE pv_id="& pv_id &" AND iss_state = "& enumISSUES_STATE_FIXED &" UNION SELECT iss_db, iss_id, iss_state, notes FROM ARCHIVE_MANAGER.CQ_ISSUES WHERE pv_id="& pv_id &" AND iss_state = "& enumISSUES_STATE_FIXED, cint(0))
177 
			NewTextFile.WriteLine("<td nowrap background='#CAC5B8' class='form_item'><font size='1' color="&chr(34)&"red"&chr(34)&" face='tahoma,sans-serif'><b>"&rsCQ("priority")&"</b></font></td>")
 - 
 
178 
			NewTextFile.WriteLine("<td nowrap background='#CAC5B8' class='form_item'><font size='1' color="&chr(34)&"red"&chr(34)&" face='tahoma,sans-serif'><b>"&rsCQ("Status")&"</b></font></td>")
 - 
 
179 
			NewTextFile.WriteLine("                     </tr>")
 - 
 
180
- 
 
181 
			'If rsCQ("iss_num") <> "" Then
 - 
 
182 
  			'	NewTextFile.Write("<blockquote><blockquote><blockquote>"&rsCQ("iss_num")&": ")
 - 
 
183 
	    	'End If
 - 
 
184
- 
 
185 
	     	'If rsCQ("summary") <> "" Then
 - 
 
186 
			'	NewTextFile.Write(rsCQ("summary")&" ")
- 
 
187 
			'End If
 - 
 
188
- 
 
189 
			'If rsCQ("summary") <> "" Then
 - 
 
190 
			'	NewTextFile.WriteLine("(Priority: "& rsCQ("priority") &")</blockquote></blockquote></blockquote>")
- 
 
191 
			'End If
 - 
 
192
- 
 
193
- 
 
194
- 
 
195 
			sqlstrA.MoveNext
 - 
 
196 
		Wend
 - 
 
197 
			NewTextFile.WriteLine( "                        </table></blockquote></blockquote></blockquote> 		")
 - 
 
198 
			sqlstrA.Close()
- 
 
199
- 
 
200 
		End If
 - 
 
201
133
202 
 
 - 
 
203 
End Sub
 - 
 
204 
'--------------------------------------------------------------------------------------------------------------------------
 - 
 
205 
Sub GetDependencyFixedIssues(pv_id)
 - 
 
206 
	Set sqlstrC = 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))
- 
 
207
- 
 
208 
		If sqlstrC.RecordCount <> 0 Then
 134 
		If sqlstrC.RecordCount <> 0 Then
209 
			NewTextFile.WriteLine()
 135 
		NewTextFile.WriteLine()
210 
			NewTextFile.WriteLine("<blockquote><blockquote>Fixed Issues:</blockquote></blockquote>")
 136 
		NewTextFile.WriteLine("<blockquote><blockquote>Fixed Issues:</blockquote></blockquote>")
211 
			NewTextFile.WriteLine("<blockquote><blockquote><blockquote><table width='100%' border='1' cellspacing='0' cellpadding='1'>")
 137 
		NewTextFile.WriteLine("<blockquote><blockquote><blockquote><table class='fixed_issues' >")
212 
			NewTextFile.WriteLine("<tr>")
 138 
		NewTextFile.WriteLine("<tr>")
213 
			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Issue&nbsp;Id&nbsp;</b></font></td>")
 139 
		NewTextFile.WriteLine("<td width='10%' class='form_field'>Issue Id</td>")
214 
			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Summary</b></font></td>")
 140 
		NewTextFile.WriteLine("<td width='55%' class='form_field'>Summary</td>")
215 
			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b></I>Issue&nbsp;Type&nbsp;</b></font></td>")
 141 
		NewTextFile.WriteLine("<td width='10%' class='form_field'>Issue Type</td>")
216 
			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b></P>Priority</b></font></td>")
 142 
		NewTextFile.WriteLine("<td width='15%' class='form_field'>Priority</td>")
217 
			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Status</b></font></td>")
 143 
		NewTextFile.WriteLine("<td width='10%' class='form_field'>Status</td>")
218 
			NewTextFile.WriteLine("</tr>")
144 
		NewTextFile.WriteLine("</tr>")
- 
 
 145
- 
 
 146 
			While ((NOT sqlstrC.BOF) AND (NOT sqlstrC.EOF))
- 
 
 147 
				DEVIiss = "-1"
- 
 
 148 
				TDSEiss = "-1"
- 
 
 149 
				VT5DMiss = "-1"
- 
 
 150 
				VTSUPiss = "-1"
- 
 
 151
- 
 
 152 
				If CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_DEVI_ID) Then
- 
 
 153 
					DEVIiss = DEVIiss &","& sqlstrC("iss_id")
- 
 
 154 
				ElseIf CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_TDSE_ID) Then
- 
 
 155 
					TDSEiss = TDSEiss &","& sqlstrC("iss_id")
- 
 
 156 
				ElseIf CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_VT5DM_ID) Then
- 
 
 157 
					VT5DMiss = VT5DMiss &","& sqlstrC("iss_id")
- 
 
 158 
				ElseIf CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_VTSUP_ID) Then
- 
 
 159 
					VTSUPiss = VTSUPiss &","& sqlstrC("iss_id")
- 
 
 160 
				End If
- 
 
 161
- 
 
 162 
				SSsql = ReadFile( QUERIES_PATH & "\cq_issues.sql" )
- 
 
 163 
				SSsql = Replace( SSsql, "/*enumCLEARQUEST_DEVI_ID*/", enumCLEARQUEST_DEVI_ID)
- 
 
 164 
				SSsql = Replace( SSsql, "/*enumCLEARQUEST_TDSE_ID*/", enumCLEARQUEST_TDSE_ID)
- 
 
 165 
				SSsql = Replace( SSsql, "/*enumCLEARQUEST_VT5DM_ID*/", enumCLEARQUEST_VT5DM_ID)
- 
 
 166 
				SSsql = Replace( SSsql, "/*enumCLEARQUEST_VTSUP_ID*/", enumCLEARQUEST_VTSUP_ID)
- 
 
 167 
				SSsql = Replace( SSsql, "/*DEVIiss*/", DEVIiss)
- 
 
 168 
				SSsql = Replace( SSsql, "/*TDSEiss*/", TDSEiss)
- 
 
 169 
				SSsql = Replace( SSsql, "/*VT5DMiss*/", VT5DMiss)
- 
 
 170 
				SSsql = Replace( SSsql, "/*VTSUPiss*/", VTSUPiss)
- 
 
 171 
 
- 
 
 172 
				retVal = Get_CQ_Issues ( SSsql, rsCQ )
- 
 
 173 
 
219 
			'NewTextFile.WriteLine()
 174 
				NewTextFile.WriteLine("<tr>")
- 
 
 175 
			NewTextFile.WriteLine("<td nowrap class='form_item'>"&rsCQ("iss_num")&"</td>")
- 
 
 176 
 
- 
 
 177 
			NewTextFile.WriteLine("<td class='form_item'>"&NewLine_To_BR ( To_HTML ( rsCQ("summary") ) )&"</td>")
- 
 
 178 
			NewTextFile.WriteLine("<td class='form_item'>"&rsCQ("issue_type")&"</td>")
220 
			'NewTextFile.WriteLine("<blockquote><blockquote>Fixed Issues:</blockquote></blockquote>")
 179 
			NewTextFile.WriteLine("<td class='form_item'>"&rsCQ("priority")&"</td>")
- 
 
 180 
			NewTextFile.WriteLine("<td class='form_item'>"&rsCQ("Status")&"</td>")
- 
 
 181 
				NewTextFile.WriteLine("</tr>")
- 
 
 182
- 
 
 183 
				sqlstrC.MoveNext
221 
 
 184 
 
- 
 
 185 
			Wend
- 
 
 186 
 
- 
 
 187 
			NewTextFile.WriteLine( "                        </table></blockquote></blockquote></blockquote> 		")
- 
 
 188 
 
- 
 
 189 
		End If
222
190
223 
		While ((NOT sqlstrC.BOF) AND (NOT sqlstrC.EOF))
 - 
 
224 
			DEVIiss = "-1"
 - 
 
225 
			TDSEiss = "-1"
 - 
 
226 
			VT5DMiss = "-1"
 - 
 
227 
			VTSUPiss = "-1"
 - 
 
228
- 
 
229 
			If CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_DEVI_ID) Then
 - 
 
230 
				DEVIiss = DEVIiss &","& sqlstrC("iss_id")
 - 
 
231 
			ElseIf CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_TDSE_ID) Then
 - 
 
232 
				TDSEiss = TDSEiss &","& sqlstrC("iss_id")
 - 
 
233 
			ElseIf CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_VT5DM_ID) Then
 - 
 
234 
				VT5DMiss = VT5DMiss &","& sqlstrC("iss_id")
- 
 
235 
			ElseIf CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_VTSUP_ID) Then
 - 
 
236 
				VTSUPiss = VTSUPiss &","& sqlstrC("iss_id")
- 
 
237 
			End If
 - 
 
238
- 
 
239 
			SSsql = ReadFile( QUERIES_PATH & "\cq_issues.sql" )
 - 
 
240 
			SSsql = Replace( SSsql, "/*enumCLEARQUEST_DEVI_ID*/", enumCLEARQUEST_DEVI_ID)
 - 
 
241 
			SSsql = Replace( SSsql, "/*enumCLEARQUEST_TDSE_ID*/", enumCLEARQUEST_TDSE_ID)
 - 
 
242 
			SSsql = Replace( SSsql, "/*enumCLEARQUEST_VT5DM_ID*/", enumCLEARQUEST_VT5DM_ID)
 - 
 
243 
			SSsql = Replace( SSsql, "/*enumCLEARQUEST_VTSUP_ID*/", enumCLEARQUEST_VTSUP_ID)
- 
 
244 
			SSsql = Replace( SSsql, "/*DEVIiss*/", DEVIiss)
 - 
 
245 
			SSsql = Replace( SSsql, "/*TDSEiss*/", TDSEiss)
 - 
 
246 
			SSsql = Replace( SSsql, "/*VT5DMiss*/", VT5DMiss)
- 
 
247 
			SSsql = Replace( SSsql, "/*VTSUPiss*/", VTSUPiss)
- 
 
248 
			retVal = Get_CQ_Issues ( SSsql, rsCQ )
- 
 
249 
 
 - 
 
250 
			NewTextFile.WriteLine("<tr>")
 - 
 
251 
			NewTextFile.WriteLine("<td nowrap background='#CAC5B8' nowrap class='form_item'><font size='1' color="&chr(34)&"red"&chr(34)&" face='tahoma,sans-serif'><b>"&rsCQ("iss_num")&"</b></font></td>")
 - 
 
252 
			NewTextFile.WriteLine("				   <td nowrap background='#CAC5B8' class='form_item'><font size='1' color="&chr(34)&"red"&chr(34)&" face='tahoma,sans-serif'><b>"&NewLine_To_BR ( To_HTML ( rsCQ("summary") ) )&"</b></font></td>")
 - 
 
253 
			NewTextFile.WriteLine("				  <td nowrap background='#CAC5B8' class='form_item'><font size='1' color="&chr(34)&"red"&chr(34)&" face='tahoma,sans-serif'><b>"&rsCQ("issue_type")&"</b></font></td>")
 - 
 
254 
			NewTextFile.WriteLine("<td nowrap background='#CAC5B8' class='form_item'><font size='1' color="&chr(34)&"red"&chr(34)&" face='tahoma,sans-serif'><b>"&rsCQ("priority")&"</b></font></td>")
 - 
 
255 
			NewTextFile.WriteLine("<td nowrap background='#CAC5B8' class='form_item'><font size='1' color="&chr(34)&"red"&chr(34)&" face='tahoma,sans-serif'><b>"&rsCQ("Status")&"</b></font></td>")
 - 
 
256 
			NewTextFile.WriteLine("                     </tr>")
 - 
 
257
- 
 
258
- 
 
259
- 
 
260 
			sqlstrC.MoveNext
 191 
		sqlstrC.Close()
261 
		Wend
 - 
 
262 
			NewTextFile.WriteLine( "                        </table></blockquote></blockquote></blockquote> 		")
- 
 
263 
			sqlstrC.Close()
192 
		Set sqlstrC = Nothing
264
- 
 
265 
		End If
193 
	End If
266
194
267 
 
 - 
 
268 
End Sub
 195 
End Sub
269 
'--------------------------------------------------------------------------------------------------------------------------
 196 
'--------------------------------------------------------------------------------------------------------------------------
270 
 
 - 
 
271 
Sub LastPvIdA(a)
 197 
Function LastPvId(pvId)
272 
	Dim qryA
 198 
	Dim qryA
273 
	Set qryA = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&a , cint(0))
 199 
	Set qryA = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&pvId &_
- 
 
 200 
	" UNION SELECT LAST_PV_ID FROM ARCHIVE_MANAGER.PACKAGE_VERSIONS WHERE PV_ID="&pvId, cint(0))
274
201
- 
 
 202 
	LastPvId = pvId
- 
 
 203
275 
	If a <> qryA("last_pv_id") Then
204 
	If pvId <> qryA("last_pv_id") Then
276 
		a = qryA("last_pv_id")
 205 
		LastPvId = qryA("last_pv_id")
277 
	Else
206 
	Else
278 
		errormsg = true
 207 
		errormsg = true
279 
	End If
 208 
	End If
280
209
281 
	qryA.Close()
 210 
	qryA.Close()
282 
End Sub
 - 
 
283 
'--------------------------------------------------------------------------------------------------------------------------
 - 
 
284 
Sub LastPvIdB(b)
 - 
 
285 
	Dim qryB
 - 
 
286 
	Set qryB = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&b , cint(0))
 - 
 
287
- 
 
288 
	If b <> qryB("last_pv_id") Then
 - 
 
289 
		b = qryB("last_pv_id")
 - 
 
290 
	Else
 - 
 
291 
		errormsg = true
211 
	Set qryA = Nothing
292 
	End If
 - 
 
293
- 
 
294 
	qryB.Close()
 - 
 
295
212 
 
296 
End Sub
 213 
End Function
297 
'--------------------------------------------------------------------------------------------------------------------------
 214 
'--------------------------------------------------------------------------------------------------------------------------
298 
Sub PreviousVersions(a, b, versionA, versionB)
 215 
Sub PreviousVersions(a, b, versionA, versionB, data, issues)
299 
	NewTextFile.WriteLine()
 216 
	NewTextFile.WriteLine()
300
- 
 
301
- 
 
302 
	NewTextFile.WriteLine("<b>Versions Between: "&versionA&" and "&versionB&"</b>")
 217 
	NewTextFile.WriteLine("<b>Versions Between: "&versionA&" and "&versionB&"</b>")
303
218
304 
	If CLng(a) < CLng(b) Then
 219 
	If CLng(a) < CLng(b) Then
305 
		While CLng(a) < CLng(b)
220 
		While CLng(a) < CLng(b)
306 
			Call LastPvIdB(b)
 221 
			b = LastPvId(b)
307 
			If CLng(a) < CLng(b) Then
 222 
			If CLng(a) < CLng(b) Then
308 
				VersionList = VersionList + ","& b &""
 223 
				VersionList = VersionList + ","& b &""
309 
				Call Comments(b)
 224 
				Call Comments(b, data)
310 
				Call GetFixedIssues(b)
 225 
				Call GetFixedIssues(b, issues)
311 
			End If
 226 
			End If
312 
		Wend
 227 
		Wend
313 
	End If
228 
	End If
314 
 
 229 
 
315 
	If CLng(b) < CLng(a) Then
 230 
	If CLng(b) < CLng(a) Then
316 
		While CLng(b) < CLng(a)
231 
		While CLng(b) < CLng(a)
317 
			Call LastPvIdA(a)
 232 
			a = LastPvId(a)
318 
			If CLng(b) < CLng(a) Then
 233 
			If CLng(b) < CLng(a) Then
319 
				VersionList = VersionList + ","& a &""
 234 
				VersionList = VersionList + ","& a &""
320 
				Call Comments(a)
 235 
				Call Comments(a, data)
321 
				Call GetFixedIssues(a)
 236 
				Call GetFixedIssues(a, issues)
322 
			End If
 237 
			End If
323 
		Wend
238 
		Wend
324 
	End If
 239 
	End If
325
240
326 
 
 - 
 
327 
End Sub
 241 
End Sub
328 
'--------------------------------------------------------------------------------------------------------------------------
 242 
'--------------------------------------------------------------------------------------------------------------------------
329 
Sub GetDependencies(pv_id_a, pv_id_b, versionA, versionB)
 243 
Sub GetDependencies(pv_id_a, pv_id_b, versionA, versionB, comments, issues)
330 
	On Error Resume Next
 244 
	On Error Resume Next
331
245
332 
	Set sqlstrA = OraDatabase.DbCreateDynaset("select distinct dpv_id from package_dependencies where pv_id IN ("& pv_id_b &") and dpv_id NOT IN (SELECT dpv_id from package_dependencies where pv_id ="& pv_id_a &" ) order by dpv_id desc", cint(0))
246 
	Set sqlstrA = OraDatabase.DbCreateDynaset("select distinct dpv_id from package_dependencies where pv_id IN ("& pv_id_b &") and dpv_id NOT IN (SELECT dpv_id from package_dependencies where pv_id = "& pv_id_a &")" &_
- 
 
 247 
	" UNION select distinct dpv_id from ARCHIVE_MANAGER.package_dependencies where pv_id IN ("& pv_id_b &") and dpv_id NOT IN (SELECT dpv_id from ARCHIVE_MANAGER.package_dependencies where pv_id = "& pv_id_a &") order by dpv_id desc", cint(0))
333
248
334 
		If sqlstrA.RecordCount <> 0 Then
 249 
	If sqlstrA.RecordCount <> 0 Then
335 
			NewTextFile.WriteLine()
 250 
		NewTextFile.WriteLine()
336 
			NewTextFile.WriteLine("<b>Dependencies Changed Between "&versionA&" and "&versionB&":</b>")
 251 
		NewTextFile.WriteLine("<b>Dependencies Changed Between "&versionA&" and "&versionB&":</b>")
337 
 
 252 
 
338 
		While ((NOT sqlstrA.BOF) AND (NOT sqlstrA.EOF))
 253 
		While ((NOT sqlstrA.BOF) AND (NOT sqlstrA.EOF))
339 
			Call dependencyComments(sqlstrA("dpv_id"))
 254 
			Call dependencyComments(sqlstrA("dpv_id"), comments)
340 
			Call GetDependencyFixedIssues(sqlstrA("dpv_id"))
 255 
			Call GetFixedIssues(sqlstrA("dpv_id"), issues)
341 
			sqlstrA.MoveNext
 256 
			sqlstrA.MoveNext
342 
		Wend
 257 
		Wend
343 
			sqlstrA.Close()
 - 
 
344
- 
 
345 
		End If
 - 
 
346 
 
 - 
 
347 
End Sub
 - 
 
348 
'--------------------------------------------------------------------------------------------------------------------------
 - 
 
349 
Sub dependencyComments(pv_id)
 - 
 
350 
	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))
- 
 
351 
			NewTextFile.WriteLine("<blockquote><blockquote>Comments:</blockquote></blockquote>")
 - 
 
352 
			NewTextFile.Write("<blockquote><blockquote><blockquote><font color="&chr(34)&"blue"&chr(34)&">"& sqlstrB("pkg_name") &" "& sqlstrB("pkg_version") &"</font>---->"& TextToHTML(sqlstrB("comments")) &"</blockquote></blockquote></blockquote>")
- 
 
353
- 
 
354 
	sqlstrB.Close()
 - 
 
355 
	Set sqlstrB = nothing
- 
 
356
- 
 
357 
 
 258 
 
358 
End Sub
 - 
 
359 
'--------------------------------------------------------------------------------------------------------------------------
 - 
 
360 
Sub LastPvIdA(a)
 - 
 
361 
	Dim qryA
 - 
 
362 
	Set qryA = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&a , cint(0))
 - 
 
363
- 
 
364 
	If a <> qryA("last_pv_id") Then
- 
 
365 
		a = qryA("last_pv_id")
 - 
 
366 
	Else
- 
 
367 
		errormsg = true
 - 
 
368 
	End If
 259 
	End If
369
260
370 
	qryA.Close()
 261 
	sqlstrA.Close()
- 
 
 262 
	Set sqlstrA = Nothing
- 
 
 263 
 
371 
End Sub
 264 
End Sub
372 
'--------------------------------------------------------------------------------------------------------------------------
 265 
'--------------------------------------------------------------------------------------------------------------------------
373 
Sub LastPvIdB(b)
 266 
Sub dependencyComments(pv_id, comments)
374 
	Dim qryB
 267 
 
375 
	Set qryB = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&b , cint(0))
 268 
		Set sqlstrB = OraDatabase.DbCreateDynaset("SELECT * FROM PACKAGE_VERSIONS pv, PACKAGES pkg WHERE pkg.pkg_id = pv.pkg_id AND PV_ID ="&pv_id &_
- 
 
 269 
		" UNION SELECT * FROM ARCHIVE_MANAGER.PACKAGE_VERSIONS pv, ARCHIVE_MANAGER.PACKAGES pkg WHERE pkg.pkg_id = pv.pkg_id AND PV_ID ="&pv_id, cint(0))
- 
 
 270 
		NewTextFile.WriteLine("<blockquote><blockquote><span class="&chr(34)&"highlight_text"&chr(34)&">"& sqlstrB("pkg_name") &" "& sqlstrB("pkg_version") &"</font></span></blockquote></blockquote>")
376
271
377 
	If b <> qryB("last_pv_id") Then
 272 
		If comments <> "Filter Comments" Then
378 
		b = qryB("last_pv_id")
 273 
	NewTextFile.WriteLine("<blockquote><blockquote>Comments:</blockquote></blockquote>")
379 
	Else
 - 
 
380 
		errormsg = true
274 
	NewTextFile.Write("<blockquote><blockquote><blockquote>"& TextToHTML(sqlstrB("comments")) &"</blockquote></blockquote></blockquote>")
381 
	End If
 275 
		End If
382
276
383 
	qryB.Close()
 277 
		sqlstrB.Close()
384
278 
		Set sqlstrB = nothing
385 
End Sub
 279 
End Sub
386 
'--------------------------------------------------------------------------------------------------------------------------
 280 
'--------------------------------------------------------------------------------------------------------------------------
387 
Sub pkg_Version(pv)
 281 
Sub pkg_Version(pv)
388 
	Dim qry
282 
	Dim qry
389 
	Set qry = OraDatabase.DbCreateDynaset("SELECT PKG_VERSION FROM PACKAGE_VERSIONS WHERE PV_ID="&pv , cint(0))
283 
	Set qry = OraDatabase.DbCreateDynaset("SELECT PKG_VERSION FROM PACKAGE_VERSIONS WHERE PV_ID="&pv &_
- 
 
 284 
	" UNION SELECT PKG_VERSION FROM ARCHIVE_MANAGER.PACKAGE_VERSIONS WHERE PV_ID="&pv, cint(0))
390 
	pkgversion = qry("pkg_version")
 285 
	pkgversion = qry("pkg_version")
391 
	qry.Close()
 286 
	qry.Close()
- 
 
 287 
	Set qry = Nothing
392 
End Sub
 288 
End Sub
393 
'--------------------------------------------------------------------------------------------------------------------------
 289 
'--------------------------------------------------------------------------------------------------------------------------
394 
Sub LastPvIdAa(a)
 - 
 
395 
	Dim qryA
 - 
 
396 
	Set qryA = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&a , cint(0))
 - 
 
397 
	c = qryA("last_pv_id")
 - 
 
398 
	qryA.Close()
 - 
 
399 
End Sub
 - 
 
400 
'--------------------------------------------------------------------------------------------------------------------------
 - 
 
401 
Sub LastPvIdBb(b)
 - 
 
402 
	Dim qryB
 - 
 
403 
	Set qryB = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&b , cint(0))
 - 
 
404 
	d = qryB("last_pv_id")
- 
 
405 
	qryB.Close()
 - 
 
406 
End Sub
 - 
 
407 
'--------------------------------------------------------------------------------------------------------------------------
 - 
 
408 
Sub Comments(Pv_Id)
 290 
Sub Comments(Pv_Id, data)
409 
	Dim comments
 291 
		Dim comments
410 
	Set comments = OraDatabase.DbCreateDynaset("SELECT COMMENTS, PKG_VERSION FROM PACKAGE_VERSIONS WHERE PV_ID="&Pv_id , cint(0))
 292 
		Set comments = OraDatabase.DbCreateDynaset("SELECT COMMENTS, PKG_VERSION FROM PACKAGE_VERSIONS WHERE PV_ID="&Pv_id &_
- 
 
 293 
		" UNION SELECT COMMENTS, PKG_VERSION FROM ARCHIVE_MANAGER.PACKAGE_VERSIONS WHERE PV_ID="&Pv_id, cint(0))
411 
	If comments("comments") <> "Rippled Build." Then
 294 
		'If comments("comments") <> "Rippled Build." Then
412 
		NewTextFile.WriteLine("<blockquote><blockquote><font color="&chr(34)&"blue"&chr(34)&">Version: "& comments("pkg_version")&"</font></blockquote></blockquote>")
 295 
			NewTextFile.WriteLine("<blockquote><blockquote><span class="&chr(34)&"highlight_text"&chr(34)&">Version: "& comments("pkg_version")&"</span></blockquote></blockquote>")
- 
 
 296 
			If data <> "Filter Comments" Then
413 
		If comments("comments") <> "" Then
 297 
				If comments("comments") <> "" Then
414 
			NewTextFile.WriteLine("<blockquote><blockquote>Comments: </blockquote></blockquote>")
 298 
					NewTextFile.WriteLine("<blockquote><blockquote>Comments: </blockquote></blockquote>")
415 
			NewTextFile.WriteLine("<blockquote><blockquote><blockquote>"& TextToHTML(comments("comments")) &"</blockquote></blockquote></blockquote>")
 299 
					NewTextFile.WriteLine("<blockquote><blockquote><blockquote>"& TextToHTML(comments("comments")) &"</blockquote></blockquote></blockquote>")
416 
			source_change = true
 300 
				End If
417 
		End If
301 
			End If
418 
	End If
 302 
		'End If
419 
 
 - 
 
420 
End Sub
 303 
End Sub
421 
'--------------------------------------------------------------------------------------------------------------------------
 304 
'--------------------------------------------------------------------------------------------------------------------------
422 
Sub Release(pvId)
 305 
Sub Release(pvId)
423 
	Dim release
 306 
	Dim release
424 
	Set release = OraDatabase.DbCreateDynaset("SELECT INSERT_STAMP FROM RELEASE_CONTENT WHERE PV_ID="&pvId , cint(0))
 307 
	Set release = OraDatabase.DbCreateDynaset("SELECT INSERT_STAMP FROM RELEASE_CONTENT WHERE PV_ID="&pvId &_
- 
 
 308 
	" UNION SELECT INSERT_STAMP FROM ARCHIVE_MANAGER.RELEASE_CONTENT WHERE PV_ID="&pvId, cint(0))
425 
 
 309 
 
426 
	If release("insert_stamp") <> "" Then
 310 
	If release("insert_stamp") <> "" Then
427 
		NewTextFile.Write(release("insert_stamp"))
 311 
		NewTextFile.Write(release("insert_stamp"))
428 
	Else
 312 
	Else
429 
		NewTextFile.Write("Version Not Used.")
 313 
		NewTextFile.Write("Version Not Used.")
Line 431... Line 315...
431 
 
 315 
 
432 
End Sub
 316 
End Sub
433 
'--------------------------------------------------------------------------------------------------------------------------
 317 
'--------------------------------------------------------------------------------------------------------------------------
434 
Sub Header()
318 
Sub Header()
435 
	NewTextFile.WriteLine("<html>")
 319 
	NewTextFile.WriteLine("<html>")
- 
 
 320 
	NewTextFile.WriteLine("<head>")
436 
End Sub
 321 
End Sub
437 
'--------------------------------------------------------------------------------------------------------------------------
 322 
'--------------------------------------------------------------------------------------------------------------------------
438 
Sub Footer()
 323 
Sub Footer()
- 
 
 324 
  NewTextFile.WriteLine("</body>")
439 
	NewTextFile.WriteLine("</html>")
 325 
	NewTextFile.WriteLine("</html>")
440 
End Sub
 326 
End Sub
441 
'--------------------------------------------------------------------------------------------------------------------------
 327 
'--------------------------------------------------------------------------------------------------------------------------
- 
 
 328 
Sub Styles()
- 
 
 329 
  NewTextFile.WriteLine("<style type="&chr(34)&"text/css"&chr(34)&">")
- 
 
 330 
  NewTextFile.WriteLine("body { font-family:Verdana,Arial,Helvetica,sans-serif; }")
- 
 
 331 
  NewTextFile.WriteLine("table { border-collapse:collapse; }")
- 
 
 332 
  NewTextFile.WriteLine("td { border-width:1; border-style:solid; border-color:black; padding:3 5 3 5; }")
- 
 
 333 
  NewTextFile.WriteLine(".fixed_issues { border-width:1; border-style:solid; border-color:black; }")
- 
 
 334 
  NewTextFile.WriteLine(".page_title { color:red; font-size:110%; text-align:center; }")
- 
 
 335 
  NewTextFile.WriteLine(".highlight_text { color:blue; }")
- 
 
 336 
  NewTextFile.WriteLine(".form_field { background-color:#EAE5D7; font:bold 70% Tahoma,sans-serif; }")
- 
 
 337 
  NewTextFile.WriteLine(".form_item { background-color:#EAE5D7; color:red; font:bold 70% Tahoma,sans-serif; vertical-align:top; }")
- 
 
 338 
  NewTextFile.WriteLine("</style>")
- 
 
 339 
End Sub
- 
 
 340 
'--------------------------------------------------------------------------------------------------------------------------
442 
Function GetIsDiffFilterInUseIcon()
 341 
Function GetIsDiffFilterInUseIcon()
443 
	GetIsDiffFilterInUseIcon = LIMG_FILTER_OFF & LIMG_DROP_DOWN_ARROW
 342 
	GetIsDiffFilterInUseIcon = LIMG_FILTER_OFF & LIMG_DROP_DOWN_ARROW
444
343
445 
	If dDiffFilter.Count > 0 Then
 344 
	If dDiffFilter.Count > 0 Then
446 
		GetIsDiffFilterInUseIcon = LIMG_FILTER_ON & LIMG_DROP_DOWN_ARROW
 345 
		GetIsDiffFilterInUseIcon = LIMG_FILTER_ON & LIMG_DROP_DOWN_ARROW
Line 481... Line 380...
481 
	mString = Server.HTMLEncode( sString )
 380 
	mString = Server.HTMLEncode( sString )
482 
	mString = Replace(mString, VBNewLine, "<br>")
 381 
	mString = Replace(mString, VBNewLine, "<br>")
483
382
484 
	TextToHTML = mString
 383 
	TextToHTML = mString
485 
End Function
 384 
End Function
486 
 
 - 
 
487 
'--------------------------------------------------------------------------------------------------------------------------
 385 
'--------------------------------------------------------------------------------------------------------------------------
488 
Sub GetFormDetails ( nSourceSBOM, ByRef outobjDetails )
 386 
Sub GetFormDetails ( nSourceSBOM, ByRef outobjDetails )
489 
	Dim rsQry, query
 387 
	Dim rsQry, query
490
388
491 
	' Exit if nSourceRtagId is empty
 389 
	' Exit if nSourceRtagId is empty
Line 541... Line 439...
541 
			outIcon = ""
439 
			outIcon = ""
542 
	End Select
 440 
	End Select
543
441
544 
End Sub
 442 
End Sub
545 
'--------------------------------------------------------------------------------------------------------------------------
 443 
'--------------------------------------------------------------------------------------------------------------------------
546 
Sub MergePackages ()
 - 
 
547 
	Dim aFullList, aAddPkgList, aRemovePkgList, dAddPkgList, dRemovePkgList, PvId
 - 
 
548 
	Dim OraParameter
 - 
 
549
- 
 
550 
	Set dAddPkgList = CreateObject("Scripting.Dictionary")
 - 
 
551 
	Set dRemovePkgList = CreateObject("Scripting.Dictionary")
 - 
 
552
- 
 
553 
	'--- Get Add Packages ---
 - 
 
554 
	' Get full list of "addpkg" parameter
 - 
 
555 
	aFullList = Split ( Replace( Request("addpkg"), " ", "" ), "," )
 - 
 
556
- 
 
557 
	' Clean empty parameters
 - 
 
558 
	For Each PvId In aFullList
 - 
 
559 
		If PvId <> "" Then
 - 
 
560 
			dAddPkgList.Add CStr( PvId ), Empty
 - 
 
561 
		End If
 - 
 
562 
	Next
 - 
 
563
- 
 
564 
	aFullList = NULL
 - 
 
565 
	aAddPkgList = dAddPkgList.Keys
 - 
 
566
- 
 
567 
	'--- Get Remove Packages ---
 - 
 
568 
	' Get full list of "removepkg" parameter
 - 
 
569 
	aFullList = Split ( Replace( Request("removepkg"), " ", "" ), "," )
 - 
 
570
- 
 
571 
	' Clean empty parameters
 - 
 
572 
	For Each PvId In aFullList
 - 
 
573 
		If PvId <> "" Then
 - 
 
574 
			dRemovePkgList.Add CStr( PvId ), Empty
 - 
 
575 
		End If
 - 
 
576 
	Next
 - 
 
577
- 
 
578 
	aFullList = NULL
 - 
 
579 
	aRemovePkgList = dRemovePkgList.Keys
 - 
 
580
- 
 
581 
	'-- Add package List to release --
 - 
 
582 
	OraDatabase.Parameters.Add "PV_ID", 			NULL, 				ORAPARM_INPUT, ORATYPE_NUMBER
- 
 
583 
	OraDatabase.Parameters.Add "VIEW_ID", 			NULL, 				ORAPARM_BOTH, ORATYPE_NUMBER
- 
 
584 
	OraDatabase.Parameters.Add "RTAG_A", 			Request("rtagA"), 	ORAPARM_INPUT, ORATYPE_NUMBER
- 
 
585 
	OraDatabase.Parameters.Add "RTAG_B", 			Request("rtagB"), 	ORAPARM_INPUT, ORATYPE_NUMBER
- 
 
586 
	OraDatabase.Parameters.Add "PROJB", 			objRelCollectorB.Item("proj_id"), 	ORAPARM_INPUT, ORATYPE_NUMBER
- 
 
587 
	OraDatabase.Parameters.Add "COMMENTS", 			"Merging from "& objRelCollectorA.Item("location") &" to "& objRelCollectorB.Item("location"), 	ORAPARM_INPUT, ORATYPE_VARCHAR2
 - 
 
588 
	OraDatabase.Parameters.Add "USER_ID", 			objAccessControl.UserId, 				ORAPARM_INPUT, ORATYPE_NUMBER
- 
 
589
- 
 
590
- 
 
591 
	Set OraParameter = OraDatabase.Parameters
 - 
 
592
- 
 
593
- 
 
594 
	On Error Resume Next
 - 
 
595
- 
 
596
- 
 
597 
	' Begin Database entry
 - 
 
598 
	objEH.TryORA ( OraSession )
 - 
 
599
- 
 
600 
	OraSession.BeginTrans
 - 
 
601
- 
 
602 
	'-- Add Packages --
 - 
 
603 
	For Each PvId In aAddPkgList
 - 
 
604 
		OraParameter("PV_ID").Value = PvId
 - 
 
605 
		OraDatabase.ExecuteSQL _
 - 
 
606 
		"BEGIN  "&_
 - 
 
607 
		"  :VIEW_ID := PK_RELEASE.GET_PACKAGE_VIEW ( :PV_ID, :RTAG_A ); "&_
 - 
 
608 
		"  PK_RELEASE.ADD_PACKAGE ( :PV_ID, :VIEW_ID, :RTAG_B, :USER_ID );  "&_
 - 
 
609 
		"END;"
 - 
 
610 
	Next
 - 
 
611
- 
 
612 
	'-- Remove Packages --
 - 
 
613 
	For Each PvId In aRemovePkgList
- 
 
614 
		OraParameter("PV_ID").Value = PvId
 - 
 
615 
		OraDatabase.ExecuteSQL _
 - 
 
616 
		"BEGIN  "&_
 - 
 
617 
		"  PK_RELEASE.REMOVE_PACKAGE ( :PV_ID, :RTAG_B, :USER_ID );  "&_
 - 
 
618 
		"END;"
 - 
 
619 
	Next
 - 
 
620
- 
 
621 
	'-- Log Project Merge Action
 - 
 
622 
	OraDatabase.ExecuteSQL _
 - 
 
623 
	"BEGIN  LOG_PROJECT_ACTION ( :PROJB, 'merge_release', :USER_ID, :COMMENTS );  END;"
 - 
 
624
- 
 
625 
	'-- Force package state recalculate
- 
 
626 
	OraDatabase.ExecuteSQL _
 - 
 
627 
	"BEGIN  "&_
 - 
 
628 
	"  TOUCH_RELEASE ( :RTAG_B );  "&_
 - 
 
629 
	"END;"
 - 
 
630
- 
 
631 
	OraSession.CommitTrans
 - 
 
632
- 
 
633 
	objEH.CatchORA ( OraSession )
 - 
 
634
- 
 
635 
	Set OraParameter = Nothing
 - 
 
636 
	OraDatabase.Parameters.Remove "PV_ID"
 - 
 
637 
	OraDatabase.Parameters.Remove "VIEW_ID"
 - 
 
638 
	OraDatabase.Parameters.Remove "RTAG_A"
 - 
 
639 
	OraDatabase.Parameters.Remove "RTAG_B"
 - 
 
640 
	OraDatabase.Parameters.Remove "USER_ID"
 - 
 
641 
	OraDatabase.Parameters.Remove "PROJB"
 - 
 
642 
	OraDatabase.Parameters.Remove "COMMENTS"
 - 
 
643 
	'Response.write "<br>"& sAddPkgList &"-"& dAddPkgList.Count &"-"& UBound( aFullList )
 - 
 
644 
End Sub
 - 
 
645 
'--------------------------------------------------------------------------------------------------------------------------
 - 
 
646 
%>
 444 
%>
647 
<%
 445 
<%
648 
'------------ RUN BEFORE PAGE RENDER ----------
 446 
'------------ RUN BEFORE PAGE RENDER ----------
649 
If Request("btn") = "Exit" Then
 447 
If Request("btn") = "Exit" Then
650 
	Call OpenInWindow ( "reports.asp" )
 448 
	Call OpenInWindow ( "reports.asp" )
651 
End If
 449 
End If
652 
 
 450 
 
653 
' Get release details
 451 
' Get release details
654 
 
 - 
 
655 
Call GetFormDetails ( parSBOMA, objRelCollectorA )
 452 
Call GetFormDetails ( parSBOMA, objRelCollectorA )
656 
Call GetFormDetails ( parSBOMB, objRelCollectorB )
 453 
Call GetFormDetails ( parSBOMB, objRelCollectorB )
657 
 
 454 
 
658 
If (Request("btn") = "Merge")  AND (objAccessControl.IsActive("MergeRelease")) Then
 - 
 
659 
	If objRelCollectorB.Item("official") <> "Y" Then
 - 
 
660 
		Call MergePackages ()
 - 
 
661 
	End If
 - 
 
662 
End If
 - 
 
663 
 
 - 
 
664 
If Request("btn") = "Swap Compare" Then
 455 
If Request("btn") = "Swap Compare" Then
665 
	Call OpenInWindow ( SCRIPT_NAME &"?sbomA="& parSBOMB &"&sbomB="& parSBOMA )
 456 
	Call OpenInWindow ( SCRIPT_NAME &"?sbomA="& parSBOMB &"&sbomB="& parSBOMA &"&rtagA="& parRtagB &"&rtagB="& parRtagA )
666 
End If
 457 
End If
667 
 
 458 
 
668 
If Request("btn") = "Hide" Then
 459 
If Request("btn") = "Hide" Then
669 
	' Store filter in cookie
 460 
	' Store filter in cookie
670 
	Response.Cookies(enum_RELMGR_COOKIE_DOMAIN)(COOKIE_HIDE_DIFF_FILTER) = Request("difilter")
 461 
	Response.Cookies(enum_RELMGR_COOKIE_DOMAIN)(COOKIE_HIDE_DIFF_FILTER) = Request("difilter")
Line 677... Line 468...
677 
<html>
 468 
<html>
678 
<head>
 469 
<head>
679 
<title>Deployment Manager SBOM Differences</title>
 470 
<title>Deployment Manager SBOM Differences</title>
680 
<meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
 471 
<meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
681 
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 472 
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- 
 
 473 
<link rel="stylesheet" href="scripts/deployment_manager.css" type="text/css">
682 
<link rel="stylesheet" href="images/release_manager_style.css" type="text/css">
 474 
<link rel="stylesheet" href="images/release_manager_style.css" type="text/css">
683 
<link rel="stylesheet" href="images/navigation.css" type="text/css">
 475 
<link rel="stylesheet" href="images/navigation.css" type="text/css">
684 
<script language="JavaScript" src="images/common.js"></script>
 476 
<script language="JavaScript" src="scripts/common.js"></script>
685 
<script language="JavaScript" src="scripts/remote_scripting.js"></script>
 477 
<script language="JavaScript" src="scripts/remote_scripting.js"></script>
686 
<script language="JavaScript" type="text/javascript">
 478 
<script language="JavaScript" type="text/javascript">
687 
<!--
 479 
<!--
688 
 
 480 
 
689 
function RequestReleaseCombo( paramString, rowId ){
 481 
function RequestReleaseCombo( paramString, rowId ){
Line 742... Line 534...
742 
	xmlHttp_Get(xmlHttp, url);
 534 
	xmlHttp_Get(xmlHttp, url);
743
535
744
536
745 
}
 537 
}
746 
 
 538 
 
747 
 
 - 
 
748 
function MergePackage ( pkga, pkgb, rowId )
 - 
 
749 
{
 - 
 
750 
 
 - 
 
751 
	// Set merge hidden field with new value
 - 
 
752 
	MM_findObj( 'ADDPKG_' + rowId ).value = pkga;
 - 
 
753
- 
 
754 
	var divA = MM_findObj( 'PVA' + rowId );
 - 
 
755 
	var divB = MM_findObj( 'PVB' + rowId );
 - 
 
756
- 
 
757 
	// Set text equal
 - 
 
758 
	divB.innerHTML = divA.innerHTML;
 - 
 
759
- 
 
760 
	// Set highlight to blank
 - 
 
761 
	divA.style.backgroundColor = '<%=LCOLOR_NOT_CHANGED%>';
 - 
 
762 
	divB.style.backgroundColor = '<%=LCOLOR_NOT_CHANGED%>';
 - 
 
763
- 
 
764 
    // Set Change state icon to blank
 - 
 
765 
	MM_findObj( 'IMGSTATE' + rowId ).style.display = 'none';
 - 
 
766
- 
 
767 
	// Remove Merge Button
 - 
 
768 
	MM_findObj( 'IMGMERGE' + rowId ).style.display = 'none';
 - 
 
769 
	MM_findObj( 'IMGREMOVE' + rowId ).style.display = 'none';
 - 
 
770
- 
 
771 
	// Show undo button
 - 
 
772 
	MM_findObj( 'IMGUNDO' + rowId ).style.display = 'block';
 - 
 
773
- 
 
774
- 
 
775 
}
 - 
 
776 
 
 - 
 
777 
 
 - 
 
778 
function RemovePackage ( pkga, pkgb, rowId )
 - 
 
779 
{
 - 
 
780 
 
 - 
 
781 
	// Set remove hidden field with new value
 - 
 
782 
	MM_findObj( 'REMOVEPKG_' + rowId ).value = pkgb;
 - 
 
783
- 
 
784 
	var divA = MM_findObj( 'PVA' + rowId );
 - 
 
785 
	var divB = MM_findObj( 'PVB' + rowId );
 - 
 
786
- 
 
787 
	// Set text equal
 - 
 
788 
	divB.style.textDecoration = 'line-through';
 - 
 
789
- 
 
790 
	// Set highlight to blank
 - 
 
791 
	if (MM_findObj( 'CHANGETYPE_' + rowId ).value != "A")
 - 
 
792 
	{
 - 
 
793 
		divA.style.backgroundColor = '<%=LCOLOR_NOT_CHANGED%>';
 - 
 
794 
	}
 - 
 
795 
	divB.style.backgroundColor = '<%=LCOLOR_NOT_CHANGED%>';
 - 
 
796
- 
 
797 
    // Set Change state icon to blank
 - 
 
798 
	MM_findObj( 'IMGSTATE' + rowId ).style.display = 'none';
 - 
 
799
- 
 
800 
	// Remove Merge Button
 - 
 
801 
	MM_findObj( 'IMGMERGE' + rowId ).style.display = 'none';
 - 
 
802 
	MM_findObj( 'IMGREMOVE' + rowId ).style.display = 'none';
 - 
 
803
- 
 
804 
	// Show undo button
 - 
 
805 
	MM_findObj( 'IMGUNDO' + rowId ).style.display = 'block';
 - 
 
806
- 
 
807
- 
 
808 
}
 - 
 
809 
 
 - 
 
810 
 
 - 
 
811 
 
 - 
 
812 
function UndoPackage ( rowId )
 - 
 
813 
{
 - 
 
814 
 
 - 
 
815 
	// Set merge/remove hidden field with new value
 - 
 
816 
	MM_findObj( 'ADDPKG_' + rowId ).value = '';
 - 
 
817 
	MM_findObj( 'REMOVEPKG_' + rowId ).value = '';
 - 
 
818
- 
 
819 
	var divA = MM_findObj( 'PVA' + rowId );
 - 
 
820 
	var divB = MM_findObj( 'PVB' + rowId );
 - 
 
821
- 
 
822 
	// Set text equal
 - 
 
823 
	divB.innerHTML = MM_findObj( 'UNDOPKG_' + rowId ).value;
 - 
 
824 
	divB.style.textDecoration = 'none';
 - 
 
825
- 
 
826
- 
 
827 
	// Set highlight to blank
 - 
 
828 
	divA.style.backgroundColor = MM_findObj( 'UNDOCOLORA_' + rowId ).value;
 - 
 
829 
	divB.style.backgroundColor = MM_findObj( 'UNDOCOLORB_' + rowId ).value;
 - 
 
830
- 
 
831
- 
 
832 
    // Set Change state icon to blank
 - 
 
833 
	MM_findObj( 'IMGSTATE' + rowId ).style.display = 'block';
 - 
 
834
- 
 
835
- 
 
836 
	// Remove Merge Button
 - 
 
837 
	var cht = MM_findObj( 'CHANGETYPE_' + rowId );
 - 
 
838
- 
 
839 
	if (cht.value == "R")
 - 
 
840 
	{
 - 
 
841 
		MM_findObj( 'IMGMERGE' + rowId ).style.display = 'block';
 - 
 
842 
	}
- 
 
843 
	else if ( (cht.value == "A") || (cht.value == "") )
- 
 
844 
	{
 - 
 
845 
		MM_findObj( 'IMGREMOVE' + rowId ).style.display = 'block';
 - 
 
846 
	}
- 
 
847 
	else
- 
 
848 
	{
 - 
 
849 
		MM_findObj( 'IMGMERGE' + rowId ).style.display = 'block';
 - 
 
850 
		MM_findObj( 'IMGREMOVE' + rowId ).style.display = 'block';
 - 
 
851 
	}
 - 
 
852
- 
 
853 
	// Show undo button
 - 
 
854 
	MM_findObj( 'IMGUNDO' + rowId ).style.display = 'none';
 - 
 
855
- 
 
856 
}
 - 
 
857 
 
 - 
 
858 
 
 - 
 
859 
function MergeAll()
 - 
 
860 
{
 - 
 
861 
	var elem
 - 
 
862
- 
 
863 
	if (document.all)
 - 
 
864 
	{
 - 
 
865 
		// Run this for IE
 - 
 
866 
		elem = document.all;
 - 
 
867 
	} else {
 - 
 
868 
		// Run this for other browsers
 - 
 
869 
		elem = document.getElementsByTagName('div');
 - 
 
870 
	}
 - 
 
871
- 
 
872 
	for (i in elem)
 - 
 
873 
	{
 - 
 
874 
		if (elem[i].id)
 - 
 
875 
		{
- 
 
876 
			if (elem[i].id.indexOf('SHORT_') == 0) elem[i].style.display = 'none';
 - 
 
877 
			if (elem[i].id.indexOf('LONG_') == 0) elem[i].style.display = 'block';
 - 
 
878 
		}
 - 
 
879 
	}
 - 
 
880
- 
 
881 
}
 - 
 
882 
 
 - 
 
883 
//-->
 539 
//-->
884 
</script>
 540 
</script>
885 
 
 541 
 
886 
</head>
 542 
</head>
887 
<body bgcolor="#FFFFFF" text="#000000" leftmargin="0" topmargin="0">
 543 
<body bgcolor="#FFFFFF" text="#000000" leftmargin="0" topmargin="0">
Line 925... Line 581...
925 
        </tr>
 581 
        </tr>
926 
        <tr>
 582 
        <tr>
927 
          <td align="left">
 583 
          <td align="left">
928
584
929 
		  <select name="rtagA" id="rtagA" class="form_item" onChange="RequestSBOMCombo( '?branch_id='+ this.value, FormName.sbomA );">
 585 
		  <select name="rtagA" id="rtagA" class="form_item" onChange="RequestSBOMCombo( '?branch_id='+ this.value, FormName.sbomA );">
930 
              <option value="">-- Select SBOM --</option>
586 
              <option value="">-- Select Branch --</option>
931 
			  <%
 587 
			  <%
932 
			  OraDatabase.Parameters.Add "PROJ_ID", 	objRelCollectorA.Item("proj_id"),	ORAPARM_INPUT,  ORATYPE_NUMBER
588 
			  OraDatabase.Parameters.Add "PROJ_ID", 	objRelCollectorA.Item("proj_id"),	ORAPARM_INPUT,  ORATYPE_NUMBER
933 
			  OraDatabase.Parameters.Add "BRANCH_ID", 	objRelCollectorA.Item("branch_id"),	ORAPARM_INPUT, ORATYPE_NUMBER
589 
			  OraDatabase.Parameters.Add "BRANCH_ID", 	objRelCollectorA.Item("branch_id"),	ORAPARM_INPUT, ORATYPE_NUMBER
934
590
935 
			  Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("ReleasesCombo.sql"), cint(0))
 591 
			  Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("ReleasesCombo.sql"), cint(0))
936
592
937 
			  OraDatabase.Parameters.Remove "PROJ_ID"
 593 
			  OraDatabase.Parameters.Remove "PROJ_ID"
938 
			  OraDatabase.Parameters.Remove "BRANCH_ID"
 594 
			  OraDatabase.Parameters.Remove "BRANCH_ID"
939
595
940 
			  While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))%>
 596 
			  While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))%>
941 
                <option value="<%=rsQry("branch_id")%>" <%=rsQry("selected")%>><%=rsQry("branch_name")%></option>
 597 
                <option value="<%=rsQry("branch_id")%>" <%=rsQry("selected")%>><%=rsQry("branch_name")%></option>
942 
              <%rsQry.MoveNext
 598 
              <%rsQry.MoveNext
943 
			  WEnd
 599 
			  WEnd
944
600
945 
			  rsQry.Close
 601 
			  rsQry.Close
Line 1030... Line 686...
1030 
                    </table></td>
 686 
                    </table></td>
1031 
                  </tr>
 687 
                  </tr>
1032 
				  <tr>
 688 
				  <tr>
1033 
                    <td>
 689 
                    <td>
1034 
					<%If (parRtagA <> "") AND (parRtagB <> "")Then%>
690 
					<%If (parRtagA <> "") AND (parRtagB <> "")Then%>
1035 
					<!-- DIFF FILTER +++++++++++++++++++++++++++++++++++++++++++ -->
691 
						<!-- DIFF FILTER +++++++++++++++++++++++++++++++++++++++++++ -->
1036 
					<fieldset style="width:150px;">
 692 
						<fieldset style="width:150px;">
1037 
					<legend><a href="javascript:;" class="body_scol" onClick="ToggleDisplay('divDiffFilter');" ><%=GetIsDiffFilterInUseIcon() %>&nbsp;Filter&nbsp;Results...</a></legend>
693 
						<legend><a href="javascript:;" class="body_scol" onClick="ToggleDisplay('divDiffFilter');" ><%=GetIsDiffFilterInUseIcon() %>&nbsp;Filter&nbsp;Results...</a></legend>
1038 
					<div name="divDiffFilter" id="divDiffFilter" class="body_txt" style="display:none;">
 694 
						<div name="divDiffFilter" id="divDiffFilter" class="body_txt" style="display:none;">
1039 
					<br>
 695 
						  <br>
1040 
					<table width="100%"  border="0" cellspacing="1" cellpadding="3">
 696 
						  <table width="100%"  border="0" cellspacing="1" cellpadding="3">
1041 
					    <tr>
 697 
							<tr>
1042 
					      <td width="1" background="images/bg_action_norm.gif"><input name="difilter" type="checkbox" value="<%=enumDB_DIFF_UPDATED%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_UPDATED)%>></td>
 698 
							  <td width="1" background="images/bg_action_norm.gif"><input name="difilter" type="checkbox" value="<%=enumDB_DIFF_UPDATED%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_UPDATED)%>></td>
1043 
					      <td width="50" nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_UPDATED%>Updated</td>
 699 
							  <td width="50" nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_UPDATED%>Updated</td>
1044 
					    </tr>
 700 
							</tr>
1045 
					    <tr>
 701 
							<tr>
1046 
					      <td background="images/bg_action_norm.gif"><input type="checkbox" name="difilter" value="<%=enumDB_DIFF_NEW%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_NEW)%>></td>
 702 
							  <td background="images/bg_action_norm.gif"><input type="checkbox" name="difilter" value="<%=enumDB_DIFF_NEW%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_NEW)%>></td>
1047 
					      <td nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_ADDED%>Added</td>
 703 
							  <td nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_ADDED%>Added</td>
1048 
					    </tr>
 704 
							</tr>
1049 
					    <tr>
 705 
							<tr>
1050 
					      <td background="images/bg_action_norm.gif"><input type="checkbox" name="difilter" value="<%=enumDB_DIFF_REMOVED%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_REMOVED)%>></td>
 706 
							  <td background="images/bg_action_norm.gif"><input type="checkbox" name="difilter" value="<%=enumDB_DIFF_REMOVED%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_REMOVED)%>></td>
1051 
					      <td nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_REMOVED%>Removed</td>
 707 
							  <td nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_REMOVED%>Removed</td>
1052 
					    </tr>
 708 
							</tr>
1053 
					    <tr>
 709 
							<tr>
- 
 
 710 
							  <td background="images/bg_action_norm.gif"><input type="checkbox" name="filter_comments" value="<%=enumDB_FILTER_COMMENTS%>" <%=GetIsDiffFilterChecked(enumDB_FILTER_COMMENTS)%>></td>
- 
 
 711 
							  <td nowrap background="images/bg_action_norm.gif" class="form_field">Comments</td>
- 
 
 712 
							</tr>
1054 
 
 713 
							<tr>
- 
 
 714 
							  <td background="images/bg_action_norm.gif"><input type="checkbox" name="filter_issues" value="<%=enumDB_FILTER_ISSUES%>" <%=GetIsDiffFilterChecked(enumDB_FILTER_ISSUES)%>></td>
- 
 
 715 
							  <td nowrap background="images/bg_action_norm.gif" class="form_field">Issues</td>
- 
 
 716 
							</tr>
1055 
					    <tr>
 717 
							<tr>
1056 
					      <td background="images/bg_action_norm.gif">&nbsp;</td>
 718 
							  <td background="images/bg_action_norm.gif">&nbsp;</td>
1057 
					      <td background="images/bg_action_norm.gif"><input name="btn" type="submit" class="form_btn" value="Hide"></td>
 719 
							  <td background="images/bg_action_norm.gif"><input name="btn" type="submit" class="form_btn" value="Hide"></td>
1058 
					    </tr>
 720 
							</tr>
1059 
					  </table>
 721 
						  </table>
1060 
					</div>
 722 
						</div>
1061 
					</fieldset>
 723 
						</fieldset>
1062 
					<!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 724 
						<!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
1063 
					<%End If%>
 725 
					<%End If%>
1064 
					</td>
 726 
					</td>
1065 
                    <td></td>
 727 
                    <td></td>
1066 
                  </tr>
 728 
                  </tr>
1067 
                </table>
 729 
                </table>
1068
730
1069 
				<%
 731 
				<%
1070 
				' Successfull Merge
 - 
 
1071 
				If (Request("btn") = "Merge") Then
 - 
 
1072 
					Call Messenger ( "Merge has completed successfully.", 3, "100%" )
- 
 
1073 
				End If
 - 
 
1074 
 
 - 
 
1075 
				Set FSO=Server.CreateObject("Scripting.FileSystemObject")
 732 
				Set FSO=Server.CreateObject("Scripting.FileSystemObject")
1076 
				Set NewTextFile=FSO.CreateTextFile(Server.MapPath("docs\compareBoms_"&objAccessControl.UserName&".html"), true)
 733 
				Set NewTextFile=FSO.CreateTextFile(Server.MapPath("docs\compareBoms_"&objAccessControl.UserName&".html"), true)
1077 
				Call Header()
734 
				Call Header()
1078 
 
 735 
 
1079 
				If (parRtagA <> "") AND (parRtagB <> "")Then%>
736 
				If (parRtagA <> "") AND (parRtagB <> "")Then%>
Line 1122... Line 779...
1122 
	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
 779 
	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
1123 
	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_
780 
	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_
1124 
	"   AND b.BOM_ID ="&parSBOMB, cint(0))
 781 
	"   AND b.BOM_ID ="&parSBOMB, cint(0))
1125
782
1126
783
1127 
				Call Javascript()
 - 
 
1128
- 
 
1129 
				NewTextFile.WriteLine("<title>Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</title>")
 784 
				NewTextFile.WriteLine("<title>Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</title>")
- 
 
 785 
				Call Javascript()
- 
 
 786 
				Call Styles()
- 
 
 787 
				NewTextFile.WriteLine("</head>")
- 
 
 788 
				NewTextFile.WriteLine("<body>")
1130 
				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>")
 789 
				NewTextFile.WriteLine("<div class="&chr(34)&"page_title"&chr(34)&">Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</div><br><br>")
1131
790
1132 
				While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))
 791 
				While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))
1133 
				VersionList = "0"
 792 
				VersionList = "0"
1134 
				errormsg = false
 793 
				errormsg = false
1135 
					rowId = rsQry("pv_id_a") &"_"& rsQry("pv_id_b")
 794 
					rowId = rsQry("pv_id_a") &"_"& rsQry("pv_id_b")
Line 1197... Line 856...
1197
856
1198 
		If rsQry("change_type") = "U" OR rsQry("change_type") = "UW" Then
 857 
		If rsQry("change_type") = "U" OR rsQry("change_type") = "UW" Then
1199 
				NewTextFile.Write("<p><SPAN id=""spanShowDetails"& rowId &""" name=""spanShowDetails""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(true,'"& rowId &"');"">"& pkgname &"</a></SPAN>")
 858 
				NewTextFile.Write("<p><SPAN id=""spanShowDetails"& rowId &""" name=""spanShowDetails""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(true,'"& rowId &"');"">"& pkgname &"</a></SPAN>")
1200 
				NewTextFile.Write("<SPAN id=""spanHideDetails"& rowId &""" name=""spanHideDetails"" style=""display:none;""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(false,'"& rowId &"');"">"& pkgname &"</a></SPAN>")
 859 
				NewTextFile.Write("<SPAN id=""spanHideDetails"& rowId &""" name=""spanHideDetails"" style=""display:none;""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(false,'"& rowId &"');"">"& pkgname &"</a></SPAN>")
1201 
				NewTextFile.WriteLine("<SPAN id=""spanPkgInfo"& rowId &""" name=""spanPkgInfo"" style=""display:none;"">")
860 
				NewTextFile.WriteLine("<SPAN id=""spanPkgInfo"& rowId &""" name=""spanPkgInfo"" style=""display:none;"">")
1202 
				'NewTextFile.WriteLine("<b><font face="&chr(34)&"arial"&chr(34)&">Package Name: "&pkgname&"</font></b><br>")
 - 
 
- 
 
 861
1203 
				NewTextFile.Write(rsQryA("location")&" uses: "&rsQry("pkg_version_a")&" ")
 862 
				NewTextFile.Write(rsQryA("location")&" uses: "&rsQry("pkg_version_a")&" ")
1204
863
1205 
				NewTextFile.WriteLine("<br>")
 864 
				NewTextFile.WriteLine("<br>")
1206 
				NewTextFile.Write(rsQryB("location")&" uses: "&rsQry("pkg_version_b")&" ")
 865 
				NewTextFile.Write(rsQryB("location")&" uses: "&rsQry("pkg_version_b")&" ")
1207
866
1208 
				a = rsQry("pv_id_a")
 867 
				a = rsQry("pv_id_a")
1209 
				b = rsQry("pv_id_b")
 868 
				b = rsQry("pv_id_b")
1210 
				c = rsQry("pv_id_a")
 869 
				c = rsQry("pv_id_a")
1211 
				d = rsQry("pv_id_b")
 870 
				d = rsQry("pv_id_b")
1212
871
1213 
				'On Error Resume Next
 - 
 
1214
- 
 
1215
- 
 
1216
- 
 
1217 
				'NewTextFile.WriteLine("<br><br>")
 - 
 
1218 
				'NewTextFile.WriteLine()
 - 
 
1219 
				'NewTextFile.WriteLine("<b>"&rsQryA("location")&"</b>")
- 
 
1220 
				'Call Comments(rsQry("pv_id_a"))
 - 
 
1221 
				'Call GetFixedIssues(rsQry("pv_id_a"))
 - 
 
1222 
				'Call GetDependencies(rsQry("pv_id_a"), rsQry("pv_id_b"))
 - 
 
1223
- 
 
1224 
				NewTextFile.WriteLine("<br><br>")
 872 
				NewTextFile.WriteLine("<br><br>")
1225 
				NewTextFile.WriteLine()
 873 
				NewTextFile.WriteLine()
1226 
				NewTextFile.WriteLine("<b>"&rsQryB("location")&"</b>")
874 
				NewTextFile.WriteLine("<b>"&rsQryB("location")&"</b>")
1227 
				Call Comments(rsQry("pv_id_b"))
 875 
				Call Comments(rsQry("pv_id_b"), Request("filter_comments"))
1228 
				Call GetFixedIssues(rsQry("pv_id_b"))
 876 
				Call GetFixedIssues(rsQry("pv_id_b"), Request("filter_issues"))
1229
877
1230 
				Dim rsQryLast
 878 
				Dim rsQryLast
1231 
				Set rsQryLast = OraDatabase.DbCreateDynaset( "SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="& rsQry("pv_id_b"), cint(0))
879 
				Set rsQryLast = OraDatabase.DbCreateDynaset( "SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="& rsQry("pv_id_b"), cint(0))
1232
880
1233 
				If rsQryLast("last_pv_id") <> a Then
 881 
				If rsQryLast("last_pv_id") <> a Then
1234 
					Call PreviousVersions(a, b, rsQry("pkg_version_a"), rsQry("pkg_version_b"))
 882 
					Call PreviousVersions(a, b, rsQry("pkg_version_a"), rsQry("pkg_version_b"), Request("filter_comments"), Request("filter_issues"))
1235 
				End If
883 
				End If
1236
884
1237 
				a = rsQry("pv_id_a")
 885 
				a = rsQry("pv_id_a")
1238 
				b = rsQry("pv_id_b")
 886 
				b = rsQry("pv_id_b")
1239 
				Call GetDependencies(a, VersionList + ","+ b, rsQry("pkg_version_a"), rsQry("pkg_version_b"))
887 
				Call GetDependencies(a, VersionList + ","+ b, rsQry("pkg_version_a"), rsQry("pkg_version_b"), Request("filter_comments"), Request("filter_issues"))
1240 
				NewTextFile.WriteLine("</SPAN>")
888 
				NewTextFile.WriteLine("</SPAN>")
1241
889
1242 
				rsQryLast.Close
 890 
				rsQryLast.Close()
1243 
				Set rsQryLast = nothing
 891 
				Set rsQryLast = Nothing
1244
892
1245 
		End If
 893 
		End If
1246
894
1247 
		If rsQry("change_type") = "A" AND rsQry("patch_b") = "Y" Then
 895 
		If rsQry("change_type") = "A" AND rsQry("patch_b") = "Y" Then
1248 
			Dim rsQryPatch
 896 
			Dim rsQryPatch
1249 
			OraDatabase.Parameters.Add "PV_ID", 	rsQry("pv_id_b"),	ORAPARM_INPUT, ORATYPE_NUMBER
897 
			OraDatabase.Parameters.Add "PV_ID", 	rsQry("pv_id_b"),	ORAPARM_INPUT, ORATYPE_NUMBER
1250 
			Set rsQryPatch = OraDatabase.DbCreateDynaset( GetQuery("pd_patch.sql"), cint(0))
 898 
			Set rsQryPatch = OraDatabase.DbCreateDynaset( GetQuery("pd_patch.sql"), cint(0))
1251 
			OraDatabase.Parameters.Remove "PV_ID"
 899 
			OraDatabase.Parameters.Remove "PV_ID"
1252 
			If NOT IsNull(rsQryPatch("pv_id")) Then
 900 
			If NOT IsNull(rsQryPatch("pv_id")) Then
1253 
				NewTextFile.Write("<p><SPAN id=""spanShowDetails"& rowId &""" name=""spanShowDetails""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(true,'"& rowId &"');"">"& rsQryPatch("pkg_name") &" "& rsQryPatch("pkg_version") &"</a></SPAN>")
 901 
				NewTextFile.Write("<p><SPAN id=""spanShowDetails"& rowId &""" name=""spanShowDetails""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(true,'"& rowId &"');""><font face="&chr(34)&"Verdana, Arial, Helvetica, sans-serif"&chr(34)&">"& rsQryPatch("pkg_name") &" "& rsQryPatch("pkg_version") &"</font></a></SPAN>")
1254 
				NewTextFile.Write("<SPAN id=""spanHideDetails"& rowId &""" name=""spanHideDetails"" style=""display:none;""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(false,'"& rowId &"');"">"& rsQryPatch("pkg_name") &" "& rsQryPatch("pkg_version") &"</a></SPAN>")
 902 
				NewTextFile.Write("<SPAN id=""spanHideDetails"& rowId &""" name=""spanHideDetails"" style=""display:none;""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(false,'"& rowId &"');""><font face="&chr(34)&"Verdana, Arial, Helvetica, sans-serif"&chr(34)&">"& rsQryPatch("pkg_name") &" "& rsQryPatch("pkg_version") &"</font></a></SPAN>")
1255 
				NewTextFile.WriteLine("<SPAN id=""spanPkgInfo"& rowId &""" name=""spanPkgInfo"" style=""display:none;"">")
903 
				NewTextFile.WriteLine("<SPAN id=""spanPkgInfo"& rowId &""" name=""spanPkgInfo"" style=""display:none;"">")
1256 
				Call Comments(rsQryPatch("pv_id"))
 904 
				Call Comments(rsQryPatch("pv_id"), Request("filter_comments"))
1257 
				Call GetFixedIssues(rsQryPatch("pv_id"))
 905 
				Call GetFixedIssues(rsQryPatch("pv_id"), Request("filter_issues"))
1258 
			Else
 906 
			Else
1259 
				NewTextFile.Write("<p><SPAN id=""spanShowDetails"& rowId &""" name=""spanShowDetails""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(true,'"& rowId &"');"">"& rsQry("pkg_name_b") &" "& rsQry("pkg_version_b") &"</a></SPAN>")
 907 
				NewTextFile.Write("<p><SPAN id=""spanShowDetails"& rowId &""" name=""spanShowDetails""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(true,'"& rowId &"');""><font face="&chr(34)&"Verdana, Arial, Helvetica, sans-serif"&chr(34)&">"& rsQry("pkg_name_b") &" "& rsQry("pkg_version_b") &"</font></a></SPAN>")
1260 
				NewTextFile.Write("<SPAN id=""spanHideDetails"& rowId &""" name=""spanHideDetails"" style=""display:none;""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(false,'"& rowId &"');"">"& rsQry("pkg_name_b") &" "& rsQry("pkg_version_b") &"</a></SPAN>")
 908 
				NewTextFile.Write("<SPAN id=""spanHideDetails"& rowId &""" name=""spanHideDetails"" style=""display:none;""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(false,'"& rowId &"');""><font face="&chr(34)&"Verdana, Arial, Helvetica, sans-serif"&chr(34)&">"& rsQry("pkg_name_b") &" "& rsQry("pkg_version_b") &"</font></a></SPAN>")
1261 
				NewTextFile.WriteLine("<SPAN id=""spanPkgInfo"& rowId &""" name=""spanPkgInfo"" style=""display:none;"">")
909 
				NewTextFile.WriteLine("<SPAN id=""spanPkgInfo"& rowId &""" name=""spanPkgInfo"" style=""display:none;"">")
1262 
				Call Comments(rsQry("pv_id_b"))
 910 
				Call Comments(rsQry("pv_id_b"), Request("filter_comments"))
1263 
				Call GetFixedIssues(rsQry("pv_id_b"))
911 
				Call GetFixedIssues(rsQry("pv_id_b"), Request("filter_issues"))
1264 
			End If
912 
			End If
1265
913
1266 
			NewTextFile.WriteLine("</SPAN>")
914 
			NewTextFile.WriteLine("</SPAN>")
1267 
			rsQryPatch.Close
 915 
			rsQryPatch.Close
1268 
			Set rsQryPatch = nothing
 916 
			Set rsQryPatch = nothing
Line 1344... Line 992...
1344 
        </tr>
 992 
        </tr>
1345 
        <tr>
 993 
        <tr>
1346 
          <td align="left">
 994 
          <td align="left">
1347
995
1348 
		  <select name="rtagB" id="rtagB" class="form_item" onChange="RequestSBOMCombo( '?branch_id='+ this.value, FormName.sbomB );">
 996 
		  <select name="rtagB" id="rtagB" class="form_item" onChange="RequestSBOMCombo( '?branch_id='+ this.value, FormName.sbomB );">
1349 
              <option value="">-- Select SBOM --</option>
997 
              <option value="">-- Select Branch --</option>
1350 
			  <%
 998 
			  <%
1351 
			  OraDatabase.Parameters.Add "PROJ_ID", 	objRelCollectorB.Item("proj_id"),	ORAPARM_INPUT,  ORATYPE_NUMBER
999 
			  OraDatabase.Parameters.Add "PROJ_ID", 	objRelCollectorB.Item("proj_id"),	ORAPARM_INPUT,  ORATYPE_NUMBER
1352 
			  OraDatabase.Parameters.Add "BRANCH_ID", 	objRelCollectorB.Item("branch_id"),	ORAPARM_INPUT, ORATYPE_NUMBER
1000 
			  OraDatabase.Parameters.Add "BRANCH_ID", 	objRelCollectorB.Item("branch_id"),	ORAPARM_INPUT, ORATYPE_NUMBER
1353
1001
1354 
			  Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("ReleasesCombo.sql"), cint(0))
 1002 
			  Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("ReleasesCombo.sql"), cint(0))