WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/web/common/common_subs.asp

    ' Handle not logged in
    Dim UserId : UserId = -1
    If objAccessControl.UserLogedIn Then UserId = objAccessControl.UserId
-   Query_String = "SELECT rt.RTAG_ID ,rt.rtag_name, proj.proj_id, proj.proj_name,rt.lxr, rt.official, NVL(lx.lxrserver, 'N') as lxrserver, NVL(rt.s3Sync, 'N') as s3Sync," &_
+   Query_String = "SELECT rt.RTAG_ID ,rt.rtag_name, proj.proj_id, proj.proj_name,rt.lxr, rt.official, NVL(lx.lxrserver, 'N') as lxrserver, NVL(rt.S3MANIFEST, 'N') as S3MANIFEST," &_
-                  "  CASE when (TRUNC(SYSDATE - rt.created_stamp) <= 20) AND rt.creator_id = "& UserId & " THEN 1 ELSE 0 END as userCanDelete" &_
+                  "  CASE when (TRUNC(SYSTIMESTAMP) - TRUNC(rt.created_stamp) <= 20) AND rt.creator_id = "& UserId & " THEN 1 ELSE 0 END as userCanDelete" &_
                   "  FROM Release_tags rt, projects proj, lxr_state lx" &_
                   "  WHERE rt.RTAG_ID = lx.RTAG_ID(+)" &_
                   "  AND rt.proj_id = proj.proj_id" &_
                   "  AND rt.RTAG_ID = " & NNrtag_id
               pkgInfoHash.Add "is_pegged", (rsTemp.Fields("pegged") <> 0)
               pkgInfoHash.Add "ripple_stop", rsTemp.Fields("ripple_stop")
               pkgInfoHash.Add "persist_ripple_stop", rsTemp.Fields("persist_ripple_stop")
               pkgInfoHash.Add "advisory_ripple", rsTemp.Fields("advisory_ripple") <> 0
+              pkgInfoHash.Add "inManifest", rsTemp.Fields("inManifest")
+              pkgInfoHash.Add "s3ManifestEnabled", rsTemp.Fields("s3manifestEnabled")
            Else
               ' -- Package Version is not a released member of the specified release
               '    Get Basic Release and Project Details
               Query_String = " select pj.PROJ_ID, rt.RTAG_ID,rt.rtag_name " &_
                              " from projects pj, release_tags rt" &_
               Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
               If ((NOT rsTemp.BOF) AND (NOT rsTemp.EOF)) Then
                   pkgInfoHash.Add "proj_id",   (rsTemp.Fields("proj_id"))
-              	  pkgInfoHash.Add "rtag_id",   (rsTemp.Fields("rtag_id"))
+                  pkgInfoHash.Add "rtag_id",   (rsTemp.Fields("rtag_id"))
-              	  pkgInfoHash.Add "rtag_name", (rsTemp.Fields("rtag_name"))
+                  pkgInfoHash.Add "rtag_name", (rsTemp.Fields("rtag_name"))
               End If
               ' -- Determine if package is a member of this release and determine base view
-    		  '    May be a WIP or PENDIND or not in the release ( Won't get here if its releases)
+              '    May be a WIP or PENDIND or not in the release ( Won't get here if its releases)
               '    Mark as Not in Release
               Query_String = "select wip.pv_id, wip.view_id as view_id, vi.view_name, 0 as env_area from work_in_progress wip, views vi where rtag_id=:RTAG_ID and pv_id=:PV_ID and vi.view_id = wip.view_id" &_
                               " union" &_
                               " select pp.pv_id, pp.view_id  as view_id, vi.view_name, 1 as env_area from planned pp, views vi where rtag_id=:RTAG_ID and pv_id=:PV_ID and vi.view_id = pp.view_id" &_
                               " union" &_
+              '
               ' -- Determine related package that is in the release
               '    Use pkg_id and v_ext to locate package
               If pkgInfoHash.Item ("pkg_id") <> "" Then
                  Query_String = "SELECT pv.PV_ID, vi.view_name" &_
