WebSVN – DevTools – Diff – /ManagerSuite/Production_Manager/trunk/diff.asp

 Dim parSBOMB
 Dim dDiffFilter
 Dim colorA, colorB, ChangeTypeIcon
 Dim btnMerge, btnRemove
 Dim rowId
-Dim email
-Dim FSO
-Dim NewTextFile
 Dim pkgA, pkgB, pkgname, delimiter, rsQryA, rsQryB, rsQryCommentsA, rsQryCommentsB, sqlstrA, counterA, sqlstrB, sqlstrC, counterB
-Dim SSsql, retVal, rsCQ, DEVIiss, TDSEiss, VT5DMiss
+Dim SSsql, retVal, rsCQ, DEVIiss, TDSEiss, VT5DMiss, VTSUPiss
 Dim a, b, c, d, pkgversion, errormsg, source_change
+Dim VersionList
 '------------ Constants Declaration -----------
 Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Updated'>"
 Const LIMG_ADDED = "<img src='images/i_added.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Added'>"
 Set objRelCollectorA = CreateObject("Scripting.Dictionary")
 Set objRelCollectorB = CreateObject("Scripting.Dictionary")
 Set dDiffFilter = CreateObject("Scripting.Dictionary")
 '----------------------------------------------
-If Request("btn") = "Mail Me Report" Then
-	email = true
-End If
 %>
 <%
 '--------------------------------------------------------------------------------------------------------------------------
 Sub GetDiffFilterValues ( outDepFilter )
 	Dim FilterVal, aFilterValues
 		aFilterValues = Split( Replace( Request.Cookies(enum_RELMGR_COOKIE_DOMAIN)(COOKIE_HIDE_DIFF_FILTER), " ", ""), ",")
 		For Each FilterVal In aFilterValues
 			outDepFilter.Item (CStr( FilterVal )) = ""
 		Next
 	End If
 End Sub
 '--------------------------------------------------------------------------------------------------------------------------
-Sub Javascript()
-	NewTextFile.WriteLine("<script language=""JavaScript"" type=""text/javascript"">")
-	NewTextFile.WriteLine("function MM_findObj(n, d) { //v4.0")
-	NewTextFile.WriteLine("  var p,i,x;")
-	NewTextFile.WriteLine("  if(!d) d=document; ")
-	NewTextFile.WriteLine("  if((p=n.indexOf(""?""))>0&&parent.frames.length) {")
-	NewTextFile.WriteLine("  	d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);")
-	NewTextFile.WriteLine("  }")
-	NewTextFile.WriteLine("  if(!(x=d[n])&&d.all) x=d.all[n]; ")
-	NewTextFile.WriteLine("  for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];")
-	NewTextFile.WriteLine("  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);")
-	NewTextFile.WriteLine("  if(!x && document.getElementById) x=document.getElementById(n); ")
-	NewTextFile.WriteLine("  return x;")
-	NewTextFile.WriteLine("}")
-	NewTextFile.WriteLine("function DisplaySPAN(show, x) {")
-	NewTextFile.WriteLine("	if (show) {")
-	NewTextFile.WriteLine("		MM_findObj(""spanHideDetails"" + x).style.display = ""block"";")
-	NewTextFile.WriteLine("		MM_findObj(""spanPkgInfo"" + x).style.display = ""block"";")
-	NewTextFile.WriteLine("		MM_findObj(""spanShowDetails"" + x).style.display = ""none"";")
-	NewTextFile.WriteLine("	} else {")
-	NewTextFile.WriteLine("		MM_findObj(""spanHideDetails"" + x).style.display = ""none"";")
-	NewTextFile.WriteLine("		MM_findObj(""spanPkgInfo"" + x).style.display = ""none"";")
-	NewTextFile.WriteLine("		MM_findObj(""spanShowDetails"" + x).style.display = ""block"";")
-	NewTextFile.WriteLine("	}")
-	NewTextFile.WriteLine("}")
-	NewTextFile.WriteLine("</script>")
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
 Sub GetFixedIssues(pv_id)
