1 files changed, 48 insertions, 12 deletions

diff --git a/src/utils/xb_dumprecs.cpp b/src/utils/xb_dumprecs.cpp
index 0a85f45..cf6e33c 100755
--- a/src/utils/xb_dumprecs.cpp
+++ b/src/utils/xb_dumprecs.cpp
@@ -2,7 +2,7 @@
 
 XBase64 Software Library
 
-Copyright (c) 1997,2003,2014,2019 Gary A Kunkel
+Copyright (c) 1997,2003,2014,2019,2023 Gary A Kunkel
 
 The xb64 software library is covered under 
 the terms of the GPL Version 3, 2007 license.
@@ -17,27 +17,57 @@ Email Contact:
 #include <xbase.h>
 using namespace xb;
 
-int main(int ac,char** av)
+void PrintHelp();
+void PrintHelp(){
+  std::cout << "Usage: xb_dumprecs [-h] [-?] [--help] [-v] [--version] -i filename.DBF"  << std::endl << std::endl;
+  std::cout << "This program dumps data records in an xbase formatted DBF file to stdout in csv format." << std::endl;
+  std::cout << "Memo data (variable length) is not included in this export.  See program xb_dumpdpt for memo data." << std::endl << std::endl;
+}
+void PrintVersion();
+void PrintVersion(){
+  std::cout << "Xbase64 Version: " << xbase_VERSION_MAJOR << "." << xbase_VERSION_MINOR << "." << xbase_VERSION_PATCH << std::endl;
+}
+
+int main(int argc, char *argv[] )
 {
   xbXBase x;
+
+
   xbInt16 iRc;
   x.EnableMsgLogging();
   x.SetLogSize( 1000000L );
-//  xbUInt32 ulRecCnt = 0;
 
-  if (ac <= 1) {
-    std::cout << "Usage: xb_dumprecs filename..." << std::endl;
+  xbString sParm;
+  if (argc < 2 || x.GetCmdLineOpt( argc, argv, "-h", sParm ) ||
+                  x.GetCmdLineOpt( argc, argv, "-?", sParm ) ||
+                  x.GetCmdLineOpt( argc, argv, "--help", sParm )){
+    PrintHelp();
+    return 1;
+  }
+
+  if ( x.GetCmdLineOpt( argc, argv, "-v", sParm ) ||
+       x.GetCmdLineOpt( argc, argv, "--version", sParm )){
+    PrintVersion();
+    return 1;
+  }
+
+  if( !x.GetCmdLineOpt( argc, argv, "-i", sParm ) || sParm == "" ){
+    PrintHelp();
     return 1;
   }
 
   xbDbf *MyFile = NULL;
-  if(( iRc = x.OpenHighestVersion( av[1], "", &MyFile )) != XB_NO_ERROR ){
-    std::cout << "Could not open file iRc = " << iRc  << " file = "  << av[1] << std::endl;
+  if(( iRc = x.OpenHighestVersion( sParm.Str(), "", &MyFile )) != XB_NO_ERROR ){
+    std::cout << "Could not open file RC = " << iRc  << " file = "  << sParm.Str() << std::endl;
     x.DisplayError( iRc );
-    return 0;
+    return 1;
   }
 
-//  std::cout << "Processing file sequentially from beginning..." << std::endl;
+  //  std::cout << "Processing file sequentially from beginning..." << std::endl;
+
+  #ifdef XB_BLOCKREAD_SUPPORT
+  MyFile->EnableBlockReadProcessing();
+  #endif
 
   xbUInt32 j = 0;
   xbUInt32 ulRecCnt = 0;
@@ -48,15 +78,21 @@ int main(int ac,char** av)
     return iRc;
   while( j < ulRecCnt ){
     if( j == 0 )
-      iRc = MyFile->DumpRecord(++j, 2, 2 );
+      iRc = MyFile->DumpRecord(++j, 2, 2 );   // header + data
     else
-      iRc = MyFile->DumpRecord(++j, 2, 1 );
+      iRc = MyFile->DumpRecord(++j, 2, 1 );   // data only
     if( iRc != XB_NO_ERROR ){
       x.DisplayError( iRc );
       return 1;
     }
   }
-//  std::cout << j << " Records written to logile" << std::endl;
+  std::cout << j << " Records processed." << std::endl;
+
+  #ifdef XB_BLOCKREAD_SUPPORT
+  MyFile->DisableBlockReadProcessing();
+  #endif
+
   MyFile->Close();
+
   return 0;
 }