Subversion Repositories DevTools

Rev

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

Rev 5893 Rev 5895
Line 40... Line 40...
40 
'----------------------------------------------
 40 
'----------------------------------------------
41 
%>
 41 
%>
42 
<%
 42 
<%
43 
'
 43 
'
44 
'   Populate from a form
 44 
'   Populate from a form
45 
'       Assumes that items are seqentially numbered starting at 1
 45 
'       Assumes that items are seqentially numbered starting at 0
46 
Sub Populate_depArray_from_Import ( ARRdep, BBarray_is_empty )
 46 
Sub Populate_depArray_from_Import ( ARRdep, BBarray_is_empty )
47 
   Dim recCnt, pkg_name, pkg_version, build_type
 47 
   Dim recCnt, pkg_name, pkg_version, build_type
48 
 
 48 
 
49 
   recCnt=0
 49 
   recCnt=0
50 
   BBarray_is_empty = true
 50 
   BBarray_is_empty = true
51 
   Do While TRUE
 51 
   Do While TRUE
52 
       pkg_name = Request("btName" & recCnt + 1)
 52 
       pkg_name = Request("btName" & recCnt)
53 
       pkg_version = Request("pkgn" & recCnt + 1)
 53 
       pkg_version = Request("pkgn" & recCnt)
54 
       build_type = Request("bt" & recCnt + 1)
 54 
       build_type = Request("bt" & recCnt)
55
55
56 
          ' Proceed only if:
 56 
          ' Proceed only if:
57 
          '    pkg name is not empty,
 57 
          '    pkg name is not empty,
58 
          '    pkg version is not empty,
 58 
          '    pkg version is not empty,
59 
          If ( pkg_name <> "" )  AND  ( pkg_version <> "" ) Then
 59 
          If ( pkg_name <> "" )  AND  ( pkg_version <> "" ) Then
Line 108... Line 108...
108 
 
 108 
 
109 
   rsTemp.Close
 109 
   rsTemp.Close
110 
   Set rsTemp = nothing
 110 
   Set rsTemp = nothing
111 
End Sub
 111 
End Sub
112 
 
 112 
 
113 
// The form passed to us may only have information for packages that need to change
 - 
 
114 
// The enumlocal_DONOT_DELETE_OLD_DEPENDENCIES does not appear to work
 - 
 
115 
//  Must provide a full set of dependencies with either a new version or the existing version
 - 
 
116 
//
 - 
 
117 
Sub Populate_depArray_from_EDIT_Custom ( NNpv_id, ARRdep, BBarray_is_empty, sDependBlock )
 - 
 
118 
   Dim depList, lastItem, i, recCnt, pkg_name, pkg_version, V_EXT
 - 
 
119 
   Dim rsTemp, rsCurrent, Query_String
 - 
 
120 
 
 - 
 
121 
   Query_String = _
 - 
 
122 
   " SELECT dpkg.pkg_name, dpv.pkg_version, dpv.pv_id"&_
 - 
 
123 
   "  FROM package_dependencies dep,"&_
 - 
 
124 
   "       package_versions dpv,"&_
 - 
 
125 
   "       packages dpkg"&_
 - 
 
126 
   " WHERE dep.dpv_id = dpv.pv_id"&_
 - 
 
127 
   "   AND dpv.pkg_id = dpkg.pkg_id"&_
 - 
 
128 
   "   AND dep.pv_id = "& NNpv_id
 - 
 
129 
 
 - 
 
130 
   Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
 - 
 
131 
 
 - 
 
132 
   recCnt = 0
 - 
 
133 
   While ((NOT rsTemp.BOF) AND (NOT rsTemp.EOF))
 - 
 
134 
      Dim pvid, pkgver, newver
 - 
 
135 
      pvid = rsTemp("pv_id")
 - 
 
136 
      pkgver = Request( "pkgn" & pvid )
 - 
 
137 
 
 - 
 
138 
      If pkgver <> "" Then
 - 
 
139 
        newver = pkgver
 - 
 
140 
      else
 - 
 
141 
        newver = rsTemp("pkg_version")
 - 
 
142 
      End if
 - 
 
143 
 
 - 
 
144 
      ReDim Preserve ARRdep( 2, recCnt )
 - 
 
145 
      ARRdep( COL_pkg_name, recCnt )    = rsTemp("pkg_name")
 - 
 
146 
      ARRdep( COL_pkg_version, recCnt ) = newver
 - 
 
147 
      ARRdep( COL_build_type, recCnt )  = Request( "bt"& pvid )
 - 
 
148 
 
 - 
 
149 
      If not rsTemp("pkg_version") =  newver Then
 - 
 
150 
         sDependBlock = rsTemp("pkg_name") & " " & newver
 - 
 
151 
      End If
 - 
 
152 
 
 - 
 
153 
      recCnt = recCnt + 1
 - 
 
154 
      BBarray_is_empty = FALSE
 - 
 