-	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))
+	Set sqlstrC = OraDatabase.DbCreateDynaset("SELECT iss_db, iss_id, iss_state, notes FROM CQ_ISSUES WHERE pv_id="& pv_id &"  AND iss_db="& CInt(enumCLEARQUEST_VTSUP_ID) &" AND iss_state = "& enumISSUES_STATE_FIXED, cint(0))
-		If sqlstrA.RecordCount <> 0 Then
-			NewTextFile.WriteLine()
-			NewTextFile.WriteLine("<blockquote><blockquote>Fixed Issues:</blockquote></blockquote>")
-			NewTextFile.WriteLine("<blockquote><blockquote><blockquote><table width='100%' border='1' cellspacing='0' cellpadding='1'>")
-			NewTextFile.WriteLine("<tr>")
-			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Issue&nbsp;Id&nbsp;</b></font></td>")
-			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Summary</b></font></td>")
-			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>")
-			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b></P>Priority</b></font></td>")
-			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Status</b></font></td>")
-			NewTextFile.WriteLine("</tr>")
+	If sqlstrC.RecordCount <> 0 Then
-		For counterA=1 to sqlstrA.RecordCount
-			DEVIiss = "-1"
-			TDSEiss = "-1"
-			VT5DMiss = "-1"
-			If CInt(sqlstrA("iss_db")) = CInt(enumCLEARQUEST_DEVI_ID) Then
-				DEVIiss = DEVIiss &","& sqlstrA("iss_id")
-			ElseIf CInt(sqlstrA("iss_db")) = CInt(enumCLEARQUEST_TDSE_ID) Then
-				TDSEiss = TDSEiss &","& sqlstrA("iss_id")
-			ElseIf CInt(sqlstrA("iss_db")) = CInt(enumCLEARQUEST_VT5DM_ID) Then
-				VT5DMiss = VT5DMiss &","& sqlstrA("iss_id")
-			End If
-			SSsql = ReadFile( QUERIES_PATH & "\cq_issues.sql" )
-			SSsql = Replace( SSsql, "/*enumCLEARQUEST_DEVI_ID*/", enumCLEARQUEST_DEVI_ID)
-			SSsql = Replace( SSsql, "/*enumCLEARQUEST_TDSE_ID*/", enumCLEARQUEST_TDSE_ID)
-			SSsql = Replace( SSsql, "/*enumCLEARQUEST_VT5DM_ID*/", enumCLEARQUEST_VT5DM_ID)
-			SSsql = Replace( SSsql, "/*DEVIiss*/", DEVIiss)
-			SSsql = Replace( SSsql, "/*TDSEiss*/", TDSEiss)
-			SSsql = Replace( SSsql, "/*VT5DMiss*/", VT5DMiss)
-			retVal = Get_CQ_Issues ( SSsql, rsCQ )
+		While ((NOT sqlstrC.BOF) AND (NOT sqlstrC.EOF))
-			NewTextFile.WriteLine("<tr>")
-			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>")
-			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>")
-			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>")
-			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>")
-			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>")
-			NewTextFile.WriteLine("                     </tr>")
-			'If rsCQ("iss_num") <> "" Then
-  			'	NewTextFile.Write("<blockquote><blockquote><blockquote>"&rsCQ("iss_num")&": ")
-	    	'End If
-	     	'If rsCQ("summary") <> "" Then
-			'	NewTextFile.Write(rsCQ("summary")&" ")
-			'End If
-			'If rsCQ("summary") <> "" Then
-			'	NewTextFile.WriteLine("(Priority: "& rsCQ("priority") &")</blockquote></blockquote></blockquote>")
-			'End If
-			sqlstrA.MoveNext
-		Next
-			NewTextFile.WriteLine( "                        </table></blockquote></blockquote></blockquote> 		")
-			sqlstrA.Close()
-		End If
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub GetDependencyFixedIssues(pv_id)
-	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))
-		If sqlstrC.RecordCount <> 0 Then
-			NewTextFile.WriteLine()
-			NewTextFile.WriteLine("<blockquote><blockquote>Fixed Issues:</blockquote></blockquote>")
-			NewTextFile.WriteLine("<blockquote><blockquote><blockquote><table width='100%' border='1' cellspacing='0' cellpadding='1'>")
-			NewTextFile.WriteLine("<tr>")
-			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Issue&nbsp;Id&nbsp;</b></font></td>")
-			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Summary</b></font></td>")
-			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>")
-			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b></P>Priority</b></font></td>")
-			NewTextFile.WriteLine("<td background='#CAC5B8' nowrap class='form_field'><font size='1' face='tahoma,sans-serif'><b>Status</b></font></td>")
-			NewTextFile.WriteLine("</tr>")
-			'NewTextFile.WriteLine()
-			'NewTextFile.WriteLine("<blockquote><blockquote>Fixed Issues:</blockquote></blockquote>")
-		For counterA=1 to sqlstrC.RecordCount
 			DEVIiss = "-1"
 			TDSEiss = "-1"
 			VT5DMiss = "-1"
+			VTSUPiss = "-1"
 			If CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_DEVI_ID) Then
 				DEVIiss = DEVIiss &","& sqlstrC("iss_id")
 			ElseIf CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_TDSE_ID) Then
 				TDSEiss = TDSEiss &","& sqlstrC("iss_id")
 			ElseIf CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_VT5DM_ID) Then
 				VT5DMiss = VT5DMiss &","& sqlstrC("iss_id")
+			ElseIf CInt(sqlstrC("iss_db")) = CInt(enumCLEARQUEST_VTSUP_ID) Then
+				VTSUPiss = VTSUPiss &","& sqlstrC("iss_id")
 			End If
 			SSsql = ReadFile( QUERIES_PATH & "\cq_issues.sql" )
 			SSsql = Replace( SSsql, "/*enumCLEARQUEST_DEVI_ID*/", enumCLEARQUEST_DEVI_ID)
 			SSsql = Replace( SSsql, "/*enumCLEARQUEST_TDSE_ID*/", enumCLEARQUEST_TDSE_ID)
 			SSsql = Replace( SSsql, "/*enumCLEARQUEST_VT5DM_ID*/", enumCLEARQUEST_VT5DM_ID)
+			SSsql = Replace( SSsql, "/*enumCLEARQUEST_VTSUP_ID*/", enumCLEARQUEST_VTSUP_ID)
 			SSsql = Replace( SSsql, "/*DEVIiss*/", DEVIiss)
 			SSsql = Replace( SSsql, "/*TDSEiss*/", TDSEiss)
 			SSsql = Replace( SSsql, "/*VT5DMiss*/", VT5DMiss)
+			SSsql = Replace( SSsql, "/*VTSUPiss*/", VTSUPiss)
 			retVal = Get_CQ_Issues ( SSsql, rsCQ )
-			NewTextFile.WriteLine("<tr>")
-			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>")
-			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>")
-			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>")
-			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>")
-			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>")
-			NewTextFile.WriteLine("                     </tr>")
 			sqlstrC.MoveNext
-		Next
+		Wend
-			NewTextFile.WriteLine( "                        </table></blockquote></blockquote></blockquote> 		")
-			sqlstrC.Close()
+	End If
-		End If
+	sqlstrC.Close()
+	Set sqlstrC = Nothing
 End Sub
 '--------------------------------------------------------------------------------------------------------------------------
-Sub LastPvIdA(a)
+Function LastPvId(pvId)
 	Dim qryA
