From 517ad9d4b6eae320b708d03a9340a22893b0cab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 29 Jan 2023 15:45:51 +0100 Subject: New upstream version 4.0.3 --- AUTHORS | Bin 7413760 -> 1619 bytes INSTALL | 2 +- NEWS | 30 +- README | 9 +- TODO | 2 +- build/borland5.5/CMakeLists.txt | 65 +- build/cmake/CMakeLists.txt | 65 +- build/linux32/CMakeLists.txt | 65 +- build/linux64/CMakeLists.txt | 64 +- build/mac64/CMakeLists.txt | 65 +- build/win32vs/CMakeLists.txt | 65 +- build/win64vs/CMakeLists.txt | 65 +- data/CopyStructureV3NoMemos.DBF | Bin 321 -> 0 bytes data/CopyStructureV4NoMemos.DBF | Bin 353 -> 0 bytes data/ExpTest.DBF | Bin 232 -> 0 bytes data/Functest.DBF | Bin 156 -> 0 bytes data/LockTest.DBF | Bin 114 -> 0 bytes data/LockTest.DBT | Bin 1024 -> 0 bytes data/TMDXDB01.DBF | Bin 58962 -> 0 bytes data/TMDXDB01.MDX | Bin 135168 -> 0 bytes data/TestFilt.DBF | Bin 1950 -> 0 bytes data/TestFilt.NDX | Bin 4096 -> 0 bytes data/TestNdx.DBF | Bin 283 -> 0 bytes data/TestNdx.INF | 5 - data/TestNdxC.NDX | Bin 1024 -> 0 bytes data/TestNdxD.NDX | Bin 19456 -> 0 bytes data/TestNdxN.NDX | Bin 19456 -> 0 bytes data/TestSQL.DBF | Bin 287 -> 0 bytes data/TestSQL.DBT | Bin 2048 -> 0 bytes data/TestV3.DBF | Bin 321 -> 0 bytes data/TestV3_memos.DBF | Bin 216 -> 0 bytes data/TestV3_memos.DBT | Bin 6144 -> 0 bytes data/TestV4.DBF | Bin 542 -> 0 bytes data/TestV4_memos.DBF | Bin 278 -> 0 bytes data/TestV4_memos.DBT | Bin 7168 -> 0 bytes data/xbfile.txt | 1 - docs/doxygen/html/classxb_1_1xbDate.html | 60 +- docs/doxygen/html/classxb_1_1xbDbf.html | 363 ++++++---- docs/doxygen/html/classxb_1_1xbFile.html | 110 +-- docs/doxygen/html/classxb_1_1xbSsv.html | 44 +- docs/doxygen/html/classxb_1_1xbString.html | 72 +- docs/doxygen/html/classxb_1_1xbTblMgr.html | 80 ++- docs/doxygen/html/classxb_1_1xbXBase.html | 88 ++- .../html/dir_25b94c3afce00ed38231227d8141f932.html | 6 +- .../html/dir_313caf1132e152dd9b58bea13a4052ca.html | 8 +- .../html/dir_68267d1309a1af8e8297ef4c3efbcdba.html | 2 +- .../html/dir_aebb8dcc11953d78e620bbef0b9e2183.html | 2 +- .../html/dir_b0856f6b0d80ccb263b2f415c91f9e17.html | 2 +- .../html/dir_d93a1d4020dea85bb71b237545b5e722.html | 4 +- .../html/dir_e931c1a3f0014e624d0645a271726ad2.html | 2 +- docs/doxygen/html/files.html | 56 +- docs/doxygen/html/functions_b.html | 1 + docs/doxygen/html/functions_d.html | 4 +- docs/doxygen/html/functions_func_b.html | 1 + docs/doxygen/html/functions_func_d.html | 4 +- docs/doxygen/html/functions_func_g.html | 3 +- docs/doxygen/html/functions_func_m.html | 2 +- docs/doxygen/html/functions_func_o.html | 2 +- docs/doxygen/html/functions_func_r.html | 2 + docs/doxygen/html/functions_g.html | 3 +- docs/doxygen/html/functions_m.html | 2 +- docs/doxygen/html/functions_o.html | 2 +- docs/doxygen/html/functions_r.html | 2 + docs/doxygen/html/functions_x.html | 2 +- docs/doxygen/html/globals.html | 12 +- docs/doxygen/html/globals_func.html | 12 +- docs/doxygen/html/menudata.js | 6 +- docs/doxygen/html/search/all_0.js | 2 +- docs/doxygen/html/search/all_1.js | 5 +- docs/doxygen/html/search/all_12.js | 3 +- docs/doxygen/html/search/all_15.js | 189 ++--- docs/doxygen/html/search/all_2.js | 45 +- docs/doxygen/html/search/all_3.js | 31 +- docs/doxygen/html/search/all_5.js | 9 +- docs/doxygen/html/search/all_6.js | 33 +- docs/doxygen/html/search/all_b.js | 4 +- docs/doxygen/html/search/all_d.js | 2 +- docs/doxygen/html/search/all_f.js | 11 +- docs/doxygen/html/search/files_0.js | 2 +- docs/doxygen/html/search/files_1.js | 99 ++- docs/doxygen/html/search/functions_0.js | 2 +- docs/doxygen/html/search/functions_1.js | 5 +- docs/doxygen/html/search/functions_12.js | 3 +- docs/doxygen/html/search/functions_15.js | 2 +- docs/doxygen/html/search/functions_3.js | 4 +- docs/doxygen/html/search/functions_5.js | 9 +- docs/doxygen/html/search/functions_6.js | 33 +- docs/doxygen/html/search/functions_b.js | 4 +- docs/doxygen/html/search/functions_d.js | 2 +- docs/doxygen/html/search/functions_f.js | 6 +- docs/doxygen/html/search/searchdata.js | 2 +- docs/doxygen/html/structxb_1_1xbSchema.html | 2 +- docs/doxygen/html/structxb_1_1xbTblList.html | 2 +- docs/doxygen/html/tstfuncs_8cpp.html | 50 +- docs/doxygen/html/xb__cfg__check_8cpp.html | 2 +- docs/doxygen/html/xb__copydbf_8cpp.html | 2 +- docs/doxygen/html/xb__dbfutil_8cpp.html | 2 +- docs/doxygen/html/xb__deletall_8cpp.html | 2 +- docs/doxygen/html/xb__dumpdbt_8cpp.html | 2 +- docs/doxygen/html/xb__dumphdr_8cpp.html | 2 +- docs/doxygen/html/xb__dumpix_8cpp.html | 2 +- docs/doxygen/html/xb__dumprecs_8cpp.html | 2 +- docs/doxygen/html/xb__ex__date_8cpp.html | 2 +- docs/doxygen/html/xb__ex__sql_8cpp.html | 2 +- docs/doxygen/html/xb__ex__string_8cpp.html | 2 +- .../doxygen/html/xb__ex__v3__create__dbf_8cpp.html | 2 +- docs/doxygen/html/xb__ex__v3__upd__dbf_8cpp.html | 2 +- .../doxygen/html/xb__ex__v4__create__dbf_8cpp.html | 2 +- docs/doxygen/html/xb__ex__v4__upd__dbf_8cpp.html | 2 +- docs/doxygen/html/xb__execsql_8cpp.html | 2 +- docs/doxygen/html/xb__pack_8cpp.html | 2 +- docs/doxygen/html/xb__tblinfo_8cpp.html | 2 +- docs/doxygen/html/xb__test__bcd_8cpp.html | 2 +- docs/doxygen/html/xb__test__date_8cpp.html | 2 +- .../html/xb__test__dbf__v3__memos_8cpp.html | 2 +- .../html/xb__test__dbf__v3__nomemos_8cpp.html | 2 +- .../html/xb__test__dbf__v4__memos_8cpp.html | 2 +- .../html/xb__test__dbf__v4__nomemos_8cpp.html | 2 +- docs/doxygen/html/xb__test__expnode_8cpp.html | 2 +- docs/doxygen/html/xb__test__expression_8cpp.html | 2 +- docs/doxygen/html/xb__test__file_8cpp.html | 2 +- docs/doxygen/html/xb__test__filter_8cpp.html | 2 +- docs/doxygen/html/xb__test__funcs_8cpp.html | 2 +- docs/doxygen/html/xb__test__linklist_8cpp.html | 2 +- docs/doxygen/html/xb__test__lock2_8cpp.html | 2 +- docs/doxygen/html/xb__test__lock_8cpp.html | 2 +- docs/doxygen/html/xb__test__log_8cpp.html | 2 +- docs/doxygen/html/xb__test__mdx_8cpp.html | 2 +- docs/doxygen/html/xb__test__ndx_8cpp.html | 2 +- docs/doxygen/html/xb__test__sql_8cpp.html | 2 +- docs/doxygen/html/xb__test__string_8cpp.html | 2 +- docs/doxygen/html/xb__test__tblmgr_8cpp.html | 2 +- docs/doxygen/html/xb__test__uda_8cpp.html | 2 +- docs/doxygen/html/xb__test__xbase_8cpp.html | 2 +- docs/doxygen/html/xb__undelall_8cpp.html | 2 +- docs/doxygen/html/xb__zap_8cpp.html | 2 +- docs/doxygen/html/xbalttbl_8cpp.html | 80 +++ docs/doxygen/html/xbase_8h.html | 2 +- docs/doxygen/html/xbase_8h_source.html | 68 +- docs/doxygen/html/xbbcd_8cpp.html | 2 +- docs/doxygen/html/xbbcd_8h.html | 2 +- docs/doxygen/html/xbbcd_8h_source.html | 50 +- docs/doxygen/html/xbcrix_8cpp.html | 2 +- docs/doxygen/html/xbcrtbl_8cpp.html | 2 +- docs/doxygen/html/xbdate_8cpp.html | 2 +- docs/doxygen/html/xbdate_8h.html | 2 +- docs/doxygen/html/xbdate_8h_source.html | 2 +- docs/doxygen/html/xbdbf3_8cpp.html | 2 +- docs/doxygen/html/xbdbf4_8cpp.html | 2 +- docs/doxygen/html/xbdbf_8cpp.html | 2 +- docs/doxygen/html/xbdbf_8h.html | 2 +- docs/doxygen/html/xbdbf_8h_source.html | 674 +++++++++--------- docs/doxygen/html/xbdelete_8cpp.html | 80 +++ docs/doxygen/html/xbdrpix_8cpp.html | 2 +- docs/doxygen/html/xbdrptbl_8cpp.html | 2 +- docs/doxygen/html/xbexp_8cpp.html | 2 +- docs/doxygen/html/xbexp_8h.html | 2 +- docs/doxygen/html/xbexp_8h_source.html | 2 +- docs/doxygen/html/xbexpnode_8cpp.html | 2 +- docs/doxygen/html/xbexpnode_8h.html | 2 +- docs/doxygen/html/xbexpnode_8h_source.html | 2 +- docs/doxygen/html/xbfields_8cpp.html | 2 +- docs/doxygen/html/xbfile_8cpp.html | 2 +- docs/doxygen/html/xbfile_8h.html | 2 +- docs/doxygen/html/xbfile_8h_source.html | 81 ++- docs/doxygen/html/xbfilter_8cpp.html | 2 +- docs/doxygen/html/xbfilter_8h.html | 2 +- docs/doxygen/html/xbfilter_8h_source.html | 2 +- docs/doxygen/html/xbfuncs_8cpp.html | 2 +- docs/doxygen/html/xbindex_8h.html | 2 +- docs/doxygen/html/xbindex_8h_source.html | 2 +- docs/doxygen/html/xbinsert_8cpp.html | 2 +- docs/doxygen/html/xbixbase_8cpp.html | 2 +- docs/doxygen/html/xbixmdx_8cpp.html | 2 +- docs/doxygen/html/xbixndx_8cpp.html | 2 +- docs/doxygen/html/xblnklst_8h.html | 2 +- docs/doxygen/html/xblnklst_8h_source.html | 2 +- docs/doxygen/html/xblnklstord_8h.html | 2 +- docs/doxygen/html/xblnklstord_8h_source.html | 2 +- docs/doxygen/html/xblnknod_8h.html | 2 +- docs/doxygen/html/xblnknod_8h_source.html | 2 +- docs/doxygen/html/xblog_8cpp.html | 2 +- docs/doxygen/html/xblog_8h.html | 2 +- docs/doxygen/html/xblog_8h_source.html | 2 +- docs/doxygen/html/xbmemo3_8cpp.html | 2 +- docs/doxygen/html/xbmemo4_8cpp.html | 2 +- docs/doxygen/html/xbmemo_8cpp.html | 2 +- docs/doxygen/html/xbmemo_8h.html | 2 +- docs/doxygen/html/xbmemo_8h_source.html | 265 +++---- docs/doxygen/html/xbretcod_8h.html | 2 +- docs/doxygen/html/xbretcod_8h_source.html | 2 +- docs/doxygen/html/xbset_8cpp.html | 2 +- docs/doxygen/html/xbsql_8cpp.html | 2 +- docs/doxygen/html/xbsql_8h.html | 2 +- docs/doxygen/html/xbsql_8h_source.html | 57 +- docs/doxygen/html/xbssv_8cpp.html | 2 +- docs/doxygen/html/xbssv_8h.html | 2 +- docs/doxygen/html/xbssv_8h_source.html | 197 +++--- docs/doxygen/html/xbstring_8cpp.html | 2 +- docs/doxygen/html/xbstring_8h.html | 2 +- docs/doxygen/html/xbstring_8h_source.html | 97 +-- docs/doxygen/html/xbtag_8cpp.html | 2 +- docs/doxygen/html/xbtag_8h.html | 2 +- docs/doxygen/html/xbtag_8h_source.html | 2 +- docs/doxygen/html/xbtblmgr_8cpp.html | 2 +- docs/doxygen/html/xbtblmgr_8h.html | 2 +- docs/doxygen/html/xbtblmgr_8h_source.html | 43 +- docs/doxygen/html/xbtypes_8h.html | 2 +- docs/doxygen/html/xbtypes_8h_source.html | 2 +- docs/doxygen/html/xbuda_8cpp.html | 2 +- docs/doxygen/html/xbuda_8h.html | 2 +- docs/doxygen/html/xbuda_8h_source.html | 2 +- docs/doxygen/html/xbxbase_8cpp.html | 2 +- docs/doxygen/html/xbxbase_8h.html | 2 +- docs/doxygen/html/xbxbase_8h_source.html | 2 +- docs/doxygen/latex/classxb_1_1xbDate.pdf | Bin 4739 -> 4739 bytes docs/doxygen/latex/classxb_1_1xbDate.tex | 20 +- docs/doxygen/latex/classxb_1_1xbDbf.pdf | Bin 4914 -> 4914 bytes docs/doxygen/latex/classxb_1_1xbDbf.tex | 255 +++++-- docs/doxygen/latex/classxb_1_1xbFile.pdf | Bin 4915 -> 4915 bytes docs/doxygen/latex/classxb_1_1xbFile.tex | 46 +- docs/doxygen/latex/classxb_1_1xbSsv.pdf | Bin 6100 -> 6100 bytes docs/doxygen/latex/classxb_1_1xbSsv.tex | 20 +- docs/doxygen/latex/classxb_1_1xbString.tex | 36 +- docs/doxygen/latex/classxb_1_1xbTblMgr.pdf | Bin 5490 -> 5490 bytes docs/doxygen/latex/classxb_1_1xbTblMgr.tex | 28 +- docs/doxygen/latex/classxb_1_1xbXBase.pdf | Bin 5492 -> 5492 bytes docs/doxygen/latex/classxb_1_1xbXBase.tex | 28 +- .../latex/dir_25b94c3afce00ed38231227d8141f932.tex | 8 +- .../latex/dir_313caf1132e152dd9b58bea13a4052ca.tex | 10 +- .../latex/dir_68267d1309a1af8e8297ef4c3efbcdba.tex | 4 +- .../latex/dir_aebb8dcc11953d78e620bbef0b9e2183.tex | 4 +- .../latex/dir_b0856f6b0d80ccb263b2f415c91f9e17.tex | 4 +- .../latex/dir_d93a1d4020dea85bb71b237545b5e722.tex | 6 +- .../latex/dir_e931c1a3f0014e624d0645a271726ad2.tex | 4 +- docs/doxygen/latex/files.tex | 200 +++--- docs/doxygen/latex/refman.tex | 6 +- docs/doxygen/latex/structxb_1_1xbSchema.tex | 2 +- docs/doxygen/latex/structxb_1_1xbTblList.tex | 2 +- docs/doxygen/latex/tstfuncs_8cpp.tex | 12 +- docs/doxygen/latex/xb__cfg__check_8cpp.tex | 4 +- docs/doxygen/latex/xb__copydbf_8cpp.tex | 4 +- docs/doxygen/latex/xb__dbfutil_8cpp.tex | 4 +- docs/doxygen/latex/xb__deletall_8cpp.tex | 4 +- docs/doxygen/latex/xb__dumpdbt_8cpp.tex | 4 +- docs/doxygen/latex/xb__dumphdr_8cpp.tex | 4 +- docs/doxygen/latex/xb__dumpix_8cpp.tex | 4 +- docs/doxygen/latex/xb__dumprecs_8cpp.tex | 4 +- docs/doxygen/latex/xb__ex__date_8cpp.tex | 4 +- docs/doxygen/latex/xb__ex__sql_8cpp.tex | 4 +- docs/doxygen/latex/xb__ex__string_8cpp.tex | 4 +- .../doxygen/latex/xb__ex__v3__create__dbf_8cpp.tex | 4 +- docs/doxygen/latex/xb__ex__v3__upd__dbf_8cpp.tex | 4 +- .../doxygen/latex/xb__ex__v4__create__dbf_8cpp.tex | 4 +- docs/doxygen/latex/xb__ex__v4__upd__dbf_8cpp.tex | 4 +- docs/doxygen/latex/xb__execsql_8cpp.tex | 4 +- docs/doxygen/latex/xb__pack_8cpp.tex | 4 +- docs/doxygen/latex/xb__tblinfo_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__bcd_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__date_8cpp.tex | 4 +- .../latex/xb__test__dbf__v3__memos_8cpp.tex | 4 +- .../latex/xb__test__dbf__v3__nomemos_8cpp.tex | 4 +- .../latex/xb__test__dbf__v4__memos_8cpp.tex | 4 +- .../latex/xb__test__dbf__v4__nomemos_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__expnode_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__expression_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__file_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__filter_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__funcs_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__linklist_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__lock2_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__lock_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__log_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__mdx_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__ndx_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__sql_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__string_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__tblmgr_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__uda_8cpp.tex | 4 +- docs/doxygen/latex/xb__test__xbase_8cpp.tex | 4 +- docs/doxygen/latex/xb__undelall_8cpp.tex | 4 +- docs/doxygen/latex/xb__zap_8cpp.tex | 4 +- docs/doxygen/latex/xbalttbl_8cpp.tex | 3 + docs/doxygen/latex/xbase_8h.tex | 4 +- docs/doxygen/latex/xbase_8h_source.tex | 68 +- docs/doxygen/latex/xbbcd_8cpp.tex | 4 +- docs/doxygen/latex/xbbcd_8h.tex | 4 +- docs/doxygen/latex/xbbcd_8h_source.tex | 50 +- docs/doxygen/latex/xbcrix_8cpp.tex | 4 +- docs/doxygen/latex/xbcrtbl_8cpp.tex | 4 +- docs/doxygen/latex/xbdate_8cpp.tex | 4 +- docs/doxygen/latex/xbdate_8h.tex | 4 +- docs/doxygen/latex/xbdate_8h_source.tex | 2 +- docs/doxygen/latex/xbdbf3_8cpp.tex | 4 +- docs/doxygen/latex/xbdbf4_8cpp.tex | 4 +- docs/doxygen/latex/xbdbf_8cpp.tex | 4 +- docs/doxygen/latex/xbdbf_8h.tex | 4 +- docs/doxygen/latex/xbdbf_8h_source.tex | 663 +++++++++--------- docs/doxygen/latex/xbdelete_8cpp.tex | 3 + docs/doxygen/latex/xbdrpix_8cpp.tex | 4 +- docs/doxygen/latex/xbdrptbl_8cpp.tex | 4 +- docs/doxygen/latex/xbexp_8cpp.tex | 4 +- docs/doxygen/latex/xbexp_8h.tex | 4 +- docs/doxygen/latex/xbexp_8h_source.tex | 2 +- docs/doxygen/latex/xbexpnode_8cpp.tex | 4 +- docs/doxygen/latex/xbexpnode_8h.tex | 4 +- docs/doxygen/latex/xbexpnode_8h_source.tex | 2 +- docs/doxygen/latex/xbfields_8cpp.tex | 4 +- docs/doxygen/latex/xbfile_8cpp.tex | 4 +- docs/doxygen/latex/xbfile_8h.tex | 4 +- docs/doxygen/latex/xbfile_8h_source.tex | 79 ++- docs/doxygen/latex/xbfilter_8cpp.tex | 4 +- docs/doxygen/latex/xbfilter_8h.tex | 4 +- docs/doxygen/latex/xbfilter_8h_source.tex | 2 +- docs/doxygen/latex/xbfuncs_8cpp.tex | 4 +- docs/doxygen/latex/xbindex_8h.tex | 4 +- docs/doxygen/latex/xbindex_8h_source.tex | 2 +- docs/doxygen/latex/xbinsert_8cpp.tex | 4 +- docs/doxygen/latex/xbixbase_8cpp.tex | 4 +- docs/doxygen/latex/xbixmdx_8cpp.tex | 4 +- docs/doxygen/latex/xbixndx_8cpp.tex | 4 +- docs/doxygen/latex/xblnklst_8h.tex | 4 +- docs/doxygen/latex/xblnklst_8h_source.tex | 2 +- docs/doxygen/latex/xblnklstord_8h.tex | 4 +- docs/doxygen/latex/xblnklstord_8h_source.tex | 2 +- docs/doxygen/latex/xblnknod_8h.tex | 4 +- docs/doxygen/latex/xblnknod_8h_source.tex | 2 +- docs/doxygen/latex/xblog_8cpp.tex | 4 +- docs/doxygen/latex/xblog_8h.tex | 4 +- docs/doxygen/latex/xblog_8h_source.tex | 2 +- docs/doxygen/latex/xbmemo3_8cpp.tex | 4 +- docs/doxygen/latex/xbmemo4_8cpp.tex | 4 +- docs/doxygen/latex/xbmemo_8cpp.tex | 4 +- docs/doxygen/latex/xbmemo_8h.tex | 4 +- docs/doxygen/latex/xbmemo_8h_source.tex | 265 +++---- docs/doxygen/latex/xbretcod_8h.tex | 4 +- docs/doxygen/latex/xbretcod_8h_source.tex | 2 +- docs/doxygen/latex/xbset_8cpp.tex | 4 +- docs/doxygen/latex/xbsql_8cpp.tex | 4 +- docs/doxygen/latex/xbsql_8h.tex | 4 +- docs/doxygen/latex/xbsql_8h_source.tex | 57 +- docs/doxygen/latex/xbssv_8cpp.tex | 4 +- docs/doxygen/latex/xbssv_8h.tex | 4 +- docs/doxygen/latex/xbssv_8h_source.tex | 193 +++--- docs/doxygen/latex/xbstring_8cpp.tex | 4 +- docs/doxygen/latex/xbstring_8h.tex | 4 +- docs/doxygen/latex/xbstring_8h_source.tex | 97 +-- docs/doxygen/latex/xbtag_8cpp.tex | 4 +- docs/doxygen/latex/xbtag_8h.tex | 4 +- docs/doxygen/latex/xbtag_8h_source.tex | 2 +- docs/doxygen/latex/xbtblmgr_8cpp.tex | 4 +- docs/doxygen/latex/xbtblmgr_8h.tex | 4 +- docs/doxygen/latex/xbtblmgr_8h_source.tex | 43 +- docs/doxygen/latex/xbtypes_8h.tex | 4 +- docs/doxygen/latex/xbtypes_8h_source.tex | 2 +- docs/doxygen/latex/xbuda_8cpp.tex | 4 +- docs/doxygen/latex/xbuda_8h.tex | 4 +- docs/doxygen/latex/xbuda_8h_source.tex | 2 +- docs/doxygen/latex/xbxbase_8cpp.tex | 4 +- docs/doxygen/latex/xbxbase_8h.tex | 4 +- docs/doxygen/latex/xbxbase_8h_source.tex | 2 +- docs/howto/AddNewMemoFileType.txt | 9 + docs/html/Xbase64ClassDiagram.jpg | Bin 0 -> 93778 bytes docs/html/gpl-3.0.txt | 674 ++++++++++++++++++ docs/html/index.htm | 33 - docs/html/index.html | 43 ++ docs/html/xbab.html | 69 ++ docs/html/xbac.html | 102 +++ docs/html/xbad.html | 27 + docs/html/xbae.html | 94 +++ docs/html/xbaf.html | 45 ++ docs/html/xbbib.htm | 63 -- docs/html/xbc1.htm | 185 ----- docs/html/xbc1.html | 199 ++++++ docs/html/xbc10.htm | 12 - docs/html/xbc10.html | 12 + docs/html/xbc11.htm | 12 - docs/html/xbc11.html | 12 + docs/html/xbc12.htm | 72 -- docs/html/xbc12.html | 86 +++ docs/html/xbc13.htm | 46 -- docs/html/xbc13.html | 46 ++ docs/html/xbc14.htm | 12 - docs/html/xbc14.html | 113 +++ docs/html/xbc15.htm | 34 - docs/html/xbc15.html | 51 ++ docs/html/xbc2.htm | 267 ------- docs/html/xbc2.html | 267 +++++++ docs/html/xbc3.htm | 73 -- docs/html/xbc3.html | 73 ++ docs/html/xbc4.htm | 80 --- docs/html/xbc4.html | 81 +++ docs/html/xbc5.htm | 205 ------ docs/html/xbc5.html | 208 ++++++ docs/html/xbc6.htm | 137 ---- docs/html/xbc6.html | 153 ++++ docs/html/xbc7.htm | 153 ---- docs/html/xbc7.html | 153 ++++ docs/html/xbc8.htm | 79 --- docs/html/xbc8.html | 79 +++ docs/html/xbc9.htm | 179 ----- docs/html/xbc9.html | 180 +++++ logs/Linux_x64.xbLog.txt | 254 ------- sql/del.sql | 9 - sql/droptbl.sql | 9 + src/core/xbbcd.cpp | 39 +- src/core/xbdbf.cpp | 770 ++++++++++----------- src/core/xbdbf3.cpp | 272 ++++++-- src/core/xbdbf4.cpp | 357 +++++++++- src/core/xbexp.cpp | 125 ++-- src/core/xbfields.cpp | 56 +- src/core/xbfile.cpp | 103 +-- src/core/xbfilter.cpp | 111 ++- src/core/xbixbase.cpp | 17 +- src/core/xbixmdx.cpp | 64 +- src/core/xbixndx.cpp | 251 ++++--- src/core/xbmemo.cpp | 12 +- src/core/xbmemo3.cpp | 109 ++- src/core/xbmemo4.cpp | 245 +++---- src/core/xbssv.cpp | 2 - src/core/xbstring.cpp | 55 ++ src/core/xbtblmgr.cpp | 31 +- src/core/xbxbase.cpp | 53 +- src/examples/xb_ex_expression.cpp | 230 ++++++ src/examples/xb_ex_string.cpp | 73 +- src/examples/xb_ex_v4_create_dbf.cpp | 42 +- src/examples/xb_ex_v4_upd_dbf.cpp | 173 ++--- src/include/xbase.h | 2 + src/include/xbbcd.h | 2 - src/include/xbconfig.h.in | 2 +- src/include/xbdbf.h | 51 +- src/include/xbfile.h | 1 - src/include/xbmemo.h | 41 +- src/include/xbsql.h | 26 +- src/include/xbssv.h | 3 - src/include/xbstring.h | 5 +- src/include/xbtblmgr.h | 17 +- src/sql/xbalttbl.cpp | 125 ++++ src/sql/xbcrix.cpp | 60 +- src/sql/xbcrtbl.cpp | 2 +- src/sql/xbdelete.cpp | 148 ++++ src/sql/xbdrpix.cpp | 38 +- src/sql/xbinsert.cpp | 32 +- src/sql/xbselect.cpp | 92 +++ src/sql/xbsql.cpp | 62 +- src/tests/tstfuncs.cpp | 18 +- src/tests/xb_test_dbf_v3_memos.cpp | 34 +- src/tests/xb_test_dbf_v3_nomemos.cpp | 4 + src/tests/xb_test_dbf_v4_memos.cpp | 26 +- src/tests/xb_test_dbf_v4_nomemos.cpp | 8 +- src/tests/xb_test_expression.cpp | 14 + src/tests/xb_test_file.cpp | 24 +- src/tests/xb_test_filter.cpp | 100 +-- src/tests/xb_test_funcs.cpp | 4 + src/tests/xb_test_mdx.cpp | 17 +- src/tests/xb_test_ndx.cpp | 92 ++- src/tests/xb_test_ndx2.cpp | 145 ---- src/tests/xb_test_sql.cpp | 95 ++- src/tests/xb_test_string.cpp | 15 +- src/tests/xb_test_tblmgr.cpp | 14 +- src/tests/xb_test_xbase.cpp | 14 +- src/utils/checkndx.cpp | 71 -- src/utils/dbfxtrct.cpp | 182 ----- src/utils/preamble.txt | 19 - src/utils/reindex.cpp | 83 --- src/utils/xb_dbfutil.cpp | 87 ++- src/utils/xb_pack.cpp | 13 +- src/utils/xb_tblinfo.cpp | 18 +- 468 files changed, 9519 insertions(+), 6730 deletions(-) delete mode 100644 data/CopyStructureV3NoMemos.DBF delete mode 100644 data/CopyStructureV4NoMemos.DBF delete mode 100644 data/ExpTest.DBF delete mode 100644 data/Functest.DBF delete mode 100644 data/LockTest.DBF delete mode 100644 data/LockTest.DBT delete mode 100644 data/TMDXDB01.DBF delete mode 100644 data/TMDXDB01.MDX delete mode 100644 data/TestFilt.DBF delete mode 100644 data/TestFilt.NDX delete mode 100644 data/TestNdx.DBF delete mode 100644 data/TestNdx.INF delete mode 100644 data/TestNdxC.NDX delete mode 100644 data/TestNdxD.NDX delete mode 100644 data/TestNdxN.NDX delete mode 100644 data/TestSQL.DBF delete mode 100644 data/TestSQL.DBT delete mode 100644 data/TestV3.DBF delete mode 100644 data/TestV3_memos.DBF delete mode 100644 data/TestV3_memos.DBT delete mode 100644 data/TestV4.DBF delete mode 100644 data/TestV4_memos.DBF delete mode 100644 data/TestV4_memos.DBT delete mode 100644 data/xbfile.txt create mode 100644 docs/doxygen/html/xbalttbl_8cpp.html create mode 100644 docs/doxygen/html/xbdelete_8cpp.html create mode 100644 docs/doxygen/latex/xbalttbl_8cpp.tex create mode 100644 docs/doxygen/latex/xbdelete_8cpp.tex create mode 100755 docs/howto/AddNewMemoFileType.txt create mode 100755 docs/html/Xbase64ClassDiagram.jpg create mode 100755 docs/html/gpl-3.0.txt delete mode 100755 docs/html/index.htm create mode 100755 docs/html/index.html create mode 100755 docs/html/xbab.html create mode 100755 docs/html/xbac.html create mode 100755 docs/html/xbad.html create mode 100755 docs/html/xbae.html create mode 100755 docs/html/xbaf.html delete mode 100755 docs/html/xbbib.htm delete mode 100755 docs/html/xbc1.htm create mode 100755 docs/html/xbc1.html delete mode 100755 docs/html/xbc10.htm create mode 100755 docs/html/xbc10.html delete mode 100755 docs/html/xbc11.htm create mode 100755 docs/html/xbc11.html delete mode 100755 docs/html/xbc12.htm create mode 100755 docs/html/xbc12.html delete mode 100755 docs/html/xbc13.htm create mode 100755 docs/html/xbc13.html delete mode 100755 docs/html/xbc14.htm create mode 100755 docs/html/xbc14.html delete mode 100755 docs/html/xbc15.htm create mode 100755 docs/html/xbc15.html delete mode 100755 docs/html/xbc2.htm create mode 100755 docs/html/xbc2.html delete mode 100755 docs/html/xbc3.htm create mode 100755 docs/html/xbc3.html delete mode 100755 docs/html/xbc4.htm create mode 100755 docs/html/xbc4.html delete mode 100755 docs/html/xbc5.htm create mode 100755 docs/html/xbc5.html delete mode 100755 docs/html/xbc6.htm create mode 100755 docs/html/xbc6.html delete mode 100755 docs/html/xbc7.htm create mode 100755 docs/html/xbc7.html delete mode 100755 docs/html/xbc8.htm create mode 100755 docs/html/xbc8.html delete mode 100755 docs/html/xbc9.htm create mode 100755 docs/html/xbc9.html delete mode 100644 logs/Linux_x64.xbLog.txt delete mode 100755 sql/del.sql create mode 100755 sql/droptbl.sql create mode 100755 src/examples/xb_ex_expression.cpp create mode 100755 src/sql/xbalttbl.cpp create mode 100755 src/sql/xbdelete.cpp create mode 100755 src/sql/xbselect.cpp delete mode 100755 src/tests/xb_test_ndx2.cpp delete mode 100755 src/utils/checkndx.cpp delete mode 100755 src/utils/dbfxtrct.cpp delete mode 100755 src/utils/preamble.txt delete mode 100755 src/utils/reindex.cpp diff --git a/AUTHORS b/AUTHORS index 16b8731..55cd46a 100755 Binary files a/AUTHORS and b/AUTHORS differ diff --git a/INSTALL b/INSTALL index 31815e0..20ced28 100755 --- a/INSTALL +++ b/INSTALL @@ -3,4 +3,4 @@ Basic Installation See Chapter 1 in the manual on getting started. -docs/html/xbc1.htm +docs/html/xbc1.html diff --git a/NEWS b/NEWS index 66fd658..60fdc49 100755 --- a/NEWS +++ b/NEWS @@ -1,13 +1,29 @@ -Xbase64 (Nov 27, 2022) +Xbase64 (Dec 26, 2022) ------------------------ -The library has been refreshed with release 4.0.1 + + +4.0.3 - 12/26/22 + +1) Additional documentation updates +2) Updates to the rename methods +3) Added SQL command - "ALTER TABLE tablename.DBF RENAME TO newname.DBF" +4) Added SQL command - "DELETE FROM tablename.DBF [WHERE expression]" +5) Update to xbDbf::DumpRecs method to support deleted records +6) Update to xbDbf::GetLongField - bug fix +7) Misc updates to xb_dbfutil program +8) Added reindex logic to xb_pack utility program +9) Created method xbString::Replace(s1,s2) +10) Updates to test program xb_ndx_test + 4.0.2 - 12/15/22 Documentation cleanup and updates. -4.0.1 - 11/22/22 Rerwrite of core library. + +4.0.1 - 11/22/22 Rewrite of core library. +The library has been refreshed (Major rewrite) with release 4.0.1 1) 32/64 bit support. 2) Big Endian or Little Endian support. @@ -20,7 +36,13 @@ The library has been refreshed with release 4.0.1 9) The beginnings of SQL support. 10) CDX and NTX index support which was available in earlier releases is still pending inclusion in the latest library rewrite. - +11) Encapsulated library into a namespace called "xb". +12) Migrated from autoconf and automake to cmake. +13) Significant testing. +14) General library cleanup. +15) Updated license to be the latest GPL. +16) Updated xbString method names to be more consistant with the rest of the library. +17) String functions were updated from 0 based routines to 1 based routines. diff --git a/README b/README index 5ba316c..bea1789 100755 --- a/README +++ b/README @@ -1,5 +1,5 @@ - Xbase64 Version 4.0.1 - 11/28/22 + Xbase64 Version 4.0.3 + 12/26/22 WHAT IS IT? @@ -35,12 +35,11 @@ DIRECTORY LAYOUT Starting point -------------- - docs/html/index.htm + docs/html/index.html -Please email comments, bug reports, and patches to Gary Kunkel -xdb-dev@lists.sourceforge.net +Please email comments, bug reports, and patches to xdb-dev@lists.sourceforge.net diff --git a/TODO b/TODO index f700fb0..13310dd 100755 --- a/TODO +++ b/TODO @@ -18,7 +18,7 @@ Xbase64 TODO's (not necessarily in this order!) 4) Transaction support - Create a logging routine - + Create a logging routine put hooks in the PutRecord function to log data diff --git a/build/borland5.5/CMakeLists.txt b/build/borland5.5/CMakeLists.txt index 0a192b8..516b9c9 100755 --- a/build/borland5.5/CMakeLists.txt +++ b/build/borland5.5/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project (xbase64) set( xbase_VERSION_MAJOR 4 ) set( xbase_VERSION_MINOR 0 ) -set( xbase_VERSION_PATCH 0 ) +set( xbase_VERSION_PATCH 3 ) MESSAGE( "--- Xbase build for: " ${CMAKE_SYSTEM_NAME} ) MESSAGE( "--- Compiler: " ${CMAKE_CXX_COMPILER_ID} ) @@ -167,7 +167,7 @@ option( XB_EXPRESSION_SUPPORT "Compile Expression support into library" option( XB_NDX_SUPPORT "Compile NDX Index support into library" ON) option( XB_MDX_SUPPORT "Compile MDX Index support into library" ON) option( XB_SQL_SUPPORT "Compile SQL support into library" ON) -option( XB_NDXINF_SUPPORT "Compile NDX INF file support into library" ON) +option( XB_INF_SUPPORT "Compile NDX INF file support into library" ON) option( XB_FILTER_SUPPORT "Compile Filter support into library" ON) @@ -183,10 +183,10 @@ Message( "--- XB_LINKLIST_SUPPORT " ${XB_LINKLIST_SUPPORT}) Message( "--- XB_LOCKING_SUPPORT " ${XB_LOCKING_SUPPORT}) Message( "--- XB_FUNCTION_SUPPORT " ${XB_FUNCTION_SUPPORT}) Message( "--- XB_EXPRESSION_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_MDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_SQL_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDXINF_SUPPORT " ${XB_NDXINF_SUPPORT}) +Message( "--- XB_NDX_SUPPORT " ${XB_NDX_SUPPORT}) +Message( "--- XB_MDX_SUPPORT " ${XB_MDX_SUPPORT}) +Message( "--- XB_SQL_SUPPORT " ${XB_SQL_SUPPORT}) +Message( "--- XB_INF_SUPPORT " ${XB_INF_SUPPORT}) Message( "--- XB_FILTER_SUPPORT " ${XB_FILTER_SUPPORT}) IF( XB_DEBUG_SUPPORT ) @@ -313,10 +313,10 @@ IF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) ENDIF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) -IF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for DBF V4 Memo files. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) -ENDIF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +ENDIF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) IF( XB_LOCKING_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for locking functions. Setting to ON" ) @@ -334,10 +334,26 @@ IF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) IF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) - MESSAGE( "--- Function support required for expressions. Setting to ON" ) + MESSAGE( "--- Linklist support required for expressions. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + MESSAGE( "--- Memo support required for SQL. Setting to ON" ) + set( XB_MEMO_SUPPORT ON CACHE BOOL "Compile memo field support into library" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + +IF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + MESSAGE( "--- DBF4 support required for SQL. Setting to ON" ) + set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + +IF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + MESSAGE( "--- Expression required for filters. Setting to ON" ) + set( XB_EXPRESSION_SUPPORT ON CACHE BOOL "Compile Expression support into library" FORCE ) +ENDIF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + + # Build configuration header file configure_file ( @@ -420,13 +436,16 @@ IF( XB_MDX_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_SQL_SUPPORT ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbalttbl.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrix.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdelete.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrpix.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrptbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbset.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbselect.cpp ) ENDIF( XB_SQL_SUPPORT ) @@ -523,18 +542,19 @@ add_test( NAME xbFunctions COMMAND xb_test_funcs QUIET ) ENDIF( XB_FUNCTION_SUPPORT ) IF( XB_NDX_SUPPORT ) +IF( XB_DBF3_SUPPORT ) add_executable( xb_test_ndx ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx.cpp ) target_link_libraries( xb_test_ndx ${EXTRA_LIBS}) add_test( NAME xbIxNdx COMMAND xb_test_ndx QUIET ) -add_executable( xb_test_ndx2 ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx2.cpp ) -target_link_libraries( xb_test_ndx2 ${EXTRA_LIBS}) -add_test( NAME xbIxNdx2 COMMAND xb_test_ndx2 QUIET ) +ENDIF( XB_DBF3_SUPPORT ) ENDIF( XB_NDX_SUPPORT ) IF( XB_MDX_SUPPORT ) +IF( XB_DBF4_SUPPORT ) add_executable( xb_test_mdx ${PROJECT_SOURCE_DIR}/tests/xb_test_mdx.cpp ) target_link_libraries( xb_test_mdx ${EXTRA_LIBS}) add_test( NAME xbIxMdx COMMAND xb_test_mdx QUIET ) +ENDIF( XB_DBF4_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_INDEX_SUPPORT ) @@ -603,10 +623,16 @@ IF( XB_EXAMPLES_SUPPORT ) IF( XB_DBF4_SUPPORT ) add_executable( xb_ex_v4_create_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_create_dbf.cpp ) target_link_libraries( xb_ex_v4_create_dbf ${EXTRA_LIBS}) + ENDIF( XB_DBF4_SUPPORT ) + + IF( XB_EXPRESSION_SUPPORT ) + add_executable( xb_ex_expression ${PROJECT_SOURCE_DIR}/examples/xb_ex_expression.cpp ) + target_link_libraries( xb_ex_expression ${EXTRA_LIBS}) + ENDIF( XB_EXPRESSION_SUPPORT ) add_executable( xb_ex_v4_upd_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_upd_dbf.cpp ) target_link_libraries( xb_ex_v4_upd_dbf ${EXTRA_LIBS}) - ENDIF( XB_DBF4_SUPPORT ) + ENDIF( XB_EXAMPLES_SUPPORT ) @@ -663,7 +689,11 @@ IF( XB_UTILS_SUPPORT ) install (TARGETS xb_pack DESTINATION bin) install (TARGETS xb_undelall DESTINATION bin) install (TARGETS xb_zap DESTINATION bin) + IF( XB_SQL_SUPPORT ) install (TARGETS xb_execsql DESTINATION bin) + ENDIF( XB_SQL_SUPPORT ) + + ENDIF( XB_UTILS_SUPPORT ) @@ -694,8 +724,7 @@ install (FILES include/xbconfig.h DESTINATION include/${CMAKE_PROJECT_NAME}) -SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) -#SET_TARGET_PROPERTIES( ${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) +SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 4.0.3 SOVERSION 0 ) IF( EXISTS /usr/local/lib64 ) install (TARGETS ${XB_LIBNAME} DESTINATION lib64/${CMAKE_PROJECT_NAME}) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 0a192b8..516b9c9 100755 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project (xbase64) set( xbase_VERSION_MAJOR 4 ) set( xbase_VERSION_MINOR 0 ) -set( xbase_VERSION_PATCH 0 ) +set( xbase_VERSION_PATCH 3 ) MESSAGE( "--- Xbase build for: " ${CMAKE_SYSTEM_NAME} ) MESSAGE( "--- Compiler: " ${CMAKE_CXX_COMPILER_ID} ) @@ -167,7 +167,7 @@ option( XB_EXPRESSION_SUPPORT "Compile Expression support into library" option( XB_NDX_SUPPORT "Compile NDX Index support into library" ON) option( XB_MDX_SUPPORT "Compile MDX Index support into library" ON) option( XB_SQL_SUPPORT "Compile SQL support into library" ON) -option( XB_NDXINF_SUPPORT "Compile NDX INF file support into library" ON) +option( XB_INF_SUPPORT "Compile NDX INF file support into library" ON) option( XB_FILTER_SUPPORT "Compile Filter support into library" ON) @@ -183,10 +183,10 @@ Message( "--- XB_LINKLIST_SUPPORT " ${XB_LINKLIST_SUPPORT}) Message( "--- XB_LOCKING_SUPPORT " ${XB_LOCKING_SUPPORT}) Message( "--- XB_FUNCTION_SUPPORT " ${XB_FUNCTION_SUPPORT}) Message( "--- XB_EXPRESSION_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_MDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_SQL_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDXINF_SUPPORT " ${XB_NDXINF_SUPPORT}) +Message( "--- XB_NDX_SUPPORT " ${XB_NDX_SUPPORT}) +Message( "--- XB_MDX_SUPPORT " ${XB_MDX_SUPPORT}) +Message( "--- XB_SQL_SUPPORT " ${XB_SQL_SUPPORT}) +Message( "--- XB_INF_SUPPORT " ${XB_INF_SUPPORT}) Message( "--- XB_FILTER_SUPPORT " ${XB_FILTER_SUPPORT}) IF( XB_DEBUG_SUPPORT ) @@ -313,10 +313,10 @@ IF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) ENDIF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) -IF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for DBF V4 Memo files. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) -ENDIF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +ENDIF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) IF( XB_LOCKING_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for locking functions. Setting to ON" ) @@ -334,10 +334,26 @@ IF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) IF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) - MESSAGE( "--- Function support required for expressions. Setting to ON" ) + MESSAGE( "--- Linklist support required for expressions. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + MESSAGE( "--- Memo support required for SQL. Setting to ON" ) + set( XB_MEMO_SUPPORT ON CACHE BOOL "Compile memo field support into library" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + +IF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + MESSAGE( "--- DBF4 support required for SQL. Setting to ON" ) + set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + +IF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + MESSAGE( "--- Expression required for filters. Setting to ON" ) + set( XB_EXPRESSION_SUPPORT ON CACHE BOOL "Compile Expression support into library" FORCE ) +ENDIF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + + # Build configuration header file configure_file ( @@ -420,13 +436,16 @@ IF( XB_MDX_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_SQL_SUPPORT ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbalttbl.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrix.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdelete.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrpix.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrptbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbset.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbselect.cpp ) ENDIF( XB_SQL_SUPPORT ) @@ -523,18 +542,19 @@ add_test( NAME xbFunctions COMMAND xb_test_funcs QUIET ) ENDIF( XB_FUNCTION_SUPPORT ) IF( XB_NDX_SUPPORT ) +IF( XB_DBF3_SUPPORT ) add_executable( xb_test_ndx ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx.cpp ) target_link_libraries( xb_test_ndx ${EXTRA_LIBS}) add_test( NAME xbIxNdx COMMAND xb_test_ndx QUIET ) -add_executable( xb_test_ndx2 ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx2.cpp ) -target_link_libraries( xb_test_ndx2 ${EXTRA_LIBS}) -add_test( NAME xbIxNdx2 COMMAND xb_test_ndx2 QUIET ) +ENDIF( XB_DBF3_SUPPORT ) ENDIF( XB_NDX_SUPPORT ) IF( XB_MDX_SUPPORT ) +IF( XB_DBF4_SUPPORT ) add_executable( xb_test_mdx ${PROJECT_SOURCE_DIR}/tests/xb_test_mdx.cpp ) target_link_libraries( xb_test_mdx ${EXTRA_LIBS}) add_test( NAME xbIxMdx COMMAND xb_test_mdx QUIET ) +ENDIF( XB_DBF4_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_INDEX_SUPPORT ) @@ -603,10 +623,16 @@ IF( XB_EXAMPLES_SUPPORT ) IF( XB_DBF4_SUPPORT ) add_executable( xb_ex_v4_create_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_create_dbf.cpp ) target_link_libraries( xb_ex_v4_create_dbf ${EXTRA_LIBS}) + ENDIF( XB_DBF4_SUPPORT ) + + IF( XB_EXPRESSION_SUPPORT ) + add_executable( xb_ex_expression ${PROJECT_SOURCE_DIR}/examples/xb_ex_expression.cpp ) + target_link_libraries( xb_ex_expression ${EXTRA_LIBS}) + ENDIF( XB_EXPRESSION_SUPPORT ) add_executable( xb_ex_v4_upd_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_upd_dbf.cpp ) target_link_libraries( xb_ex_v4_upd_dbf ${EXTRA_LIBS}) - ENDIF( XB_DBF4_SUPPORT ) + ENDIF( XB_EXAMPLES_SUPPORT ) @@ -663,7 +689,11 @@ IF( XB_UTILS_SUPPORT ) install (TARGETS xb_pack DESTINATION bin) install (TARGETS xb_undelall DESTINATION bin) install (TARGETS xb_zap DESTINATION bin) + IF( XB_SQL_SUPPORT ) install (TARGETS xb_execsql DESTINATION bin) + ENDIF( XB_SQL_SUPPORT ) + + ENDIF( XB_UTILS_SUPPORT ) @@ -694,8 +724,7 @@ install (FILES include/xbconfig.h DESTINATION include/${CMAKE_PROJECT_NAME}) -SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) -#SET_TARGET_PROPERTIES( ${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) +SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 4.0.3 SOVERSION 0 ) IF( EXISTS /usr/local/lib64 ) install (TARGETS ${XB_LIBNAME} DESTINATION lib64/${CMAKE_PROJECT_NAME}) diff --git a/build/linux32/CMakeLists.txt b/build/linux32/CMakeLists.txt index 0a192b8..516b9c9 100755 --- a/build/linux32/CMakeLists.txt +++ b/build/linux32/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project (xbase64) set( xbase_VERSION_MAJOR 4 ) set( xbase_VERSION_MINOR 0 ) -set( xbase_VERSION_PATCH 0 ) +set( xbase_VERSION_PATCH 3 ) MESSAGE( "--- Xbase build for: " ${CMAKE_SYSTEM_NAME} ) MESSAGE( "--- Compiler: " ${CMAKE_CXX_COMPILER_ID} ) @@ -167,7 +167,7 @@ option( XB_EXPRESSION_SUPPORT "Compile Expression support into library" option( XB_NDX_SUPPORT "Compile NDX Index support into library" ON) option( XB_MDX_SUPPORT "Compile MDX Index support into library" ON) option( XB_SQL_SUPPORT "Compile SQL support into library" ON) -option( XB_NDXINF_SUPPORT "Compile NDX INF file support into library" ON) +option( XB_INF_SUPPORT "Compile NDX INF file support into library" ON) option( XB_FILTER_SUPPORT "Compile Filter support into library" ON) @@ -183,10 +183,10 @@ Message( "--- XB_LINKLIST_SUPPORT " ${XB_LINKLIST_SUPPORT}) Message( "--- XB_LOCKING_SUPPORT " ${XB_LOCKING_SUPPORT}) Message( "--- XB_FUNCTION_SUPPORT " ${XB_FUNCTION_SUPPORT}) Message( "--- XB_EXPRESSION_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_MDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_SQL_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDXINF_SUPPORT " ${XB_NDXINF_SUPPORT}) +Message( "--- XB_NDX_SUPPORT " ${XB_NDX_SUPPORT}) +Message( "--- XB_MDX_SUPPORT " ${XB_MDX_SUPPORT}) +Message( "--- XB_SQL_SUPPORT " ${XB_SQL_SUPPORT}) +Message( "--- XB_INF_SUPPORT " ${XB_INF_SUPPORT}) Message( "--- XB_FILTER_SUPPORT " ${XB_FILTER_SUPPORT}) IF( XB_DEBUG_SUPPORT ) @@ -313,10 +313,10 @@ IF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) ENDIF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) -IF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for DBF V4 Memo files. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) -ENDIF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +ENDIF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) IF( XB_LOCKING_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for locking functions. Setting to ON" ) @@ -334,10 +334,26 @@ IF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) IF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) - MESSAGE( "--- Function support required for expressions. Setting to ON" ) + MESSAGE( "--- Linklist support required for expressions. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + MESSAGE( "--- Memo support required for SQL. Setting to ON" ) + set( XB_MEMO_SUPPORT ON CACHE BOOL "Compile memo field support into library" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + +IF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + MESSAGE( "--- DBF4 support required for SQL. Setting to ON" ) + set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + +IF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + MESSAGE( "--- Expression required for filters. Setting to ON" ) + set( XB_EXPRESSION_SUPPORT ON CACHE BOOL "Compile Expression support into library" FORCE ) +ENDIF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + + # Build configuration header file configure_file ( @@ -420,13 +436,16 @@ IF( XB_MDX_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_SQL_SUPPORT ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbalttbl.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrix.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdelete.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrpix.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrptbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbset.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbselect.cpp ) ENDIF( XB_SQL_SUPPORT ) @@ -523,18 +542,19 @@ add_test( NAME xbFunctions COMMAND xb_test_funcs QUIET ) ENDIF( XB_FUNCTION_SUPPORT ) IF( XB_NDX_SUPPORT ) +IF( XB_DBF3_SUPPORT ) add_executable( xb_test_ndx ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx.cpp ) target_link_libraries( xb_test_ndx ${EXTRA_LIBS}) add_test( NAME xbIxNdx COMMAND xb_test_ndx QUIET ) -add_executable( xb_test_ndx2 ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx2.cpp ) -target_link_libraries( xb_test_ndx2 ${EXTRA_LIBS}) -add_test( NAME xbIxNdx2 COMMAND xb_test_ndx2 QUIET ) +ENDIF( XB_DBF3_SUPPORT ) ENDIF( XB_NDX_SUPPORT ) IF( XB_MDX_SUPPORT ) +IF( XB_DBF4_SUPPORT ) add_executable( xb_test_mdx ${PROJECT_SOURCE_DIR}/tests/xb_test_mdx.cpp ) target_link_libraries( xb_test_mdx ${EXTRA_LIBS}) add_test( NAME xbIxMdx COMMAND xb_test_mdx QUIET ) +ENDIF( XB_DBF4_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_INDEX_SUPPORT ) @@ -603,10 +623,16 @@ IF( XB_EXAMPLES_SUPPORT ) IF( XB_DBF4_SUPPORT ) add_executable( xb_ex_v4_create_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_create_dbf.cpp ) target_link_libraries( xb_ex_v4_create_dbf ${EXTRA_LIBS}) + ENDIF( XB_DBF4_SUPPORT ) + + IF( XB_EXPRESSION_SUPPORT ) + add_executable( xb_ex_expression ${PROJECT_SOURCE_DIR}/examples/xb_ex_expression.cpp ) + target_link_libraries( xb_ex_expression ${EXTRA_LIBS}) + ENDIF( XB_EXPRESSION_SUPPORT ) add_executable( xb_ex_v4_upd_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_upd_dbf.cpp ) target_link_libraries( xb_ex_v4_upd_dbf ${EXTRA_LIBS}) - ENDIF( XB_DBF4_SUPPORT ) + ENDIF( XB_EXAMPLES_SUPPORT ) @@ -663,7 +689,11 @@ IF( XB_UTILS_SUPPORT ) install (TARGETS xb_pack DESTINATION bin) install (TARGETS xb_undelall DESTINATION bin) install (TARGETS xb_zap DESTINATION bin) + IF( XB_SQL_SUPPORT ) install (TARGETS xb_execsql DESTINATION bin) + ENDIF( XB_SQL_SUPPORT ) + + ENDIF( XB_UTILS_SUPPORT ) @@ -694,8 +724,7 @@ install (FILES include/xbconfig.h DESTINATION include/${CMAKE_PROJECT_NAME}) -SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) -#SET_TARGET_PROPERTIES( ${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) +SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 4.0.3 SOVERSION 0 ) IF( EXISTS /usr/local/lib64 ) install (TARGETS ${XB_LIBNAME} DESTINATION lib64/${CMAKE_PROJECT_NAME}) diff --git a/build/linux64/CMakeLists.txt b/build/linux64/CMakeLists.txt index beac984..516b9c9 100755 --- a/build/linux64/CMakeLists.txt +++ b/build/linux64/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project (xbase64) set( xbase_VERSION_MAJOR 4 ) set( xbase_VERSION_MINOR 0 ) -set( xbase_VERSION_PATCH 0 ) +set( xbase_VERSION_PATCH 3 ) MESSAGE( "--- Xbase build for: " ${CMAKE_SYSTEM_NAME} ) MESSAGE( "--- Compiler: " ${CMAKE_CXX_COMPILER_ID} ) @@ -167,7 +167,7 @@ option( XB_EXPRESSION_SUPPORT "Compile Expression support into library" option( XB_NDX_SUPPORT "Compile NDX Index support into library" ON) option( XB_MDX_SUPPORT "Compile MDX Index support into library" ON) option( XB_SQL_SUPPORT "Compile SQL support into library" ON) -option( XB_NDXINF_SUPPORT "Compile NDX INF file support into library" ON) +option( XB_INF_SUPPORT "Compile NDX INF file support into library" ON) option( XB_FILTER_SUPPORT "Compile Filter support into library" ON) @@ -183,10 +183,10 @@ Message( "--- XB_LINKLIST_SUPPORT " ${XB_LINKLIST_SUPPORT}) Message( "--- XB_LOCKING_SUPPORT " ${XB_LOCKING_SUPPORT}) Message( "--- XB_FUNCTION_SUPPORT " ${XB_FUNCTION_SUPPORT}) Message( "--- XB_EXPRESSION_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_MDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_SQL_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDXINF_SUPPORT " ${XB_NDXINF_SUPPORT}) +Message( "--- XB_NDX_SUPPORT " ${XB_NDX_SUPPORT}) +Message( "--- XB_MDX_SUPPORT " ${XB_MDX_SUPPORT}) +Message( "--- XB_SQL_SUPPORT " ${XB_SQL_SUPPORT}) +Message( "--- XB_INF_SUPPORT " ${XB_INF_SUPPORT}) Message( "--- XB_FILTER_SUPPORT " ${XB_FILTER_SUPPORT}) IF( XB_DEBUG_SUPPORT ) @@ -313,10 +313,10 @@ IF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) ENDIF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) -IF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for DBF V4 Memo files. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) -ENDIF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +ENDIF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) IF( XB_LOCKING_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for locking functions. Setting to ON" ) @@ -334,10 +334,26 @@ IF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) IF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) - MESSAGE( "--- Function support required for expressions. Setting to ON" ) + MESSAGE( "--- Linklist support required for expressions. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + MESSAGE( "--- Memo support required for SQL. Setting to ON" ) + set( XB_MEMO_SUPPORT ON CACHE BOOL "Compile memo field support into library" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + +IF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + MESSAGE( "--- DBF4 support required for SQL. Setting to ON" ) + set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + +IF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + MESSAGE( "--- Expression required for filters. Setting to ON" ) + set( XB_EXPRESSION_SUPPORT ON CACHE BOOL "Compile Expression support into library" FORCE ) +ENDIF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + + # Build configuration header file configure_file ( @@ -420,13 +436,16 @@ IF( XB_MDX_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_SQL_SUPPORT ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbalttbl.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrix.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdelete.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrpix.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrptbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbset.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbselect.cpp ) ENDIF( XB_SQL_SUPPORT ) @@ -523,18 +542,19 @@ add_test( NAME xbFunctions COMMAND xb_test_funcs QUIET ) ENDIF( XB_FUNCTION_SUPPORT ) IF( XB_NDX_SUPPORT ) +IF( XB_DBF3_SUPPORT ) add_executable( xb_test_ndx ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx.cpp ) target_link_libraries( xb_test_ndx ${EXTRA_LIBS}) add_test( NAME xbIxNdx COMMAND xb_test_ndx QUIET ) -add_executable( xb_test_ndx2 ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx2.cpp ) -target_link_libraries( xb_test_ndx2 ${EXTRA_LIBS}) -add_test( NAME xbIxNdx2 COMMAND xb_test_ndx2 QUIET ) +ENDIF( XB_DBF3_SUPPORT ) ENDIF( XB_NDX_SUPPORT ) IF( XB_MDX_SUPPORT ) +IF( XB_DBF4_SUPPORT ) add_executable( xb_test_mdx ${PROJECT_SOURCE_DIR}/tests/xb_test_mdx.cpp ) target_link_libraries( xb_test_mdx ${EXTRA_LIBS}) add_test( NAME xbIxMdx COMMAND xb_test_mdx QUIET ) +ENDIF( XB_DBF4_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_INDEX_SUPPORT ) @@ -603,10 +623,16 @@ IF( XB_EXAMPLES_SUPPORT ) IF( XB_DBF4_SUPPORT ) add_executable( xb_ex_v4_create_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_create_dbf.cpp ) target_link_libraries( xb_ex_v4_create_dbf ${EXTRA_LIBS}) + ENDIF( XB_DBF4_SUPPORT ) + + IF( XB_EXPRESSION_SUPPORT ) + add_executable( xb_ex_expression ${PROJECT_SOURCE_DIR}/examples/xb_ex_expression.cpp ) + target_link_libraries( xb_ex_expression ${EXTRA_LIBS}) + ENDIF( XB_EXPRESSION_SUPPORT ) add_executable( xb_ex_v4_upd_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_upd_dbf.cpp ) target_link_libraries( xb_ex_v4_upd_dbf ${EXTRA_LIBS}) - ENDIF( XB_DBF4_SUPPORT ) + ENDIF( XB_EXAMPLES_SUPPORT ) @@ -663,7 +689,11 @@ IF( XB_UTILS_SUPPORT ) install (TARGETS xb_pack DESTINATION bin) install (TARGETS xb_undelall DESTINATION bin) install (TARGETS xb_zap DESTINATION bin) + IF( XB_SQL_SUPPORT ) install (TARGETS xb_execsql DESTINATION bin) + ENDIF( XB_SQL_SUPPORT ) + + ENDIF( XB_UTILS_SUPPORT ) @@ -694,7 +724,7 @@ install (FILES include/xbconfig.h DESTINATION include/${CMAKE_PROJECT_NAME}) -SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 4.0.0 SOVERSION 0 ) +SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 4.0.3 SOVERSION 0 ) IF( EXISTS /usr/local/lib64 ) install (TARGETS ${XB_LIBNAME} DESTINATION lib64/${CMAKE_PROJECT_NAME}) diff --git a/build/mac64/CMakeLists.txt b/build/mac64/CMakeLists.txt index 0a192b8..516b9c9 100755 --- a/build/mac64/CMakeLists.txt +++ b/build/mac64/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project (xbase64) set( xbase_VERSION_MAJOR 4 ) set( xbase_VERSION_MINOR 0 ) -set( xbase_VERSION_PATCH 0 ) +set( xbase_VERSION_PATCH 3 ) MESSAGE( "--- Xbase build for: " ${CMAKE_SYSTEM_NAME} ) MESSAGE( "--- Compiler: " ${CMAKE_CXX_COMPILER_ID} ) @@ -167,7 +167,7 @@ option( XB_EXPRESSION_SUPPORT "Compile Expression support into library" option( XB_NDX_SUPPORT "Compile NDX Index support into library" ON) option( XB_MDX_SUPPORT "Compile MDX Index support into library" ON) option( XB_SQL_SUPPORT "Compile SQL support into library" ON) -option( XB_NDXINF_SUPPORT "Compile NDX INF file support into library" ON) +option( XB_INF_SUPPORT "Compile NDX INF file support into library" ON) option( XB_FILTER_SUPPORT "Compile Filter support into library" ON) @@ -183,10 +183,10 @@ Message( "--- XB_LINKLIST_SUPPORT " ${XB_LINKLIST_SUPPORT}) Message( "--- XB_LOCKING_SUPPORT " ${XB_LOCKING_SUPPORT}) Message( "--- XB_FUNCTION_SUPPORT " ${XB_FUNCTION_SUPPORT}) Message( "--- XB_EXPRESSION_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_MDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_SQL_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDXINF_SUPPORT " ${XB_NDXINF_SUPPORT}) +Message( "--- XB_NDX_SUPPORT " ${XB_NDX_SUPPORT}) +Message( "--- XB_MDX_SUPPORT " ${XB_MDX_SUPPORT}) +Message( "--- XB_SQL_SUPPORT " ${XB_SQL_SUPPORT}) +Message( "--- XB_INF_SUPPORT " ${XB_INF_SUPPORT}) Message( "--- XB_FILTER_SUPPORT " ${XB_FILTER_SUPPORT}) IF( XB_DEBUG_SUPPORT ) @@ -313,10 +313,10 @@ IF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) ENDIF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) -IF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for DBF V4 Memo files. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) -ENDIF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +ENDIF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) IF( XB_LOCKING_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for locking functions. Setting to ON" ) @@ -334,10 +334,26 @@ IF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) IF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) - MESSAGE( "--- Function support required for expressions. Setting to ON" ) + MESSAGE( "--- Linklist support required for expressions. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + MESSAGE( "--- Memo support required for SQL. Setting to ON" ) + set( XB_MEMO_SUPPORT ON CACHE BOOL "Compile memo field support into library" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + +IF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + MESSAGE( "--- DBF4 support required for SQL. Setting to ON" ) + set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + +IF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + MESSAGE( "--- Expression required for filters. Setting to ON" ) + set( XB_EXPRESSION_SUPPORT ON CACHE BOOL "Compile Expression support into library" FORCE ) +ENDIF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + + # Build configuration header file configure_file ( @@ -420,13 +436,16 @@ IF( XB_MDX_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_SQL_SUPPORT ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbalttbl.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrix.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdelete.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrpix.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrptbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbset.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbselect.cpp ) ENDIF( XB_SQL_SUPPORT ) @@ -523,18 +542,19 @@ add_test( NAME xbFunctions COMMAND xb_test_funcs QUIET ) ENDIF( XB_FUNCTION_SUPPORT ) IF( XB_NDX_SUPPORT ) +IF( XB_DBF3_SUPPORT ) add_executable( xb_test_ndx ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx.cpp ) target_link_libraries( xb_test_ndx ${EXTRA_LIBS}) add_test( NAME xbIxNdx COMMAND xb_test_ndx QUIET ) -add_executable( xb_test_ndx2 ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx2.cpp ) -target_link_libraries( xb_test_ndx2 ${EXTRA_LIBS}) -add_test( NAME xbIxNdx2 COMMAND xb_test_ndx2 QUIET ) +ENDIF( XB_DBF3_SUPPORT ) ENDIF( XB_NDX_SUPPORT ) IF( XB_MDX_SUPPORT ) +IF( XB_DBF4_SUPPORT ) add_executable( xb_test_mdx ${PROJECT_SOURCE_DIR}/tests/xb_test_mdx.cpp ) target_link_libraries( xb_test_mdx ${EXTRA_LIBS}) add_test( NAME xbIxMdx COMMAND xb_test_mdx QUIET ) +ENDIF( XB_DBF4_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_INDEX_SUPPORT ) @@ -603,10 +623,16 @@ IF( XB_EXAMPLES_SUPPORT ) IF( XB_DBF4_SUPPORT ) add_executable( xb_ex_v4_create_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_create_dbf.cpp ) target_link_libraries( xb_ex_v4_create_dbf ${EXTRA_LIBS}) + ENDIF( XB_DBF4_SUPPORT ) + + IF( XB_EXPRESSION_SUPPORT ) + add_executable( xb_ex_expression ${PROJECT_SOURCE_DIR}/examples/xb_ex_expression.cpp ) + target_link_libraries( xb_ex_expression ${EXTRA_LIBS}) + ENDIF( XB_EXPRESSION_SUPPORT ) add_executable( xb_ex_v4_upd_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_upd_dbf.cpp ) target_link_libraries( xb_ex_v4_upd_dbf ${EXTRA_LIBS}) - ENDIF( XB_DBF4_SUPPORT ) + ENDIF( XB_EXAMPLES_SUPPORT ) @@ -663,7 +689,11 @@ IF( XB_UTILS_SUPPORT ) install (TARGETS xb_pack DESTINATION bin) install (TARGETS xb_undelall DESTINATION bin) install (TARGETS xb_zap DESTINATION bin) + IF( XB_SQL_SUPPORT ) install (TARGETS xb_execsql DESTINATION bin) + ENDIF( XB_SQL_SUPPORT ) + + ENDIF( XB_UTILS_SUPPORT ) @@ -694,8 +724,7 @@ install (FILES include/xbconfig.h DESTINATION include/${CMAKE_PROJECT_NAME}) -SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) -#SET_TARGET_PROPERTIES( ${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) +SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 4.0.3 SOVERSION 0 ) IF( EXISTS /usr/local/lib64 ) install (TARGETS ${XB_LIBNAME} DESTINATION lib64/${CMAKE_PROJECT_NAME}) diff --git a/build/win32vs/CMakeLists.txt b/build/win32vs/CMakeLists.txt index 0a192b8..516b9c9 100755 --- a/build/win32vs/CMakeLists.txt +++ b/build/win32vs/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project (xbase64) set( xbase_VERSION_MAJOR 4 ) set( xbase_VERSION_MINOR 0 ) -set( xbase_VERSION_PATCH 0 ) +set( xbase_VERSION_PATCH 3 ) MESSAGE( "--- Xbase build for: " ${CMAKE_SYSTEM_NAME} ) MESSAGE( "--- Compiler: " ${CMAKE_CXX_COMPILER_ID} ) @@ -167,7 +167,7 @@ option( XB_EXPRESSION_SUPPORT "Compile Expression support into library" option( XB_NDX_SUPPORT "Compile NDX Index support into library" ON) option( XB_MDX_SUPPORT "Compile MDX Index support into library" ON) option( XB_SQL_SUPPORT "Compile SQL support into library" ON) -option( XB_NDXINF_SUPPORT "Compile NDX INF file support into library" ON) +option( XB_INF_SUPPORT "Compile NDX INF file support into library" ON) option( XB_FILTER_SUPPORT "Compile Filter support into library" ON) @@ -183,10 +183,10 @@ Message( "--- XB_LINKLIST_SUPPORT " ${XB_LINKLIST_SUPPORT}) Message( "--- XB_LOCKING_SUPPORT " ${XB_LOCKING_SUPPORT}) Message( "--- XB_FUNCTION_SUPPORT " ${XB_FUNCTION_SUPPORT}) Message( "--- XB_EXPRESSION_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_MDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_SQL_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDXINF_SUPPORT " ${XB_NDXINF_SUPPORT}) +Message( "--- XB_NDX_SUPPORT " ${XB_NDX_SUPPORT}) +Message( "--- XB_MDX_SUPPORT " ${XB_MDX_SUPPORT}) +Message( "--- XB_SQL_SUPPORT " ${XB_SQL_SUPPORT}) +Message( "--- XB_INF_SUPPORT " ${XB_INF_SUPPORT}) Message( "--- XB_FILTER_SUPPORT " ${XB_FILTER_SUPPORT}) IF( XB_DEBUG_SUPPORT ) @@ -313,10 +313,10 @@ IF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) ENDIF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) -IF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for DBF V4 Memo files. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) -ENDIF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +ENDIF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) IF( XB_LOCKING_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for locking functions. Setting to ON" ) @@ -334,10 +334,26 @@ IF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) IF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) - MESSAGE( "--- Function support required for expressions. Setting to ON" ) + MESSAGE( "--- Linklist support required for expressions. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + MESSAGE( "--- Memo support required for SQL. Setting to ON" ) + set( XB_MEMO_SUPPORT ON CACHE BOOL "Compile memo field support into library" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + +IF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + MESSAGE( "--- DBF4 support required for SQL. Setting to ON" ) + set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + +IF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + MESSAGE( "--- Expression required for filters. Setting to ON" ) + set( XB_EXPRESSION_SUPPORT ON CACHE BOOL "Compile Expression support into library" FORCE ) +ENDIF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + + # Build configuration header file configure_file ( @@ -420,13 +436,16 @@ IF( XB_MDX_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_SQL_SUPPORT ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbalttbl.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrix.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdelete.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrpix.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrptbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbset.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbselect.cpp ) ENDIF( XB_SQL_SUPPORT ) @@ -523,18 +542,19 @@ add_test( NAME xbFunctions COMMAND xb_test_funcs QUIET ) ENDIF( XB_FUNCTION_SUPPORT ) IF( XB_NDX_SUPPORT ) +IF( XB_DBF3_SUPPORT ) add_executable( xb_test_ndx ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx.cpp ) target_link_libraries( xb_test_ndx ${EXTRA_LIBS}) add_test( NAME xbIxNdx COMMAND xb_test_ndx QUIET ) -add_executable( xb_test_ndx2 ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx2.cpp ) -target_link_libraries( xb_test_ndx2 ${EXTRA_LIBS}) -add_test( NAME xbIxNdx2 COMMAND xb_test_ndx2 QUIET ) +ENDIF( XB_DBF3_SUPPORT ) ENDIF( XB_NDX_SUPPORT ) IF( XB_MDX_SUPPORT ) +IF( XB_DBF4_SUPPORT ) add_executable( xb_test_mdx ${PROJECT_SOURCE_DIR}/tests/xb_test_mdx.cpp ) target_link_libraries( xb_test_mdx ${EXTRA_LIBS}) add_test( NAME xbIxMdx COMMAND xb_test_mdx QUIET ) +ENDIF( XB_DBF4_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_INDEX_SUPPORT ) @@ -603,10 +623,16 @@ IF( XB_EXAMPLES_SUPPORT ) IF( XB_DBF4_SUPPORT ) add_executable( xb_ex_v4_create_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_create_dbf.cpp ) target_link_libraries( xb_ex_v4_create_dbf ${EXTRA_LIBS}) + ENDIF( XB_DBF4_SUPPORT ) + + IF( XB_EXPRESSION_SUPPORT ) + add_executable( xb_ex_expression ${PROJECT_SOURCE_DIR}/examples/xb_ex_expression.cpp ) + target_link_libraries( xb_ex_expression ${EXTRA_LIBS}) + ENDIF( XB_EXPRESSION_SUPPORT ) add_executable( xb_ex_v4_upd_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_upd_dbf.cpp ) target_link_libraries( xb_ex_v4_upd_dbf ${EXTRA_LIBS}) - ENDIF( XB_DBF4_SUPPORT ) + ENDIF( XB_EXAMPLES_SUPPORT ) @@ -663,7 +689,11 @@ IF( XB_UTILS_SUPPORT ) install (TARGETS xb_pack DESTINATION bin) install (TARGETS xb_undelall DESTINATION bin) install (TARGETS xb_zap DESTINATION bin) + IF( XB_SQL_SUPPORT ) install (TARGETS xb_execsql DESTINATION bin) + ENDIF( XB_SQL_SUPPORT ) + + ENDIF( XB_UTILS_SUPPORT ) @@ -694,8 +724,7 @@ install (FILES include/xbconfig.h DESTINATION include/${CMAKE_PROJECT_NAME}) -SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) -#SET_TARGET_PROPERTIES( ${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) +SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 4.0.3 SOVERSION 0 ) IF( EXISTS /usr/local/lib64 ) install (TARGETS ${XB_LIBNAME} DESTINATION lib64/${CMAKE_PROJECT_NAME}) diff --git a/build/win64vs/CMakeLists.txt b/build/win64vs/CMakeLists.txt index 0a192b8..516b9c9 100755 --- a/build/win64vs/CMakeLists.txt +++ b/build/win64vs/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project (xbase64) set( xbase_VERSION_MAJOR 4 ) set( xbase_VERSION_MINOR 0 ) -set( xbase_VERSION_PATCH 0 ) +set( xbase_VERSION_PATCH 3 ) MESSAGE( "--- Xbase build for: " ${CMAKE_SYSTEM_NAME} ) MESSAGE( "--- Compiler: " ${CMAKE_CXX_COMPILER_ID} ) @@ -167,7 +167,7 @@ option( XB_EXPRESSION_SUPPORT "Compile Expression support into library" option( XB_NDX_SUPPORT "Compile NDX Index support into library" ON) option( XB_MDX_SUPPORT "Compile MDX Index support into library" ON) option( XB_SQL_SUPPORT "Compile SQL support into library" ON) -option( XB_NDXINF_SUPPORT "Compile NDX INF file support into library" ON) +option( XB_INF_SUPPORT "Compile NDX INF file support into library" ON) option( XB_FILTER_SUPPORT "Compile Filter support into library" ON) @@ -183,10 +183,10 @@ Message( "--- XB_LINKLIST_SUPPORT " ${XB_LINKLIST_SUPPORT}) Message( "--- XB_LOCKING_SUPPORT " ${XB_LOCKING_SUPPORT}) Message( "--- XB_FUNCTION_SUPPORT " ${XB_FUNCTION_SUPPORT}) Message( "--- XB_EXPRESSION_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_MDX_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_SQL_SUPPORT " ${XB_EXPRESSION_SUPPORT}) -Message( "--- XB_NDXINF_SUPPORT " ${XB_NDXINF_SUPPORT}) +Message( "--- XB_NDX_SUPPORT " ${XB_NDX_SUPPORT}) +Message( "--- XB_MDX_SUPPORT " ${XB_MDX_SUPPORT}) +Message( "--- XB_SQL_SUPPORT " ${XB_SQL_SUPPORT}) +Message( "--- XB_INF_SUPPORT " ${XB_INF_SUPPORT}) Message( "--- XB_FILTER_SUPPORT " ${XB_FILTER_SUPPORT}) IF( XB_DEBUG_SUPPORT ) @@ -313,10 +313,10 @@ IF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) ENDIF( NOT XB_DBF3_SUPPORT AND NOT XB_DBF4_SUPPORT ) -IF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for DBF V4 Memo files. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) -ENDIF( XB_DBF_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +ENDIF( XB_DBF4_SUPPORT AND XB_MEMO_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) IF( XB_LOCKING_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) MESSAGE( "--- Link List support required for locking functions. Setting to ON" ) @@ -334,10 +334,26 @@ IF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_FUNCTION_SUPPORT ) IF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) - MESSAGE( "--- Function support required for expressions. Setting to ON" ) + MESSAGE( "--- Linklist support required for expressions. Setting to ON" ) set( XB_LINKLIST_SUPPORT ON CACHE BOOL "Compile Link List routines into library" FORCE ) ENDIF( XB_EXPRESSION_SUPPORT AND NOT XB_LINKLIST_SUPPORT ) +IF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + MESSAGE( "--- Memo support required for SQL. Setting to ON" ) + set( XB_MEMO_SUPPORT ON CACHE BOOL "Compile memo field support into library" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_MEMO_SUPPORT ) + +IF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + MESSAGE( "--- DBF4 support required for SQL. Setting to ON" ) + set( XB_DBF4_SUPPORT ON CACHE BOOL "Compile DBase File Format Version 4 support" FORCE ) +ENDIF( XB_SQL_SUPPORT AND NOT XB_DBF4_SUPPORT ) + +IF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + MESSAGE( "--- Expression required for filters. Setting to ON" ) + set( XB_EXPRESSION_SUPPORT ON CACHE BOOL "Compile Expression support into library" FORCE ) +ENDIF( XB_FILTER_SUPPORT AND NOT XB_EXPRESSION_SUPPORT ) + + # Build configuration header file configure_file ( @@ -420,13 +436,16 @@ IF( XB_MDX_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_SQL_SUPPORT ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbalttbl.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrix.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbcrtbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdelete.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrpix.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbdrptbl.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbinsert.cpp ) set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbset.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbsql.cpp ) + set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/sql/xbselect.cpp ) ENDIF( XB_SQL_SUPPORT ) @@ -523,18 +542,19 @@ add_test( NAME xbFunctions COMMAND xb_test_funcs QUIET ) ENDIF( XB_FUNCTION_SUPPORT ) IF( XB_NDX_SUPPORT ) +IF( XB_DBF3_SUPPORT ) add_executable( xb_test_ndx ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx.cpp ) target_link_libraries( xb_test_ndx ${EXTRA_LIBS}) add_test( NAME xbIxNdx COMMAND xb_test_ndx QUIET ) -add_executable( xb_test_ndx2 ${PROJECT_SOURCE_DIR}/tests/xb_test_ndx2.cpp ) -target_link_libraries( xb_test_ndx2 ${EXTRA_LIBS}) -add_test( NAME xbIxNdx2 COMMAND xb_test_ndx2 QUIET ) +ENDIF( XB_DBF3_SUPPORT ) ENDIF( XB_NDX_SUPPORT ) IF( XB_MDX_SUPPORT ) +IF( XB_DBF4_SUPPORT ) add_executable( xb_test_mdx ${PROJECT_SOURCE_DIR}/tests/xb_test_mdx.cpp ) target_link_libraries( xb_test_mdx ${EXTRA_LIBS}) add_test( NAME xbIxMdx COMMAND xb_test_mdx QUIET ) +ENDIF( XB_DBF4_SUPPORT ) ENDIF( XB_MDX_SUPPORT ) IF( XB_INDEX_SUPPORT ) @@ -603,10 +623,16 @@ IF( XB_EXAMPLES_SUPPORT ) IF( XB_DBF4_SUPPORT ) add_executable( xb_ex_v4_create_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_create_dbf.cpp ) target_link_libraries( xb_ex_v4_create_dbf ${EXTRA_LIBS}) + ENDIF( XB_DBF4_SUPPORT ) + + IF( XB_EXPRESSION_SUPPORT ) + add_executable( xb_ex_expression ${PROJECT_SOURCE_DIR}/examples/xb_ex_expression.cpp ) + target_link_libraries( xb_ex_expression ${EXTRA_LIBS}) + ENDIF( XB_EXPRESSION_SUPPORT ) add_executable( xb_ex_v4_upd_dbf ${PROJECT_SOURCE_DIR}/examples/xb_ex_v4_upd_dbf.cpp ) target_link_libraries( xb_ex_v4_upd_dbf ${EXTRA_LIBS}) - ENDIF( XB_DBF4_SUPPORT ) + ENDIF( XB_EXAMPLES_SUPPORT ) @@ -663,7 +689,11 @@ IF( XB_UTILS_SUPPORT ) install (TARGETS xb_pack DESTINATION bin) install (TARGETS xb_undelall DESTINATION bin) install (TARGETS xb_zap DESTINATION bin) + IF( XB_SQL_SUPPORT ) install (TARGETS xb_execsql DESTINATION bin) + ENDIF( XB_SQL_SUPPORT ) + + ENDIF( XB_UTILS_SUPPORT ) @@ -694,8 +724,7 @@ install (FILES include/xbconfig.h DESTINATION include/${CMAKE_PROJECT_NAME}) -SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) -#SET_TARGET_PROPERTIES( ${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 0 ) +SET_TARGET_PROPERTIES( ${XB_LIBNAME} PROPERTIES VERSION 4.0.3 SOVERSION 0 ) IF( EXISTS /usr/local/lib64 ) install (TARGETS ${XB_LIBNAME} DESTINATION lib64/${CMAKE_PROJECT_NAME}) diff --git a/data/CopyStructureV3NoMemos.DBF b/data/CopyStructureV3NoMemos.DBF deleted file mode 100644 index 341e667..0000000 Binary files a/data/CopyStructureV3NoMemos.DBF and /dev/null differ diff --git a/data/CopyStructureV4NoMemos.DBF b/data/CopyStructureV4NoMemos.DBF deleted file mode 100644 index 1e27a29..0000000 Binary files a/data/CopyStructureV4NoMemos.DBF and /dev/null differ diff --git a/data/ExpTest.DBF b/data/ExpTest.DBF deleted file mode 100644 index d9eb058..0000000 Binary files a/data/ExpTest.DBF and /dev/null differ diff --git a/data/Functest.DBF b/data/Functest.DBF deleted file mode 100644 index f5988c4..0000000 Binary files a/data/Functest.DBF and /dev/null differ diff --git a/data/LockTest.DBF b/data/LockTest.DBF deleted file mode 100644 index 26e138a..0000000 Binary files a/data/LockTest.DBF and /dev/null differ diff --git a/data/LockTest.DBT b/data/LockTest.DBT deleted file mode 100644 index 9fc546e..0000000 Binary files a/data/LockTest.DBT and /dev/null differ diff --git a/data/TMDXDB01.DBF b/data/TMDXDB01.DBF deleted file mode 100644 index 0f1124b..0000000 Binary files a/data/TMDXDB01.DBF and /dev/null differ diff --git a/data/TMDXDB01.MDX b/data/TMDXDB01.MDX deleted file mode 100644 index 1e0119d..0000000 Binary files a/data/TMDXDB01.MDX and /dev/null differ diff --git a/data/TestFilt.DBF b/data/TestFilt.DBF deleted file mode 100644 index 0691389..0000000 Binary files a/data/TestFilt.DBF and /dev/null differ diff --git a/data/TestFilt.NDX b/data/TestFilt.NDX deleted file mode 100644 index e2c76fd..0000000 Binary files a/data/TestFilt.NDX and /dev/null differ diff --git a/data/TestNdx.DBF b/data/TestNdx.DBF deleted file mode 100644 index 1b54b95..0000000 Binary files a/data/TestNdx.DBF and /dev/null differ diff --git a/data/TestNdx.INF b/data/TestNdx.INF deleted file mode 100644 index cb4ba66..0000000 --- a/data/TestNdx.INF +++ /dev/null @@ -1,5 +0,0 @@ -[dbase] -NDX=TestNdxC.NDX -NDX1=TestNdxD.NDX -NDX2=TestNdxN.NDX - diff --git a/data/TestNdxC.NDX b/data/TestNdxC.NDX deleted file mode 100644 index d8afd5f..0000000 Binary files a/data/TestNdxC.NDX and /dev/null differ diff --git a/data/TestNdxD.NDX b/data/TestNdxD.NDX deleted file mode 100644 index 647c3b8..0000000 Binary files a/data/TestNdxD.NDX and /dev/null differ diff --git a/data/TestNdxN.NDX b/data/TestNdxN.NDX deleted file mode 100644 index 7bc71a3..0000000 Binary files a/data/TestNdxN.NDX and /dev/null differ diff --git a/data/TestSQL.DBF b/data/TestSQL.DBF deleted file mode 100644 index 34bb7b2..0000000 Binary files a/data/TestSQL.DBF and /dev/null differ diff --git a/data/TestSQL.DBT b/data/TestSQL.DBT deleted file mode 100644 index f457ac8..0000000 Binary files a/data/TestSQL.DBT and /dev/null differ diff --git a/data/TestV3.DBF b/data/TestV3.DBF deleted file mode 100644 index 341e667..0000000 Binary files a/data/TestV3.DBF and /dev/null differ diff --git a/data/TestV3_memos.DBF b/data/TestV3_memos.DBF deleted file mode 100644 index 4c731d6..0000000 Binary files a/data/TestV3_memos.DBF and /dev/null differ diff --git a/data/TestV3_memos.DBT b/data/TestV3_memos.DBT deleted file mode 100644 index 48dc068..0000000 Binary files a/data/TestV3_memos.DBT and /dev/null differ diff --git a/data/TestV4.DBF b/data/TestV4.DBF deleted file mode 100644 index 0fbd2cd..0000000 Binary files a/data/TestV4.DBF and /dev/null differ diff --git a/data/TestV4_memos.DBF b/data/TestV4_memos.DBF deleted file mode 100644 index bcf0609..0000000 Binary files a/data/TestV4_memos.DBF and /dev/null differ diff --git a/data/TestV4_memos.DBT b/data/TestV4_memos.DBT deleted file mode 100644 index c7b5526..0000000 Binary files a/data/TestV4_memos.DBT and /dev/null differ diff --git a/data/xbfile.txt b/data/xbfile.txt deleted file mode 100644 index cb8d0ca..0000000 --- a/data/xbfile.txt +++ /dev/null @@ -1 +0,0 @@ -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB \ No newline at end of file diff --git a/docs/doxygen/html/classxb_1_1xbDate.html b/docs/doxygen/html/classxb_1_1xbDate.html index 5e193da..80dcc57 100644 --- a/docs/doxygen/html/classxb_1_1xbDate.html +++ b/docs/doxygen/html/classxb_1_1xbDate.html @@ -225,6 +225,10 @@ Public Member Functions xbBool BitSet (unsigned char c, xbInt16 iBitNo) const  Check a bit in a one byte field and see if it is set. More...
  +void BitDump (unsigned char c) const +  +void BitDump (char c) const +  xbBool GetDefaultAutoCommit () const  Get the default auto commit setting. More...
  @@ -396,6 +400,58 @@ Static Protected Attributes

