Subversion Repositories DevTools

Rev

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

Rev 6970 Rev 6971
Line 46... Line 46...
46 
On Error Resume Next
 46 
On Error Resume Next
47 
If (parOpr = "getData") Then
 47 
If (parOpr = "getData") Then
48 
    getData
 48 
    getData
49 
ElseIf (parOpr = "mergeVersion") Then
 49 
ElseIf (parOpr = "mergeVersion") Then
50 
    mergeVersion
 50 
    mergeVersion
- 
 
 51 
ElseIf (parOpr = "getPackageInfo") Then
- 
 
 52 
    getPackageInfo
51 
 
 53 
 
52 
Else
 54 
Else
53 
    oJSON.data("error") = 1
 55 
    oJSON.data("error") = 1
54 
    oJSON.data("emsgSummary") = "Unknown JSON Operation"
 56 
    oJSON.data("emsgSummary") = "Unknown JSON Operation"
55 
    oJSON.data("emsgDetails") = "The Requested JSON operation is not supported: " & parOpr
 57 
    oJSON.data("emsgDetails") = "The Requested JSON operation is not supported: " & parOpr
Line 117... Line 119...
117 
'
 119 
'
118 
Sub mergeVersion
 120 
Sub mergeVersion
119 
    Dim OraParameter
 121 
    Dim OraParameter
120 
    Dim mode : mode =  QStrPar("mode")
 122 
    Dim mode : mode =  QStrPar("mode")
121 
 
 123 
 
- 
 
 124 
    If NOT releaseIsMergable(releaseInfoHash("official")) Then
- 
 
 125 
        result = -4
- 
 
 126 
        If NOT objAccessControl.UserLogedIn Then
- 
 
 127 
            oJSON.data("emsgSummary") = "User not logged in"
- 
 
 128 
        Else
- 
 
 129 
            oJSON.data("emsgSummary") = "Access not allowed"
- 
 
 130 
        End If
- 
 
 131 
        Exit Sub
- 
 
 132 
    End If
- 
 
 133 
 
122 
    OraDatabase.Parameters.Add "RTAG_ID", parRtagId, ORAPARM_INPUT, ORATYPE_NUMBER
 134 
    OraDatabase.Parameters.Add "RTAG_ID", parRtagId, ORAPARM_INPUT, ORATYPE_NUMBER
123 
    OraDatabase.Parameters.Add "NPV_ID",   QStrPar("npv_id"), ORAPARM_INPUT, ORATYPE_NUMBER
 135 
    OraDatabase.Parameters.Add "NPV_ID",   QStrPar("npv_id"), ORAPARM_INPUT, ORATYPE_NUMBER
124 
    OraDatabase.Parameters.Add "PV_ID",   QStrPar("pv_id"), ORAPARM_INPUT, ORATYPE_NUMBER
 136 
    OraDatabase.Parameters.Add "PV_ID",   QStrPar("pv_id"), ORAPARM_INPUT, ORATYPE_NUMBER
125 
    OraDatabase.Parameters.Add "VIEW_ID",  NULL, ORAPARM_BOTH, ORATYPE_NUMBER
 137 
    OraDatabase.Parameters.Add "VIEW_ID",  NULL, ORAPARM_BOTH, ORATYPE_NUMBER
126 
    OraDatabase.Parameters.Add "USER_ID",  objAccessControl.UserId, ORAPARM_INPUT, ORATYPE_NUMBER
 138 
    OraDatabase.Parameters.Add "USER_ID",  objAccessControl.UserId, ORAPARM_INPUT, ORATYPE_NUMBER
Line 243... Line 255...
243 
       rsQry.MoveNext
 255 
       rsQry.MoveNext
244 
    Wend
 256 
    Wend
245 
 
 257 
 
246 
End Sub
 258 
End Sub
247 
 
 259 
 
- 
 
 260 
'-------------------------------------------------
- 
 
 261 
' Function:    getPackageInfo
- 
 
 262 
' Description: Get basic Package info
- 
 
 263 
'              Requires pvid
- 
 
 264 
'
- 
 
 265 
' Returns:      pkgName
- 
 
 266 
'               pkgVersion
- 
 
 267 
'
- 
 
 268 
'
- 
 
 269 
Sub getPackageInfo
- 
 
 270 
    Dim entry
- 
 
 271 
    OraDatabase.Parameters.Add "PV_ID", QStrPar("pv_id"), ORAPARM_INPUT, ORATYPE_NUMBER
- 
 
 272 
 
- 
 
 273 
    SqlQry = "select p.pkg_name, pv.pkg_version from  packages p, package_versions pv where pv.pv_id = :PV_ID and pv.pkg_id = p.pkg_id"
- 
 
 274 
    objEH.ErrorRedirect = FALSE
- 
 
 275 
    objEH.TryORA ( OraSession )
- 
 
 276 
    On Error Resume Next
- 
 
 277 
    Set rsQry = OraDatabase.DbCreateDynaset( SqlQry, ORADYN_DEFAULT )
- 
 
 278 
    objEH.CatchORA ( OraSession )
- 
 
 279 
    On Error GoTo 0
- 
 
 280 
    If Err.Number = 0 Then
- 
 
 281 
        result = 0
- 
 
 282 
    End If
- 
 
 283 
 
- 
 
 284 
    Set entry  = oJSON.Collection()
- 
 
 285 
    Set oJSON.data("aaData") = entry
- 
 
 286 
    entry("pkg_name")= rsQry("PKG_NAME")
- 
 
 287 
    entry("pkg_version")= rsQry("PKG_VERSION")
- 
 
 288 
 
- 
 
 289 
	OraDatabase.Parameters.Remove "PV_ID"
- 
 
 290 
End Sub
248 
%>
 291 
%>