-	Set qryA = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&a , cint(0))
+	Set qryA = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&pvId , cint(0))
+	LastPvId = pvId
-	If a <> qryA("last_pv_id") Then
+	If pvId <> qryA("last_pv_id") Then
-		a = qryA("last_pv_id")
+		LastPvId = qryA("last_pv_id")
 	Else
 		errormsg = true
 	End If
 	qryA.Close()
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub LastPvIdB(b)
-	Dim qryB
-	Set qryB = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&b , cint(0))
-	If b <> qryB("last_pv_id") Then
-		b = qryB("last_pv_id")
-	Else
-		errormsg = true
+	Set qryA = Nothing
-	End If
-	qryB.Close()
-End Sub
+End Function
 '--------------------------------------------------------------------------------------------------------------------------
 Sub PreviousVersions(a, b, versionA, versionB)
-	NewTextFile.WriteLine()
-	NewTextFile.WriteLine("<b>Versions Between: "&versionA&" and "&versionB&"</b>")
-	If a < b Then
+	If CLng(a) < CLng(b) Then
-		While a < b
+		While CLng(a) < CLng(b)
-			Call LastPvIdB(b)
+			b = LastPvId(b)
-			If a < b Then
+			If CLng(a) < CLng(b) Then
+				VersionList = VersionList + ","& b &""
 				Call Comments(b)
 				Call GetFixedIssues(b)
 			End If
 		Wend
 	End If
-	If b < a Then
+	If CLng(b) < CLng(a) Then
-		While b < a
+		While CLng(b) < CLng(a)
-			Call LastPvIdA(a)
+			a = LastPvId(a)
-			If b < a Then
+			If CLng(b) < CLng(a) Then
+				VersionList = VersionList + ","& a &""
 				Call Comments(a)
 				Call GetFixedIssues(a)
 			End If
 		Wend
 	End If
 End Sub
 '--------------------------------------------------------------------------------------------------------------------------
-Sub GetDependencies(pv_id_a, pv_id_b, versionA, versionB)
-	On Error Resume Next
-	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))
-		If sqlstrA.RecordCount <> 0 Then
-			NewTextFile.WriteLine()
-			NewTextFile.WriteLine("<b>Dependencies Changed Between "&versionA&" and "&versionB&":</b>")
-		For counterA=1 to sqlstrA.RecordCount
-			Call dependencyComments(sqlstrA("dpv_id"))
-			Call GetDependencyFixedIssues(sqlstrA("dpv_id"))
-			sqlstrA.MoveNext
-		Next
-			sqlstrA.Close()
-		End If
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub dependencyComments(pv_id)
-	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))
-			NewTextFile.WriteLine("<blockquote><blockquote>Comments and Fixed Issues:</blockquote></blockquote>")
-			NewTextFile.Write("<blockquote><blockquote><blockquote>"& sqlstrB("pkg_name") &" "& sqlstrB("pkg_version") &"---->"& TextToHTML(sqlstrB("comments")) &"</blockquote></blockquote></blockquote>")
-	sqlstrB.Close()
-	Set sqlstrB = nothing
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub LastPvIdA(a)
-	Dim qryA
-	Set qryA = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&a , cint(0))
-	If a <> qryA("last_pv_id") Then
-		a = qryA("last_pv_id")
-	Else
-		errormsg = true
-	End If
-	qryA.Close()
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub LastPvIdB(b)
-	Dim qryB
-	Set qryB = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&b , cint(0))
-	If b <> qryB("last_pv_id") Then
-		b = qryB("last_pv_id")
-	Else
-		errormsg = true
-	End If
-	qryB.Close()
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
 Sub pkg_Version(pv)
 	Dim qry
 	Set qry = OraDatabase.DbCreateDynaset("SELECT PKG_VERSION FROM PACKAGE_VERSIONS WHERE PV_ID="&pv , cint(0))
 	pkgversion = qry("pkg_version")
 	qry.Close()
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub LastPvIdAa(a)
-	Dim qryA
-	Set qryA = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&a , cint(0))
-	c = qryA("last_pv_id")
+	Set qry = Nothing
-	qryA.Close()
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub LastPvIdBb(b)
-	Dim qryB
-	Set qryB = OraDatabase.DbCreateDynaset("SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="&b , cint(0))
-	d = qryB("last_pv_id")
-	qryB.Close()
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub Comments(Pv_Id)
-	Dim comments
-	Set comments = OraDatabase.DbCreateDynaset("SELECT COMMENTS, PKG_VERSION FROM PACKAGE_VERSIONS WHERE PV_ID="&Pv_id , cint(0))
-	If comments("comments") <> "Rippled Build." Then
-		NewTextFile.WriteLine("<blockquote><blockquote><font color="&chr(34)&"blue"&chr(34)&">Version: "& comments("pkg_version")&"</font></blockquote></blockquote>")
-		If comments("comments") <> "" Then
-			NewTextFile.WriteLine("<blockquote><blockquote>Comments: </blockquote></blockquote>")
-			NewTextFile.WriteLine("<blockquote><blockquote><blockquote>"& TextToHTML(comments("comments")) &"</blockquote></blockquote></blockquote>")
-			source_change = true
-		End If
-	End If
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub Release(pvId)
-	Dim release
-	Set release = OraDatabase.DbCreateDynaset("SELECT INSERT_STAMP FROM RELEASE_CONTENT WHERE PV_ID="&pvId , cint(0))
-	If release("insert_stamp") <> "" Then
-		NewTextFile.Write(release("insert_stamp"))
-	Else
-		NewTextFile.Write("Version Not Used.")
-	End If
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub Header()
-	NewTextFile.WriteLine("<html>")
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
-Sub Footer()
-	NewTextFile.WriteLine("</html>")
 End Sub
 '--------------------------------------------------------------------------------------------------------------------------
 Function GetIsDiffFilterInUseIcon()
 	GetIsDiffFilterInUseIcon = LIMG_FILTER_OFF & LIMG_DROP_DOWN_ARROW
 	mString = Server.HTMLEncode( sString )
 	mString = Replace(mString, VBNewLine, "<br>")
 	TextToHTML = mString
 End Function
 '--------------------------------------------------------------------------------------------------------------------------
 Sub GetFormDetails ( nSourceSBOM, ByRef outobjDetails )
 	Dim rsQry, query
 	' Exit if nSourceRtagId is empty
 			outIcon = ""
 	End Select
 End Sub
 '--------------------------------------------------------------------------------------------------------------------------
