Subversion Repositories DevTools

Rev

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

Rev 2636 Rev 2731
Line 461... Line 461...
461 
   OraDatabase.Parameters.Remove "PV_ID"
 461 
   OraDatabase.Parameters.Remove "PV_ID"
462 
End Sub
 462 
End Sub
463 
 
 463 
 
464 
'---------------------------------------------------------------
 464 
'---------------------------------------------------------------
465 
' Returns the jats extraction commands
 465 
' Returns the jats extraction commands
466 
Sub Jats_Extract_Command (ByRef sjats_cmds(), ByRef ajats_cmd_test, ByRef sjats_cmds_qh)
 466 
Sub Jats_Extract_Command (ByRef sjats_cmds(), ByRef ajats_cmd_test, ByRef sjats_cmds_qh, ByRef sjats_extractable)
467 
   Dim dlocked: dlocked = pkgInfoHash.Item("dlocked")
 467 
   Dim dlocked: dlocked = pkgInfoHash.Item("dlocked")
468 
   Dim pkg_vcs_tag: pkg_vcs_tag = Get_Pkg_Vcs_Tag(Request("pv_id"))
 468 
   Dim pkg_vcs_tag: pkg_vcs_tag = Get_Pkg_Vcs_Tag(Request("pv_id"))
469 
   Dim ii: ii = -1
 469 
   Dim ii: ii = -1
470 
   Dim baseCmd
 470 
   Dim baseCmd
- 
 
 471 
   sjats_extractable = false
471 
 
 472 
 
472 
   ' if not released then use last package version vcs tag and branch else use current vcs tag
 473 
   ' if not released then use last package version vcs tag and branch else use current vcs tag
473 
   If dlocked <> "Y" Then
 474 
   If dlocked <> "Y" Then
474 
     ' not released, so get last package version id
 475 
     ' not released, so get last package version id
475 
 
 476 
 
Line 486... Line 487...
486 
 
 487 
 
487 
         ' ClearCase extraction may get a project specific branch appended
 488 
         ' ClearCase extraction may get a project specific branch appended
488 
         ' This will be used to automatically branch the files in the package
 489 
         ' This will be used to automatically branch the files in the package
489 
         '
 490 
         '
490 
         If (VcsType = "CC") Then
 491 
         If (VcsType = "CC") Then
- 
 
 492 
             sjats_extractable = true
491 
             Call Query_Config_Spec (Request("rtag_id"), last_pv_id)
 493 
             Call Query_Config_Spec (Request("rtag_id"), last_pv_id)
492 
             Dim config_branch: config_branch = rsQry("config_spec_branch")
 494 
             Dim config_branch: config_branch = rsQry("config_spec_branch")
493 
             If NOT IsNull(config_branch) AND (config_branch <> "") Then
 495 
             If NOT IsNull(config_branch) AND (config_branch <> "") Then
494 
                 ii = ii+1 : sjats_cmds(ii) = baseCmd & " -branch " & config_branch
 496 
                 ii = ii+1 : sjats_cmds(ii) = baseCmd & " -branch " & config_branch
495 
             End If
 497 
             End If
496 
         End If
 498 
         End If
497 
 
 499 
 
498 
         If (VcsType = "SVN") Then
 500 
         If (VcsType = "SVN") Then
- 
 
 501 
            sjats_extractable = true
499 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Tag"
 502 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Tag"
500 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Tip"
 503 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Tip"
501 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Work"
 504 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Work"
502 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Exact"
 505 
            ii = ii+1 : sjats_cmds(ii) = baseCmd & " -devMode=Exact"
503 
         End If
 506 
         End If
Line 507... Line 510...
507 
 
 510 
 
