Add 1.1.2 entry:

Add return code handling.

MQSLoad.java

@@ -1,7 +1,7 @@
 // $RCSfile: MQSLoad.java,v $
-// $Revision: 1.3 $
+// $Revision: 1.6 $
 // $Name:  $
-// $Date: 2002/04/19 15:22:14 $
+// $Date: 2002/05/06 09:52:24 $
 // $Author: giberta1 $
 
 /*
@@ -27,6 +27,7 @@
 
 import com.ibm.mq.*;
 import java.io.*;
+import java.text.*;
 
 
 
@@ -41,7 +42,8 @@ public class MQSLoad
         private int             MsgQ_Open_Options = MQC.MQOO_OUTPUT | MQC.MQOO_FAIL_IF_QUIESCING;
         private String          File_Name;
         private String		Field_Break = "";
-        private String		Message_Break = "\n";
+        private String		Message_Break = "\r\n";
+        private boolean		Keep_Message_Break = false;
         
 
 
@@ -64,46 +66,47 @@ public class MQSLoad
 	//
 	//-------------------------------------------------------------------------------------------------------------------------
 	
-        public static String Str_Format( String  Fmt)
+        public static String Str_Format( String  UnFmt)
         {
         	int	 idx;
         	boolean  esc = false;
-        	String   result = "";
+        	String   fmt = "";
         	
         	
-                for( idx = 0; idx < Fmt.length(); idx++)
+                for( idx = 0; idx < UnFmt.length(); idx++)
                 {
                 	if( esc)
                 	{
-                		switch( Fmt.charAt( idx))
+                		switch( UnFmt.charAt( idx))
                 		{
-                			case '/':
+                			case '\\':
                 			{
-                				result = result + "\\";
+                				fmt += "\\";
                 				break;
                 			}
 
                 			case 'n':
                 			{
-                				result = result + "\n";
+                				fmt += "\n";
                 				break;
                 			}
                 			
                 			case 'r':
                 			{
-                				result = result + "\r";
+                				fmt += "\r";
                 				break;
                 			}
                 			
                 			case 't':
                 			{
-                				result = result + "\t";
+                				fmt += "\t";
                 				break;
                 			}
                 			
                 			default:
                 			{
-                				result = result + "?";
+                				fmt += "?";
+                				break;
                 			}             		
                 		}
                 		
@@ -111,18 +114,71 @@ public class MQSLoad
                 	}
                 	else
                 	{
-	                	if( Fmt.charAt( idx) == '\\')
+	                	if( UnFmt.charAt( idx) == '\\')
         	        	{
                 			esc = true;
                 		}
                 		else
                 		{
-                			result = result + Fmt.charAt( idx);
+                			fmt += UnFmt.charAt( idx);
                 		}
                 	}
                 }
                 
-                return( result);
+                return( fmt);
+        }
+
+        
+        
+        
+        
+	//-------------------------------------------------------------------------------------------------------------------------
+	//
+	//-------------------------------------------------------------------------------------------------------------------------
+	
+        public static String Str_UnFormat( String  Fmt)
+        {
+        	int	 idx;
+        	String   unfmt = "";
+        	
+        	
+                for( idx = 0; idx < Fmt.length(); idx++)
+                {
+        		switch( Fmt.charAt( idx))
+        		{
+        			case '\\':
+        			{
+        				unfmt += "\\\\";
+        				break;
+        			}
+
+        			case '\n':
+        			{
+        				unfmt += "\\n";
+        				break;
+        			}
+        			
+        			case '\r':
+        			{
+        				unfmt += "\\r";
+        				break;
+        			}
+        			
+        			case '\t':
+        			{
+        				unfmt += "\\t";
+        				break;
+        			}
+        			
+        			default:
+        			{
+        				unfmt += Fmt.charAt( idx);
+        				break;
+        			}             		
+        		}
+                }
+                
+                return( unfmt);
         }
 
         
@@ -166,6 +222,10 @@ public class MQSLoad
                         			throw new Exception();
                         		}
                 		}
+                		else if ( args[argc].equals( "-kmb"))
+                		{
+                			Keep_Message_Break = true;
+                		}
                 		else
                 		{
         	                        MsgQ_Name = args[argc++];
@@ -201,7 +261,7 @@ public class MQSLoad
                 try
                 {
                         QMng = new MQQueueManager( QMng_Name);
-                        System.out.println( "QManager Open: (" + QMng + ") !");
+//                        System.out.println( "QManager Open: (" + QMng + ") !");
                 }
                 
                 catch( Exception Expt)
@@ -212,13 +272,13 @@ public class MQSLoad
                 try
                 {
                         MsgQ = QMng.accessQueue( MsgQ_Name, MsgQ_Open_Options, null, null, null);
-                        System.out.println( "MsgQ Open:  (" + MsgQ + ") !");
+//                        System.out.println( "MsgQ Open:  (" + MsgQ + ") !");
                 }
    
                 catch( Exception Expt)
                 {      
                         QMng.disconnect();
-                        System.out.println( "QManager Close:  (" + QMng + ") !");                        
+//                        System.out.println( "QManager Close:  (" + QMng + ") !");                        
 
                         throw Expt;
 		}
@@ -237,9 +297,9 @@ public class MQSLoad
                 try
                 {
                         MsgQ.close();
-                        System.out.println( "MsgQ Close:  (" + MsgQ + ") !");
+//                        System.out.println( "MsgQ Close:  (" + MsgQ + ") !");
                         QMng.disconnect();
-                        System.out.println( "QManager Close:  (" + QMng + ") !");
+//                        System.out.println( "QManager Close:  (" + QMng + ") !");
                 }
 
                 catch( Exception Expt)
@@ -301,7 +361,7 @@ public class MQSLoad
 	//
 	//-------------------------------------------------------------------------------------------------------------------------
 	
-        private void Load_File( BufferedInputStream  Input_File) throws Exception
+        private int  Load_File( BufferedInputStream  Input_File) throws Exception
         {
         	byte       input_char;
                 int        msg_nb = 0;
@@ -384,6 +444,11 @@ public class MQSLoad
 						if( next_message <= cur_window_size)
 						{
 //							System.out.println( "* Write Msg CurPos: (" + cur_pos + ")");
+							if( Keep_Message_Break)
+							{
+								output_msg.writeString( Message_Break);
+							}
+							
 		                                        output_msg.messageId = MQC.MQMI_NONE;
 		                                        MQSPut_Msg( output_msg);
 		                                        output_msg.clearMessage();
@@ -413,6 +478,7 @@ public class MQSLoad
         		}
 
 	                System.out.println( "\n");
+			return( msg_nb);
 	   	}
 	   	
                 catch( Exception Expt)
@@ -431,12 +497,21 @@ public class MQSLoad
 	
         public MQSLoad( String args[])
         {
+		int     msg_nb;
+		long    time_begin, time_end;
+		double  time_elapsed, speed;
+		NumberFormat  nf = NumberFormat.getInstance();
+		
+		
 		try
 		{
                                       
                         if( ( args.length < 2) || ( args.length > 6))
                         {
-                                System.out.println( "Usage: MQSLoad [-fb \"field_break\"] [-mb \"message_break\"] <Output_MsgQueue_Name> <Input_File_Name>");
+                                System.out.println( "Usage: MQSLoad [-fb \"field_break\"] [-mb \"message_break\"] [-kmb] <Output_MsgQueue_Name> <Input_File_Name>");
+                                System.out.println( "       Default: Field Break: (" + Str_UnFormat( Field_Break) + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   Keep Message Break: (" + Keep_Message_Break + ")");
+
+				System.exit( 1);
                         }
                         else
                         {
@@ -445,7 +520,7 @@ public class MQSLoad
                                 Arg_Parse( args);
                     
                                 System.out.println( "Output MsgQueue Name: (" + MsgQ_Name + ")   Input File Name: (" + File_Name + ")");
-                                System.out.println( "Field Break: (" + Field_Break + ")   Message_Break: (" + Message_Break + ")");
+                                System.out.println( "Field Break: (" + Str_UnFormat( Field_Break) + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   Keep Message Break: (" + Keep_Message_Break + ")");
                 
                                 MQSInit();
 
@@ -455,10 +530,22 @@ public class MQSLoad
 	                                
 	                                try
 	                                {
-		                                System.out.println("Input File Open:  (" + input_file + ") !");
+//		                                System.out.println("Input File Open:  (" + input_file + ") !");
+
+						time_begin = System.currentTimeMillis();
+		                                msg_nb = Load_File( input_file);
+		                                time_end = System.currentTimeMillis();
 		                                
-		                                Load_File( input_file);
+		                                time_elapsed = ( time_end - time_begin) / 100.0;
-		                                                
+		                               	speed = msg_nb / time_elapsed;
+		                               	
+		                               	nf.setMinimumFractionDigits(2);
+		                               	nf.setMaximumFractionDigits(2);
+		                               	
+		                                System.out.println( "Loaded Message Nb: (" + msg_nb
+								    + ")   Elapsed Time: (" + nf.format(time_elapsed)
+								    + ") s   Speed: (" + nf.format(speed)
+								    + ") msg/s");
 		                        }
 		                        
 		                        catch( Exception Expt)
@@ -478,6 +565,8 @@ public class MQSLoad
                         
                                 MQSDeInit();
                                 System.out.println( "MQS Load Completed !");
+
+				System.exit( 0);
                         }
                 }
 
@@ -485,6 +574,8 @@ public class MQSLoad
                 {
                         System.out.println("Exception:  (" + Expt + ") !");
                         Expt.printStackTrace();
+                        
+			System.exit( 1);
                 }
         }
 }

ReadMe.txt

@@ -1,5 +1,59 @@
 # $RCSfile: ReadMe.txt,v $
-# $Revision: 1.1 $
+# $Revision: 1.6 $
 # $Name:  $
-# $Date: 2001/07/09 15:51:18 $
+# $Date: 2002/05/02 17:24:15 $
 # $Author: giberta1 $
+
+
+
+
+
+Compilation:
+------------
+	- Just type: "javac MQSLoad.java" !
+
+
+
+Installation:
+-------------
+
+	- You only need the MQSLoad.class file.
+
+
+
+Notes:
+------
+
+	- MQSLoad has been tested with MQ/Series 5.2,
+
+	- "-fb" and "-mb" arguments accept a string with formated escape character:
+		+ "\n" for newline,
+		+ "\r" for return,
+		+ "\t" for tabulation,
+		+ "\\" for \.
+
+	- Message breaks are used for message separation in the batch file,
+	- Message breaks are striped from the sended message if "-kmb" (keep message break) is not set,
+	- Field breaks are striped from the sended message.
+ 
+	- Windows text files: newline is specified as "\r\n",
+	- Unix text files: newline is specified as "\n".
+
+	- By default:
+		+ There is no field break,
+		+ Message break is "\r\n",
+		+ Message breaks are striped.
+
+	- This software is under the GNU General Public License. See GNU-GPL.txt.
+
+
+
+Usage Examples:
+---------------
+
+	- To load a swift batch file "swift-batch.txt" with "---MESSAGE-BREAK---" message separator into the MQ/Series "SWIFT-QUEUE" use:
+		java MQSLoad -mb "---MESSAGE-BREAK---\r\n" SWIFT-QUEUE swift-batch.txt
+	- To load a raw swift batch file "swift-batch-raw.txt" with "}\r\n" message break into the MQ/Series "SWIFT-QUEUE" and by keeping message break separator use:
+		java MQSLoad -mb "}\r\n" -kmb SWIFT-QUEUE swift-batch-raw.txt
+	- To load a csv batch file "batch.csv" with ";" field separator into the MQ/Series "DATA-QUEUE" use:
+		java MQSLoad -fb ";" DATA-QUEUE csv-batch.csv

ReleaseNotes.txt

@@ -1,5 +1,49 @@
 # $RCSfile: ReleaseNotes.txt,v $
-# $Revision: 1.1 $
+# $Revision: 1.4 $
 # $Name:  $
-# $Date: 2001/07/09 15:51:18 $
+# $Date: 2002/05/06 09:57:19 $
 # $Author: giberta1 $
+
+
+
+
+
+--------------------------------------------------------------------------------
+MQSLoad V 1.1.2 - A. Gibert - 06/05/02
+--------------------------------------------------------------------------------
+
+Add return code handling.
+
+
+
+--------------------------------------------------------------------------------
+MQSLoad V 1.1.1 - A. Gibert - 02/05/02
+--------------------------------------------------------------------------------
+
+Add Keep Message Break support,
+Add -kmb option.
+
+
+
+--------------------------------------------------------------------------------
+MQSLoad V 1.1.0 - A. Gibert - 23/04/02
+--------------------------------------------------------------------------------
+
+Add string field break and string message break support,
+Add customisable field break and message break support,
+Add command line switches "-fb" and "-mb",
+Add statistics reporting,
+Add nicer message sending progress indicator,
+Complete rewrite of the sending engine,
+Remove some debug print-out,
+Add GPL and FDL licenses files.
+
+
+
+--------------------------------------------------------------------------------
+MQSLoad V 1.0.0 - A. Gibert - 12/07/01
+--------------------------------------------------------------------------------
+
+First release,
+Field break hardcoded to ";",
+Message break hardcoded to "\r\n".

ToDo.txt

@@ -1,5 +1,12 @@
 # $RCSfile: ToDo.txt,v $
-# $Revision: 1.1 $
+# $Revision: 1.2 $
 # $Name:  $
-# $Date: 2001/07/09 15:51:17 $
+# $Date: 2002/04/23 16:25:50 $
 # $Author: giberta1 $
+
+
+
+
+
+- write a better documentation !
+- ...

test-swift-batch-big2.txt

@@ -0,0 +1,49 @@
+SWIFTOUT                                                                                                                                
+{1:F01BCMAMAMCAXXX0857229951}{2:O1001511000801CICPFRPPAXXX65003436280008011611N}{4:
+:20:CIC0001
+:32A:000918EUR25062,66
+:50:SOCIETE S.A.
+PARIS
+FRANCE
+:57A:BCMAMAMCXXX
+:59:I.A.M.
+FES
+MAROC
+:70:/RFB/SOC01901
+:71A:BEN
+-}{5:{MAC:BCED2F18}{CHK:075B64FB4533}}
+---MESSAGE-BREAK---
+SWIFTOUT                                                                                                                                
+{1:F01BCMAMAMC1XXX0000000000}{2:I730BNPAFRPPXXXXN}{4:
+:20:ELC00001007
+:21:TESTS-DL-003
+:30:010629
+-}
+---MESSAGE-BREAK---
+SWIFTOUT                                                                                                                                
+{1:F01BCMAMAMC1XXX0000000000}{2:I710BCPCMACCXXXXN}{4:
+:27:1/1
+:40B:IRREVOCABLE TRANSFERABLE
+ADDING OUR CONFIRMATION
+:20:ELC00001002
+:21:POB00001001
+:31C:010328
+:31D:010528PARIS
+:52A:BARCGB22XXX
+:50:SOCIETE ABC
+AVENUE DES ALPES
+CASABLANCA
+:59:HUSUM PLASTIC
+:32B:MAD100000,00
+:41A:BARCGB22XXX
+BY PAYMENT
+:43P:NOT ALLOWED
+:43T:NOT ALLOWED
+:44A:GERMANY
+:44B:CASABLANCA
+:71B:ALL FOREIGN BANK CHARGES ARE FOR
+THE ACCOUNT OF THE BENEFICIARY
+:49:WITHOUT
+-}
+---MESSAGE-BREAK---
+SWIFTEND                                                                                                                                

test-swift-batch.txt

@@ -0,0 +1,80 @@
+SWIFTBEGIN                                                                                                                              
+---MESSAGE-BREAK---
+SWIFTOUT                                                                                                                                
+{1:F01BCMAMAMCAXXX0857229951}{2:O1001511000801CICPFRPPAXXX65003436280008011611N}{4:
+:20:CIC0001
+:32A:000918EUR25062,66
+:50:SOCIETE S.A.
+PARIS
+FRANCE
+---MESSAGE-BREAK---
+SWIFTBEGIN                                                                                                                              
+---MESSAGE-BREAK---
+SWIFTOUT                                                                                                                                
+{1:F01BCMAMAMCAXXX0857229951}{2:O1001511000801CICPFRPPAXXX65003436280008011611N}{4:
+:20:CIC0001
+:32A:000918EUR25062,66
+:50:SOCIETE S.A.
+PARIS
+FRANCE
+:57A:BCMAMAMCXXX
+:59:I.A.M.
+FES
+MAROC
+:70:/RFB/SOC01901
+:71A:BEN
+-}{5:{MAC:BCED2F18}{CHK:075B64FB4533}}
+---MESSAGE-BREAK---
+SWIFTABORT                                                                                                                              
+---MESSAGE-BREAK---
+SWIFTBEGIN                                                                                                                              
+---MESSAGE-BREAK---
+SWIFTOUT                                                                                                                                
+{1:F01BCMAMAMCAXXX0857229951}{2:O1001511000801CICPFRPPAXXX65003436280008011611N}{4:
+:20:CIC0001
+:32A:000918EUR25062,66
+:50:SOCIETE S.A.
+PARIS
+FRANCE
+:57A:BCMAMAMCXXX
+:59:I.A.M.
+FES
+MAROC
+:70:/RFB/SOC01901
+:71A:BEN
+-}{5:{MAC:BCED2F18}{CHK:075B64FB4533}}
+---MESSAGE-BREAK---
+SWIFTOUT                                                                                                                                
+{1:F01BCMAMAMC1XXX0000000000}{2:I730BNPAFRPPXXXXN}{4:
+:20:ELC00001007
+:21:TESTS-DL-003
+:30:010629
+-}
+---MESSAGE-BREAK---
+SWIFTOUT                                                                                                                                
+{1:F01BCMAMAMC1XXX0000000000}{2:I710BCPCMACCXXXXN}{4:
+:27:1/1
+:40B:IRREVOCABLE TRANSFERABLE
+ADDING OUR CONFIRMATION
+:20:ELC00001002
+:21:POB00001001
+:31C:010328
+:31D:010528PARIS
+:52A:BARCGB22XXX
+:50:SOCIETE ABC
+AVENUE DES ALPES
+CASABLANCA
+:59:HUSUM PLASTIC
+:32B:MAD100000,00
+:41A:BARCGB22XXX
+BY PAYMENT
+:43P:NOT ALLOWED
+:43T:NOT ALLOWED
+:44A:GERMANY
+:44B:CASABLANCA
+:71B:ALL FOREIGN BANK CHARGES ARE FOR
+THE ACCOUNT OF THE BENEFICIARY
+:49:WITHOUT
+-}
+---MESSAGE-BREAK---
+SWIFTEND                                                                                                                                

test-swift-raw.txt

@@ -0,0 +1,42 @@
+{1:F01BCMAMAMCAXXX0857229951}{2:O1001511000801CICPFRPPAXXX65003436280008011611N}{4:
+:20:CIC0001
+:32A:000918EUR25062,66
+:50:SOCIETE S.A.
+PARIS
+FRANCE
+:57A:BCMAMAMCXXX
+:59:I.A.M.
+FES
+MAROC
+:70:/RFB/SOC01901
+:71A:BEN
+-}{5:{MAC:BCED2F18}{CHK:075B64FB4533}}
+{1:F01BCMAMAMC1XXX0000000000}{2:I730BNPAFRPPXXXXN}{4:
+:20:ELC00001007
+:21:TESTS-DL-003
+:30:010629
+-}
+{1:F01BCMAMAMC1XXX0000000000}{2:I710BCPCMACCXXXXN}{4:
+:27:1/1
+:40B:IRREVOCABLE TRANSFERABLE
+ADDING OUR CONFIRMATION
+:20:ELC00001002
+:21:POB00001001
+:31C:010328
+:31D:010528PARIS
+:52A:BARCGB22XXX
+:50:SOCIETE ABC
+AVENUE DES ALPES
+CASABLANCA
+:59:HUSUM PLASTIC
+:32B:MAD100000,00
+:41A:BARCGB22XXX
+BY PAYMENT
+:43P:NOT ALLOWED
+:43T:NOT ALLOWED
+:44A:GERMANY
+:44B:CASABLANCA
+:71B:ALL FOREIGN BANK CHARGES ARE FOR
+THE ACCOUNT OF THE BENEFICIARY
+:49:WITHOUT
+-}