-Sub MergePackages ()
-	Dim aFullList, aAddPkgList, aRemovePkgList, dAddPkgList, dRemovePkgList, PvId
-	Dim OraParameter
-	Set dAddPkgList = CreateObject("Scripting.Dictionary")
-	Set dRemovePkgList = CreateObject("Scripting.Dictionary")
-	'--- Get Add Packages ---
-	' Get full list of "addpkg" parameter
-	aFullList = Split ( Replace( Request("addpkg"), " ", "" ), "," )
-	' Clean empty parameters
-	For Each PvId In aFullList
-		If PvId <> "" Then
-			dAddPkgList.Add CStr( PvId ), Empty
-		End If
-	Next
-	aFullList = NULL
-	aAddPkgList = dAddPkgList.Keys
-	'--- Get Remove Packages ---
-	' Get full list of "removepkg" parameter
-	aFullList = Split ( Replace( Request("removepkg"), " ", "" ), "," )
-	' Clean empty parameters
-	For Each PvId In aFullList
-		If PvId <> "" Then
-			dRemovePkgList.Add CStr( PvId ), Empty
-		End If
-	Next
-	aFullList = NULL
-	aRemovePkgList = dRemovePkgList.Keys
-	'-- Add package List to release --
-	OraDatabase.Parameters.Add "PV_ID", 			NULL, 				ORAPARM_INPUT, ORATYPE_NUMBER
-	OraDatabase.Parameters.Add "VIEW_ID", 			NULL, 				ORAPARM_BOTH, ORATYPE_NUMBER
-	OraDatabase.Parameters.Add "RTAG_A", 			Request("rtagA"), 	ORAPARM_INPUT, ORATYPE_NUMBER
-	OraDatabase.Parameters.Add "RTAG_B", 			Request("rtagB"), 	ORAPARM_INPUT, ORATYPE_NUMBER
-	OraDatabase.Parameters.Add "PROJB", 			objRelCollectorB.Item("proj_id"), 	ORAPARM_INPUT, ORATYPE_NUMBER
-	OraDatabase.Parameters.Add "COMMENTS", 			"Merging from "& objRelCollectorA.Item("location") &" to "& objRelCollectorB.Item("location"), 	ORAPARM_INPUT, ORATYPE_VARCHAR2
-	OraDatabase.Parameters.Add "USER_ID", 			objAccessControl.UserId, 				ORAPARM_INPUT, ORATYPE_NUMBER
-	Set OraParameter = OraDatabase.Parameters
-	On Error Resume Next
-	' Begin Database entry
-	objEH.TryORA ( OraSession )
-	OraSession.BeginTrans
-	'-- Add Packages --
-	For Each PvId In aAddPkgList
-		OraParameter("PV_ID").Value = PvId
-		OraDatabase.ExecuteSQL _
-		"BEGIN  "&_
-		"  :VIEW_ID := PK_RELEASE.GET_PACKAGE_VIEW ( :PV_ID, :RTAG_A ); "&_
-		"  PK_RELEASE.ADD_PACKAGE ( :PV_ID, :VIEW_ID, :RTAG_B, :USER_ID );  "&_
-		"END;"
-	Next
-	'-- Remove Packages --
-	For Each PvId In aRemovePkgList
-		OraParameter("PV_ID").Value = PvId
-		OraDatabase.ExecuteSQL _
-		"BEGIN  "&_
-		"  PK_RELEASE.REMOVE_PACKAGE ( :PV_ID, :RTAG_B, :USER_ID );  "&_
-		"END;"
-	Next
-	'-- Log Project Merge Action
-	OraDatabase.ExecuteSQL _
-	"BEGIN  LOG_PROJECT_ACTION ( :PROJB, 'merge_release', :USER_ID, :COMMENTS );  END;"
-	'-- Force package state recalculate
-	OraDatabase.ExecuteSQL _
-	"BEGIN  "&_
-	"  TOUCH_RELEASE ( :RTAG_B );  "&_
-	"END;"
-	OraSession.CommitTrans
-	objEH.CatchORA ( OraSession )
-	Set OraParameter = Nothing
-	OraDatabase.Parameters.Remove "PV_ID"
-	OraDatabase.Parameters.Remove "VIEW_ID"
-	OraDatabase.Parameters.Remove "RTAG_A"
-	OraDatabase.Parameters.Remove "RTAG_B"
-	OraDatabase.Parameters.Remove "USER_ID"
-	OraDatabase.Parameters.Remove "PROJB"
-	OraDatabase.Parameters.Remove "COMMENTS"
-	'Response.write "<br>"& sAddPkgList &"-"& dAddPkgList.Count &"-"& UBound( aFullList )
-End Sub
-'--------------------------------------------------------------------------------------------------------------------------
 %>
 <%
 '------------ RUN BEFORE PAGE RENDER ----------
 If Request("btn") = "Exit" Then
 	Call OpenInWindow ( "reports.asp" )
 End If
 ' Get release details
 Call GetFormDetails ( parSBOMA, objRelCollectorA )
 Call GetFormDetails ( parSBOMB, objRelCollectorB )
-If (Request("btn") = "Merge")  AND (objAccessControl.IsActive("MergeRelease")) Then
-	If objRelCollectorB.Item("official") <> "Y" Then
-		Call MergePackages ()
-	End If
-End If
 If Request("btn") = "Swap Compare" Then
 	Call OpenInWindow ( SCRIPT_NAME &"?sbomA="& parSBOMB &"&sbomB="& parSBOMA )
 End If
 If Request("btn") = "Hide" Then
 Call GetDiffFilterValues ( dDiffFilter )
 '----------------------------------------------
 %>
 <html>
 <head>
