Subversion Repositories DevTools

Rev

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

Rev 4199 Rev 4203
Line 58... Line 58...
58 
    '
 58 
    '
59 
    ' If Manual then force change type to 'F'
 59 
    ' If Manual then force change type to 'F'
60 
    ' If Auto then ensure that the version number is of the correct form
 60 
    ' If Auto then ensure that the version number is of the correct form
61 
    if buildType = "M" then
61 
    if buildType = "M" then
62 
        changeType = "F"
 62 
        changeType = "F"
63 
    else
 - 
 
64 
        version=vExt
 - 
 
65 
    end if
 63 
    end if
66 
 
 64 
 
- 
 
 65 
    If changeType <> "F" Then
- 
 
 66 
        version=vExt
- 
 
 67 
    End If
- 
 
 68 
 
67 
    '
 69 
    '
68 
    '   Get existing data
 70 
    '   Get existing data
69 
    '       Test for package existence
 71 
    '       Test for package existence
70 
    '       Check for changes
 72 
    '       Check for changes
71 
    '
 73 
    '
Line 82... Line 84...
82 
    errMessage = OraDatabase.Parameters("errMessage").Value
 84 
    errMessage = OraDatabase.Parameters("errMessage").Value
83 
    OraDatabase.Parameters.Remove "NNpv_id"
 85 
    OraDatabase.Parameters.Remove "NNpv_id"
84 
    On Error GoTo 0
 86 
    On Error GoTo 0
85 
 
 87 
 
86 
    If NOT objEH.LastOraFailed Then
 88 
    If NOT objEH.LastOraFailed Then
87 
        Dim changed, typechange
 89 
        Dim changed
88 
        changed = 0
 90 
        changed = 0
89 
        typechange = 0
 - 
 
90 
 
 91 
 
91 
        If ((rsQry.BOF) OR (rsQry.EOF)) Then
 92 
        If ((rsQry.BOF) OR (rsQry.EOF)) Then
92 
            oJSON.data("emsgDetails") = "Package not found"
 93 
            oJSON.data("emsgDetails") = "Package not found"
93 
            oJSON.data("error") = 1
 94 
            oJSON.data("error") = 1
94 
        End If
 95 
        End If
95 
 
 96 
 
96 
        ' Detect changes
 97 
        ' Detect changes
97 
        '   version can only be tested if a Manually Versioned
 98 
        '   version can only be tested if a Manually Versioned
98 
        '
 99 
        '
99 
        If buildType = "M" AND rsQry("pkg_version") <> version Then changed = 1
 100 
        If changeType = "F" AND rsQry("pkg_version") <> version Then changed = 1
100 
        If rsQry("build_type") <> buildType Then changed = changed + 2
 101 
        If rsQry("build_type")  <> buildType Then changed = changed + 2
101 
        If rsQry("v_ext")       <> vExt Then changed = changed + 4
 102 
        If rsQry("v_ext")       <> vExt Then changed = changed + 4
102 
        If rsQry("change_type") <> changeType Then typechange = 3
 103 
        If rsQry("change_type") <> changeType Then changed = changed + 8
103 
 
 104 
 
104 
        If changed Then
 105 
        If changed Then
105 
            '
 106 
            '
106 
            '   Setup for the database access
 107 
            '   Setup for the database access
107 
            OraDatabase.Parameters.Add "RTAG_ID", rtagId, ORAPARM_INPUT, ORATYPE_NUMBER
 108 
            OraDatabase.Parameters.Add "RTAG_ID", rtagId, ORAPARM_INPUT, ORATYPE_NUMBER
108 
            OraDatabase.Parameters.Add "NNpv_id", pvId, ORAPARM_INPUT, ORATYPE_NUMBER
 109 
            OraDatabase.Parameters.Add "NNpv_id", pvId, ORAPARM_INPUT, ORATYPE_NUMBER
109 
            OraDatabase.Parameters.Add "SSpkg_version",  version,      ORAPARM_INPUT, ORATYPE_VARCHAR2
 110 
            OraDatabase.Parameters.Add "SSpkg_version",  version,      ORAPARM_INPUT, ORATYPE_VARCHAR2
110 
            OraDatabase.Parameters.Add "BUILD_TYPE", buildType, ORAPARM_INPUT, ORATYPE_CHAR
 111 
            OraDatabase.Parameters.Add "BUILD_TYPE", buildType, ORAPARM_INPUT, ORATYPE_CHAR
- 
 
 112 
            OraDatabase.Parameters.Add "CHANGE_TYPE", changeType, ORAPARM_INPUT, ORATYPE_CHAR
111 
            OraDatabase.Parameters.Add "NNuser_id", objAccessControl.UserId, ORAPARM_INPUT, ORATYPE_NUMBER
 113 
            OraDatabase.Parameters.Add "NNuser_id", objAccessControl.UserId, ORAPARM_INPUT, ORATYPE_NUMBER
112 
            OraDatabase.Parameters.Add "errMessage", 0, ORAPARM_OUTPUT, ORATYPE_VARCHAR2
 114 
            OraDatabase.Parameters.Add "errMessage", 0, ORAPARM_OUTPUT, ORATYPE_VARCHAR2
113 
 
 115 
 
114 
            SqlQry = "BEGIN Rename_Package_Version (:NNpv_id,:SSpkg_version,:BUILD_TYPE,:NNuser_id,:errMessage ); END;"
 116 
            SqlQry = "BEGIN Rename_Package_Version (:NNpv_id,:SSpkg_version,:BUILD_TYPE,:CHANGE_TYPE,:NNuser_id,:errMessage ); END;"
115 
            objEH.ErrorRedirect = FALSE
 117 
            objEH.ErrorRedirect = FALSE
116 
            objEH.TryORA ( OraSession )
 118 
            objEH.TryORA ( OraSession )
117 
            On Error Resume Next
 119 
            On Error Resume Next
118 
            OraDatabase.ExecuteSQL SqlQry
 120 
            OraDatabase.ExecuteSQL SqlQry
119 
            objEH.CatchORA ( OraSession )
 121 
            objEH.CatchORA ( OraSession )
Line 124... Line 126...
124 
            OraDatabase.Parameters.Remove "NNpv_id"
 126 
            OraDatabase.Parameters.Remove "NNpv_id"
125 
            OraDatabase.Parameters.Remove "SSpkg_version"
 127 
            OraDatabase.Parameters.Remove "SSpkg_version"
126 
            OraDatabase.Parameters.Remove "NNuser_id"
 128 
            OraDatabase.Parameters.Remove "NNuser_id"
127 
            OraDatabase.Parameters.Remove "errMessage"
 129 
            OraDatabase.Parameters.Remove "errMessage"
128 
            OraDatabase.Parameters.Remove "BUILD_TYPE"
 130 
            OraDatabase.Parameters.Remove "BUILD_TYPE"
129 
        End If
 - 
 
130 
 
 - 
 
131 
        ' Need to update the chnage type in a seperate operation
 - 
 
132 
        If NOT objEH.LastOraFailed Then
 - 
 
133 
            If typechange <> 0 Then
 - 
 
134 
                UpdateChangeType pvId, changeType
 131 
            OraDatabase.Parameters.Remove "CHANGE_TYPE"
135 
            End If
 - 
 
136 
            result = 0
 132 
            result = 0
137 
        End If
 133 
        End If
138 
 
 134 
 
139 
    rsQry.Close
 135 
    rsQry.Close
140 
    Set rsQry = Nothing
 136 
    Set rsQry = Nothing