Member Function Documentation

+ +

◆ BitDump() [1/2]

+ +
+
+ + + + + +
+ + + + + + + + +
void xb::xbSsv::BitDump (char c) const
+
+inherited
+
+ +
+
+ +

◆ BitDump() [2/2]

+ +
+
+ + + + + +
+ + + + + + + + +
void xb::xbSsv::BitDump (unsigned char c) const
+
+inherited
+
+ +
+

◆ BitSet()

@@ -1808,8 +1864,8 @@ XB_INVALID_DATE
The documentation for this class was generated from the following files: diff --git a/docs/doxygen/html/classxb_1_1xbDbf.html b/docs/doxygen/html/classxb_1_1xbDbf.html index 14e02ca..d532bc4 100644 --- a/docs/doxygen/html/classxb_1_1xbDbf.html +++ b/docs/doxygen/html/classxb_1_1xbDbf.html @@ -132,10 +132,12 @@ Public Member Functions virtual xbInt16 DeleteRecord ()  Delete the current record. More...
  -virtual xbInt16 DumpHeader (xbInt16 iOption) const -  -virtual xbInt16 DumpRecord (xbUInt32 ulRecNo, xbInt16 iOutputDest=0, xbInt16 iOutputFmt=0) -  +virtual xbInt16 DumpHeader (xbInt16 iOption) const + Dump dbf file header. More...