-<title>Deployment Manager SBOM Differences</title>
+<title>Production Manager SBOM Differences</title>
 <meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="images/release_manager_style.css" type="text/css">
 <link rel="stylesheet" href="images/navigation.css" type="text/css">
 <script language="JavaScript" src="images/common.js"></script>
 	xmlHttp_Get(xmlHttp, url);
+}
-function MergePackage ( pkga, pkgb, rowId )
-{
-	// Set merge hidden field with new value
-	MM_findObj( 'ADDPKG_' + rowId ).value = pkga;
-	var divA = MM_findObj( 'PVA' + rowId );
-	var divB = MM_findObj( 'PVB' + rowId );
-	// Set text equal
-	divB.innerHTML = divA.innerHTML;
-	// Set highlight to blank
-	divA.style.backgroundColor = '<%=LCOLOR_NOT_CHANGED%>';
-	divB.style.backgroundColor = '<%=LCOLOR_NOT_CHANGED%>';
-    // Set Change state icon to blank
-	MM_findObj( 'IMGSTATE' + rowId ).style.display = 'none';
-	// Remove Merge Button
-	MM_findObj( 'IMGMERGE' + rowId ).style.display = 'none';
-	MM_findObj( 'IMGREMOVE' + rowId ).style.display = 'none';
-	// Show undo button
-	MM_findObj( 'IMGUNDO' + rowId ).style.display = 'block';
-}
-function RemovePackage ( pkga, pkgb, rowId )
-{
-	// Set remove hidden field with new value
-	MM_findObj( 'REMOVEPKG_' + rowId ).value = pkgb;
-	var divA = MM_findObj( 'PVA' + rowId );
-	var divB = MM_findObj( 'PVB' + rowId );
-	// Set text equal
-	divB.style.textDecoration = 'line-through';
-	// Set highlight to blank
-	if (MM_findObj( 'CHANGETYPE_' + rowId ).value != "A")
-	{
-		divA.style.backgroundColor = '<%=LCOLOR_NOT_CHANGED%>';
-	}
-	divB.style.backgroundColor = '<%=LCOLOR_NOT_CHANGED%>';
-    // Set Change state icon to blank
-	MM_findObj( 'IMGSTATE' + rowId ).style.display = 'none';
-	// Remove Merge Button
-	MM_findObj( 'IMGMERGE' + rowId ).style.display = 'none';
-	MM_findObj( 'IMGREMOVE' + rowId ).style.display = 'none';
-	// Show undo button
-	MM_findObj( 'IMGUNDO' + rowId ).style.display = 'block';
-}
 function UndoPackage ( rowId )
+{
 	// Set merge/remove hidden field with new value
 	MM_findObj( 'ADDPKG_' + rowId ).value = '';
 	// Show undo button
 	MM_findObj( 'IMGUNDO' + rowId ).style.display = 'none';
+}
-function MergeAll()
-{
-	var elem
-	if (document.all)
-	{
-		// Run this for IE
-		elem = document.all;
-	} else {
-		// Run this for other browsers
-		elem = document.getElementsByTagName('div');
-	}
-	for (i in elem)
-	{
-		if (elem[i].id)
-		{
-			if (elem[i].id.indexOf('SHORT_') == 0) elem[i].style.display = 'none';
-			if (elem[i].id.indexOf('LONG_') == 0) elem[i].style.display = 'block';
-		}
-	}
-}
 //-->
 </script>
 </head>
 <body bgcolor="#FFFFFF" text="#000000" leftmargin="0" topmargin="0">
 <!-- HEADER -->
 <!--#include file="_header.asp"-->
 <!-- BODY ---->
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
   <tr>
-    <td width="1%" background="images/bg_lite_blue.gif" valign="top">
+    <td width="1%" background="images/bg_lightgreen.gif" valign="top">
 	<!-- SELECT SBOM A ---------------------------------------------->
 	<br>
       <table width="100%"  border="0" cellspacing="10" cellpadding="0">
 		<tr>
           <td align="left" class="body_col"><img src="images/i_rtag_open_mode.gif" border="0" align="absmiddle" width="15" height="13">&nbsp;Select SBOM A<hr size="1px" color="Olive" noshade></td>
         </tr>
-        <tr>
+<!--         <tr>
           <td align="left">
 		  <select name="projA" class="form_item" onChange="RequestReleaseCombo( '?proj_id='+ this.value, FormName.rtagA );">
               <option value="">-- Select Project --</option>
 			  <%
 			  OraDatabase.Parameters.Add "PROJ_ID", 	objRelCollectorA.Item("proj_id"),	ORAPARM_INPUT, ORATYPE_NUMBER
 			  rsQry.Close
 			  Set rsQry = Nothing
 			  %>
 		  </select></td>
-        </tr>
+        </tr> -->
         <tr>
           <td align="left">
 		  <select name="sbomA" id="sbomA" class="form_item">
             <%
+			If objAccessControl.IsActive("Vasttrafik")	Then
+				nBranchId	=	1142
+			Else
+				nBranchId	=	542
+			End	If
 			  OraDatabase.Parameters.Add "BOM_ID", 	objRelCollectorA.Item("bom_id"),	ORAPARM_INPUT,  ORATYPE_NUMBER
-			  OraDatabase.Parameters.Add "BRANCH_ID", 	objRelCollectorA.Item("branch_id"),	ORAPARM_INPUT, ORATYPE_NUMBER
+			  OraDatabase.Parameters.Add "BRANCH_ID", 	nBranchId,	ORAPARM_INPUT, ORATYPE_NUMBER
-			  Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("SBOMCombo.sql"), cint(0))
+			  Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("ProductionTreeCombo.sql"), cint(0))
 			  OraDatabase.Parameters.Remove "BOM_ID"
 			  OraDatabase.Parameters.Remove "BRANCH_ID"
 			  While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))%>
