Subversion Repositories DevTools

Rev

Rev 5958 | Rev 6648 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5958 Rev 6646
Line 47... Line 47...
47 
Dim colorA, colorB, ChangeTypeIcon
 47 
Dim colorA, colorB, ChangeTypeIcon
48 
Dim btnMerge, btnRemove
 48 
Dim btnMerge, btnRemove
49 
Dim rowId
 49 
Dim rowId
50 
Dim email
 50 
Dim email
51 
Dim genReport
 51 
Dim genReport
- 
 
 52 
Dim genSummary
- 
 
 53 
Dim summaryText
52 
Dim FSO
 54 
Dim FSO
53 
Dim NewTextFile
 55 
Dim NewTextFile
- 
 
 56 
Dim NewTextFilePath
54 
Dim pkgA, pkgB, pkgname, delimiter, rsQryA, rsQryB, rsQryCommentsA, rsQryCommentsB, sqlstrA, counterA, sqlstrB, sqlstrC, counterB
 57 
Dim pkgA, pkgB, pkgname, delimiter, rsQryA, rsQryB, rsQryCommentsA, rsQryCommentsB, sqlstrA, counterA, sqlstrB, sqlstrC, counterB
55 
Dim SSsql, retVal, rsCQ, DEVIiss
 58 
Dim SSsql, retVal, rsCQ, DEVIiss
56 
Dim a, b, c, d, pkgversion, errormsg
 59 
Dim a, b, c, d, pkgversion, errormsg
57 
Dim VersionList
 60 
Dim VersionList
58 
 
 61 
 
59 
 
 - 
 
60 
'------------ Constants Declaration -----------
 62 
'------------ Constants Declaration -----------
61 
Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Updated'>"
 63 
Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Updated'>"
62 
Const LIMG_RIPPLED = "<img src='images/i_rippled.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Rippled'>"
 64 
Const LIMG_RIPPLED = "<img src='images/i_rippled.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Rippled'>"
63 
Const LIMG_ADDED = "<img src='images/i_added.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Added'>"
 65 
Const LIMG_ADDED = "<img src='images/i_added.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Added'>"
64 
Const LIMG_REMOVED = "<img src='images/i_removed.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Removed'>"
 66 
Const LIMG_REMOVED = "<img src='images/i_removed.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Removed'>"
Line 81... Line 83...
81 
Set objRelCollectorA = CreateObject("Scripting.Dictionary")
 83 
Set objRelCollectorA = CreateObject("Scripting.Dictionary")
82 
Set objRelCollectorB = CreateObject("Scripting.Dictionary")
 84 
Set objRelCollectorB = CreateObject("Scripting.Dictionary")
83 
Set dDiffFilter = CreateObject("Scripting.Dictionary")
 85 
Set dDiffFilter = CreateObject("Scripting.Dictionary")
84 
 
 86 
 
85 
'----------------------------------------------
 87 
'----------------------------------------------
86 
If Request("btn") = "Mail Me Report" Then
 88 
If Request("btn") = "btn_report" Then
87 
    email = true
 89 
    email = true
88 
    genReport = true
 90 
    genReport = true
89 
End If
 91 
End If
- 
 
 92 
If Request("btn") = "btn_summary" Then
- 
 
 93 
    email = true
- 
 
 94 
    genSummary = true
- 
 
 95 
End If
90 
If Request("btn") = "Show Me Report" Then
 96 
If Request("btn") = "Show Me Report" Then
91 
    genReport = true
 97 
    genReport = true
92 
End If
 98 
End If
93 
%>
 99 
%>
94 
<%
 100 
<%
- 
 
 101 
'--------------------------------------------------------------------------
- 
 
 102 
'   Add text to summary email
- 
 
 103 
'       Attempt to prevent gmail from creating hyperlinks out of some text
- 
 
 104 
'           - Put '.' inside a 'span'
- 
 
 105 
Sub Summary(txt)
- 
 
 106 
 If genSummary Then
- 
 
 107 
     summaryText = summaryText & Replace(txt,".", "<span>.</span>")
- 
 
 108 
 End If
- 
 
 109 
End Sub
95 
'--------------------------------------------------------------------------------------------------------------------------
 110 
'--------------------------------------------------------------------------------------------------------------------------
96 
Sub GetDiffFilterValues ( outDepFilter )
 111 
Sub GetDiffFilterValues ( outDepFilter )
97 
    Dim FilterVal, aFilterValues
 112 
    Dim FilterVal, aFilterValues
98 
 
 113 
 
99 
    If Request.Cookies(enum_RELMGR_COOKIE_DOMAIN)(COOKIE_HIDE_DIFF_FILTER) <> "" Then
 114 
    If Request.Cookies(enum_RELMGR_COOKIE_DOMAIN)(COOKIE_HIDE_DIFF_FILTER) <> "" Then
Line 105... Line 120...
105 
 
 120 
 
106 
    End If
 121 
    End If
107 
 
 122 
 
108 
End Sub
 123 
End Sub
109 
'--------------------------------------------------------------------------------------------------------------------------
 124 
'--------------------------------------------------------------------------------------------------------------------------
- 
 
 125 
Sub DisplayFilterSelector
- 
 
 126 
 %>
- 
 
 127 
        <!-- DIFF FILTER +++++++++++++++++++++++++++++++++++++++++++ -->
- 
 
 128 
        <p>&nbsp;
- 
 
 129 
        <fieldset style="width:150px;">