+  +virtual xbInt16 DumpRecord (xbUInt32 ulRecNo, xbInt16 iOutputDest=0, xbInt16 iOutputFmt=0) + Dump record. More...
+  virtual xbInt16 GetAutoCommit () const  Get auto commit setting. More...
  @@ -143,7 +145,7 @@ Public Member Functions  Get auto commit setting. More...
  virtual xbUInt32 GetCurRecNo () const - Get Auto Lock setting. More...
+ Get a pointer to the current index object. More...
  virtual xbInt16 GetDbfStatus () const  Return the current dbf status. More...
@@ -172,8 +174,6 @@ Public Member Functions virtual xbInt16 GetNextRecord (xbInt16 iOption, xbUInt32 ulStartRec)  Get the next record. More...
  -virtual xbInt32 GetPhysicalIxCnt () const -  virtual xbInt16 GetPrevRecord ()  Get the previous record. More...
  @@ -183,6 +183,9 @@ Public Member Functions virtual xbInt16 GetRecord (xbUInt32 ulRecNo)  Get record for specified record number. More...
  +virtual xbUInt32 GetRecordCount () + Get the current number of records in the dbf data file. More...
+  virtual xbInt16 GetRecordCnt (xbUInt32 &ulRecCnt)  Get the current number of records in the dbf data file. More...
  @@ -200,12 +203,15 @@ Public Member Functions virtual xbXBaseGetXbasePtr () const  Get the pointer to the xbXbase structure,. More...
  -virtual xbBool MemoFieldsExist () const -  -virtual xbInt16 Open (const xbString &sTableName) -  -virtual xbInt16 Open (const xbString &sTableName, const xbString &sAlias) -  +virtual xbBool MemoFieldsExist () const + Check for existence of any memo fields. More...