-            <option value="<%=rsQry("bom_id")%>" <%=rsQry("selected")%>><%=rsQry("version")%></option>
+            <option value="<%=rsQry("bom_id")%>" <%=rsQry("selected")%>><%=rsQry("bom_name")%>&gt;<%=rsQry("bom_version")%></option>
             <%rsQry.MoveNext
 			  WEnd
 			  rsQry.Close
 			  Set rsQry = Nothing
           </select>
 		  </td>
         </tr>
 		<%If (parRtagA <> "") Then%>
-		<tr>
+<!-- 		<tr>
           <td align="left"><a href="Bom_Home.asp?bom_id=<%=parSBOMA%>" class="body_txt_drk">Go To SBOM A &raquo;</a></td>
-        </tr>
+        </tr> -->
 		<%End If%>
     </table>
     <!-- SELECT SBOM A END ---------------------------------------------->	</td>
     <td width="1%" valign="top" background="images/bg_lght_gray.gif">&nbsp;</td>
                 <td width="1%"></td>
                 <td width="100%" align="left" class="form_ttl">DIFF SBOM</td>
                 <td width="1%"></td>
               </tr>
               <tr>
-                <td align="left" valign="top" background="images/lbox_bg_green.gif"><img src="images/lbox_tl_cnr_b.gif" width="13" height="13"></td>
+                <td align="left" valign="top" background="images/lbox_bg_blue.gif"><img src="images/lbox_tl_cnr_b.gif" width="13" height="13"></td>
-                <td background="images/lbox_bg_green.gif" align="left" class="wform_ttl">&nbsp;
+                <td background="images/lbox_bg_blue.gif" align="left" class="wform_ttl">&nbsp;
                 </td>
-                <td align="right" valign="top" background="images/lbox_bg_green.gif"><img src="images/lbox_tr_cnr_b.gif" width="13" height="13"></td>
+                <td align="right" valign="top" background="images/lbox_bg_blue.gif"><img src="images/lbox_tr_cnr_b.gif" width="13" height="13"></td>
               </tr>
               <tr>
                 <td width="1%" bgcolor="#FFFFFF"><img src="images/h_trsp_dot.gif" width="10" height="100"></td>
                 <td bgcolor="#FFFFFF" valign="top" class="form_item">
 				<table width="100%"  border="0" cellspacing="0" cellpadding="5">
                   <tr>
                     <td width="100%" bgcolor="#DAD7C8">
 					<input type="submit" name="btn" value="Compare" class="form_btn_comp" style="margin-right:5px;">
-					<input type="submit" name="btn" value="Swap Compare" class="form_btn_comp">
+					<input type="submit" name="btn" value="Swap Compare" class="form_btn_comp" style="margin-right:5px;">
-					<span class="body_txt">
+					<%If parSBOMA <> parSBOMB AND parSBOMA <> "" AND parSBOMB <> "" Then%>
-					<input name="btn" type="submit" class="form_btn" value="Mail Me Report">
+					<input name="generate_button" id="generate_button" type="button" class="form_btn" value="Generate Report" onclick="window.open('diff_report.asp?sbomA=<%=parSBOMA%>&sbomB=<%=parSBOMB%>');">
+					<%End If%>
-					</span>					</td>
+					</td>
                     <td width="1" align="right" bgcolor="#DAD7C8" nowrap>
 					<table width="100%"  border="0" cellspacing="0" cellpadding="0">
                       <tr>
                         <td><input type="submit" name="btn" value="Exit" class="form_btn_comp"></td>
 				' Successfull Merge
 				If (Request("btn") = "Merge") Then
 					Call Messenger ( "Merge has completed successfully.", 3, "100%" )
 				End If
-				Set FSO=Server.CreateObject("Scripting.FileSystemObject")
-				Set NewTextFile=FSO.CreateTextFile(Server.MapPath("docs\compareBoms_"&objAccessControl.UserName&".html"), true)
-				Call Header()
-				If (parRtagA <> "") AND (parRtagB <> "")Then%>
+				If (parSBOMA <> "") AND (parSBOMB <> "") Then%>
                 <table width="100%"  border="0" cellspacing="1" cellpadding="0">
                   <tr>
                     <td width="50%" bgcolor="#E4E9EC" class="body_row" nowrap><%= ReleaseIcon(objRelCollectorA.Item("official")) & objRelCollectorA.Item("location")%> </td>
                     <td width="1" bgcolor="#E4E9EC"><img src="images/spacer.gif" width="20" height="1"></td>
                     <td width="1" bgcolor="#E4E9EC"><img src="images/spacer.gif" width="20" height="20"></td>
 	"  	    DM_PROJECTS pr"&_
 	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
 	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_
 	"   AND b.BOM_ID ="&parSBOMB, cint(0))
-				Call Javascript()
-				NewTextFile.WriteLine("<title>Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</title>")
-				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>")
 				While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))
+				VersionList = "0"
 				errormsg = false
 					rowId = rsQry("pv_id_a") &"_"& rsQry("pv_id_b")
 					btnMerge = LIMG_MERGE
 					btnRemove = LIMG_REMOVE
 						<input type="hidden" name="removepkg" id="REMOVEPKG_<%=rowId%>" value="">
 						<input type="hidden" id="UNDOPKG_<%=rowId%>" value="<%=rsQry("pkg_name_b") &" "& rsQry("pkg_version_b")%>">
 					</td>
                     <td bgcolor="#F5F5F5"><DIV id="IMGUNDO<%=rowId%>" style="display:none;" ><a href="javascript:;" onClick="UndoPackage( '<%=rowId%>' );"><%=LIMG_UNDO%></a></DIV></td>
                   </tr>