- 
 
 130 
        <legend class="body_scol"><%=GetIsDiffFilterInUseIcon() %>&nbsp;Filter&nbsp;Results...</a></legend>
- 
 
 131 
        <div name="divDiffFilter" id="divDiffFilter" class="body_txt">
- 
 
 132 
          <br>
- 
 
 133 
          <table width="100%"  border="0" cellspacing="1" cellpadding="3">
- 
 
 134 
            <tr>
- 
 
 135 
              <td width="1" background="images/bg_action_norm.gif"><input name="difilter" type="checkbox" value="<%=enumDB_DIFF_UPDATED%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_UPDATED)%>></td>
- 
 
 136 
              <td width="50" nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_UPDATED%>Updated</td>
- 
 
 137 
            </tr>
- 
 
 138 
            <tr>
- 
 
 139 
              <td background="images/bg_action_norm.gif"><input type="checkbox" name="difilter" value="<%=enumDB_DIFF_NEW%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_NEW)%>></td>
- 
 
 140 
              <td nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_ADDED%>Added</td>
- 
 
 141 
            </tr>
- 
 
 142 
            <tr>
- 
 
 143 
              <td background="images/bg_action_norm.gif"><input type="checkbox" name="difilter" value="<%=enumDB_DIFF_REMOVED%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_REMOVED)%>></td>
- 
 
 144 
              <td nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_REMOVED%>Removed</td>
- 
 
 145 
            </tr>
- 
 
 146 
            <tr>
- 
 
 147 
              <td background="images/bg_action_norm.gif"><input type="checkbox" name="filter_comments" value="<%=enumDB_FILTER_COMMENTS%>" <%=GetIsDiffFilterChecked(enumDB_FILTER_COMMENTS)%>></td>
- 
 
 148 
              <td nowrap background="images/bg_action_norm.gif" class="form_field">Comments</td>
- 
 
 149 
            </tr>
- 
 
 150 
            <tr>
- 
 
 151 
              <td background="images/bg_action_norm.gif"><input type="checkbox" name="filter_issues" value="<%=enumDB_FILTER_ISSUES%>" <%=GetIsDiffFilterChecked(enumDB_FILTER_ISSUES)%>></td>
- 
 
 152 
              <td nowrap background="images/bg_action_norm.gif" class="form_field">Issues</td>
- 
 
 153 
            </tr>
- 
 
 154 
            <tr>
- 
 
 155 
              <td background="images/bg_action_norm.gif">&nbsp;</td>
- 
 
 156 
              <td background="images/bg_action_norm.gif"><input name="btn" type="submit" class="form_btn" value="Hide"></td>
- 
 
 157 
            </tr>
- 
 
 158 
          </table>
- 
 
 159 
        </div>
- 
 
 160 
        </fieldset>
- 
 
 161 
        <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
 
 162 
<%
- 
 
 163 
End Sub
- 
 
 164 
'--------------------------------------------------------------------------------------------------------------------------
110 
Sub Javascript()
 165 
Sub Javascript()
- 
 
 166 
 If genReport Then
111 
    NewTextFile.WriteLine("<script language=""JavaScript"" type=""text/javascript"">")
 167 
        NewTextFile.WriteLine("<script language=""JavaScript"" type=""text/javascript"">")
112 
    NewTextFile.WriteLine("function MM_findObj(n, d) { //v4.0")
 168 
        NewTextFile.WriteLine("function MM_findObj(n, d) { //v4.0")
113 
    NewTextFile.WriteLine("  var p,i,x;")
 169 
        NewTextFile.WriteLine("  var p,i,x;")
114 
    NewTextFile.WriteLine("  if(!d) d=document; ")
 170 
        NewTextFile.WriteLine("  if(!d) d=document; ")
115 
    NewTextFile.WriteLine("  if((p=n.indexOf(""?""))>0&&parent.frames.length) {")
 171 
        NewTextFile.WriteLine("  if((p=n.indexOf(""?""))>0&&parent.frames.length) {")
116 
    NewTextFile.WriteLine("  	d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);")
 172 
        NewTextFile.WriteLine("  	d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);")
117 
    NewTextFile.WriteLine("  }")
 173 
        NewTextFile.WriteLine("  }")
118 
    NewTextFile.WriteLine("  if(!(x=d[n])&&d.all) x=d.all[n]; ")
 174 
        NewTextFile.WriteLine("  if(!(x=d[n])&&d.all) x=d.all[n]; ")
119 
    NewTextFile.WriteLine("  for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];")
 175 
        NewTextFile.WriteLine("  for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];")
120 
    NewTextFile.WriteLine("  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);")
 176 
        NewTextFile.WriteLine("  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);")
121 
    NewTextFile.WriteLine("  if(!x && document.getElementById) x=document.getElementById(n); ")
 177 
        NewTextFile.WriteLine("  if(!x && document.getElementById) x=document.getElementById(n); ")
122 
    NewTextFile.WriteLine("  return x;")
 178 
        NewTextFile.WriteLine("  return x;")
123 
    NewTextFile.WriteLine("}")
 179 
        NewTextFile.WriteLine("}")
124 
 
 180 
 
125 
    NewTextFile.WriteLine("function toggleSPAN(x) {")
 181 
        NewTextFile.WriteLine("function toggleSPAN(x) {")
126 
    NewTextFile.WriteLine("    var el = MM_findObj('spanPkgInfo' + x);")
 182 
        NewTextFile.WriteLine("    var el = MM_findObj('spanPkgInfo' + x);")