+  +virtual xbInt16 Open (const xbString &sTableName) + Open a table/dbf file. More...
+  +virtual xbInt16 Open (const xbString &sTableName, const xbString &sAlias) + Open a table/dbf file. More...
+  virtual xbInt16 Open (const xbString &sTableName, const xbString &sAlias, xbInt16 iOpenMode, xbInt16 iShareMode)=0   virtual xbInt16 Pack () @@ -226,11 +232,13 @@ Public Member Functions virtual xbInt16 RecordDeleted (xbInt16 iOpt=0) const  Return record deletion status. More...
  +virtual xbInt16 Rename (const xbString sNewName)=0 +  virtual xbInt16 SetAutoCommit (xbInt16 iAutoCommit)  Set auto commit. More...
  virtual xbInt16 UndeleteAllRecords () - Undelete all records. More...
+ Set auto lock. More...
  virtual xbInt16 UndeleteRecord ()  Undelete one record. More...
@@ -570,9 +578,6 @@ Public Member Functions xbInt16 xbRename (const xbString &sOldName, const xbString &sNewName)  Rename file. More...
  -xbInt16 xbRename (const xbString &sOldName, const xbString &sNewName, xbInt16 iOption) - Rename file. More...
-  void xbRewind ()  Xbase wrapper for rewind. More...
  @@ -606,6 +611,10 @@ Public Member Functions xbBool BitSet (unsigned char c, xbInt16 iBitNo) const  Check a bit in a one byte field and see if it is set. More...
  +void BitDump (unsigned char c) const +  +void BitDump (char c) const +  xbBool GetDefaultAutoCommit () const  Get the default auto commit setting. More...
  @@ -841,6 +850,58 @@ Static Protected Attributes

