1 files changed, 94 insertions, 50 deletions

diff --git a/src/examples/xb_ex_v3_upd_dbf.cpp b/src/examples/xb_ex_v3_upd_dbf.cpp
index aa6ec49..eecba16 100755
--- a/src/examples/xb_ex_v3_upd_dbf.cpp
+++ b/src/examples/xb_ex_v3_upd_dbf.cpp
@@ -2,7 +2,7 @@
 
 XBase64 Software Library
 
-Copyright (c) 1997,2003,2014,2021,2022 Gary A Kunkel
+Copyright (c) 1997,2003,2014,2021,2022,2023 Gary A Kunkel
 
 The xb64 software library is covered under the terms of the GPL Version 3, 2007 license.
 
@@ -45,7 +45,9 @@ int main()
   x.WriteLogMessage( "Program [xb_ex_v3_upd_dbf] initializing..." );
 
 
-  xbDbf * MyTable = new xbDbf3( &x );                            /* class for V3 table */
+  xbDbf * MyTable = new xbDbf3( &x );       /* class for V3 table */
+
+  xbString sSearchKey;                      /* string for doing an index lookup */
 
   xbInt16 iRc = 0;
   xbInt16 iErrorStop = 0;
@@ -53,29 +55,36 @@ int main()
   try{
 
     if(( iRc = MyTable->Open( "MyV3Table1.DBF" )) != XB_NO_ERROR ){
-      iErrorStop = 1;
+      iErrorStop = 100;
       throw iRc;
     }
 
+
     #ifdef XB_NDX_SUPPORT
     // V3 NDX style indices can be opened manually  (vs production MDX index files opened automatically)
+
+
     if(( iRc = MyTable->OpenIndex( "NDX", "MYINDEX1.NDX")) != XB_NO_ERROR ){
-      iErrorStop = 2;
+      iErrorStop = 110;
       throw iRc;
     }
+
+
+/*
     if(( iRc = MyTable->OpenIndex( "NDX", "MYINDEX2.NDX" )) != XB_NO_ERROR ){
-      iErrorStop = 3;
+      iErrorStop = 120;
       throw iRc;
     }
+
     if(( iRc = MyTable->OpenIndex( "NDX", "MYINDEX3.NDX" )) != XB_NO_ERROR ){ 
-      iErrorStop = 4;
+      iErrorStop = 130;
       throw iRc;
     }
+*/
+
     std::cout << "Current tag = [" << MyTable->GetCurTagName().Str() << "]\n";
     #endif
 
-
-
     // get the field numbers for all the fields in the table
     fld_FIRSTNAME = MyTable->GetFieldNo( "FIRSTNAME" );
     fld_LASTNAME  = MyTable->GetFieldNo( "LASTNAME" );
@@ -84,189 +93,223 @@ int main()
     fld_RETIRED   = MyTable->GetFieldNo( "RETIRED?" );
     fld_ZIPCODE   = MyTable->GetFieldNo( "ZIPCODE" );
 
+
+
+    // do an index lookup for (key does not exist in this example)
+    sSearchKey = "abc123";
+    if(( iRc = MyTable->Find( sSearchKey )) != XB_NOT_FOUND ){
+      iErrorStop = 140;
+      throw iRc;
+    }
+    std::cout << "RC = " << iRc << "\n";
+
+
+
     #ifdef XB_MEMO_SUPPORT
     fld_MEMO1     = MyTable->GetFieldNo( "MEMO1" );
     #endif
 
 
+
     // Blank the record buffer
     if(( iRc = MyTable->BlankRecord()) != XB_NO_ERROR ){
-      iErrorStop = 7;
+      iErrorStop = 140;
       throw iRc;
     }
 
+
     // put field examples - using field numbers
     if(( iRc = MyTable->PutField( fld_LASTNAME, "JONES" )) != XB_NO_ERROR ){
-      iErrorStop = 8;
+      iErrorStop = 150;
       throw iRc;
     }
 
+
     if(( iRc = MyTable->PutField( fld_FIRSTNAME, "JERRY" )) != XB_NO_ERROR ){
-      iErrorStop = 9;
+      iErrorStop = 160;
       throw iRc;
     }
 
+
     if(( iRc = MyTable->PutField( fld_AMOUNT, "12.35" )) != XB_NO_ERROR ){
-      iErrorStop = 10;
+      iErrorStop = 170;
       throw iRc;
     }
 
     if(( iRc = MyTable->PutField( fld_BIRTHDATE, "19880208" )) != XB_NO_ERROR ){
-      iErrorStop = 10;
+      iErrorStop = 180;
       throw iRc;
     }
 
     if(( iRc = MyTable->PutLogicalField( fld_RETIRED, "Y" )) != XB_NO_ERROR ){
-      iErrorStop = 11;
+      iErrorStop = 190;
       throw iRc;
     }
 
     if(( iRc = MyTable->PutLongField( fld_ZIPCODE, 12345 )) != XB_NO_ERROR ){
-      iErrorStop = 12;
+      iErrorStop = 200;
       throw iRc;
     }
 
     #ifdef XB_MEMO_SUPPORT
     sMemoData = "Memo data record 1";
     if(( iRc = MyTable->UpdateMemoField( fld_MEMO1, sMemoData )) != XB_NO_ERROR ){
-      iErrorStop = 13;
+      iErrorStop = 210;
       throw iRc;
     }
     #endif
 
     // Append the first record
     if(( iRc = MyTable->AppendRecord()) != XB_NO_ERROR ){
-      iErrorStop = 15;
-      throw iRc;
+      // here is where you would address any errors.
+      // in this program, we simply abort and continue
+      MyTable->Abort();
     }
 
     // put field to the record buffer using field name (slightly less efficient than using field numbers)
-
     // Blank the record buffer
     if(( iRc = MyTable->BlankRecord()) != XB_NO_ERROR ){
-      iErrorStop = 20;
+      iErrorStop = 220;
       throw iRc;
     }
 
     if(( iRc = MyTable->PutField( "LASTNAME", "EINSTIEN" )) != XB_NO_ERROR ){
-      iErrorStop = 21;
+      iErrorStop = 230;
       throw iRc;
     }
 
     if(( iRc = MyTable->PutField( "FIRSTNAME", "ALBERT" )) != XB_NO_ERROR ){
-      iErrorStop = 22;
+      iErrorStop = 240;
       throw iRc;
     }
 
     if(( iRc = MyTable->PutField( "AMOUNT", "987.55" )) != XB_NO_ERROR ){
-      iErrorStop = 23;
+      iErrorStop = 250;
       throw iRc;
     }
 
     if(( iRc = MyTable->PutField( fld_BIRTHDATE, "19890209" )) != XB_NO_ERROR ){
-      iErrorStop = 24;
+      iErrorStop = 260;
       throw iRc;
     }
 
     if(( iRc = MyTable->PutLogicalField( "RETIRED?", "N" )) != XB_NO_ERROR ){
-      iErrorStop = 25;
+      iErrorStop = 270;
       throw iRc;
     }
 
     if(( iRc = MyTable->PutLongField( "ZIPCODE", 44256 )) != XB_NO_ERROR ){
-      iErrorStop = 26;
+      iErrorStop = 280;
       throw iRc;
     }
 
     #ifdef XB_MEMO_SUPPORT
     sMemoData = "Memo data record 2";
     if(( iRc = MyTable->UpdateMemoField( fld_MEMO1, sMemoData )) != XB_NO_ERROR ){
-      iErrorStop = 27;
+      iErrorStop = 290;
       throw iRc;
     }
     #endif
 
     // Append the second record 
     if(( iRc = MyTable->AppendRecord()) != XB_NO_ERROR ){
-      iErrorStop = 30;
-      throw iRc;
+      // here is where you would address any errors.
+      // in this program, we simply abort and continue
+      MyTable->Abort();
     }
 
+
+    if(( iRc = MyTable->GetRecord( 1 )) != XB_NO_ERROR ){
+      iErrorStop = 300;
+      throw iRc;
+    }
     // get a field with a field number
-    xbString FirstName;
-    if(( iRc = MyTable->GetField( fld_FIRSTNAME, FirstName )) < 0 ){
-      iErrorStop = 40;
+    xbString sFirstName;
+    if(( iRc = MyTable->GetField( fld_FIRSTNAME, sFirstName )) < 0 ){
+      iErrorStop = 310;
       throw iRc;
     }
-    std::cout << "First Name is [" << FirstName.Str() << "]" << std::endl;
+    std::cout << "First Name is [" << sFirstName.Str() << "]" << std::endl;
 
-    xbString LastName;
-    if(( iRc = MyTable->GetField( "LASTNAME", LastName )) < 0 ){
-      iErrorStop = 41;
+    xbString sLastName;
+    if(( iRc = MyTable->GetField( "LASTNAME", sLastName )) < 0 ){
+      iErrorStop = 320;
       throw iRc;
     }
-    std::cout << "Last Name is [" << LastName.Str() << "]" << std::endl;
+    std::cout << "Last Name is [" << sLastName.Str() << "]" << std::endl;
 
     xbInt16 iNoOfDecimals;
     if(( iRc = MyTable->GetFieldDecimal( "AMOUNT", iNoOfDecimals )) != XB_NO_ERROR ){
-      iErrorStop = 42;
+      iErrorStop = 330;
       throw iRc;
     }
     std::cout << "There are " << iNoOfDecimals << " decimals in the AMOUNT field" << std::endl;
 
     xbString FieldName;
     if(( iRc = MyTable->GetFieldName( 4, FieldName )) != XB_NO_ERROR ){
-      iErrorStop = 43;
+      iErrorStop = 340;
       throw iRc;
     }
     std::cout << "Field #4 name is " << FieldName.Str() << std::endl;
 
     xbString sRetired;
     if(( iRc = MyTable->GetLogicalField( "RETIRED?", sRetired )) < 0 ){
-      iErrorStop = 45;
+      iErrorStop = 350;
       throw iRc;
     }
     std::cout << "Switch value = [" << sRetired.Str() << "]" << std::endl;
 
     xbInt32 lZip;
     if(( iRc = MyTable->GetLongField( "ZIPCODE", lZip )) < 0  ){
-      iErrorStop = 46;
+      iErrorStop = 360;
       throw iRc;
     }
     std::cout << "Long value = [" << lZip << "]" << std::endl;
 
     // Initialize the record buffer in preparation for another record
     if(( iRc = MyTable->BlankRecord()) != XB_NO_ERROR ){
-      iErrorStop = 48;
+      iErrorStop = 370;
       throw iRc;
     }
 
     // Append another record (it will be blank)
     if(( iRc = MyTable->AppendRecord()) != XB_NO_ERROR ){
-      iErrorStop = 49;
-      throw iRc;
+      // here is where you would address any errors.
+      // in this program, we simply abort and continue
+      MyTable->Abort();
     };
 
-    // mark current record for deletion
+    // mark record 1 for deletion
+    if(( iRc = MyTable->GetRecord( 1 )) != XB_NO_ERROR ){
+      iErrorStop = 300;
+      throw iRc;
+    }
+
     if(( iRc = MyTable->DeleteRecord()) != XB_NO_ERROR ){
-      iErrorStop = 50;
+      iErrorStop = 380;
       throw iRc;
     };
 
     // save current record
     if(( iRc = MyTable->PutRecord()) != XB_NO_ERROR ){
-      iErrorStop = 51;
+      iErrorStop = 390;
       throw iRc;
     }
     // pack the table with no options
     if(( iRc = MyTable->Pack()) != XB_NO_ERROR ){
-      iErrorStop = 52;
+      iErrorStop = 400;
       throw iRc;
     }
 
+    if(( iRc = MyTable->Commit()) != XB_NO_ERROR ){
+      // here is where you would address any errors.
+      // in this program, we simply abort and continue
+      MyTable->Abort();
+    }
+
     /* Close database and associated indexes */
     if(( iRc = MyTable->Close())   != XB_NO_ERROR ){
-      iErrorStop = 53;
+      iErrorStop = 410;
       throw iRc;
     }
 
@@ -276,7 +319,8 @@ int main()
     std::cout << x.GetErrorMessage( rc ) << std::endl;
   }
 
-#endif // XB_DBF3_SUPPORT
+  delete MyTable;
 
+  #endif // XB_DBF3_SUPPORT
   return 0;
 }