127 
    NewTextFile.WriteLine("    if (el.style.display != ""block"") {")
 183 
        NewTextFile.WriteLine("    if (el.style.display != ""block"") {")
128 
    NewTextFile.WriteLine("        el.style.display = ""block"";")
 184 
        NewTextFile.WriteLine("        el.style.display = ""block"";")
129 
    NewTextFile.WriteLine("    } else {")
 185 
        NewTextFile.WriteLine("    } else {")
130 
    NewTextFile.WriteLine("        el.style.display = ""none"";")
 186 
        NewTextFile.WriteLine("        el.style.display = ""none"";")
131 
    NewTextFile.WriteLine("    }")
 187 
        NewTextFile.WriteLine("    }")
132 
    NewTextFile.WriteLine("}")
 188 
        NewTextFile.WriteLine("}")
133 
 
 189 
 
134 
    NewTextFile.WriteLine("function MM_getElementsByClassName(cn) {")
 190 
        NewTextFile.WriteLine("function MM_getElementsByClassName(cn) {")
135 
    NewTextFile.WriteLine("    var allT=document.getElementsByTagName('*'), allCN=[], i=0, a;")
 191 
        NewTextFile.WriteLine("    var allT=document.getElementsByTagName('*'), allCN=[], i=0, a;")
136 
    NewTextFile.WriteLine("    while(a=allT[i++]) {")
 192 
        NewTextFile.WriteLine("    while(a=allT[i++]) {")
137 
    NewTextFile.WriteLine("        a.className==cn ? allCN[allCN.length]=a : null;")
 193 
        NewTextFile.WriteLine("        a.className==cn ? allCN[allCN.length]=a : null;")
138 
    NewTextFile.WriteLine("    }")
 194 
        NewTextFile.WriteLine("    }")
139 
    NewTextFile.WriteLine("    return allCN")
 195 
        NewTextFile.WriteLine("    return allCN")
140 
    NewTextFile.WriteLine("}")
 196 
        NewTextFile.WriteLine("}")
141 
 
 197 
 
142 
    NewTextFile.WriteLine("    function MM_toggleAll(cn, show){")
 198 
        NewTextFile.WriteLine("    function MM_toggleAll(cn, show){")
143 
    NewTextFile.WriteLine("        var allEl = MM_getElementsByClassName(cn);")
 199 
        NewTextFile.WriteLine("        var allEl = MM_getElementsByClassName(cn);")
144 
    NewTextFile.WriteLine("        for (var ii=0; ii<allEl.length;ii++){")
 200 
        NewTextFile.WriteLine("        for (var ii=0; ii<allEl.length;ii++){")
145 
    NewTextFile.WriteLine("            var el = allEl[ii];")
 201 
        NewTextFile.WriteLine("            var el = allEl[ii];")
146 
    NewTextFile.WriteLine("            if(show) {")
 202 
        NewTextFile.WriteLine("            if(show) {")
147 
    NewTextFile.WriteLine("                el.style.display = ""block"";")
 203 
        NewTextFile.WriteLine("                el.style.display = ""block"";")
148 
    NewTextFile.WriteLine("            } else {")
 204 
        NewTextFile.WriteLine("            } else {")
149 
    NewTextFile.WriteLine("                el.style.display = ""none"";")
 205 
        NewTextFile.WriteLine("                el.style.display = ""none"";")
150 
    NewTextFile.WriteLine("            }")
 206 
        NewTextFile.WriteLine("            }")
151 
    NewTextFile.WriteLine("        }")
 207 
        NewTextFile.WriteLine("        }")
152 
    NewTextFile.WriteLine("    }")
 208 
        NewTextFile.WriteLine("    }")
153 
 
 209 
 
154 
    NewTextFile.WriteLine("</script>")
 210 
        NewTextFile.WriteLine("</script>")
- 
 
 211 
 End If
155 
End Sub
 212 
End Sub
156 
'--------------------------------------------------------------------------------------------------------------------------
 213 
'--------------------------------------------------------------------------------------------------------------------------
157 
Sub GetFixedIssues(pv_id, issues)
 214 
Sub GetFixedIssues(pv_id, issues)
158 
    If issues <> "Filter Issues" Then
 215 
    If issues <> "Filter Issues" Then
159 
        Set sqlstrC = OraDatabase.DbCreateDynaset( _
 216 
        Set sqlstrC = OraDatabase.DbCreateDynaset( _
Line 317... Line 374...
317 
 
 374 
 
318 
        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))
 375 
        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))
319 
        NewTextFile.WriteLine("<blockquote><blockquote><span class="&chr(34)&"highlight_text"&chr(34)&">"& sqlstrB("pkg_name") &" "& sqlstrB("pkg_version") &"</font></span></blockquote></blockquote>")
 376 
        NewTextFile.WriteLine("<blockquote><blockquote><span class="&chr(34)&"highlight_text"&chr(34)&">"& sqlstrB("pkg_name") &" "& sqlstrB("pkg_version") &"</font></span></blockquote></blockquote>")
320 
 
 377 
 
321 
        If comments <> "Filter Comments" Then
 378 
        If comments <> "Filter Comments" Then
322 
    NewTextFile.WriteLine("<blockquote><blockquote>Comments:</blockquote></blockquote>")
 379 
            NewTextFile.WriteLine("<blockquote><blockquote>Comments:</blockquote></blockquote>")
