Subversion Repositories DevTools

Rev

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

Rev 5791 Rev 6370
Line 48... Line 48...
48 
Dim verNumber
 48 
Dim verNumber
49 
Dim parPkgName
 49 
Dim parPkgName
50 
Dim parRename
 50 
Dim parRename
51 
Dim rFile
 51 
Dim rFile
52 
Dim disableBuildType
 52 
Dim disableBuildType
- 
 
 53 
Dim bCanRenamePackage
- 
 
 54 
Dim parPkgId
53 
 
 55 
 
54 
'------------ Constants Declaration -----------
 56 
'------------ Constants Declaration -----------
55 
 
 57 
 
56 
'-----------------------------------------------------------------------------------------------------------------------------
 58 
'-----------------------------------------------------------------------------------------------------------------------------
57 
Sub GetPackageInfo( nPvId, outPkgInfo )
 59 
Sub GetPackageInfo( nPvId, outPkgInfo )
Line 97... Line 99...
97 
    "        DECODE ( pv.pv_id, "& nPv_id &", 'selected', NULL ) AS selected"&_
 99 
    "        DECODE ( pv.pv_id, "& nPv_id &", 'selected', NULL ) AS selected"&_
98 
    "    FROM PACKAGES pkg, package_versions pv"&_
 100 
    "    FROM PACKAGES pkg, package_versions pv"&_
99 
    "   WHERE pkg.pkg_id = pv.pkg_id  AND  pkg.pkg_id = "& NNpkg_id
 101 
    "   WHERE pkg.pkg_id = pv.pkg_id  AND  pkg.pkg_id = "& NNpkg_id
100 
End Function
 102 
End Function
101 
 
 103 
 
- 
 
 104 
'-----------------------------------------------------------------------------------------------------------------------------
- 
 
 105 
'   If there is exactly one version of this package, then it can be renamed
- 
 
 106 
'   Return 0 or 1
- 
 
 107 
'
- 
 
 108 
Function CanRenamePackage(NNpkg_id)
- 
 
 109 
    Dim rsTemp, Query_String, count
- 
 
 110 
    CanRenamePackage = 0
- 
 
 111 
 
- 
 
 112 
   Query_String = "select count(*) as count from package_versions where pkg_id=" & NNpkg_id
- 
 
 113 
 
- 
 
 114 
   Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
- 
 
 115 
 
- 
 
 116 
   If ((NOT rsTemp.BOF) AND (NOT rsTemp.EOF)) Then
- 
 
 117 
      count = rsTemp.Fields("count")
- 
 
 118 
      If count = 1 Then
- 
 
 119 
          CanRenamePackage = 1
- 
 
 120 
      End If
- 
 
 121 
   End If
- 
 
 122 
 
- 
 
 123 
   rsTemp.Close
- 
 
 124 
   Set rsTemp = nothing
- 
 
 125 
End Function
- 
 
 126 
 
102 
'-------------------------------------------------------------------------------------------------------------
 127 
'-------------------------------------------------------------------------------------------------------------
103 
' Returns TRUE if the specified version has a COTS extension
 128 
' Returns TRUE if the specified version has a COTS extension
104 
' Really determines if the extension has to be strict Major.Minor.PatchBuild
 129 
' Really determines if the extension has to be strict Major.Minor.PatchBuild
105 
' or is allowed to be more relaxes. As in COTS and TOOL packages.
 130 
' or is allowed to be more relaxes. As in COTS and TOOL packages.
106 
'
 131 
'
Line 235... Line 260...
235 
parPv_id = QStrPar("pv_id")
 260 
parPv_id = QStrPar("pv_id")
236 
parBase_view_id = Request("base_view_id")
 261 
parBase_view_id = Request("base_view_id")
237 
parPkgName = QStrPar("pkgName")
 262 
parPkgName = QStrPar("pkgName")
238 
parRename = QStrPar("renameMode")
 263 
parRename = QStrPar("renameMode")
239 
rFile = QStrPar("rFile")
 264 
rFile = QStrPar("rFile")
- 
 
 265 
bCanRenamePackage = 0
- 
 
 266 
parPkgId = 0
240 
If IsEmpty(rFile) OR rFile = "" Then
 267 
If IsEmpty(rFile) OR rFile = "" Then
241 
    rFile="dependencies.asp"
 268 
    rFile="dependencies.asp"
