Subversion Repositories DevTools

Rev

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

Rev 4254 Rev 4553
Line 68... Line 68...
68
Const LIMG_MERGE = "<img src='images/bt_move_all_right.gif' title='Click to merge.' border='0'>"
68
Const LIMG_MERGE = "<img src='images/bt_move_all_right.gif' title='Click to merge.' border='0'>"
69
Const LIMG_MERGE_WARN = "<img src='images/bt_move_warn_right.gif' title='Right hand side version is newer.' border='0'>"
69
Const LIMG_MERGE_WARN = "<img src='images/bt_move_warn_right.gif' title='Right hand side version is newer.' border='0'>"
70
Const LIMG_REMOVE = "<img src='images/bt_remove.gif' title='Remove this version from release.' border='0'>"
70
Const LIMG_REMOVE = "<img src='images/bt_remove.gif' title='Remove this version from release.' border='0'>"
71
Const LIMG_UNDO = "<img src='images/bt_undo.gif' title='Undo merge/remove.' border='0'>"
71
Const LIMG_UNDO = "<img src='images/bt_undo.gif' title='Undo merge/remove.' border='0'>"
72
'------------ Variable Init -------------------
72
'------------ Variable Init -------------------
73
Set rsCQ = Server.CreateObject("ADODB.Recordset")
-
 
74
parRtagA = Request("rtagA")
73
parRtagA = Request("rtagA")
75
parRtagB = Request("rtagB")
74
parRtagB = Request("rtagB")
76
Set objRelCollectorA = CreateObject("Scripting.Dictionary")
75
Set objRelCollectorA = CreateObject("Scripting.Dictionary")
77
Set objRelCollectorB = CreateObject("Scripting.Dictionary")
76
Set objRelCollectorB = CreateObject("Scripting.Dictionary")
78
Set dDiffFilter = CreateObject("Scripting.Dictionary")
77
Set dDiffFilter = CreateObject("Scripting.Dictionary")
Line 366... Line 365...
366
 
365
 
367
End Function
366
End Function
368
'---------------------------------------------------------------------------------------------------------------------------
367
'---------------------------------------------------------------------------------------------------------------------------
369
Function  Get_CQ_Issues ( SSsql, OOrsCQ )
368
Function  Get_CQ_Issues ( SSsql, OOrsCQ )
370
 
369
 
371
    If OOrsCQ.State = 1 Then
-
 
372
        OOrsCQ.Close
-
 
373
    End If
-
 
374
 
-
 
375
    On Error Resume Next
370
    On Error Resume Next
376
    OOrsCQ.ActiveConnection = CQ_conn
371
    Set OOrsCQ = OraDatabase.DbCreateDynaset( SSsql, cint(0))
377
    OOrsCQ.Source = SSsql
-
 
378
    OOrsCQ.CursorType = 0
-
 
379
    OOrsCQ.CursorLocation = 2
-
 
380
    OOrsCQ.LockType = 3
-
 
381
    OOrsCQ.Open()
-
 
382
    Get_CQ_Issues = Err.Number
372
    Get_CQ_Issues = Err.Number
383
 
373
 
384
End Function
374
End Function
385
'--------------------------------------------------------------------------------------------------------------------------
375
'--------------------------------------------------------------------------------------------------------------------------
386
Public Function TextToHTML ( sString )
376
Public Function TextToHTML ( sString )