323 
    NewTextFile.Write("<blockquote><blockquote><blockquote>"& TextToHTML(sqlstrB("comments")) &"</blockquote></blockquote></blockquote>")
 380 
            NewTextFile.Write("<blockquote><blockquote><blockquote>"& TextToHTML(sqlstrB("comments")) &"</blockquote></blockquote></blockquote>")
324 
        End If
 381 
        End If
325 
 
 382 
 
326 
        sqlstrB.Close()
 383 
        sqlstrB.Close()
327 
        Set sqlstrB = nothing
 384 
        Set sqlstrB = nothing
328 
End Sub
 385 
End Sub
Line 516... Line 573...
516 
<script language="JavaScript" src="scripts/common.js"></script>
 573 
<script language="JavaScript" src="scripts/common.js"></script>
517 
<script language="JavaScript" src="scripts/remote_scripting.js"></script>
 574 
<script language="JavaScript" src="scripts/remote_scripting.js"></script>
518 
<script language="JavaScript" type="text/javascript">
 575 
<script language="JavaScript" type="text/javascript">
519 
<!--
 576 
<!--
520 
 
 577 
 
521 
function RequestReleaseCombo( paramString, rowId )
 578 
function RequestReleaseCombo( paramString, rowId, rowId2 )
522 
{
 579 
{
523 
    var requestURL = 'RequestReleaseCombo.asp';
 580 
    var requestURL = 'RequestReleaseCombo.asp';
524 
 
 581 
 
525 
    // Set ajax divname
 582 
    // Set ajax divname
526 
    ajaxdivname = rowId;
 583 
    ajaxdivname = rowId;
527 
 
 584 
 
528 
    //Append the name to search for to the requestURL
 585 
    //Append the name to search for to the requestURL
529 
    var url = requestURL + paramString;
 586 
    var url = requestURL + paramString;
530 
 
 587 
 
531 
    //Progress
 - 
 
532 
    //alert(MM_findObj( rowId ));
 588 
    // Cleanout other combo boxes
533 
 
 - 
 
534 
    //MM_findObj( rowId ).options[0] = new Option('Loading...','');
 - 
 
535 
    //MM_findObj( rowId ).selectedIndex = 0;
 - 
 
536 
    rowId.options[0] = new Option('Loading...','');
 589 
    rowId.options[0] = new Option('Loading...','');
537 
    rowId.selectedIndex = 0;
 590 
    rowId.selectedIndex = 0;
538 
 
 591 
 
- 
 
 592 
    rowId2.innerHTML = '';
539 
 
 593 
 
540 
    //Create the xmlHttp object to use in the request
 594 
    //Create the xmlHttp object to use in the request
541 
    //stateChangeHandler will fire when the state has changed, i.e. data is received back
 595 
    //stateChangeHandler will fire when the state has changed, i.e. data is received back
542 
    // This is non-blocking (asynchronous)
 596 
    // This is non-blocking (asynchronous)
543 
    xmlHttp = GetXmlHttpObject(stateComboChangeHandler);
 597 
    xmlHttp = GetXmlHttpObject(stateComboChangeHandler);
544 
 
 598 
 
545 
    //Send the xmlHttp get to the specified url
 599 
    //Send the xmlHttp get to the specified url
546 
    xmlHttp_Get(xmlHttp, url);
 600 
    xmlHttp_Get(xmlHttp, url);
547 
 
 - 
 
548 
 
 - 
 
549 
}
 601 
}
550 
 
 602 
 
551 
function RequestSBOMCombo( paramString, rowId ){
 603 
function RequestSBOMCombo( paramString, rowId ){
552 
    var requestURL = 'RequestSBOMCombo.asp';
 604 
    var requestURL = 'RequestSBOMCombo.asp';
553 
 
 605 
 
Line 556... Line 608...
556 
 
 608 
 
557 
    //Append the name to search for to the requestURL
 609 
    //Append the name to search for to the requestURL
558 
    var url = requestURL + paramString;
 610 
    var url = requestURL + paramString;
559 
 
 611 
 
560 
    //Progress
 612 
    //Progress
561 
    //alert(MM_findObj( rowId ));
 - 
 
562 
 
 - 
 
563 
    //MM_findObj( rowId ).options[0] = new Option('Loading...','');
 - 
 
564 
    //MM_findObj( rowId ).selectedIndex = 0;
 - 
 
565 
    rowId.options[0] = new Option('Loading...','');
 613 
    rowId.options[0] = new Option('Loading...','');
566 
    rowId.selectedIndex = 0;
 614 
    rowId.selectedIndex = 0;
567 
 
 615 
 
568 
 
 - 
 
569 
    //Create the xmlHttp object to use in the request
 616 
    //Create the xmlHttp object to use in the request
570 
    //stateChangeHandler will fire when the state has changed, i.e. data is received back
 617 
    //stateChangeHandler will fire when the state has changed, i.e. data is received back
571 
    // This is non-blocking (asynchronous)
 618 
    // This is non-blocking (asynchronous)
572 
    xmlHttp = GetXmlHttpObject(stateComboChangeHandler);
 619 
    xmlHttp = GetXmlHttpObject(stateComboChangeHandler);
573 
 
 620 
 
574 
    //Send the xmlHttp get to the specified url
 621 
    //Send the xmlHttp get to the specified url
575 
    xmlHttp_Get(xmlHttp, url);
 622 
    xmlHttp_Get(xmlHttp, url);
576 
 
 - 
 
577 
 
 - 
 
578 
}
 623 
}
579 
 
 624 
 
580 
//-->
 625 