242 
End If
 269 
End If
243 
 
 270 
 
244 
newPackage = 0
 271 
newPackage = 0
Line 271... Line 298...
271 
    End If
 298 
    End If
272 
 
 299 
 
273 
    ' Package already exists
 300 
    ' Package already exists
274 
    Call GetPackageInfo( parPv_id, objPkgInfo )
 301 
    Call GetPackageInfo( parPv_id, objPkgInfo )
275 
    parPkgName = objPkgInfo.Item("pkg_name")
 302 
    parPkgName = objPkgInfo.Item("pkg_name")
- 
 
 303 
    If parRename <> 2 Then
- 
 
 304 
        parPkgId = objPkgInfo.Item("pkg_id")
- 
 
 305 
        bCanRenamePackage = CanRenamePackage(parPkgId)
- 
 
 306 
    End If
276 
 
 307 
 
277 
    ' Extract version number without extension
 308 
    ' Extract version number without extension
278 
    verNumber = objPkgInfo.Item("pkg_version")
 309 
    verNumber = objPkgInfo.Item("pkg_version")
279 
    verNumber = Mid( verNumber,1, Len(verNumber) - Len(objPkgInfo.Item("v_ext")))
 310 
    verNumber = Mid( verNumber,1, Len(verNumber) - Len(objPkgInfo.Item("v_ext")))
280 
 
 311 
 
Line 532... Line 563...
532 
// Purpose:
563 
// Purpose:
533 
//
 564 
//
534 
function checkPackage()
 565 