Returns
Return Codes
+ + + +

◆ BitDump() [1/2]

+ +
+
+ + + + + +
+ + + + + + + + +
void xb::xbSsv::BitDump (char c) const
+
+inherited
+
+ +
+
+ +

◆ BitDump() [2/2]

+ +
+
+ + + + + +
+ + + + + + + + +
void xb::xbSsv::BitDump (unsigned char c) const
+
+inherited
+
+
@@ -1470,8 +1531,8 @@ Static Protected Attributes - -

◆ DumpHeader()

+ +

◆ DumpHeader()

@@ -1480,7 +1541,7 @@ Static Protected Attributes - + @@ -1494,10 +1555,23 @@ Static Protected Attributes
virtual xbInt16 xb::xbDbf::DumpHeader xbInt16 xb::xbDbf::DumpHeader ( xbInt16  iOption)
+

Dump dbf file header.

+

This routine dumps dbf header information to the console.

+
Parameters
+ + +
iOption1 = Print header only
+ 2 = Field data only
+ 3 = Header and Field data
+ 4 = Header, Field and Memo header data if applicable
+
+
+
Returns
Return Codes
+
- -

◆ DumpRecord()

+ +

◆ DumpRecord()

@@ -1506,7 +1580,7 @@ Static Protected Attributes - + @@ -1536,6 +1610,23 @@ Static Protected Attributes
virtual xbInt16 xb::xbDbf::DumpRecord xbInt16 xb::xbDbf::DumpRecord ( xbUInt32  ulRecNo,
+

Dump record.

+

Dump the contents of the specified record

+
Parameters
+ + + + +
ulRecNoRecord number of record to be dumped.
iOutputDest0 = stdout
+ 1 = Syslog
+ 2 = Both
+
iOutputFmt0 = with field names
+ 1 = 1 line per rec, no field names
+ 2 = 1 line per rec, first line is a list of field names.
+
+
+
Returns
Return Codes
+
@@ -2249,9 +2340,7 @@ Static Protected Attributes
-

Get Auto Lock setting.

-
Returns
Auto lock setting.
-

Get a pointer to the current index object.

+

Get a pointer to the current index object.

Returns
Pointer to current index.

Return the current record number.

Returns
Returns the current record number.
@@ -4615,31 +4704,6 @@ XB_INVALID_DATA XB_WRITE
-
- - -

◆ GetPhysicalIxCnt()

- -
-
- - - - - -
- - - - - - - -
virtual xbInt32 xb::xbDbf::GetPhysicalIxCnt () const
-
-virtual
-
-
@@ -4880,6 +4944,34 @@ XB_INVALID_DATA
Returns
Return Codes
+ + + +

◆ GetRecordCount()

+ +
+
+ + + + + +
+ + + + + + + +
xbUInt32 xb::xbDbf::GetRecordCount ()
+
+virtual
+
+ +

Get the current number of records in the dbf data file.

+
Returns
Record count or Return Codes
+
@@ -5298,8 +5390,8 @@ XB_INVALID_DATA - -

◆ MemoFieldsExist()

+ +

◆ MemoFieldsExist()

@@ -5308,7 +5400,7 @@ XB_INVALID_DATA - + @@ -5321,6 +5413,10 @@ XB_INVALID_DATA
virtual xbBool xb::xbDbf::MemoFieldsExist xbBool xb::xbDbf::MemoFieldsExist ( ) const
+

Check for existence of any memo fields.

+
Returns
xbTrue - Memo fields exist.
+xbFalse - Memo fields don't exist.
+
@@ -5377,8 +5473,8 @@ XB_INVALID_DATA - -

◆ Open() [1/3]

+ +

◆ Open() [1/3]

@@ -5387,7 +5483,7 @@ XB_INVALID_DATA - + @@ -5401,10 +5497,20 @@ XB_INVALID_DATA
virtual xbInt16 xb::xbDbf::Open xbInt16 xb::xbDbf::Open ( const xbString sTableName)
+

Open a table/dbf file.

+

This routine sets the alias name to the same as the table name.

+
Parameters
+ + +
sTableNameTable name to open, Include the .dbf or .DBF extension.
+
+
+
Returns
Return Codes
+
- -

◆ Open() [2/3]

+ +

◆ Open() [2/3]

@@ -5413,7 +5519,7 @@ XB_INVALID_DATA - + @@ -5437,6 +5543,16 @@ XB_INVALID_DATA
virtual xbInt16 xb::xbDbf::Open xbInt16 xb::xbDbf::Open ( const xbString sTableName,
+

Open a table/dbf file.

+
Parameters
+ + + +
sTableNameTable name to open, Include the .dbf or .DBF extension.
sAliasAlias name to assign to this entry.
+
+
+
Returns
Return Codes
+
@@ -6643,6 +6759,32 @@ XB_INVALID_DATA
Returns
xbTrue - Record deleted.
xbFalse - Record not deleted.
+ + + +

◆ Rename()

+ +
+
+ + + + + +
+ + + + + + + + +
virtual xbInt16 xb::xbDbf::Rename (const xbString sNewName)
+
+pure virtual
+
+
@@ -7058,7 +7200,45 @@ xbFalse - Record not deleted.
-

Undelete all records.

+

Set auto lock.

+

This routine sets the auto lock setting for this table. There is an overall system level auto lock default setting and each table can have it's own autolock setting. This method controls the table level auto lock setting.

+
Parameters
+ + +
iAutoLock1 - Use auto lock for this table.
+ 0 - Don't use auto lock for this table.
+ -1 - (minus one) Use system default.
+
+
+
+
Returns
Return Codes
+

Set the header locked status.

+
Parameters
+ + +
bHeaderLockedxbTrue - Locked
+xbFalse - Not locked.
+
+
+
Returns
void
+

Set lock flavor.

+

This routine is for future expansion.

Parameters
+ + +
iLockFlavor1 - Use Dbase (tm) style locking.
+
+
+
Returns
void
+

Set table locked status.

+
Parameters
+ + +
bTableLocked- xbTrue Table locked.
+xbFalse Table unlocked.
+
+
+
Returns
void
+

Undelete all records.

This routine will remove the deletion flag on any deleted records in the table.

Returns
Return Codes
@@ -8104,7 +8284,7 @@ The mode can also include the letter "b" for binary ie; "r+b". The "b" is ignore -

◆ xbRename() [1/2]

+

◆ xbRename()

@@ -8147,59 +8327,6 @@ The mode can also include the letter "b" for binary ie; "r+b". The "b" is ignore
Returns
Return Codes
-
-
- -

◆ xbRename() [2/2]

- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
xbInt16 xb::xbFile::xbRename (const xbStringsOldName,
const xbStringsNewName,
xbInt16 iOption 
)
-
-inherited
-
- -

Rename file.

-
Parameters
- - - - -
sOldNameOriginal file name
sNewNameNew file name
iOptionIf Set to 1, assume this is a rename request for a dbf file, and should rename the dbt file also
-
-
-
Returns
Return Codes
-
@@ -8823,9 +8950,9 @@ The mode can also include the letter "b" for binary ie; "r+b". The "b" is ignore
The documentation for this class was generated from the following files: diff --git a/docs/doxygen/html/classxb_1_1xbFile.html b/docs/doxygen/html/classxb_1_1xbFile.html index c3684e1..b569a52 100644 --- a/docs/doxygen/html/classxb_1_1xbFile.html +++ b/docs/doxygen/html/classxb_1_1xbFile.html @@ -300,9 +300,6 @@ Public Member Functions xbInt16 xbRename (const xbString &sOldName, const xbString &sNewName)  Rename file. More...
  -xbInt16 xbRename (const xbString &sOldName, const xbString &sNewName, xbInt16 iOption) - Rename file. More...
-  void xbRewind ()  Xbase wrapper for rewind. More...
  @@ -336,6 +333,10 @@ Public Member Functions xbBool BitSet (unsigned char c, xbInt16 iBitNo) const  Check a bit in a one byte field and see if it is set. More...
  +void BitDump (unsigned char c) const +  +void BitDump (char c) const +  xbBool GetDefaultAutoCommit () const  Get the default auto commit setting. More...
  @@ -429,6 +430,58 @@ Static Protected Attributes

Member Function Documentation

+ +

◆ BitDump() [1/2]

+ +
+
+ + + + + +
+ + + + + + + + +
void xb::xbSsv::BitDump (char c) const
+
+inherited
+
+ +
+
+ +

◆ BitDump() [2/2]

+ +
+
+ + + + + +
+ + + + + + + + +
void xb::xbSsv::BitDump (unsigned char c) const
+
+inherited
+
+ +
+

◆ BitSet()

@@ -3131,7 +3184,7 @@ The mode can also include the letter "b" for binary ie; "r+b". The "b" is ignore -

◆ xbRename() [1/2]

+

◆ xbRename()

@@ -3166,51 +3219,6 @@ The mode can also include the letter "b" for binary ie; "r+b". The "b" is ignore
Returns
Return Codes
-
-
- -

◆ xbRename() [2/2]

- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
xbInt16 xb::xbFile::xbRename (const xbStringsOldName,
const xbStringsNewName,
xbInt16 iOption 
)
-
- -

Rename file.

-
Parameters
- - - - -
sOldNameOriginal file name
sNewNameNew file name
iOptionIf Set to 1, assume this is a rename request for a dbf file, and should rename the dbt file also
-
-
-
Returns
Return Codes
-
@@ -3350,8 +3358,8 @@ The mode can also include the letter "b" for binary ie; "r+b". The "b" is ignore
The documentation for this class was generated from the following files: diff --git a/docs/doxygen/html/classxb_1_1xbSsv.html b/docs/doxygen/html/classxb_1_1xbSsv.html index 38c9d8d..9180d1d 100644 --- a/docs/doxygen/html/classxb_1_1xbSsv.html +++ b/docs/doxygen/html/classxb_1_1xbSsv.html @@ -123,6 +123,10 @@ Public Member Functions xbBool BitSet (unsigned char c, xbInt16 iBitNo) const  Check a bit in a one byte field and see if it is set. More...
  +void BitDump (unsigned char c) const +  +void BitDump (char c) const +  xbBool GetDefaultAutoCommit () const  Get the default auto commit setting. More...
  @@ -185,6 +189,42 @@ Static Protected Attributes

Member Function Documentation

+ +

◆ BitDump() [1/2]

+ +
+
+ + + + + + + + +
void xb::xbSsv::BitDump (char c) const
+
+ +
+
+ +

◆ BitDump() [2/2]

+ +
+
+ + + + + + + + +
void xb::xbSsv::BitDump (unsigned char c) const
+
+ +
+

◆ BitSet()

@@ -640,8 +680,8 @@ Static Protected Attributes
The documentation for this class was generated from the following files: diff --git a/docs/doxygen/html/classxb_1_1xbString.html b/docs/doxygen/html/classxb_1_1xbString.html index 1f771c6..7d509c9 100644 --- a/docs/doxygen/html/classxb_1_1xbString.html +++ b/docs/doxygen/html/classxb_1_1xbString.html @@ -192,12 +192,12 @@ Public Member Functions xbStringAssign (const char *srcStr, xbUInt32 lStartPos)  Assign portion of string. More...
  -xbStringAssign (const xbString &s, xbUInt32 pos, xbUInt32 n) - Assign portion of string. More...
-  -xbStringAssign (const xbString &s, xbUInt32 n) - Assign portion of string. More...
-  +xbStringAssign (const xbString &s, xbUInt32 pos, xbUInt32 lCopyLen) + Assign portion of string. More...
+  +xbStringAssign (const xbString &s, xbUInt32 lCopyLen) + Assign portion of string. More...
xbString Copy () const  Copy a string. More...
  @@ -279,6 +279,9 @@ Public Member Functions xbStringRemove (xbUInt32 ulPos, xbUInt32 ulN)  Remove portion of string. More...
  +xbStringReplace (const char *sReplace, const char *sReplaceWith, xbInt16 iOpt=0) + Replace a value within a string with another value. More...
xbStringResize (xbUInt32 lSize)  Resize a string. More...
  @@ -772,8 +775,8 @@ Friends - -

◆ Assign() [3/4]

+ +

◆ Assign() [3/4]

@@ -810,8 +813,8 @@ Friends
- -

◆ Assign() [4/4]

+ +

◆ Assign() [4/4]

@@ -2248,6 +2251,51 @@ Friends
Returns
Reference to string.
+
+
+ +

◆ Replace()

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
xbString & xb::xbString::Replace (const char * sReplace,
const char * sReplaceWith,
xbInt16 iOption = 0 
)
+
+ +

Replace a value within a string with another value.

+
Parameters
+ + + + +
sReplace- Character string to replace.
sReplaceWith- Character string to replace with
iOption- 0 = All occurrences, 1 = first occurrence
+
+
+
Returns
Reference to this string.
+
@@ -2787,8 +2835,8 @@ Friends
The documentation for this class was generated from the following files: diff --git a/docs/doxygen/html/classxb_1_1xbTblMgr.html b/docs/doxygen/html/classxb_1_1xbTblMgr.html index 1203682..ccd4287 100644 --- a/docs/doxygen/html/classxb_1_1xbTblMgr.html +++ b/docs/doxygen/html/classxb_1_1xbTblMgr.html @@ -104,6 +104,8 @@ Public Member Functions   xbDbfGetDbfPtr (xbInt16 sItemNo) const   +xbTblListGetTblListEntry (xbDbf *d) +  xbInt16 GetOpenTableCount () const   xbInt16 RemoveTblFromTblList (const xbString &sTblAlias) @@ -134,6 +136,10 @@ Public Member Functions xbBool BitSet (unsigned char c, xbInt16 iBitNo) const  Check a bit in a one byte field and see if it is set. More...
  +void BitDump (unsigned char c) const +  +void BitDump (char c) const +  xbBool GetDefaultAutoCommit () const  Get the default auto commit setting. More...
  @@ -267,6 +273,58 @@ Static Protected Attributes
+
+ + +

◆ BitDump() [1/2]

+ +
+
+ + + + + +
+ + + + + + + + +
void xb::xbSsv::BitDump (char c) const
+
+inherited
+
+ +
+
+ +

◆ BitDump() [2/2]

+ +
+
+ + + + + +
+ + + + + + + + +
void xb::xbSsv::BitDump (unsigned char c) const
+
+inherited
+
+
@@ -649,6 +707,24 @@ Static Protected Attributes
+
+ + +

◆ GetTblListEntry()

+ +
+
+ + + + + + + + +
xbTblList * xb::xbTblMgr::GetTblListEntry (xbDbfd)
+
+
@@ -950,8 +1026,8 @@ Static Protected Attributes
The documentation for this class was generated from the following files: diff --git a/docs/doxygen/html/classxb_1_1xbXBase.html b/docs/doxygen/html/classxb_1_1xbXBase.html index 1d2115e..7699920 100644 --- a/docs/doxygen/html/classxb_1_1xbXBase.html +++ b/docs/doxygen/html/classxb_1_1xbXBase.html @@ -151,6 +151,8 @@ Public Member Functions   xbDbfGetDbfPtr (xbInt16 sItemNo) const   +xbTblListGetTblListEntry (xbDbf *d) +  xbInt16 GetOpenTableCount () const   xbInt16 RemoveTblFromTblList (const xbString &sTblAlias) @@ -181,6 +183,10 @@ Public Member Functions xbBool BitSet (unsigned char c, xbInt16 iBitNo) const  Check a bit in a one byte field and see if it is set. More...
  +void BitDump (unsigned char c) const +  +void BitDump (char c) const +  xbBool GetDefaultAutoCommit () const  Get the default auto commit setting. More...
  @@ -352,6 +358,58 @@ Friends
+
+ + +

◆ BitDump() [1/2]

+ +
+
+ + + + + +
+ + + + + + + + +
void xb::xbSsv::BitDump (char c) const
+
+inherited
+
+ +
+
+ +

◆ BitDump() [2/2]

+ +
+
+ + + + + +
+ + + + + + + + +
void xb::xbSsv::BitDump (unsigned char c) const
+
+inherited
+
+
@@ -953,6 +1011,32 @@ Friends
+
+ + +

◆ GetTblListEntry()

+ +
+
+ + + + + +
+ + + + + + + + +
xbTblList * xb::xbTblMgr::GetTblListEntry (xbDbfd)
+
+inherited
+
+
@@ -1678,8 +1762,8 @@ Friends
The documentation for this class was generated from the following files: diff --git a/docs/doxygen/html/dir_25b94c3afce00ed38231227d8141f932.html b/docs/doxygen/html/dir_25b94c3afce00ed38231227d8141f932.html index acb76a6..6e22ff0 100644 --- a/docs/doxygen/html/dir_25b94c3afce00ed38231227d8141f932.html +++ b/docs/doxygen/html/dir_25b94c3afce00ed38231227d8141f932.html @@ -5,7 +5,7 @@ -Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.2/src/sql Directory Reference +Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.3/src/sql Directory Reference @@ -73,10 +73,14 @@ $(function() { + + + + diff --git a/docs/doxygen/html/dir_313caf1132e152dd9b58bea13a4052ca.html b/docs/doxygen/html/dir_313caf1132e152dd9b58bea13a4052ca.html index a67b05b..fd2b2f8 100644 --- a/docs/doxygen/html/dir_313caf1132e152dd9b58bea13a4052ca.html +++ b/docs/doxygen/html/dir_313caf1132e152dd9b58bea13a4052ca.html @@ -5,7 +5,7 @@ -Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.2/src/utils Directory Reference +Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.3/src/utils Directory Reference @@ -73,12 +73,6 @@ $(function() {

Files

file  xbalttbl.cpp
 
file  xbcrix.cpp
 
file  xbcrtbl.cpp
 
file  xbdelete.cpp
 
file  xbdrpix.cpp
 
file  xbdrptbl.cpp
- - - - - - diff --git a/docs/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/docs/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html index e8e40b0..66057d7 100644 --- a/docs/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +++ b/docs/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html @@ -5,7 +5,7 @@ -Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.2/src Directory Reference +Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.3/src Directory Reference diff --git a/docs/doxygen/html/dir_aebb8dcc11953d78e620bbef0b9e2183.html b/docs/doxygen/html/dir_aebb8dcc11953d78e620bbef0b9e2183.html index ccb523e..bb40dd2 100644 --- a/docs/doxygen/html/dir_aebb8dcc11953d78e620bbef0b9e2183.html +++ b/docs/doxygen/html/dir_aebb8dcc11953d78e620bbef0b9e2183.html @@ -5,7 +5,7 @@ -Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.2/src/core Directory Reference +Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.3/src/core Directory Reference diff --git a/docs/doxygen/html/dir_b0856f6b0d80ccb263b2f415c91f9e17.html b/docs/doxygen/html/dir_b0856f6b0d80ccb263b2f415c91f9e17.html index 3a44668..76eb467 100644 --- a/docs/doxygen/html/dir_b0856f6b0d80ccb263b2f415c91f9e17.html +++ b/docs/doxygen/html/dir_b0856f6b0d80ccb263b2f415c91f9e17.html @@ -5,7 +5,7 @@ -Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.2/src/include Directory Reference +Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.3/src/include Directory Reference diff --git a/docs/doxygen/html/dir_d93a1d4020dea85bb71b237545b5e722.html b/docs/doxygen/html/dir_d93a1d4020dea85bb71b237545b5e722.html index 2d23c9f..03dde8a 100644 --- a/docs/doxygen/html/dir_d93a1d4020dea85bb71b237545b5e722.html +++ b/docs/doxygen/html/dir_d93a1d4020dea85bb71b237545b5e722.html @@ -5,7 +5,7 @@ -Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.2/src/tests Directory Reference +Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.3/src/tests Directory Reference @@ -109,8 +109,6 @@ Files - - diff --git a/docs/doxygen/html/dir_e931c1a3f0014e624d0645a271726ad2.html b/docs/doxygen/html/dir_e931c1a3f0014e624d0645a271726ad2.html index fe510dd..5553e32 100644 --- a/docs/doxygen/html/dir_e931c1a3f0014e624d0645a271726ad2.html +++ b/docs/doxygen/html/dir_e931c1a3f0014e624d0645a271726ad2.html @@ -5,7 +5,7 @@ -Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.2/src/examples Directory Reference +Xbase64: /mnt/1Tdata/xbase/xbase64-4.0.3/src/examples Directory Reference diff --git a/docs/doxygen/html/files.html b/docs/doxygen/html/files.html index de1cd6e..d85fb7b 100644 --- a/docs/doxygen/html/files.html +++ b/docs/doxygen/html/files.html @@ -127,13 +127,15 @@ $(function() { - - - - - - - + + + + + + + + + @@ -153,29 +155,25 @@ $(function() { - - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + +

Files

file  checkndx.cpp
 
file  dbfxtrct.cpp
 
file  reindex.cpp
 
file  xb_cfg_check.cpp
 
file  xb_copydbf.cpp
 
file  xb_test_ndx.cpp
 
file  xb_test_ndx2.cpp
 
file  xb_test_sql.cpp
 
file  xb_test_string.cpp
  sql
  tests
  utils
diff --git a/docs/doxygen/html/functions_b.html b/docs/doxygen/html/functions_b.html index 0fc903f..d9dfa32 100644 --- a/docs/doxygen/html/functions_b.html +++ b/docs/doxygen/html/functions_b.html @@ -66,6 +66,7 @@ $(function() {
Here is a list of all struct and union fields with links to the structures/unions they belong to:

- b -

diff --git a/docs/doxygen/html/functions_d.html b/docs/doxygen/html/functions_d.html index cdce904..21f0ffb 100644 --- a/docs/doxygen/html/functions_d.html +++ b/docs/doxygen/html/functions_d.html @@ -77,8 +77,8 @@ $(function() {
  • DisableMsgLogging() : xb::xbXBase
  • DisplayError() : xb::xbSsv
  • DisplayTableList() : xb::xbTblMgr
  • -
  • DumpHeader() : xb::xbDbf
  • -
  • DumpRecord() : xb::xbDbf
  • +
  • DumpHeader() : xb::xbDbf
  • +
  • DumpRecord() : xb::xbDbf
  • diff --git a/docs/doxygen/html/functions_func_b.html b/docs/doxygen/html/functions_func_b.html index 2981d25..82917cf 100644 --- a/docs/doxygen/html/functions_func_b.html +++ b/docs/doxygen/html/functions_func_b.html @@ -66,6 +66,7 @@ $(function() {  

    - b -

    diff --git a/docs/doxygen/html/functions_func_d.html b/docs/doxygen/html/functions_func_d.html index a6f53b2..4f361cd 100644 --- a/docs/doxygen/html/functions_func_d.html +++ b/docs/doxygen/html/functions_func_d.html @@ -77,8 +77,8 @@ $(function() {
  • DisableMsgLogging() : xb::xbXBase
  • DisplayError() : xb::xbSsv
  • DisplayTableList() : xb::xbTblMgr
  • -
  • DumpHeader() : xb::xbDbf
  • -
  • DumpRecord() : xb::xbDbf
  • +
  • DumpHeader() : xb::xbDbf
  • +
  • DumpRecord() : xb::xbDbf
  • diff --git a/docs/doxygen/html/functions_func_g.html b/docs/doxygen/html/functions_func_g.html index b3cf069..736af49 100644 --- a/docs/doxygen/html/functions_func_g.html +++ b/docs/doxygen/html/functions_func_g.html @@ -113,16 +113,17 @@ $(function() {
  • GetOpenMode() : xb::xbFile
  • GetOpenTableCount() : xb::xbTblMgr
  • GetPathSeparator() : xb::xbString
  • -
  • GetPhysicalIxCnt() : xb::xbDbf
  • GetPrevRecord() : xb::xbDbf
  • GetRawField() : xb::xbDbf
  • GetRecord() : xb::xbDbf
  • GetRecordBuf() : xb::xbDbf
  • GetRecordCnt() : xb::xbDbf
  • +
  • GetRecordCount() : xb::xbDbf
  • GetRecordLen() : xb::xbDbf
  • GetShareMode() : xb::xbFile
  • GetSize() : xb::xbString
  • GetTblAlias() : xb::xbDbf
  • +
  • GetTblListEntry() : xb::xbTblMgr
  • GetULongField() : xb::xbDbf
  • GetVersion() : xb::xbDbf
  • GetXbaseFileTypeByte() : xb::xbFile
  • diff --git a/docs/doxygen/html/functions_func_m.html b/docs/doxygen/html/functions_func_m.html index be44b4b..cf56d43 100644 --- a/docs/doxygen/html/functions_func_m.html +++ b/docs/doxygen/html/functions_func_m.html @@ -66,7 +66,7 @@ $(function() {  

    - m -

    diff --git a/docs/doxygen/html/functions_func_o.html b/docs/doxygen/html/functions_func_o.html index 059327b..09eacbf 100644 --- a/docs/doxygen/html/functions_func_o.html +++ b/docs/doxygen/html/functions_func_o.html @@ -66,7 +66,7 @@ $(function() {  

    - o -

    diff --git a/docs/doxygen/html/functions_g.html b/docs/doxygen/html/functions_g.html index 0315594..601e48d 100644 --- a/docs/doxygen/html/functions_g.html +++ b/docs/doxygen/html/functions_g.html @@ -113,16 +113,17 @@ $(function() {
  • GetOpenMode() : xb::xbFile
  • GetOpenTableCount() : xb::xbTblMgr
  • GetPathSeparator() : xb::xbString
  • -
  • GetPhysicalIxCnt() : xb::xbDbf
  • GetPrevRecord() : xb::xbDbf
  • GetRawField() : xb::xbDbf
  • GetRecord() : xb::xbDbf
  • GetRecordBuf() : xb::xbDbf
  • GetRecordCnt() : xb::xbDbf
  • +
  • GetRecordCount() : xb::xbDbf
  • GetRecordLen() : xb::xbDbf
  • GetShareMode() : xb::xbFile
  • GetSize() : xb::xbString
  • GetTblAlias() : xb::xbDbf
  • +
  • GetTblListEntry() : xb::xbTblMgr
  • GetULongField() : xb::xbDbf
  • GetVersion() : xb::xbDbf
  • GetXbaseFileTypeByte() : xb::xbFile
  • diff --git a/docs/doxygen/html/functions_m.html b/docs/doxygen/html/functions_m.html index 03122f3..c4bd343 100644 --- a/docs/doxygen/html/functions_m.html +++ b/docs/doxygen/html/functions_m.html @@ -66,7 +66,7 @@ $(function() {
    Here is a list of all struct and union fields with links to the structures/unions they belong to:

    - m -

    diff --git a/docs/doxygen/html/functions_o.html b/docs/doxygen/html/functions_o.html index 6c5dcb0..95321c1 100644 --- a/docs/doxygen/html/functions_o.html +++ b/docs/doxygen/html/functions_o.html @@ -66,7 +66,7 @@ $(function() {
    Here is a list of all struct and union fields with links to the structures/unions they belong to:

    - o -

    diff --git a/docs/doxygen/html/functions_x.html b/docs/doxygen/html/functions_x.html index 122a118..d7e5863 100644 --- a/docs/doxygen/html/functions_x.html +++ b/docs/doxygen/html/functions_x.html @@ -74,7 +74,7 @@ $(function() {
  • xbFclose() : xb::xbFile
  • xbFeof() : xb::xbFile
  • xbFflush() : xb::xbFile
  • -
  • xbFgetc() : xb::xbFile
  • +
  • xbFgetc() : xb::xbFile
  • xbFgets() : xb::xbFile
  • xbFile() : xb::xbFile
  • xbFopen() : xb::xbFile
  • diff --git a/docs/doxygen/html/globals.html b/docs/doxygen/html/globals.html index 91cbdf4..bae955d 100644 --- a/docs/doxygen/html/globals.html +++ b/docs/doxygen/html/globals.html @@ -78,11 +78,6 @@ $(function() { -

    - f -

    - -

    - g -

    @@ -107,7 +102,7 @@ $(function() {

    - m -

    @@ -119,11 +114,6 @@ $(function() { -

    - u -

    - -

    - v -

    diff --git a/docs/doxygen/html/globals_func.html b/docs/doxygen/html/globals_func.html index 3ecaa0b..c273ac7 100644 --- a/docs/doxygen/html/globals_func.html +++ b/docs/doxygen/html/globals_func.html @@ -78,11 +78,6 @@ $(function() { -

    - f -

    - -

    - g -

    @@ -94,7 +89,7 @@ $(function() {

    - m -

    @@ -103,11 +98,6 @@ $(function() {
  • TestTokenMethod() : xb_test_expression.cpp
  • TestWeight() : xb_test_expression.cpp
  • - - -

    - u -