//-->
581 
</script>
 626 
</script>
582 
 
 627 
 
Line 604... Line 649...
604 
        <tr>
 649 
        <tr>
605 
          <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>
 650 
          <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>
606 
        </tr>
 651 
        </tr>
607 
        <tr>
 652 
        <tr>
608 
          <td align="left">
 653 
          <td align="left">
609 
          <select name="projA" class="form_item" onChange="RequestReleaseCombo( '?proj_id='+ this.value, FormName.rtagA );">
 654 
          <select name="projA" class="form_item" onChange="RequestReleaseCombo( '?proj_id='+ this.value, FormName.rtagA, FormName.sbomA );">
610 
              <option value="">-- Select Project --</option>
 655 
              <option value="">-- Select Project --</option>
611 
              <%
 656 
              <%
612 
              OraDatabase.Parameters.Add "PROJ_ID",     objRelCollectorA.Item("proj_id"),   ORAPARM_INPUT, ORATYPE_NUMBER
 657 
              OraDatabase.Parameters.Add "PROJ_ID",     objRelCollectorA.Item("proj_id"),   ORAPARM_INPUT, ORATYPE_NUMBER
613 
 
 658 
 
614 
              Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("ProjectsCombo.sql"), cint(0))
 659 
              Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("ProjectsCombo.sql"), cint(0))
Line 678... Line 723...
678 
        <%If (parRtagA <> "") Then%>
 723 
        <%If (parRtagA <> "") Then%>
679 
        <tr>
 724 
        <tr>
680 
          <td align="left"><a href="Bom_Home.asp?bom_id=<%=parSBOMA%>" class="body_txt_drk">Go To SBOM A &raquo;</a></td>
 725 
          <td align="left"><a href="Bom_Home.asp?bom_id=<%=parSBOMA%>" class="body_txt_drk">Go To SBOM A &raquo;</a></td>
681 
        </tr>
 726 
        </tr>
682 
        <%End If%>
 727 
        <%End If%>
- 
 
 728 
        <tr>
- 
 
 729 
          <td>
- 
 
 730 
            <%Call DisplayFilterSelector%>
- 
 
 731 
          </td>
- 
 
 732 
        </tr>
683 
    </table>
 733 
    </table>
684 
 
 734 
 
685 
    <!-- SELECT SBOM A END ---------------------------------------------->
 735 
    <!-- SELECT SBOM A END ---------------------------------------------->
686 
    </td>
 736 
    </td>
687 
    <td rowspan="2" valign="top" background="images/bg_lght_gray.gif" align="center">
 737 
    <td rowspan="2" valign="top" background="images/bg_lght_gray.gif" align="center">
Line 702... Line 752...
702 
                <td width="1%"></td>
 752 
                <td width="1%"></td>
703 
                <td width="100%" align="left" class="form_ttl">DIFF SBOM
 753 
                <td width="100%" align="left" class="form_ttl">DIFF SBOM
704 
                <%If genReport Then%>
 754 
                <%If genReport Then%>
705 
                &nbsp;[Generating Report]
 755 
                &nbsp;[Generating Report]
706 
                <%End If%>
 756 
                <%End If%>
- 
 
 757 
                <%If genSummary Then%>
- 
 
 758 
                &nbsp;[Generating Summary]
- 
 
 759 
                <%End If%>
707 
                </td>
 760 
                </td>
708 
                <td width="1%"></td>
 761 
                <td width="1%"></td>
709 
              </tr>
 762 
              </tr>
710 
              <tr>
 763 
              <tr>
711 
                <td align="left" valign="top" background="images/lbox_bg_blue.gif"><img src="images/lbox_tl_cnr_b.gif" width="13" height="13"></td>
 764 
                <td align="left" valign="top" background="images/lbox_bg_blue.gif"><img src="images/lbox_tl_cnr_b.gif" width="13" height="13"></td>
Line 723... Line 776...
723 
                  <tr>
 776 
                  <tr>
724 
                    <td width="100%" bgcolor="#DAD7C8">
 777 
                    <td width="100%" bgcolor="#DAD7C8">
725 
                    <input type="submit" name="btn" value="Compare" class="form_btn_comp" style="margin-right:5px;">
 778 
                    <input type="submit" name="btn" value="Compare" class="form_btn_comp" style="margin-right:5px;">
726 
                    <input type="submit" name="btn" value="Swap Compare" class="form_btn_comp">
 779 
                    <input type="submit" name="btn" value="Swap Compare" class="form_btn_comp">
727 
                    <span class="body_txt">
 780 
                    <span class="body_txt">
728 
                        <input name="btn" type="submit" class="form_btn" value="Mail Me Report">
 781 
                        <button name="btn" type="submit" class="form_btn" value="btn_report">Mail Me Report</button>
- 
 
 782 
                        <button name="btn" type="submit" class="form_btn" value="btn_summary">Mail Me Summary</button>
729 
                    <%
 783 
                    <%
730 
                        '<input name="btn" type="submit" class="form_btn" value="Show Me Report">
 784 
                        '<input name="btn" type="submit" class="form_btn" value="Show Me Report">
731 
                    %>
 785 
                    %>
732 
                    </span>
 786 
                    </span>
733 
                    </td>
 787 
                    </td>
Line 737... Line 791...
737 
 
 791 
 
738 
                        <td><input type="submit" name="btn" value="Exit" class="form_btn_comp"></td>
 792 
                        <td><input type="submit" name="btn" value="Exit" class="form_btn_comp"></td>