155 
 
 - 
 
156 
      rsTemp.MoveNext
 - 
 
157 
   WEnd
 - 
 
158 
 
 - 
 
159 
   rsTemp.Close
 - 
 
160 
   Set rsTemp = nothing
 - 
 
161 
 
 - 
 
162 
End Sub
 - 
 
163 
 
 - 
 
164 
Sub Update_Package_Dependencies ( ARRdep, NNpv_id, NNuser_id, NNdelete_old_dependency, sAction_type, sDependBlock )
 113 
Sub Update_Package_Dependencies ( ARRdep, NNpv_id, NNuser_id, NNdelete_old_dependency, sAction_type, sDependBlock )
165 
   Dim i, OraParameter, sComments
 114 
   Dim i, OraParameter, sComments
166 
 
 115 
 
167 
   OraDatabase.Parameters.Add "PV_ID",            NNpv_id,                 ORAPARM_INPUT, ORATYPE_NUMBER
 116 
   OraDatabase.Parameters.Add "PV_ID",            NNpv_id,                 ORAPARM_INPUT, ORATYPE_NUMBER
168 
   OraDatabase.Parameters.Add "PKG_NAME",         "",                      ORAPARM_INPUT, ORATYPE_VARCHAR2
 117 
   OraDatabase.Parameters.Add "PKG_NAME",         "",                      ORAPARM_INPUT, ORATYPE_VARCHAR2
Line 201... Line 150...
201 
   End If
 150 
   End If
202 
 
 151 
 
203 
   OraDatabase.ExecuteSQL _
 152 
   OraDatabase.ExecuteSQL _
204 
   "BEGIN  Log_Action ( :PV_ID, :ACTION_TYPE_NAME, :USER_ID, :COMMENTS );  END;"
 153 
   "BEGIN  Log_Action ( :PV_ID, :ACTION_TYPE_NAME, :USER_ID, :COMMENTS );  END;"
205 
 
 154 
 
206 
 
 - 
 
207 
 
 - 
 
208 
   OraDatabase.Parameters.Remove "PV_ID"
 155 
   OraDatabase.Parameters.Remove "PV_ID"
209 
   OraDatabase.Parameters.Remove "PKG_NAME"
 156 
   OraDatabase.Parameters.Remove "PKG_NAME"
210 
   OraDatabase.Parameters.Remove "PKG_VERSION"
 157 
   OraDatabase.Parameters.Remove "PKG_VERSION"
211 
   OraDatabase.Parameters.Remove "BUILD_TYPE"
 158 
   OraDatabase.Parameters.Remove "BUILD_TYPE"
212 
   OraDatabase.Parameters.Remove "USER_ID"
 159 
   OraDatabase.Parameters.Remove "USER_ID"
Line 290... Line 237...
290 
 
 237 
 
291 
      If ((NOT array_is_empty) AND (Err.number = 0)) Then
 238 
      If ((NOT array_is_empty) AND (Err.number = 0)) Then
292 
         Call Update_Package_Dependencies ( depArray, Request("pv_id"), objAccessControl.UserId, enumlocal_DELETE_OLD_DEPENDENCIES, "depend_add", null )
 239 
         Call Update_Package_Dependencies ( depArray, Request("pv_id"), objAccessControl.UserId, enumlocal_DELETE_OLD_DEPENDENCIES, "depend_add", null )
293 
      End If
 240 
      End If
294 
 
 241 
 
295 
 
 - 
 
296 
   ElseIf Request("update_type") = "edit_custom" Then
 - 
 
297 
      '---- EDIT CUSTOM dependency ----
 - 
 
298 
      Call Populate_depArray_from_EDIT_Custom ( Request("pv_id"), depArray, array_is_empty, sDependBlock )
 - 
 
299 
      Call Remove_Old_Dependencies ( Request("pv_id") )
 - 
 
300 
 
 - 
 
301 
      If ((NOT array_is_empty) AND (Err.number = 0)) Then
 - 
 
302 
         Call Update_Package_Dependencies ( depArray, Request("pv_id"), objAccessControl.UserId, enumlocal_DONOT_DELETE_OLD_DEPENDENCIES, "depend_update", sDependBlock )
 - 
 
303 
      End If
 - 
 
304 
 
 - 
 
305 
 
 - 
 
306 
   ElseIf Request("update_type") = "edit_import" Then
 242 
   ElseIf Request("update_type") = "edit_import" Then
307 
      '-- JATS,ANT dependency import after being edited
 243 
      '-- JATS,ANT dependency import after being edited
308 
      Call Populate_depArray_from_Import ( depArray, array_is_empty )
 244 
      Call Populate_depArray_from_Import ( depArray, array_is_empty )
309 
      Call Remove_Old_Dependencies ( Request("pv_id") )
 245 
      Call Remove_Old_Dependencies ( Request("pv_id") )
310 
 
 246