-<%
-	If email then
-		If rsQry("pv_id_a") Then
-			Set rsQryCommentsA = OraDatabase.DbCreateDynaset( "SELECT COMMENTS FROM PACKAGE_VERSIONS WHERE PV_ID="& rsQry("pv_id_a"), cint(0))
-		End If
-		If rsQry("pv_id_b") Then
-			Set rsQryCommentsB = OraDatabase.DbCreateDynaset( "SELECT COMMENTS FROM PACKAGE_VERSIONS WHERE PV_ID="& rsQry("pv_id_b"), cint(0))
-		End If
-		pkgA = rsQry("pkg_name_a")
-		pkgB = rsQry("pkg_name_b")
-		If pkgA <> "" then
-			pkgname = pkgA
-		Else
-			pkgname = pkgB
-		End If
-		If rsQry("change_type") = "U" OR rsQry("change_type") = "UW" Then
-				NewTextFile.Write("<p><SPAN id=""spanShowDetails"& rowId &""" name=""spanShowDetails""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(true,'"& rowId &"');"">"& pkgname &"</a></SPAN>")
-				NewTextFile.Write("<SPAN id=""spanHideDetails"& rowId &""" name=""spanHideDetails"" style=""display:none;""><a href=""javascript:;"" class=""body_scol"" onClick=""DisplaySPAN(false,'"& rowId &"');"">"& pkgname &"</a></SPAN>")
-				NewTextFile.WriteLine("<SPAN id=""spanPkgInfo"& rowId &""" name=""spanPkgInfo"" style=""display:none;"">")
-				'NewTextFile.WriteLine("<b><font face="&chr(34)&"arial"&chr(34)&">Package Name: "&pkgname&"</font></b><br>")
-				NewTextFile.Write(rsQryA("location")&" uses: "&rsQry("pkg_version_a")&" ")
-				NewTextFile.WriteLine("<br>")
-				NewTextFile.Write(rsQryB("location")&" uses: "&rsQry("pkg_version_b")&" ")
-				a = rsQry("pv_id_a")
-				b = rsQry("pv_id_b")
-				c = rsQry("pv_id_a")
-				d = rsQry("pv_id_b")
-				'On Error Resume Next
-				'NewTextFile.WriteLine("<br><br>")
-				'NewTextFile.WriteLine()
-				'NewTextFile.WriteLine("<b>"&rsQryA("location")&"</b>")
-				'Call Comments(rsQry("pv_id_a"))
-				'Call GetFixedIssues(rsQry("pv_id_a"))
-				'Call GetDependencies(rsQry("pv_id_a"), rsQry("pv_id_b"))
-				NewTextFile.WriteLine("<br><br>")
-				NewTextFile.WriteLine()
-				NewTextFile.WriteLine("<b>"&rsQryB("location")&"</b>")
-				Call Comments(rsQry("pv_id_b"))
-				Call GetFixedIssues(rsQry("pv_id_b"))
-				Dim rsQryLast
-				Set rsQryLast = OraDatabase.DbCreateDynaset( "SELECT LAST_PV_ID FROM PACKAGE_VERSIONS WHERE PV_ID="& rsQry("pv_id_b"), cint(0))
-				If rsQryLast("last_pv_id") <> a Then
-					Call PreviousVersions(a, b, rsQry("pkg_version_a"), rsQry("pkg_version_b"))
-				End If
-				a = rsQry("pv_id_a")
-				b = rsQry("pv_id_b")
-				Call GetDependencies(a, b, rsQry("pkg_version_a"), rsQry("pkg_version_b"))
-				NewTextFile.WriteLine("</SPAN>")
-				rsQryLast.Close
-				Set rsQryLast = nothing
-		End If
-		If rsQry("change_type") = "A" AND rsQry("patch_b") = "Y" Then
-			Dim rsQryPatch
-			OraDatabase.Parameters.Add "PV_ID", 	rsQry("pv_id_b"),	ORAPARM_INPUT, ORATYPE_NUMBER
-			Set rsQryPatch = OraDatabase.DbCreateDynaset( GetQuery("pd_patch.sql"), cint(0))
-			OraDatabase.Parameters.Remove "PV_ID"
-			If NOT IsNull(rsQryPatch("pv_id")) Then
-				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>")
-				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>")
+			<%
-				NewTextFile.WriteLine("<SPAN id=""spanPkgInfo"& rowId &""" name=""spanPkgInfo"" style=""display:none;"">")
-				Call Comments(rsQryPatch("pv_id"))
-				Call GetFixedIssues(rsQryPatch("pv_id"))
-			Else
-				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>")
-				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>")
-				NewTextFile.WriteLine("<SPAN id=""spanPkgInfo"& rowId &""" name=""spanPkgInfo"" style=""display:none;"">")
-				Call Comments(rsQry("pv_id_b"))
-				Call GetFixedIssues(rsQry("pv_id_b"))
-			End If
-			NewTextFile.WriteLine("</SPAN>")
-			rsQryPatch.Close
-			Set rsQryPatch = nothing
-		End If
-	End If
-	rsQry.MoveNext
+			rsQry.MoveNext
-	WEnd
+			WEnd
-	rsQry.Close
+			rsQry.Close
-	Set rsQry = Nothing
+			Set rsQry = Nothing
-%>
-<%
-	Call Footer()
-	NewTextFile.Close
-	Set NewTextFile=Nothing
-%>
+			%>
                 </table>
                 <br>
 			<%Else%>
 				<br>
 				<%
 				</td>
                 <td width="1%" background="images/lbox_bgside_white.gif">&nbsp;</td>
               </tr>
               <tr>
-                <td width="1%" background="images/lbox_bg_green.gif" valign="bottom"><img src="images/lbox_bl_cnr_b.gif" width="13" height="13"></td>
+                <td width="1%" background="images/lbox_bg_blue.gif" valign="bottom"><img src="images/lbox_bl_cnr_b.gif" width="13" height="13"></td>
-                <td background="images/lbox_bg_green.gif"></td>
+                <td background="images/lbox_bg_blue.gif"></td>
-                <td width="1%" background="images/lbox_bg_green.gif" valign="bottom" align="right"><img src="images/lbox_br_cnr_b.gif" width="13" height="13"></td>
+                <td width="1%" background="images/lbox_bg_blue.gif" valign="bottom" align="right"><img src="images/lbox_br_cnr_b.gif" width="13" height="13"></td>
               </tr>
             </table>
           </td>
         </tr>
       </table>
     <!-- DIFF END ---------------------------------------------------->
     </td>
-	<td valign="top" width="1%" background="images/bg_lite_blue.gif">
+	<td valign="top" width="1%" background="images/bg_lightgreen.gif">
 	  <!-- SELECT SBOM B ---------------------------------------------->
       <br>
       <table width="100%"  border="0" cellspacing="10" cellpadding="0">
 		<tr>
           <td align="left" class="body_col"><img src="images/i_rtag_open_mode.gif" border="0" align="absmiddle" width="15" height="13">&nbsp;Select SBOM B<hr size="1px" color="Olive" noshade></td>
         </tr>
-        <tr>
+<!--         <tr>
           <td align="left">
 		  <select name="projB" class="form_item" onChange="RequestReleaseCombo( '?proj_id='+ this.value, FormName.rtagB );">
               <option value="">-- Select Project --</option>
 			  <%
 			  OraDatabase.Parameters.Add "PROJ_ID", 	objRelCollectorB.Item("proj_id"),	ORAPARM_INPUT, ORATYPE_NUMBER
 			  rsQry.Close
 			  Set rsQry = Nothing
 			  %>
 		  </select></td>
-        </tr>
+        </tr> -->
         <tr>
           <td align="left">
 		  <select name="sbomB" id="sbomB" class="form_item">
             <%
+			Dim nBranchId
+			If objAccessControl.IsActive("Vasttrafik")	Then
+				nBranchId	=	1142
+			Else
+				nBranchId	=	542
+			End	If
 			  OraDatabase.Parameters.Add "BOM_ID", 	objRelCollectorB.Item("bom_id"),	ORAPARM_INPUT,  ORATYPE_NUMBER
-			  OraDatabase.Parameters.Add "BRANCH_ID", 	objRelCollectorB.Item("branch_id"),	ORAPARM_INPUT, ORATYPE_NUMBER
+			  OraDatabase.Parameters.Add "BRANCH_ID", 	nBranchId,	ORAPARM_INPUT, ORATYPE_NUMBER
-			  Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("SBOMCombo.sql"), cint(0))
+			  Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("ProductionTreeCombo.sql"), cint(0))
 			  OraDatabase.Parameters.Remove "BOM_ID"
 			  OraDatabase.Parameters.Remove "BRANCH_ID"
 			  While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))%>
-            <option value="<%=rsQry("bom_id")%>" <%=rsQry("selected")%>><%=rsQry("version")%></option>
+            <option value="<%=rsQry("bom_id")%>" <%=rsQry("selected")%>><%=rsQry("bom_name")%>&gt;<%=rsQry("bom_version")%></option>
             <%rsQry.MoveNext
 			  WEnd
 			  rsQry.Close
 			  Set rsQry = Nothing
 		  </td>
         </tr>
 		<%If (parRtagB <> "") Then%>
-		<tr>
+<!-- 		<tr>
           <td align="left"><a href="Bom_home.asp?bom_id=<%=parSBOMB%>" class="body_txt_drk">Go To SBOM B &raquo;</a></td>
-        </tr>
+        </tr> -->
 		<%End If%>
       </table>
       <!-- SELECT RELEASE B END ---------------------------------------------->	  </td>
   </tr>
   <tr>
-    <td valign="bottom" align="center" background="images/bg_lite_blue.gif"><img src="images/img_vtree.gif" width="86" height="99" vspace="20" hspace="30"></td>
+    <td valign="bottom" align="center" background="images/bg_lightgreen.gif"><img src="images/img_vtree.gif" width="86" height="99" vspace="20" hspace="30"></td>
     <td background="images/bg_lght_gray.gif" valign="top"><img src="images/h_trsp_dot.gif" width="1" height="500"></td>
-	<td valign="bottom" background="images/bg_lite_blue.gif" align="center"><img src="images/img_vtree.gif" width="86" height="99" vspace="20" hspace="30"></td>
+	<td valign="bottom" background="images/bg_lightgreen.gif" align="center"><img src="images/img_vtree.gif" width="86" height="99" vspace="20" hspace="30"></td>
   </tr>
 </table>
 </form>
 <!-- FOOTER -->
 <!--#include file="_footer.asp"-->
 <%
-	If email Then
+	'If email Then
-		Dim myMail, LocalPath
+		'Dim myMail, LocalPath
-		Set myMail=Server.CreateObject("Persits.MailSender")
+		'Set myMail=Server.CreateObject("Persits.MailSender")
-		LocalPath = Server.MapPath("docs\compareBoms_"&objAccessControl.UserName&".html")
+		'LocalPath = Server.MapPath("docs\compareBoms_"&objAccessControl.UserName&".html")
-		myMail.Host = SMTP_HOST
+	'	myMail.Host = SMTP_HOST
-		myMail.Subject="BOM Comparisons from Deployment Manager"
+	'	myMail.Subject="BOM Comparisons from Deployment Manager"
-		myMail.From="releasem@erggroup.com"
+	'	myMail.From="releasem@erggroup.com"
-		myMail.AddAddress objAccessControl.UserEmail
+	'	myMail.AddAddress objAccessControl.UserEmail
 		' Attach the file
-		myMail.AddAttachment LocalPath
+	'	myMail.AddAttachment LocalPath
-		myMail.Body = "Your requested report..."
+	'	myMail.Body = "Your requested report..."
-		myMail.Send
+	'	myMail.Send
-		set myMail=nothing
+	'	set myMail=nothing
-	End If
+	'End If
 %>
 </body>
 </html>
 <%
 Call Destroy_All_Objects

Subversion Repositories DevTools

(root)/ManagerSuite/Production_Manager/trunk/diff.asp @ 66 – Rev 62 → 64