-              				  " FROM RELEASE_CONTENT rc, package_versions pv, views vi" &_
+                        " FROM RELEASE_CONTENT rc, package_versions pv, views vi" &_
-              				  " WHERE rc.rtag_id = :RTAG_ID" &_
+                        " WHERE rc.rtag_id = :RTAG_ID" &_
-              				  " and rc.PV_ID = pv.pv_id" &_
+                        " and rc.PV_ID = pv.pv_id" &_
-    						  " and vi.view_id = rc.base_view_id" &_
+                        " and vi.view_id = rc.base_view_id" &_
-              				  " and pv.pkg_id = " & pkgInfoHash.Item ("pkg_id") &_
+                        " and pv.pkg_id = " & pkgInfoHash.Item ("pkg_id") &_
-              				  " and NVL(pv.v_ext,'') = NVL('"&pkgInfoHash.Item ("v_ext")&"', '')"
+                        " and NVL(pv.v_ext,'') = NVL('"&pkgInfoHash.Item ("v_ext")&"', '')"
                  Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
                  If rsTemp.RecordCount > 0 Then
-              		pkgInfoHash.Item ("pv_id_InRelease") = (rsTemp.Fields("pv_id"))
+                  pkgInfoHash.Item ("pv_id_InRelease") = (rsTemp.Fields("pv_id"))
                     'pkgInfoHash.Remove ("base_view_id")
                     pkgInfoHash.Item ("release_view_name") = (rsTemp.Fields("view_name"))
                  End If
               End If
    OraDatabase.Parameters.Remove "OP_CODE_LIST"
 End Sub
 '-----------------------------------------------------------------------------------------------------------------------------