508 
     baseCmd =  "jats vcsrelease -extract -label """ & pkg_vcs_tag & """"
 511 
     baseCmd =  "jats vcsrelease -extract -label """ & pkg_vcs_tag & """"
509 
     ii = ii+1 : sjats_cmds(ii) = baseCmd
 512 
     ii = ii+1 : sjats_cmds(ii) = baseCmd
510
513
511 
   Else
 514 
   Else
512 
     ' released
 515 
    ' released
- 
 
 516 
    sjats_cmds_qh = vcsInfoCollector.Item("vcs_tag")
- 
 
 517 
 
- 
 
 518 
    if ( sjats_cmds_qh = "CC" OR sjats_cmds_qh = "SVN" ) Then
- 
 
 519 
        sjats_extractable = true
513 
     baseCmd =  "jats vcsrelease -extract -label """ & pkg_vcs_tag & """"
 520 
        baseCmd =  "jats vcsrelease -extract -label """ & pkg_vcs_tag & """"
514 
     ii = ii+1 : sjats_cmds(ii) = baseCmd
 521 
        ii = ii+1 : sjats_cmds(ii) = baseCmd
- 
 
 522 
    Else
515 
     sjats_cmds_qh = vcsInfoCollector.Item("vcs_tag")
 523 
        baseCmd =  "Cannot be extracted with JATS"
- 
 
 524 
        ii = ii+1 : sjats_cmds(ii) = baseCmd
- 
 
 525 
    End If
516 
 
 526 
 
517 
   End If
 527 
   End If
518 
 
 528 
 
519 
   ' Test Command
 529 
   ' Test Command
- 
 
 530 
   if sjats_extractable Then
520 
   ajats_cmd_test = "jats vcsrelease -test -label """ & pkg_vcs_tag & """"
 531 
        ajats_cmd_test = "jats vcsrelease -test -label """ & pkg_vcs_tag & """"
- 
 
 532 
   Else
- 
 
 533 
        ajats_cmd_test = "Cannot be extracted with JATS"
- 
 
 534 
   End If
521 
 
 535 
 
522 
   ReDim Preserve sjats_cmds(ii)
 536 
   ReDim Preserve sjats_cmds(ii)
523 
   rsQry.Close()
 537 
   rsQry.Close()
524 
   Set rsQry = nothing
 538 
   Set rsQry = nothing
525 
 
 539 
 
Line 870... Line 884...
870 
               <%End If%>
 884 
               <%End If%>
871 
            </td>
 885 
            </td>
872 
         </tr>
 886 
         </tr>
873 
      <%End If%>
 887 
      <%End If%>
874 
 
 888 
 
- 
 
 889 
      <%
- 
 
 890 
      ' Get JATS extraction commands
- 
 
 891 
      Dim  sjats_cmd_test, sjats_cmds_qh, sjats_extractable
- 
 
 892 
      ReDim sjats_cmds(6)
- 
 
 893 
      call Jats_Extract_Command(sjats_cmds, sjats_cmd_test, sjats_cmds_qh, sjats_extractable)
- 
 
 894 
      %>
- 
 
 895 
 
- 
 
 896
875 
      <%If IsNull(pkgInfoHash.Item ("is_patch")) Then%>
 897 
      <%If IsNull(pkgInfoHash.Item ("is_patch")) Then%>
876 
         <tr>
 898 
         <tr>
877 
            <td width="20%" bgcolor=#e4e9ec class="sublbox_txt">
 899 
            <td width="20%" bgcolor=#e4e9ec class="sublbox_txt">
878 
            <%
 900 
            <%
879 
            ' Previous Version
 901 
            ' Previous Version
Line 912... Line 934...
912 
                    <tr class="sublbox_txt">
 934 
                    <tr class="sublbox_txt">
913 
                      <td width=15% colspan=2 nowrap class="sublbox_txt">
 935 
                      <td width=15% colspan=2 nowrap class="sublbox_txt">
914 
                        <%=sprevious_version_value%>
 936 
                        <%=sprevious_version_value%>
915 
                      </td>
 937 
                      </td>
916 
                      <td colspan="2" nowrap class="sublbox_txt">
 938 
                      <td colspan="2" nowrap class="sublbox_txt">
- 
 
 939 
                      <% If sjats_extractable Then
- 
 
 940 
                        response.write( NewLine_To_BR ( To_HTML(slast_vcs_tag) ))
- 
 
 941 
                      Else
- 
 
 942 
                        response.write("Cannot be extracted with JATS")
- 
 
 943 
                      End If
917 
                        <%=NewLine_To_BR ( To_HTML(slast_vcs_tag) )%><%=Quick_Help ( "PreviousVcsTag" )%>
 944 
                      response.write(Quick_Help ( "PreviousVcsTag" ))
- 
 
 945 
                      %>
918 
                      </td>
 946 
                      </td>
919 
                    </tr>
947 
                    </tr>
920 
                  </table>
 948 
                  </table>
921 
                </td>
 949 
                </td>
922 
         </tr>
 950 
         </tr>
Line 940... Line 968...
940 
                <tr class="sublbox_txt">
 968 
                <tr class="sublbox_txt">
941 
                  <td width=15% colspan=2 nowrap class="sublbox_txt">
 969 
                  <td width=15% colspan=2 nowrap class="sublbox_txt">
942 
                    <%=old_previous_version_value%>
 970 
                    <%=old_previous_version_value%>
943 
                  </td>
 971 
                  </td>
944 
                  <td colspan=2 nowrap class="sublbox_txt">
 972 
                  <td colspan=2 nowrap class="sublbox_txt">
- 
 
 973 
                      <% If sjats_extractable Then
- 
 
 974 
                        response.write( NewLine_To_BR ( To_HTML(old_pkg_vcs_tag) ))
- 
 
 975 
                      Else
- 
 
 976 
                        response.write("Cannot be extracted with JATS")
- 
 
 977 
                      End If
945 
                    <%=old_pkg_vcs_tag%><%=Quick_Help ( "PreviousSignificantVcsTag" )%>
 978 
                      response.write(Quick_Help ( "PreviousSignificantVcsTag" ))
- 
 
 979 
                      %>
946 
                  </td>
 980 
                  </td>
947 
                </tr>
 981 
                </tr>
948 
              </table>
 982 
              </table>
949 
            </td>
 983 
            </td>
950 
         </tr>
 984 
         </tr>
951 
      <%End If%>
 985 
      <%End If%>
952 
 
 986 
 
953 
      <tr>
 987 
      <tr>
954 
         <%
 - 
 
955 
         ' Get JATS extraction commands
 - 
 
956 
         Dim  sjats_cmd_test, sjats_cmds_qh
 - 
 
957 
         ReDim sjats_cmds(6)
 - 
 
958 
         call Jats_Extract_Command(sjats_cmds, sjats_cmd_test, sjats_cmds_qh)
 - 
 
959 
         %>
 - 
 
960 
         <td width="20%" bgcolor=#e4e9ec class="sublbox_txt" valign="top">
 988 
         <td width="20%" bgcolor=#e4e9ec class="sublbox_txt" valign="top">
961 
           <strong>JATS extraction commands:</strong>
 989 
           <strong>JATS extraction commands:</strong>
962 
                <%=Quick_Help ( "JatsExtraction_" & sjats_cmds_qh )%>
 990 
                <%=Quick_Help ( "JatsExtraction_" & sjats_cmds_qh )%>
963 
         </td>
 991 
         </td>
964 
         <td>
 992 
         <td>
Line 993... Line 1021...
993 
 
 1021 
 
994 
      If (IsNull(prevVcsTag) OR prevVcsTag = "" ) Then
 1022 
      If (IsNull(prevVcsTag) OR prevVcsTag = "" ) Then
995 
            sBcCmd = "No prior label to compare against"
 1023 
            sBcCmd = "No prior label to compare against"
996 
      ElseIf (IsNull(curVcsTag) OR curVcsTag = "" ) Then
 1024 
      ElseIf (IsNull(curVcsTag) OR curVcsTag = "" ) Then
997 
            sBcCmd = "Current VCS tag not yet specified"
 1025 
            sBcCmd = "Current VCS tag not yet specified"
- 
 
 1026 
      ElseIf (not sjats_extractable) Then
- 
 
 1027 
            sBcCmd = "Cannot be extracted with JATS"
998 
      Else
 1028 
      Else
999 
            sBcCmd = "jats vcsdiff -old=" & prevVcsTag & " -new=" & curVcsTag
 1029 
            sBcCmd = "jats vcsdiff -old=" & prevVcsTag & " -new=" & curVcsTag
1000 
 
 - 
 
1001 
      End If
 1030 
      End If
1002 
      sBcCmd = NewLine_To_BR( To_HTML (sBcCmd) )
 1031 
      sBcCmd = NewLine_To_BR( To_HTML (sBcCmd) )
1003 
 
 1032 
 
1004 
      ' Codestriker commands - Only for ClearCase
 1033 
      ' Codestriker commands - Only for ClearCase
1005 
      Dim sCsCmd
 1034 
      Dim sCsCmd
Line 2396... Line 2425...
2396 
            </tr>
 2425 
            </tr>
2397 
            <%rsQry.MoveNext
 2426 
            <%rsQry.MoveNext
2398 
         WEnd%>
 2427 
         WEnd%>
2399 
      </table>
 2428 
      </table>
2400 
   </fieldset>
 2429 
   </fieldset>
2401 
   <br><br>
 2430 
   <br><br>
2402 

            2431