[Radmind-commit] radmind-assistant/rsm RSMLoadsetManager.m, 1.45, 1.46

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/rsm
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8993

Modified Files:
	RSMLoadsetManager.m 
Log Message:
Check class of object passed to -checkInLoadset: and use appropriate methods.
Fix: [ 1529700 ] Verify and Check-in still checks in a failed loadset.
Exit status of lcksum checked in every case before check-in.


Index: RSMLoadsetManager.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMLoadsetManager.m,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** RSMLoadsetManager.m	1 Aug 2006 16:43:04 -0000	1.45
--- RSMLoadsetManager.m	1 Aug 2006 22:57:59 -0000	1.46
***************
*** 620,624 ****
      NSString            *newpath = nil;
      
!     loadsetPath = [ loadset objectForKey: @"RadmindServerItemPath" ];
      newpath = [ NSString stringWithFormat: @"%@/%@", @"/var/radmind/transcript",
                                              [ loadsetPath lastPathComponent ]];
--- 620,632 ----
      NSString            *newpath = nil;
      
!     if ( [ loadset isKindOfClass: [ NSDictionary class ]] ) {
! 	loadsetPath = [ loadset objectForKey: @"RadmindServerItemPath" ];
!     } else if ( [ loadset isKindOfClass: [ NSString class ]] ) {
! 	loadsetPath = loadset;
!     } else {
! 	NSLog( @"Unexpected object type %@", [ loadset class ] );
! 	return;
!     }
!     
      newpath = [ NSString stringWithFormat: @"%@/%@", @"/var/radmind/transcript",
                                              [ loadsetPath lastPathComponent ]];
***************
*** 1355,1364 ****
          
      case RA_TRANSCRIPT_VERIFY:
!         if ( status != 0 && ( ! assistFirstPositiveCheckIn || ! assistFirstNegativeCheckIn )) {
!             NSBeginAlertSheet( [ NSString stringWithFormat: @"%@: incorrect",
!                             [[ self transcript ] lastPathComponent ]],
!                             @"OK", @"", @"", transcriptWindow, self, NULL, NULL, nil,
!                             @"" );
!         } else if ( ! assistFirstPositiveCheckIn ) {
              NSBeginAlertSheet( [ NSString stringWithFormat: @"%@: verified",
                                          [[ self transcript ] lastPathComponent ]],
--- 1363,1378 ----
          
      case RA_TRANSCRIPT_VERIFY:
! 	if ( status != 0 ) {
! 	    NSBeginAlertSheet( [ NSString stringWithFormat: @"%@: incorrect",
! 				    [[ self transcript ] lastPathComponent ]],
! 			@"OK", @"", @"", transcriptWindow, self, NULL, NULL, nil,
! 			@"%@ contained some errors that need correcting. Please verify "
! 			@"that the loadset was uploaded correctly. If you created the loadset "
! 			@"without checksums, select the loadset, and click the Update button. "
! 			@"When the loadset has been updated, drag the loadset to the "
! 			@"Production Loadsets pane to check it in. From there you can drag "
! 			@"and drop it to the command file of your choice.", [ self transcript ] );
! 	    return;
! 	} else if ( ! assistFirstPositiveCheckIn ) {
              NSBeginAlertSheet( [ NSString stringWithFormat: @"%@: verified",
                                          [[ self transcript ] lastPathComponent ]],
***************
*** 1366,1384 ****
                              @"" );
          }
!         
          if ( [ _checkedInTranscripts count ] == 1 && [ _tmpTranscripts count ] == 1
                      && assistFirstPositiveCheckIn ) {
- 	    if ( status != 0 ) {
- 		NSBeginAlertSheet( [ NSString stringWithFormat: @"%@: incorrect",
-                                         [[ self transcript ] lastPathComponent ]],
-                             @"OK", @"", @"", transcriptWindow, self, NULL, NULL, nil,
-                             @"%@ contained some errors that need correcting. Please verify "
- 			    @"that the loadset was uploaded correctly. If you created the loadset "
- 			    @"without checksums, select the loadset, and click the Update button. "
- 			    @"When the loadset has been updated, drag the loadset to the "
- 			    @"Production Loadsets pane to check it in. From there you can drag "
- 			    @"and drop it to the command file of your choice.", [ self transcript ] );
- 		return;
- 	    }
              [ self checkInLoadset: [ _tmpTranscripts objectAtIndex: 0 ]];
          } else if ( [ _tmpTranscripts count ] >= 1 && completeCheckInOfLoadset ) {
--- 1380,1386 ----
                              @"" );
          }
! 	
          if ( [ _checkedInTranscripts count ] == 1 && [ _tmpTranscripts count ] == 1
                      && assistFirstPositiveCheckIn ) {
              [ self checkInLoadset: [ _tmpTranscripts objectAtIndex: 0 ]];
          } else if ( [ _tmpTranscripts count ] >= 1 && completeCheckInOfLoadset ) {