Subversion Repositories DevTools

Rev

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

Rev 6971 Rev 7022
Line 587... Line 587...
587 
                pkgInfoHash.Add "hasRippleInstr", 1
 587 
                pkgInfoHash.Add "hasRippleInstr", 1
588 
            End If
 588 
            End If
589 
            If  opCodeStr = OP_CODE_1_TEST_BUILD_PACKAGE  Then
 589 
            If  opCodeStr = OP_CODE_1_TEST_BUILD_PACKAGE  Then
590 
                pkgInfoHash.Add "hasTestInstr", 1
 590 
                pkgInfoHash.Add "hasTestInstr", 1
591 
            End If
 591 
            End If
- 
 
 592 
            If  opCodeStr = OP_CODE_2_FUTURE_BUILD  Then
- 
 
 593 
                pkgInfoHash.Add "hasFutureBuild", 1
- 
 
 594 
            End If
592 
         Next
 595 
         Next
593 
      End If
 596 
      End If
594 
 
 597 
 
595 
   Else     ' NOT isaRelease
 598 
   Else     ' NOT isaRelease
596 
      If pkgInfoHash.Exists ("modified_stamp") Then
 599 
      If pkgInfoHash.Exists ("modified_stamp") Then
Line 623... Line 626...
623 
      pkgInfoHash.Add "planned_operation", (rsTemp.Fields("operation"))
 626 
      pkgInfoHash.Add "planned_operation", (rsTemp.Fields("operation"))
624 
   Else
 627 
   Else
625 
      pkgInfoHash.Add "planned_operation", " "
 628 
      pkgInfoHash.Add "planned_operation", " "
626 
   End If
 629 
   End If
627 
 
 630 
 
- 
 
 631 
   ' Determine if we are building this package on any build machine
- 
 
 632 
   '
- 
 
 633 
   pkgInfoHash.Add "isBuilding", isBuilding(SSpv_id)
- 
 
 634 
 
- 
 
 635 
 
628 
   OraDatabase.Parameters.Remove "PV_ID"
 636 
   OraDatabase.Parameters.Remove "PV_ID"
629 
   OraDatabase.Parameters.Remove "RTAG_ID"
 637 
   OraDatabase.Parameters.Remove "RTAG_ID"
630 
   OraDatabase.Parameters.Remove "RETURN_NUMBER"
 638 
   OraDatabase.Parameters.Remove "RETURN_NUMBER"
631 
   OraDatabase.Parameters.Remove "OP_CODE_LIST"
 639 
   OraDatabase.Parameters.Remove "OP_CODE_LIST"
632
640
Line 1916... Line 1924...
1916 
         activeDaemonCount = rsTemp("Count")
 1924 
         activeDaemonCount = rsTemp("Count")
1917 
      End If
 1925 
      End If
1918 
      rsTemp.Close()
 1926 
      rsTemp.Close()
1919 
      set rsTemp = nothing
 1927 
      set rsTemp = nothing
1920 
   End If
 1928 
   End If
- 
 
 1929 
End Function
- 
 
 1930 
'----------------------------------------------------------------------------------------------------------------------
- 
 
 1931 
Function hasFutureBuild( NNrtag_id, NNpv_id )
- 
 
 1932 
   Dim rsTemp, Query_String
- 
 
 1933 
 
- 
 
 1934 
   hasFutureBuild = FALSE
- 
 
 1935 
 
- 
 
 1936 
   If NNrtag_id <> "" AND NNpv_id <> "" Then
- 
 
 1937 
 
- 
 
 1938 
      Query_String = " SELECT * FROM DAEMON_INSTRUCTIONS di WHERE di.RTAG_ID ="& NNrtag_id &" AND di.PV_ID ="& NNpv_id & " AND OP_CODE = " & OP_CODE_2_FUTURE_BUILD
1921 
 
 1939 
 
- 
 
 1940 
      Set rsTemp = OraDatabase.DbCreateDynaset(Query_String, cint(0))
- 
 
 1941 
      If rsTemp.RecordCount <> 0  Then
- 
 
 1942 
         hasFutureBuild = TRUE
- 
 
 1943 
      End If
- 
 
 1944 
      rsTemp.Close()
- 
 
 1945 
      set rsTemp = nothing
- 
 
 1946 
   End If
1922 
End Function
 1947 
End Function
- 
 
 1948 
 
- 
 
 1949 
'----------------------------------------------------------------------------------------------------------------------
- 
 
 1950 
Function isBuilding( NNpv_id )
- 
 
 1951 
   Dim rsTemp, Query_String
- 
 
 1952 
 
- 
 
 1953 
   isBuilding = FALSE
- 
 
 1954 
 
- 
 
 1955 
   If  NNpv_id <> "" Then
- 
 
 1956 
      Query_String = _
- 
 
 1957 
            "SELECT unique rl.CURRENT_PV_ID" &_
- 
 
 1958 
            " FROM RELEASE_CONFIG rc, RELEASE_TAGS rt, RUN_LEVEL rl " &_
- 
 
 1959 
            " WHERE rt.RTAG_ID = rc.RTAG_ID " &_
- 
 
 1960 
            "   AND rc.bmcon_id is not null" &_
- 
 
 1961 
            "   AND rt.OFFICIAL in ( 'N', 'R', 'C')" &_
- 
 
 1962 
            "   AND rl.RCON_ID(+) = rc.RCON_ID" &_
- 
 
 1963 
            "   AND rl.CURRENT_PKG_ID_BEING_BUILT is not null" &_
- 
 
 1964 
            "   AND NVL(rl.PAUSE,0) < 2" &_
- 
 
 1965 
            "   AND rl.CURRENT_PV_ID = " & NNpv_id
- 
 
 1966 
 
- 
 
 1967 
      Set rsTemp = OraDatabase.DbCreateDynaset(Query_String, cint(0))
- 
 
 1968 
      If rsTemp.RecordCount <> 0  Then
- 
 
 1969 
         isBuilding = TRUE
- 
 
 1970 
      End If
- 
 
 1971 
      rsTemp.Close()
- 
 
 1972 
      set rsTemp = nothing
- 
 
 1973 
   End If
- 
 
 1974 
End Function
- 
 
 1975 
 
1923 
'----------------------------------------------------------------------------------------------------------------------
 1976 
'----------------------------------------------------------------------------------------------------------------------
1924 
Function pv_id_exists( nPv_id )
 1977 
Function pv_id_exists( nPv_id )
1925 
   Dim rsTemp, Query_String
 1978 
   Dim rsTemp, Query_String
1926 
 
 1979 
 
1927 
   If NOT IsNull( nPv_id ) AND nPv_id <> "" Then
 1980 
   If NOT IsNull( nPv_id ) AND nPv_id <> "" Then