6 Commits

Author SHA1 Message Date
giberta1
33b67fe311 Add trim mode ("-tm") explanations. 2002-05-21 16:07:17 +00:00
giberta1
9174e00abe Add 1.1.3 entry:
Add trim mode support,
    Add "-tm" option,
    Add MQQueueManager() auto retry,
    Fix flush file name bad parsing bug,
    Add version, date and author print out.
2002-05-21 16:03:38 +00:00
giberta1
f390c41e76 Add version, date and author print out. 2002-05-21 15:44:45 +00:00
giberta1
e807001586 Add trim mode support,
Add "-tm" option,
Add MQQueueManager() auto retry,
Fix flush file name bad parsing bug.
2002-05-21 15:36:28 +00:00
giberta1
b3f10a6962 Add 1.1.2 entry:
Rename SWIFTABORT into SWIFTERROR,
    Add Legend printout line.
2002-05-13 16:38:12 +00:00
giberta1
49d568238e Rename SWIFTABORT message into SWIFTERROR,
Add legend message.
2002-05-13 16:28:02 +00:00
3 changed files with 85 additions and 26 deletions

View File

@@ -1,7 +1,7 @@
// $RCSfile: MQSSave.java,v $ // $RCSfile: MQSSave.java,v $
// $Revision: 1.5 $ // $Revision: 1.8 $
// $Name: $ // $Name: $
// $Date: 2002/05/06 09:51:49 $ // $Date: 2002/05/21 15:44:45 $
// $Author: giberta1 $ // $Author: giberta1 $
/* /*
@@ -35,7 +35,7 @@ import java.text.*;
public class MQSSave public class MQSSave
{ {
private MQQueueManager QMng; private MQQueueManager QMng = null;
private String QMng_Name = ""; private String QMng_Name = "";
private MQQueue MsgQ; private MQQueue MsgQ;
private String MsgQ_Name; private String MsgQ_Name;
@@ -43,7 +43,13 @@ public class MQSSave
private String Output_File_Name, Flush_File_Name = "flush.txt"; private String Output_File_Name, Flush_File_Name = "flush.txt";
private String Message_Break = "\r\n"; private String Message_Break = "\r\n";
private boolean TI_Swift_Batch_Mode = false; private boolean TI_Swift_Batch_Mode = false;
private boolean Trim_Mode = false;
private int Total_Nb = 0, Moved_Nb = 0, Skiped_Nb = 0, Scaned_Nb = 0, Flushed_Nb = 0; 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_Tag = "$Name: $";
private String MQSSave_Date = "$Date: 2002/05/21 15:44:45 $";
private String MQSSave_Author = "$Author: giberta1 $";
@@ -214,7 +220,7 @@ public class MQSSave
{ {
if( argc < ( args.length + 1)) if( argc < ( args.length + 1))
{ {
Flush_File_Name = Str_Format( args[++argc]); Flush_File_Name = args[++argc];
} }
else else
{ {
@@ -226,6 +232,10 @@ public class MQSSave
{ {
TI_Swift_Batch_Mode = true; TI_Swift_Batch_Mode = true;
} }
else if ( args[argc].equals( "-tm"))
{
Trim_Mode = true;
}
else else
{ {
Output_File_Name = args[argc++]; Output_File_Name = args[argc++];
@@ -258,17 +268,29 @@ public class MQSSave
private void MQSInit() throws Exception private void MQSInit() throws Exception
{ {
try short retry = 0;
{ final short RETRY_MAX = 10;
QMng = new MQQueueManager( QMng_Name);
// System.out.println( "QManager Open: (" + QMng + ") !");
} while( QMng == null)
{
try
{
QMng = new MQQueueManager( QMng_Name);
// System.out.println( "QManager Open: (" + QMng + ") !");
}
catch( Exception Expt) catch( Exception Expt)
{ {
throw Expt; System.out.print("!");
if( retry++ > RETRY_MAX)
{
throw Expt;
}
}
} }
try try
{ {
MsgQ = QMng.accessQueue( MsgQ_Name, MsgQ_Open_Options, null, null, null); MsgQ = QMng.accessQueue( MsgQ_Name, MsgQ_Open_Options, null, null, null);
@@ -457,7 +479,7 @@ public class MQSSave
String msg_type; String msg_type;
final String TYPE_SWIFTBEGIN = "SWIFTBEGIN"; final String TYPE_SWIFTBEGIN = "SWIFTBEGIN";
final String TYPE_SWIFTEND = "SWIFTEND "; final String TYPE_SWIFTEND = "SWIFTEND ";
final String TYPE_SWIFTABORT = "SWIFTABORT"; final String TYPE_SWIFTERROR = "SWIFTERROR";
final String TYPE_SWIFTOUT = "SWIFTOUT "; final String TYPE_SWIFTOUT = "SWIFTOUT ";
boolean get_first = false; boolean get_first = false;
boolean first_flush = true; boolean first_flush = true;
@@ -525,7 +547,7 @@ public class MQSSave
first_flush = true; first_flush = true;
} }
} }
else if( msg_type.equals( TYPE_SWIFTEND) || msg_type.equals( TYPE_SWIFTABORT)) else if( msg_type.equals( TYPE_SWIFTEND) || msg_type.equals( TYPE_SWIFTERROR))
{ {
// System.out.print( "FEA "); // System.out.print( "FEA ");
Counter_Print( Total_Nb++, '#'); Counter_Print( Total_Nb++, '#');
@@ -545,6 +567,12 @@ public class MQSSave
input_msg.readString( FILLER_LEN); input_msg.readString( FILLER_LEN);
buffer_byte = new byte[ input_msg.getMessageLength() - MSGTYPE_LEN - FILLER_LEN]; buffer_byte = new byte[ input_msg.getMessageLength() - MSGTYPE_LEN - FILLER_LEN];
input_msg.readFully( buffer_byte); input_msg.readFully( buffer_byte);
if( Trim_Mode)
{
String buffer_string = new String( buffer_byte).trim();
buffer_byte = buffer_string.getBytes();
}
Flush_File.write( buffer_byte, 0, buffer_byte.length); Flush_File.write( buffer_byte, 0, buffer_byte.length);
@@ -588,7 +616,7 @@ public class MQSSave
get_first = true; get_first = true;
first_scan = true; first_scan = true;
} }
else if( msg_type.equals( TYPE_SWIFTABORT)) else if( msg_type.equals( TYPE_SWIFTERROR))
{ {
// System.out.print( "SA "); // System.out.print( "SA ");
@@ -637,7 +665,7 @@ public class MQSSave
mode = MODE_SCAN; mode = MODE_SCAN;
get_first = true; get_first = true;
} }
else if( msg_type.equals( TYPE_SWIFTABORT)) else if( msg_type.equals( TYPE_SWIFTERROR))
{ {
System.out.println( "Internal error: (" + msg_type + ") found during Move!"); System.out.println( "Internal error: (" + msg_type + ") found during Move!");
throw new Exception(); throw new Exception();
@@ -656,6 +684,12 @@ public class MQSSave
buffer_byte = new byte[ input_msg.getMessageLength() - MSGTYPE_LEN - FILLER_LEN]; buffer_byte = new byte[ input_msg.getMessageLength() - MSGTYPE_LEN - FILLER_LEN];
input_msg.readFully( buffer_byte); 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); Output_File.write( buffer_byte, 0, buffer_byte.length);
MQSDelete_Msg( input_msg); MQSDelete_Msg( input_msg);
@@ -700,14 +734,15 @@ public class MQSSave
NumberFormat nf = NumberFormat.getInstance(); NumberFormat nf = NumberFormat.getInstance();
BufferedOutputStream Output_File = null, Flush_File = null; BufferedOutputStream Output_File = null, Flush_File = null;
try try
{ {
System.out.println("MQSSave: " + MQSSave_Tag + " / " + MQSSave_Date + " / " + MQSSave_Author);
if( ( args.length < 2) || ( args.length > 7)) if( ( args.length < 2) || ( args.length > 7))
{ {
System.out.println( "Usage: MQSSave [-mb \"message_break\"] [-tisbm [-ffn <Flush_File_Name>]] <Output_File_Name> <Input_MsgQueue_Name>"); System.out.println( "Usage: MQSSave [-mb \"message_break\"] [-tisbm [-ffn <Flush_File_Name>]] [-tm] <Output_File_Name> <Input_MsgQueue_Name>");
System.out.println( " Default: Message Break: (" + Str_UnFormat( Message_Break) + ") TI Swift Batch Mode: (" + TI_Swift_Batch_Mode + ") Flush File Name: (" + Flush_File_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.exit( 1); System.exit( 1);
} }
@@ -718,8 +753,8 @@ public class MQSSave
Arg_Parse( args); 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 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 + ")"); System.out.println( "Message Break: (" + Str_UnFormat( Message_Break) + ") TI Swift Batch Mode: (" + TI_Swift_Batch_Mode + ") Trim Mode: (" + Trim_Mode + ")");
MQSInit(); MQSInit();
try try
@@ -728,6 +763,7 @@ public class MQSSave
if( TI_Swift_Batch_Mode) if( TI_Swift_Batch_Mode)
{ {
System.out.println( "Legend: .: Saved *: Flushed #: Skiped ~: Scaned");
Flush_File = new BufferedOutputStream( new FileOutputStream( Flush_File_Name)); Flush_File = new BufferedOutputStream( new FileOutputStream( Flush_File_Name));
} }

View File

@@ -1,7 +1,7 @@
# $RCSfile: ReadMe.txt,v $ # $RCSfile: ReadMe.txt,v $
# $Revision: 1.3 $ # $Revision: 1.4 $
# $Name: $ # $Name: $
# $Date: 2002/05/03 17:23:49 $ # $Date: 2002/05/21 16:07:17 $
# $Author: giberta1 $ # $Author: giberta1 $
@@ -39,6 +39,8 @@ Notes:
- The Flush File is only used when TI Swift Batch Mode is enabled (by setting "-tisbm" command line switch). - The Flush File is only used when TI Swift Batch Mode is enabled (by setting "-tisbm" command line switch).
- When trim mode is enabled (by setting "-tm" command line switch), all the trailing spaces are removed.
- By default Message break is "\r\n", - By default Message break is "\r\n",
- By default Flush File Name is "flush.txt". - By default Flush File Name is "flush.txt".

View File

@@ -1,13 +1,34 @@
# $RCSfile: ReleaseNotes.txt,v $ # $RCSfile: ReleaseNotes.txt,v $
# $Revision: 1.4 $ # $Revision: 1.6 $
# $Name: $ # $Name: $
# $Date: 2002/05/06 10:00:34 $ # $Date: 2002/05/21 16:03:38 $
# $Author: giberta1 $ # $Author: giberta1 $
--------------------------------------------------------------------------------
MQSSave V 1.1.3 - A. Gibert - 21/05/02
--------------------------------------------------------------------------------
Add trim mode support,
Add "-tm" option,
Add MQQueueManager() auto retry,
Fix flush file name bad parsing bug,
Add version, date and author print out.
--------------------------------------------------------------------------------
MQSSave V 1.1.2 - A. Gibert - 13/05/02
--------------------------------------------------------------------------------
Rename SWIFTABORT into SWIFTERROR,
Add Legend printout line.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
MQSSave V 1.1.1 - A. Gibert - 06/05/02 MQSSave V 1.1.1 - A. Gibert - 06/05/02
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------