739 
                      </tr>
 793 
                      </tr>
740 
                    </table></td>
 794 
                    </table></td>
741 
                  </tr>
 795 
                  </tr>
742 
                  <tr>
 - 
 
743 
                    <td>
 - 
 
744 
                    <%If (parRtagA <> "") AND (parRtagB <> "")Then%>
 - 
 
745 
                        <!-- DIFF FILTER +++++++++++++++++++++++++++++++++++++++++++ -->
 - 
 
746 
                        <fieldset style="width:150px;">
 - 
 
747 
                        <legend><a href="javascript:;" class="body_scol" onClick="ToggleDisplay('divDiffFilter');" ><%=GetIsDiffFilterInUseIcon() %>&nbsp;Filter&nbsp;Results...</a></legend>
 - 
 
748 
                        <div name="divDiffFilter" id="divDiffFilter" class="body_txt" style="display:none;">
 - 
 
749 
                          <br>
 - 
 
750 
                          <table width="100%"  border="0" cellspacing="1" cellpadding="3">
 - 
 
751 
                            <tr>
 - 
 
752 
                              <td width="1" background="images/bg_action_norm.gif"><input name="difilter" type="checkbox" value="<%=enumDB_DIFF_UPDATED%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_UPDATED)%>></td>
 - 
 
753 
                              <td width="50" nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_UPDATED%>Updated</td>
 - 
 
754 
                            </tr>
 - 
 
755 
                            <tr>
 - 
 
756 
                              <td background="images/bg_action_norm.gif"><input type="checkbox" name="difilter" value="<%=enumDB_DIFF_NEW%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_NEW)%>></td>
 - 
 
757 
                              <td nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_ADDED%>Added</td>
 - 
 
758 
                            </tr>
 - 
 
759 
                            <tr>
 - 
 
760 
                              <td background="images/bg_action_norm.gif"><input type="checkbox" name="difilter" value="<%=enumDB_DIFF_REMOVED%>" <%=GetIsDiffFilterChecked(enumDB_DIFF_REMOVED)%>></td>
 - 
 
761 
                              <td nowrap background="images/bg_action_norm.gif" class="form_field"><%=LIMG_REMOVED%>Removed</td>
 - 
 
762 
                            </tr>
 - 
 
763 
                            <tr>
 - 
 
764 
                              <td background="images/bg_action_norm.gif"><input type="checkbox" name="filter_comments" value="<%=enumDB_FILTER_COMMENTS%>" <%=GetIsDiffFilterChecked(enumDB_FILTER_COMMENTS)%>></td>
 - 
 
765 
                              <td nowrap background="images/bg_action_norm.gif" class="form_field">Comments</td>
 - 
 
766 
                            </tr>
 - 
 
767 
                            <tr>
 - 
 
768 
                              <td background="images/bg_action_norm.gif"><input type="checkbox" name="filter_issues" value="<%=enumDB_FILTER_ISSUES%>" <%=GetIsDiffFilterChecked(enumDB_FILTER_ISSUES)%>></td>
 - 
 
769 
                              <td nowrap background="images/bg_action_norm.gif" class="form_field">Issues</td>
 - 
 
770 
                            </tr>
 - 
 
771 
                            <tr>
 - 
 
772 
                              <td background="images/bg_action_norm.gif">&nbsp;</td>
 - 
 
773 
                              <td background="images/bg_action_norm.gif"><input name="btn" type="submit" class="form_btn" value="Hide"></td>
 - 
 
774 
                            </tr>
 - 
 
775 
                          </table>
 - 
 
776 
                        </div>
 - 
 
777 
                        </fieldset>
 - 
 
778 
                        <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 - 
 
779 
                    <%End If%>
 - 
 
780 
                    </td>
 - 
 
781 
                    <td></td>
 - 
 
782 
                  </tr>
 - 
 
783 
                </table>
 796 
                </table>
784 
 
 - 
 
785 
                <%
 797 
                <%
- 
 
 798 
                If genReport Then
786 
                Set FSO=Server.CreateObject("Scripting.FileSystemObject")
 799 
                    Set FSO=Server.CreateObject("Scripting.FileSystemObject")
787 
                Set NewTextFile=FSO.CreateTextFile(Server.MapPath("docs\compareBoms_"&objAccessControl.UserName&".html"), true)
 800 
                    NewTextFilePath = Server.MapPath("docs\compareBoms_"&objAccessControl.UserName&".html")
- 
 
 801 
                    Set NewTextFile=FSO.CreateTextFile(NewTextFilePath, true)
788 
                Call Header()
 802 
                    Call Header()
- 
 
 803 
                End If
789 
 
 804 
 
790 
                If (parRtagA <> "") AND (parRtagB <> "")Then%>
 805 
                If (parRtagA <> "") AND (parRtagB <> "")Then%>
791 
                <table width="100%"  border="0" cellspacing="1" cellpadding="0">
 806 
                <table width="100%"  border="0" cellspacing="1" cellpadding="0">
792 
                  <tr>
 807 
                  <tr>
793 
                    <td width="50%" bgcolor="#E4E9EC" class="body_row" nowrap><%= ReleaseIcon(objRelCollectorA.Item("official")) & objRelCollectorA.Item("location")%> </td>
 808 
                    <td width="50%" bgcolor="#E4E9EC" class="body_row" nowrap><%= ReleaseIcon(objRelCollectorA.Item("official")) & objRelCollectorA.Item("location")%> </td>