-'	Add information to the pkgInfoHash describing the S3 Sync
-'	Added only when required
-'	Assumes that Get_Pkg_Info has already been called
-'	Calculate:
-'		s3Sync - This package in this release is marked for S3Sync
-'   	s3SyncEnabled - This Release has s3 sync enabled
-'		s3SyncContent - This version of the package appears to have S3Sync content
-Sub Get_Pkg_Info_s3Sync ()
-	Dim Query_String, rsTemp, pvidInRelease
-	pkgInfoHash.Add "s3Sync", "N"
-	pkgInfoHash.Add "s3SyncEnabled", "N"
-	pkgInfoHash.Add "s3SyncContent", "N"
-	If pkgInfoHash.Item ("isaRelease") Then
-		'	Use the base package in a Release if this is a WIP or in Pending
-		'	as the property will be inherited when the package is updated
-		'
-		pvidInRelease = pkgInfoHash.Item ("pv_id_InRelease")
-		If pvidInRelease = "" Then
-			pvidInRelease = pkgInfoHash.Item ("pv_id")
-		End If
-		OraDatabase.Parameters.Add "PV_ID",         pvidInRelease,    ORAPARM_INPUT, ORATYPE_NUMBER
-		OraDatabase.Parameters.Add "RTAG_ID",       pkgInfoHash.Item ("rtag_id"),  ORAPARM_INPUT, ORATYPE_NUMBER
-		  Query_String = _
-            "SELECT NVL(RC.S3SYNC, 'N') AS S3SYNC, NVL(RT.S3SYNC, 'N') AS S3SYNCENABLED, NVL2(S3.PV_ID, 'Y', 'N') AS S3SYNCCONTENT " &_
-            " FROM RELEASE_CONTENT RC, RELEASE_TAGS RT, ( " &_
-            "    SELECT RCP.* " &_
-            "    FROM RELEASE_COMPONENTS   RCP, RELEASE_CONTENT RC " &_
-            "    WHERE RC.RTAG_ID = :RTAG_ID " &_
-            "          AND RC.PV_ID = RCP.PV_ID " &_
-            "          AND RC.PV_ID = :PV_ID " &_
-            "          AND RCP.FILE_NAME = 's3Transfer.json' " &_
-            "          AND RCP.FILE_PATH IS NULL " &_
-            ") S3 " &_
-            " WHERE RC.RTAG_ID = rt.RTAG_ID " &_
-            "      AND RC.PV_ID = :PV_ID " &_
-            "      AND rt.RTAG_ID = :RTAG_ID " &_
-            "      AND S3.PV_ID (+) = RC.PV_ID "
-		  Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
-		  If rsTemp.RecordCount > 0 Then
-			pkgInfoHash.Item ("s3Sync") = (rsTemp.Fields("s3Sync"))
-			pkgInfoHash.Item ("s3SyncEnabled") = (rsTemp.Fields("s3SyncEnabled"))
-			pkgInfoHash.Item ("s3SyncContent") = (rsTemp.Fields("s3SyncContent"))
-		  End If
-		OraDatabase.Parameters.Remove "PV_ID"
-		OraDatabase.Parameters.Remove "RTAG_ID"
-		rsTemp.Close
-		Set rsTemp = nothing
-	End If
-End Sub
-'-----------------------------------------------------------------------------------------------------------------------------
 ' Get Package Info - when we don't have a package
 Sub Get_NoPkg_Info(NNrtag)
 	Dim rsTemp, Query_String
 	OraDatabase.Parameters.Add "RTAG_ID", 		NNrtag,		ORAPARM_INPUT, ORATYPE_NUMBER
         RenderLxrStateString = "<a class=mmItem href='"&lxrUrl&"' title='"&hover&"'><img src=""images/"&image&""" height=16 border=0 vspace=0 hspace=0 style='vertical-align : bottom'>" & txt &"</a>"
     End If
 End Function
 '-------------------------------------------------
-' Function:         RenderS3SyncStateString
+' Function:         RenderS3ManifestStateString
-' Description:      Return a string to show the current S3 Sync state
+' Description:      Return a string to show the current S3 Manifest Processing state
-Function RenderS3SyncStateString(rtagid, s3Sync, official, txt)
+Function RenderS3ManifestStateString(rtagid, s3Manifest, official, txt)
-    If s3Sync = "N" Then
+    If s3Manifest = "N" Then
-        RenderS3SyncStateString = ""
+        RenderS3ManifestStateString = ""
     Else
-        Dim image, hover, iClass
+        Dim image, hover, iClass, iStyle
-		iClass = ""
+        iClass = ""
+        iStyle = ""
-        If releaseIsClosed(official) Then s3Sync = "A"
+        If releaseIsClosed(official) Then s3Manifest = "A"
-        Select Case s3Sync
+        Select Case s3Manifest
             Case "Y"
                 image = "AmazonS3.png"
-                hover = "S3 Sync Active"
+                hover = "Manifest Generation to S3 Active"
             Case "N"
                 image = "AmazonS3.png"
-                hover = "S3 Sync not enabled"
+                hover = "Manifest Generation to S3 Active not enabled"
             Case "A"
                 image = "AmazonS3.png"
-                hover = "S3 Sync not active. Release is no longer open"
+                hover = "Manifest Generation to S3 Active not active. Release is no longer open"
                 iClass = "class=lessOpacity"
             Case Else
-                image = "LXRlogo64_progress.jpeg"
+                image = "AmazonS3.png"
-                hover = "S3Sync unknown State:(" & s3Sync &")"
+                hover = "Manifest Generation unknown State:(" & s3Manifest &")"
+                iStyle = " filter: grayscale(1);"
         End Select
-        RenderS3SyncStateString = "<span title='"&hover&"'><img "& iClass &" src=""images/"&image&""" height=16 border=0 vspace=0 hspace=0 style='vertical-align : bottom'>" & txt & "</span>"
+        RenderS3ManifestStateString = "<span title='"&hover&"'><img "& iClass &" src=""images/"&image&""" height=16 border=0 vspace=0 hspace=0 style='vertical-align : bottom;"& iStyle &"'>" & txt & "</span>"
     End If
 End Function
 '-------------------------------------------------

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/web/common/common_subs.asp – Rev 7417 → 7468