Fix elapsed time computation !

Add queue manager name option "-qm".

MQSSave.java

@@ -1,14 +1,14 @@
 // $RCSfile: MQSSave.java,v $
-// $Revision: 1.8 $
+// $Revision: 1.15 $
 // $Name:  $
-// $Date: 2002/05/21 15:44:45 $
+// $Date: 2008/11/10 01:52:00 $
-// $Author: giberta1 $
+// $Author: agibert $
 
 /*
- * MQSSave.java - MQ/Seires queue to data file saver
+ * MQSSave.java - MQ/Series queue to data file saver
- * Copyright (C) 2002 Arnaud G. Gibert
+ * Copyright (C) 2001-2006 Arnaud G. Gibert
- * arnaud.gibert@misys.com
+ * mailto:arnaud@rx3.net
- * www.misys.com
+ * http://www.rx3.org/dvp/MQSLoad
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -43,12 +43,15 @@ public class MQSSave
         private String          Output_File_Name, Flush_File_Name = "flush.txt";
         private String		Message_Break = "\r\n";
         private boolean		TI_Swift_Batch_Mode = false;
+        private boolean		Copy_Mode = false;
         private boolean		Trim_Mode = false;
+        private boolean		MBTrailer_Mode = false;
 	private int           	Total_Nb = 0, Moved_Nb = 0, Skiped_Nb = 0, Scaned_Nb = 0, Flushed_Nb = 0;
-	private String		MQSSave_Revision = "$Revision: 1.8 $";
+	private String		MQSSave_Revision = "$Revision: 1.15 $";
 	private String    	MQSSave_Tag      = "$Name:  $";
-	private	String    	MQSSave_Date     = "$Date: 2002/05/21 15:44:45 $";
+	private	String    	MQSSave_Date     = "$Date: 2008/11/10 01:52:00 $";
-	private	String 		MQSSave_Author   = "$Author: giberta1 $";
+	private	String 		MQSSave_Author   = "$Author: agibert $";
+        private Integer		Sleep_Time 	 = 0;
 
 
 
@@ -204,7 +207,19 @@ public class MQSSave
                 {
 			while( argc < args.length)
                         {
-				if ( args[argc].equals( "-mb"))
+				if ( args[argc].equals( "-qm"))
+                		{
+                			if( argc < ( args.length + 1))
+                			{
+                        			QMng_Name = Str_Format( args[++argc]);
+                        		}
+                        		else
+                        		{
+                        			System.out.println( "Invalid number of command line options...");
+                        			throw new Exception();
+                        		}
+                		}
+				else if ( args[argc].equals( "-mb"))
                 		{
                 			if( argc < ( args.length + 1))
                 			{
@@ -228,14 +243,50 @@ public class MQSSave
                         			throw new Exception();
                         		}
                 		}
+                		else if ( args[argc].equals( "-st"))
+				{
+					if( argc < ( args.length + 1))
+					{
+						Sleep_Time = Integer.parseInt( args[++argc]);
+					}
+					else
+					{
+						System.out.println( "Invalid number of command line options...");
+						throw new Exception();
+					}
+				}
 				else if ( args[argc].equals( "-tisbm"))
                 		{
-                			TI_Swift_Batch_Mode = true;
+                			if( Copy_Mode == false)
+                			{
+		               			TI_Swift_Batch_Mode = true;
+		               		}
+		               		else
+		               		{
+                        			System.out.println( "Invalid command line option combination: -tisbm and -cm...");
+                        			throw new Exception();
+		               		}
+                		}
+				else if ( args[argc].equals( "-cm"))
+                		{
+                			if( TI_Swift_Batch_Mode == false)
+                			{
+	                			Copy_Mode = true;
+	                		}
+	                		else
+	                		{
+                        			System.out.println( "Invalid command line option combination: -tisbm and -cm...");
+                        			throw new Exception();
+	                		}
                 		}
 				else if ( args[argc].equals( "-tm"))
                 		{
                 			Trim_Mode = true;
                 		}
+				else if ( args[argc].equals( "-mbtm"))
+                		{
+                			MBTrailer_Mode = true;
+                		}
                 		else
                 		{
 	        	                Output_File_Name = args[argc++];
@@ -462,6 +513,32 @@ public class MQSSave
 	
 	
 	
+	//-------------------------------------------------------------------------------------------------------------------------
+	//
+	//-------------------------------------------------------------------------------------------------------------------------
+
+	private void Stand_By(int timer)
+	{
+	        if( timer > 0)
+		{
+			try
+			{
+			        synchronized( this)
+				{ 
+					wait( timer);				
+				}
+			}
+			catch(InterruptedException  ie)
+			{
+				ie.printStackTrace();
+			}
+		}
+	}
+
+
+
+
+
 	//-------------------------------------------------------------------------------------------------------------------------
 	//
 	//-------------------------------------------------------------------------------------------------------------------------
@@ -508,6 +585,8 @@ public class MQSSave
 					if( mode == MODE_FULLMOVE)
 					{
 			                        Counter_Print( Total_Nb++, '.');
+
+						Stand_By( Sleep_Time);
 		                        
 			                        if( Moved_Nb > 1)
 			                        {
@@ -517,9 +596,18 @@ public class MQSSave
 		                        	buffer_byte = new byte[ input_msg.getMessageLength()];
 		                       		input_msg.readFully( buffer_byte);
 
+						if( Trim_Mode)
+						{
+							String buffer_string = new String( buffer_byte).trim();
+							buffer_byte = buffer_string.getBytes();
+						}
+						
 		                        	Output_File.write( buffer_byte, 0, buffer_byte.length);
 		                        			  		
-			  			MQSDelete_Msg( input_msg);
+			  			if( Copy_Mode == false )
+			  			{
+			  				MQSDelete_Msg( input_msg);
+			  			}
 					}
 					else
 					{
@@ -535,8 +623,11 @@ public class MQSSave
 									{
 //										System.out.print( "FB1 ");
 							                        Counter_Print( Total_Nb++, '#');
+
+										Stand_By( Sleep_Time);
 	
 										MQSDelete_Msg( input_msg);
+										
 										first_flush = false;
 									}
 									else
@@ -552,6 +643,8 @@ public class MQSSave
 //									System.out.print( "FEA ");
 						                        Counter_Print( Total_Nb++, '#');
 
+									Stand_By( Sleep_Time);
+
 									MQSDelete_Msg( input_msg);
 								}
 								else if( msg_type.equals( TYPE_SWIFTOUT))
@@ -559,6 +652,8 @@ public class MQSSave
 //									System.out.print( "FO ");
 						                        Counter_Print( Total_Nb++, '*');
 									
+									Stand_By( Sleep_Time);
+
 						                        if( Flushed_Nb > 1)
 						                        {
 				                			        Flush_File.write( Message_Break.getBytes());
@@ -643,6 +738,9 @@ public class MQSSave
 								}										
 
 					                        Counter_Print( Total_Nb++, '~');
+
+								Stand_By( Sleep_Time);
+
 								break;
 							}
 							
@@ -653,6 +751,8 @@ public class MQSSave
 //									System.out.print( "MB ");
 						                        Counter_Print( Total_Nb++, '#');
 
+									Stand_By( Sleep_Time);
+
 									MQSDelete_Msg( input_msg);
 								}
 								else if( msg_type.equals( TYPE_SWIFTEND))
@@ -660,6 +760,8 @@ public class MQSSave
 //									System.out.print( "ME ");
 						                        Counter_Print( Total_Nb++, '#');
 
+       									Stand_By( Sleep_Time);
+
 									MQSDelete_Msg( input_msg);
 
 									mode = MODE_SCAN;
@@ -675,6 +777,8 @@ public class MQSSave
 //									System.out.print( "MO ");
 						                        Counter_Print( Total_Nb++, '.');
 
+									Stand_By( Sleep_Time);
+
 			                        			if( Moved_Nb > 1)
 			                        			{
 				                        			Output_File.write( Message_Break.getBytes());
@@ -692,7 +796,7 @@ public class MQSSave
 
 		                        				Output_File.write( buffer_byte, 0, buffer_byte.length);
 
-			  						MQSDelete_Msg( input_msg);
+		  							MQSDelete_Msg( input_msg);
 			  					}
 								else
 								{
@@ -709,6 +813,11 @@ public class MQSSave
 		  	}
 		  	while( input_msg != null);
 		  		
+                        if( MBTrailer_Mode)
+                        {
+	                        Output_File.write( Message_Break.getBytes());
+               	        }
+
 	                System.out.println( "\n");
 	   	}
 	   	
@@ -741,8 +850,8 @@ public class MQSSave
                                       
                         if( ( args.length < 2) || ( args.length > 7))
                         {
-                                System.out.println( "Usage: MQSSave [-mb \"message_break\"] [-tisbm [-ffn <Flush_File_Name>]] [-tm] <Output_File_Name> <Input_MsgQueue_Name>");
+                                System.out.println( "Usage: MQSSave [-qm \"Input_QueueMng_Name\"] [-st \"sleep_time\"] [-mb \"message_break\"] [-tisbm [-ffn <Flush_File_Name>] | -cm ] [-tm] [-mbtm] <Output_File_Name> <Input_MsgQueue_Name>");
-                                System.out.println( "       Default: Message Break: (" + Str_UnFormat( Message_Break) + ")   TI Swift Batch Mode: (" + TI_Swift_Batch_Mode + ")   Trim Mode: (" + Trim_Mode + ")   Flush File Name: (" + Flush_File_Name + ")");
+                                System.out.println( "       Default: Input QueueMng Name: (" + QMng_Name + ")   Sleep Time: (" + Sleep_Time + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   TI Swift Batch Mode: (" + TI_Swift_Batch_Mode + ")   Copy Mode: (" + Copy_Mode + ")   Flush File Name: (" + Flush_File_Name + ")   Trim Mode: (" + Trim_Mode + ")  MsgBreak Trailer Mode: (" + MBTrailer_Mode + ")");
                                 
 				System.exit( 1);
                         }
@@ -752,8 +861,8 @@ public class MQSSave
                                 
                                 Arg_Parse( args);
                     
-                                System.out.println( "Output File Name: (" + Output_File_Name + ")   Input MsgQue Name: (" + MsgQ_Name + ")   Flush File Name: (" + Flush_File_Name + ")");
+                                System.out.println( "Output File Name: (" + Output_File_Name + ")   Input QueueMng Name: (" + QMng_Name + ")   Input MsgQue Name: (" + MsgQ_Name + ")   Flush File Name: (" + Flush_File_Name + ")");
-                                System.out.println( "Message Break: (" + Str_UnFormat( Message_Break) + ")   TI Swift Batch Mode: (" + TI_Swift_Batch_Mode + ")   Trim Mode: (" + Trim_Mode + ")");
+                                System.out.println( "Sleep Time: (" + Sleep_Time + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   TI Swift Batch Mode: (" + TI_Swift_Batch_Mode + ")   Copy Mode: (" + Copy_Mode + ")   Trim Mode: (" + Trim_Mode + ")   MsgBreak Trailer Mode: (" + MBTrailer_Mode + ")");
 
                                 MQSInit();
 
@@ -775,7 +884,7 @@ public class MQSSave
 		                                Save_File( Output_File, Flush_File);
 		                                time_end = System.currentTimeMillis();
 
-		                                time_elapsed = ( time_end - time_begin) / 100.0;
+		                                time_elapsed = ( time_end - time_begin) / 1000.0;
 		                               	speed = Total_Nb / time_elapsed;
 		                               	
 		                               	nf.setMinimumFractionDigits(2);

ReadMe.txt

@@ -1,8 +1,8 @@
 # $RCSfile: ReadMe.txt,v $
-# $Revision: 1.4 $
+# $Revision: 1.5 $
 # $Name:  $
-# $Date: 2002/05/21 16:07:17 $
+# $Date: 2007/12/11 16:50:50 $
-# $Author: giberta1 $
+# $Author: agibert $
 
 
 
@@ -24,7 +24,7 @@ Installation:
 Notes:
 ------
 
-	- MQSSave has been tested with MQ/Series 5.2,
+	- MQSSave has been tested with MQ/Series 5.2, 5.2, 5.3 and WMQ 6.0.
 
 	- "-mb" argument accept a string with formated escape character:
 		+ "\n" for newline,

ReleaseNotes.txt

@@ -1,15 +1,66 @@
 # $RCSfile: ReleaseNotes.txt,v $
-# $Revision: 1.6 $
+# $Revision: 1.12 $
 # $Name:  $
-# $Date: 2002/05/21 16:03:38 $
+# $Date: 2008/11/10 01:52:00 $
-# $Author: giberta1 $
+# $Author: agibert $
 
 
 
 
 
 --------------------------------------------------------------------------------
-MQSSave V 1.1.3 - A. Gibert - 21/05/02
+MQSSave V 1.3.2 - A. Gibert - 2008/11/10
+--------------------------------------------------------------------------------
+
+Fix elapsed time computation !
+
+
+
+--------------------------------------------------------------------------------
+MQSSave V 1.3.1 - A. Gibert - 2008/01/03
+--------------------------------------------------------------------------------
+
+Fix usage print out.
+
+
+
+--------------------------------------------------------------------------------
+MQSSave V 1.3.0 - C. Colin / A. Gibert - 2007/12/10
+--------------------------------------------------------------------------------
+
+Add sleep time option "-st".
+
+
+
+--------------------------------------------------------------------------------
+MQSSave V 1.2.0 - A. Gibert - 2007/06/05
+--------------------------------------------------------------------------------
+
+Add queue manager name option "-qm".
+
+
+
+--------------------------------------------------------------------------------
+MQSSave V 1.1.5 - A. Gibert - 2003/09/04
+--------------------------------------------------------------------------------
+
+Add message break trailer mode support,
+Add -mbtm option,
+Add copy mode support,
+Add "-cm" option.
+
+
+
+--------------------------------------------------------------------------------
+MQSSave V 1.1.4 - A. Gibert - 2002/07/29
+--------------------------------------------------------------------------------
+
+Fix trim mode support when tisbm off.
+
+
+
+--------------------------------------------------------------------------------
+MQSSave V 1.1.3 - A. Gibert - 2002/05/21
 --------------------------------------------------------------------------------
 
 Add trim mode support,
@@ -21,7 +72,7 @@ Add version, date and author print out.
 
 
 --------------------------------------------------------------------------------
-MQSSave V 1.1.2 - A. Gibert - 13/05/02
+MQSSave V 1.1.2 - A. Gibert - 2002/05/13
 --------------------------------------------------------------------------------
 
 Rename SWIFTABORT into SWIFTERROR,
@@ -30,7 +81,7 @@ Add Legend printout line.
 
 
 --------------------------------------------------------------------------------
-MQSSave V 1.1.1 - A. Gibert - 06/05/02
+MQSSave V 1.1.1 - A. Gibert - 2002/05/06
 --------------------------------------------------------------------------------
 
 Add return code handling.
@@ -38,7 +89,7 @@ Add return code handling.
 
 
 --------------------------------------------------------------------------------
-MQSSave V 1.1.0 - A. Gibert - 03/05/02
+MQSSave V 1.1.0 - A. Gibert - 2002/05/03
 --------------------------------------------------------------------------------
 
 Add TI Swift batch mode support,
@@ -50,7 +101,7 @@ Fix MQSSave usage print: replace MQSLoad by MSSave !
 
 
 --------------------------------------------------------------------------------
-MQSSave V 1.0.0 - A. Gibert - 23/04/02
+MQSSave V 1.0.0 - A. Gibert - 2002/04/23
 --------------------------------------------------------------------------------
 
 First release.