Line 832... Line 847...
832 
	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
 847 
	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
833 
	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_
 848 
	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_
834 
	"   AND b.BOM_ID ="&parSBOMB, cint(0))
 849 
	"   AND b.BOM_ID ="&parSBOMB, cint(0))
835 
 
 850 
 
836 
 
 851 
 
- 
 
 852 
                If genReport Then
837 
                NewTextFile.WriteLine("<title>Difference Report Between "&_
 853 
                    NewTextFile.WriteLine("<title>Difference Report Between "&_
838 
                            rsQryA("branch_name")&" "& rsQryA("location")&" and "&_
 854 
                                rsQryA("branch_name")&" "& rsQryA("location")&" and "&_
839 
                            rsQryB("branch_name")&" "& rsQryB("location")&_
 855 
                                rsQryB("branch_name")&" "& rsQryB("location")&_
840 
                            "</title>")
 856 
                                "</title>")
841 
                Call Javascript()
 857 
                    Call Javascript()
842 
                Call Styles()
 858 
                    Call Styles()
843 
                NewTextFile.WriteLine("</head>")
 859 
                    NewTextFile.WriteLine("</head>")
844 
                NewTextFile.WriteLine("<body>")
 860 
                    NewTextFile.WriteLine("<body>")
845 
                NewTextFile.WriteLine("<div class="&chr(34)&"page_title"&chr(34)&">Difference Report Between "&_
 861 
                    NewTextFile.WriteLine("<div class="&chr(34)&"page_title"&chr(34)&">Difference Report Between "&_
846 
                            rsQryA("proj_name") & " > " & rsQryA("branch_name")&" > "&rsQryA("location")&" and "&_
 862 
                                rsQryA("proj_name") & " > " & rsQryA("branch_name")&" > "&rsQryA("location")&" and "&_
847 
                            rsQryB("proj_name") & " > " & rsQryB("branch_name")&" > "&rsQryB("location")&_
 863 
                                rsQryB("proj_name") & " > " & rsQryB("branch_name")&" > "&rsQryB("location")&_
848 
                            "</div><br><br>")
 864 
                                "</div><br><br>")
- 
 
 865 
                End If
- 
 
 866 
 
- 
 
 867 
                Summary("<table style='border:1px solid black;border-collapse: collapse;'")
- 
 
 868 
                Summary("<tr>")
- 
 
 869 
                Summary("<td colspan=2 style='border: 1px solid black;'>"&rsQryA("proj_name") & " > " & rsQryA("branch_name")&" > "&rsQryA("location")&"</td>")
- 
 
 870 
                Summary("<td colspan=2 style='border: 1px solid black;'>"&rsQryB("proj_name") & " > " & rsQryB("branch_name")&" > "&rsQryB("location")&"</td>")
- 
 
 871 
                Summary("</tr>")
849 
 
 872 
 
- 
 
 873 
                If genReport Then
850 
                NewTextFile.WriteLine("<b>Toggle Sections:</b><blockquote>")
 874 
                    NewTextFile.WriteLine("<b>Toggle Sections:</b><blockquote>")
851 
                NewTextFile.WriteLine("<a href=""javascript:;"" onClick=""MM_toggleAll('divPkgInfo','1');"">Expand All</a>")
 875 
                    NewTextFile.WriteLine("<a href=""javascript:;"" onClick=""MM_toggleAll('divPkgInfo','1');"">Expand All</a>")
852 
                NewTextFile.WriteLine("<a href=""javascript:;"" onClick=""MM_toggleAll('divPkgInfo','');"">Collapse All</a>")
 876 
                    NewTextFile.WriteLine("<a href=""javascript:;"" onClick=""MM_toggleAll('divPkgInfo','');"">Collapse All</a>")
853 
                NewTextFile.WriteLine("</blockquote>")
 877 
                    NewTextFile.WriteLine("</blockquote>")
- 
 
 878 
                End If
854 
 
 879 
 
855 
                While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))
 880 
                While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))
856 
                VersionList = "0"
 881 
                    VersionList = "0"
857 
                errormsg = false
 882 
                    errormsg = false
858 
                    rowId = rsQry("pv_id_a") &"_"& rsQry("pv_id_b")
 883 
                    rowId = rsQry("pv_id_a") &"_"& rsQry("pv_id_b")
859 
 
 884 
 
860 
                    btnMerge = LIMG_MERGE
 885 
                    btnMerge = LIMG_MERGE
861 
                    btnRemove = LIMG_REMOVE
 886 
                    btnRemove = LIMG_REMOVE
862 
                    colorA = LCOLOR_NOT_CHANGED
 887 
                    colorA = LCOLOR_NOT_CHANGED
Line 900... Line 925...
900 
                        <input type="hidden" name="removepkg" id="REMOVEPKG_<%=rowId%>" value="">
 925 
                        <input type="hidden" name="removepkg" id="REMOVEPKG_<%=rowId%>" value="">
901 
                        <input type="hidden" id="UNDOPKG_<%=rowId%>" value="<%=rsQry("pkg_name_b") &" "& rsQry("pkg_version_b")%>">
 926 
                        <input type="hidden" id="UNDOPKG_<%=rowId%>" value="<%=rsQry("pkg_name_b") &" "& rsQry("pkg_version_b")%>">
902 
                    </td>
 927 
                    </td>
903 
                  </tr>
 928 
                  </tr>
904 
<%
 929 
<%
- 
 
 930 
    Summary("<tr>")