function checkPackage()
535 
{
 566 
{
536 
    var f = document.getElementById('NEWversion');
 567 
    var f = document.getElementById('NEWversion');
537 
    if ( f.newPackage.value > 0 )
 568 
    if ( f.newPackage.value > 0 || f.renamePackage.value > 0 )
538 
    {
 569 
    {
539 
        reseteMessage();
 570 
        reseteMessage();
540 
        MM_validateForm("--Silent",'FRpkgName','Package Name','RisPackage');
 571 
        MM_validateForm("--Silent",'FRpkgName','Package Name','RisPackage');
541 
        checkPackageHighlight( ! document.MM_returnValue, 'Name well formed', 'Invalid Characters in name');
 572 
        checkPackageHighlight( ! document.MM_returnValue, 'Name well formed', 'Invalid Characters in name');
542 
        if ( ! document.MM_returnValue ) return;
 573 
        if ( ! document.MM_returnValue ) return;
Line 565... Line 596...
565 
 
 596 
 
566 
        //Gather the results from the callback
 597 
        //Gather the results from the callback
567 
        var str = xmlHttp.responseText;
 598 
        var str = xmlHttp.responseText;
568 
        try {
 599 
        try {
569 
            var myJson = JSON.parse(str);
 600 
            var myJson = JSON.parse(str);
- 
 
 601 
            var f = document.getElementById('NEWversion');
- 
 
 602 
            var pkgId = f.FRpkgId.value;
- 
 
 603 
            if ( !(pkgId && myJson.result == pkgId)) {
570 
            checkPackageHighlight( myJson.result != 0, 'Name is unused', 'Package Exists');
 604 
                checkPackageHighlight(myJson.result != 0, 'Name is unused', 'Package Exists');
- 
 
 605 
            } else {
- 
 
 606 
                checkPackageHighlight(0, '', '');
- 
 
 607 
            }
571 
        }
 608 
        }
572 
        catch(e) {
 609 
        catch(e) {
573 
            checkPackageHighlight( 1, '','Error in AJAX operation');
 610 
            checkPackageHighlight( 1, '','Error in AJAX operation');
574 
        }
 611 
        }
575 
        MM_hideProgressBar();
 612 
        MM_hideProgressBar();
Line 779... Line 816...
779 
            + "&rtagId=" + document.all['rtag_id'].value
 816 
            + "&rtagId=" + document.all['rtag_id'].value
780 
            + "&pvId=" + document.all['OLDpv_id'].value
 817 
            + "&pvId=" + document.all['OLDpv_id'].value
781 
            + "&vExt=" + document.all['v_ext'].value
 818 
            + "&vExt=" + document.all['v_ext'].value
782 
            + "&Opr=updateVer";
 819 
            + "&Opr=updateVer";
783 
 
 820 
 
- 
 
 821 
    var f = document.getElementById('NEWversion');
- 
 
 822 
    if ( f.renamePackage.value > 0 ) {
- 
 
 823 
        url += "&Mode=1";
- 
 
 824 
    }
- 
 
 825 
 
- 
 
 826 
 
784 
    MM_showProgressBar();
 827 
    MM_showProgressBar();
785 
    xmlHttp.open("GET",url,false);          // `false` makes the request synchronous
 828 
    xmlHttp.open("GET",url,false);          // `false` makes the request synchronous
786 
    xmlHttp.send(null);
 829 
    xmlHttp.send(null);
787 
}
 830 
}
788 
 
 831 
 
Line 987... Line 1030...
987 
                              <table width="100%" border="0" cellspacing="1" cellpadding="5">
 1030 
                              <table width="100%" border="0" cellspacing="1" cellpadding="5">
988 
 
 1031 
 
989 
                                 <!-- Package Name -->
 1032 
                                 <!-- Package Name -->
990 
                                 <tr>
 1033 
                                 <tr>
991 
                                    <td background="images/bg_form_lightbluedark.gif" width="20%" class="form_field">Package Name</td>
 1034 
                                    <td background="images/bg_form_lightbluedark.gif" width="20%" class="form_field">Package Name</td>
992 
                                   <% if newPackage > 0 Then %>
 1035 
                                   <% if newPackage > 0 OR bCanRenamePackage > 0 Then %>
993 
                                        <td background="images/bg_form_lightgray.gif" class="form_item">
 1036 
                                        <td background="images/bg_form_lightgray.gif" class="form_item">
994 
                                          <input type="text" id="FRpkgName" name="FRpkgName" class="form_item" size="40" value="<%=parPkgName%>" onBlur="checkPackage()">
 1037 
                                          <input type="text" id="FRpkgName" name="FRpkgName" class="form_item" size="40" value="<%=parPkgName%>" onBlur="checkPackage()">
995 
                                          <span id="cpError"></span>
 1038 
                                          <span id="cpError"></span>
996 
                                        </td>
 1039 
                                        </td>
997 
                                    <% Else %>
 1040 
                                    <% Else %>
Line 1219... Line 1262...
1219 
                                 <input type="hidden" name="build_type" id="build_type" value="A">
 1262 
                                 <input type="hidden" name="build_type" id="build_type" value="A">
1220 
                                 <input type="hidden" name="FRnewver" id="FRnewver" value="hello">
 1263 
                                 <input type="hidden" name="FRnewver" id="FRnewver" value="hello">
1221 
                                 <input type="hidden" name="OLDpv_id" value="<%=parPv_id%>">
 1264 
                                 <input type="hidden" name="OLDpv_id" value="<%=parPv_id%>">
1222 
                                 <input type="hidden" name="rtag_id" value="<%=parRtag_id%>">
 1265 
                                 <input type="hidden" name="rtag_id" value="<%=parRtag_id%>">
1223 
                                 <input type="hidden" name="newPackage" value="<%=newPackage%>">
 1266 
                                 <input type="hidden" name="newPackage" value="<%=newPackage%>">
- 
 
 1267 
                                 <input type="hidden" name="renamePackage" value="<%=bCanRenamePackage%>">
- 
 
 1268 
                                 <input type="hidden" id="FRpkgId" name="FRpkgId" value="<%=parPkgId%>">
1224 
                                 <% if NOT (newPackage > 0) Then %>
 1269 
                                 <%If NOT ((newPackage > 0) OR bCanRenamePackage > 0) Then %>
1225 
                                 <input type="hidden" id="FRpkgName" name="FRpkgName" value="<%=parPkgName%>">
 1270 
                                 <input type="hidden" id="FRpkgName" name="FRpkgName" value="<%=parPkgName%>">
1226 
                                 <%End If%>
 1271 
                                 <%End If%>
- 
 
 1272 
 
1227 
                              </table>
 1273 
                              </table>
1228 
                           </td>
 1274 
                           </td>
1229 
                        </tr>
 1275 
                        </tr>
1230 
                        <tr>
 1276 
                        <tr>
1231 
                           <td width="1%">&nbsp;</td>
 1277 
                           <td width="1%">&nbsp;</td>