- 
 
 931 
    Summary("<td style='border: 1px solid black;'>"&rsQry("pkg_name_a")&"</td>")
- 
 
 932 
    Summary("<td style='border: 1px solid black;'>"&rsQry("pkg_version_a")&"</td>")
- 
 
 933 
    Summary("<td style='border: 1px solid black;'>"&rsQry("pkg_name_b")&"</td>")
- 
 
 934 
    Summary("<td style='border: 1px solid black;'>"&rsQry("pkg_version_b")&"</td>")
- 
 
 935 
    Summary("</tr>")
905 
    If genReport Then
 936 
    If genReport Then
906 
        If rsQry("pv_id_a") Then
 937 
        If rsQry("pv_id_a") Then
907 
            Set rsQryCommentsA = OraDatabase.DbCreateDynaset( "SELECT COMMENTS FROM PACKAGE_VERSIONS WHERE PV_ID="& rsQry("pv_id_a"), cint(0))
 938 
            Set rsQryCommentsA = OraDatabase.DbCreateDynaset( "SELECT COMMENTS FROM PACKAGE_VERSIONS WHERE PV_ID="& rsQry("pv_id_a"), cint(0))
908 
        End If
 939 
        End If
909 
 
 940 
 
Line 986... Line 1017...
986 
 
 1017 
 
987 
    rsQry.Close
 1018 
    rsQry.Close
988 
    Set rsQry = Nothing
 1019 
    Set rsQry = Nothing
989 
%>
 1020 
%>
990 
<%
 1021 
<%
- 
 
 1022 
    Summary("</table>")
- 
 
 1023 
    If genReport Then
991 
    Call Footer()
 1024 
        Call Footer()
992 
    NewTextFile.Close
 1025 
        NewTextFile.Close
993 
    Set NewTextFile=Nothing
 1026 
        Set NewTextFile=Nothing
- 
 
 1027 
    End If
994 
%>
 1028 
%>
995 
                </table>
 1029 
                </table>
996 
                <br>
 1030 
                <br>
997 
            <%Else%>
 1031 
            <%Else%>
998 
                <br>
 1032 
                <br>
Line 1031... Line 1065...
1031 
        <tr>
 1065 
        <tr>
1032 
          <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>
 1066 
          <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>
1033 
        </tr>
 1067 
        </tr>
1034 
        <tr>
 1068 
        <tr>
1035 
          <td align="left">
 1069 
          <td align="left">
1036 
          <select name="projB" class="form_item" onChange="RequestReleaseCombo( '?proj_id='+ this.value, FormName.rtagB );">
 1070 
          <select name="projB" class="form_item" onChange="RequestReleaseCombo( '?proj_id='+ this.value, FormName.rtagB, FormName.sbomB );">
1037 
              <option value="">-- Select Project --</option>
 1071 
              <option value="">-- Select Project --</option>
1038 
              <%
 1072 
              <%
1039 
              OraDatabase.Parameters.Add "PROJ_ID",     objRelCollectorB.Item("proj_id"),   ORAPARM_INPUT, ORATYPE_NUMBER
 1073 
              OraDatabase.Parameters.Add "PROJ_ID",     objRelCollectorB.Item("proj_id"),   ORAPARM_INPUT, ORATYPE_NUMBER
1040 
 
 1074 
 
1041 
              Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("ProjectsCombo.sql"), cint(0))
 1075 
              Set rsQry = OraDatabase.DbCreateDynaset( GetQuery("ProjectsCombo.sql"), cint(0))
Line 1124... Line 1158...
1124 
    </table>
 1158 
    </table>
1125 
</form>
 1159 
</form>
1126 
<%
 1160 
<%
1127 
If email Then
 1161 
If email Then
1128 
 
 1162 
 
1129 
    Dim myMail, LocalPath
 1163 
    Dim myMail
1130 
    Set myMail=Server.CreateObject("Persits.MailSender")
 1164 
    Set myMail=Server.CreateObject("Persits.MailSender")
1131 
    LocalPath = Server.MapPath("docs\compareBoms_"&objAccessControl.UserName&".html")
 - 
 
1132 
 
 1165 
 
1133 
    myMail.Host = SMTP_HOST
 1166 
    myMail.Host = SMTP_HOST
1134 
    myMail.Subject="BOM Comparisons from Deployment Manager"
 - 
 
1135 
    myMail.From="releasem@erggroup.com"
 1167 
    myMail.From="releasem@vixtechnology.com"
1136 
    myMail.AddAddress objAccessControl.UserEmail
 1168 
    myMail.AddAddress objAccessControl.UserEmail
1137 
    ' Attach the file
 1169 
    If genReport Then
1138 
    myMail.AddAttachment LocalPath
 1170 
    myMail.Subject="BOM Comparisons from Deployment Manager"
1139 
    myMail.Body = "Your requested report..."
 1171 
        myMail.Body = "Your requested report..."
- 
 
 1172 
        myMail.AddAttachment NewTextFilePath
- 
 
 1173 
    Else
- 
 
 1174 
    myMail.Subject="BOM Sumamry Comparisons from Deployment Manager"
- 
 
 1175 
        myMail.Body = summaryText
- 
 
 1176 
        myMail.IsHTML = True
- 
 
 1177 
    End If
1140 
    myMail.Send
 1178 
    myMail.Send
1141 
 
 1179 
 
1142 
    set myMail=nothing
 1180 
    set myMail=nothing
1143 
 
 1181 
 
1144 
End If
 1182 
End If