fix #75

Author: gam6itko

README.md

@@ -97,3 +97,8 @@ Troubleshooting
 -----
 
 I'm not an expert on dBase and I don't know all the specifics of the field types and versions, so the lib may not be able to handle some situations. If you find an error, please open an issue and send me a sample table that I can reproduce your problem and I'll try to help.
+
+Useful links
+-----
+
+[Xbase File Format Description](http://www.manmrk.net/tutorials/database/xbase/)

src/XBase/Enum/TableType.php

@@ -2,6 +2,9 @@
 
 namespace XBase\Enum;
 
+/**
+ * @see https://www.dbf2002.com/dbf-file-format.html
+ */
 final class TableType
 {
     /** @var int dBase II or FoxBASE */
@@ -23,7 +26,7 @@ final class TableType
     /** @var int FoxBASE+/dBase III PLUS/FoxPro, with memo (*.DBT) */
     const DBASE_III_PLUS_MEMO = 0x83;
     /** @var int dBase IV/dBase 5, with memo (*.DBT) */
-    const DBASE_IV_MEMO_PLUS_MEMO = 0x8B;
+    const DBASE_IV_MEMO = 0x8B;
     /** @var int dBase 7, with memo (*.DBT) */
     const DBASE_7_MEMO = 0x8C;
     /** @var int dBase IV/dBase 5, SQL table files, with memo (*.DBT) */
@@ -32,7 +35,7 @@ final class TableType
     const SMT = 0xE5;
     /** @var int dBase IV/dBase 5, SQL system files, with memo */
     const DBASE_IV_SQL_SYSTEM_MEMO = 0xEB;
-    /** @var int FoxPro 2.x ( or earlier) with memo (*.FTP) */
+    /** @var int FoxPro 2.x ( or earlier) with memo (*.FPT) */
     const FOXPRO_MEMO = 0xF5;
     /** @var int FoxBASE */
     const FOXBASE = 0xFB;
@@ -42,10 +45,32 @@ public static function isFoxpro(int $version): bool
         return in_array($version, [
             self::VISUAL_FOXPRO,
             self::VISUAL_FOXPRO_AI,
+            self::VISUAL_FOXPRO_VAR,
             self::DBASE_III_PLUS_MEMO,
             self::DBASE_IV_SQL_TABLE_MEMO,
             self::FOXPRO_MEMO,
             self::FOXBASE,
         ]);
     }
+
+    public static function isVisualFoxpro(int $version): bool
+    {
+        return in_array($version, [
+            self::VISUAL_FOXPRO,
+            self::VISUAL_FOXPRO_AI,
+            self::VISUAL_FOXPRO_VAR,
+        ]);
+    }
+
+    public static function hasMemo(int $version): bool
+    {
+        return in_array($version, [
+            self::DBASE_III_PLUS_MEMO,
+            self::DBASE_IV_MEMO,
+            self::DBASE_IV_SQL_TABLE_MEMO,
+            self::DBASE_IV_SQL_SYSTEM_MEMO,
+            self::DBASE_7_MEMO,
+            self::FOXPRO_MEMO,
+        ]);
+    }
 }

src/XBase/Memo.php

@@ -14,7 +14,7 @@ class Memo
     /**
      * Memo constructor.
      *
-     * @param Table $table
+     * @param Table  $table
      * @param string $tableName
      */
     public function __construct(Table $table, $tableName)
@@ -29,7 +29,7 @@ public function __construct(Table $table, $tableName)
      */
     protected function open()
     {
-        $fileName = str_replace(array("dbf", "DBF"), array("fpt", "FPT"), $this->tableName);
+        $fileName = str_replace(["dbf", "DBF"], ["fpt", "FPT"], $this->tableName);
 
         if (!file_exists($fileName)) {
             return false;

src/XBase/Record.php

@@ -2,6 +2,7 @@
 
 namespace XBase;
 
+use XBase\Enum\TableType;
 use XBase\Exception\InvalidColumnException;
 
 class Record
@@ -301,7 +302,11 @@ public function getBoolean($columnName)
     public function getMemo($columnName)
     {
         $data = $this->forceGetString($columnName);
-        if ($data && strlen($data) == 2) {
+        if (TableType::FOXPRO_MEMO === $this->table->version) {
+            return $this->memoFile->get((int) $data);
+        }
+
+        if ($data && 2 === strlen($data)) {
             $pointer = unpack('s', $data)[1];
             return $this->memoFile->get($pointer);
         } else {

src/XBase/Table.php

@@ -12,6 +12,9 @@ class Table
     /** @var int Record field length in bytes */
     const FIELD_LENGTH = 32;
 
+    /** @var int Visual FoxPro backlist length */
+    const VFP_BACKLIST_LENGTH = 263;
+
     /** @var string Table filepath. */
     protected $tableName;
     /** @var array|null */
@@ -43,7 +46,10 @@ class Table
     public $encrypted;
     /** @var string */
     public $mdxFlag;
-    /** @var string */
+    /**
+     * @var string Language codepage.
+     * @see https://blog.codetitans.pl/post/dbf-and-language-code-page/
+     */
     public $languageCode;
     /** @var Column[] */
     public $columns;
@@ -71,7 +77,7 @@ public function __construct($tableName, $availableColumns = null, $convertFrom =
     {
         $this->tableName = $tableName;
         $this->availableColumns = $availableColumns;
-        $this->convertFrom = $convertFrom;
+        $this->convertFrom = $convertFrom; //todo autodetect from languageCode
         $this->memoFile = new Memo($this, $this->tableName);
         $this->open();
     }
@@ -108,7 +114,10 @@ protected function readHeader()
         $this->languageCode = $this->readByte();
         $this->readBytes(2); //reserved
 
-        $fieldCount = floor(($this->headerLength - ($this->isFoxpro() ? 296 : 33)) / self::FIELD_LENGTH);
+        $fieldCount = ($this->headerLength - ((self::HEADER_LENGTH + 1) + (TableType::isVisualFoxpro($this->version) ? self::VFP_BACKLIST_LENGTH : 0))) / self::FIELD_LENGTH;
+        if (is_float($fieldCount)) {
+            trigger_error('Wrong fieldCount calculation', E_USER_WARNING);
+        }
 
         /* some checking */
         if ($this->headerLength > filesize($this->tableName)) {
@@ -149,11 +158,15 @@ protected function readHeader()
             }
         }
 
-        if ($this->isFoxpro()) {
-            $this->backlist = $this->readBytes(263);
+        if (chr(0x0D) !== $this->readByte()) {
+            throw new TableException('Expected header terminator not present at position ' . ftell($this->fp));
+        }
+
+        if (TableType::isVisualFoxpro($this->version)) {
+            $this->backlist = $this->readBytes(self::VFP_BACKLIST_LENGTH);
         }
 
-        $this->setFilePos($this->headerLength);
+//        $this->setFilePos($this->headerLength);
         $this->recordPos = -1;
         $this->record = false;
         $this->deleteCount = 0;

tests/FoxproTest.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace XBase\Tests;
+
+use PHPUnit\Framework\TestCase;
+use XBase\Enum\FieldType;
+use XBase\Enum\TableFlag;
+use XBase\Enum\TableType;
+use XBase\Table;
+
+class FoxproTest extends TestCase
+{
+    public function testRead()
+    {
+        $table = new Table(__DIR__.'/Resources/foxpro/1.dbf', null, 'cp852'); //todo file to big need to reduce
+
+        self::assertSame(TableType::FOXPRO_MEMO, $table->version);
+        self::assertSame(true, $table->isFoxpro());
+        self::assertSame(417, $table->headerLength);
+        self::assertSame(66, $table->recordByteLength);
+        self::assertSame(false, $table->inTransaction);
+        self::assertSame(false, $table->encrypted);
+        self::assertSame(TableFlag::NONE, ord($table->mdxFlag));
+        self::assertSame(0x64, ord($table->languageCode));
+
+        self::assertSame(12, $table->getColumnCount());
+//        self::assertSame(10, $table->getRecordCount());
+
+        $columns = $table->getColumns();
+        self::assertIsArray($columns);
+        self::assertCount(12, $columns);
+
+        $c = $columns['poz'];
+        self::assertSame(FieldType::MEMO, $c->getType());
+        self::assertSame(7, $c->getColIndex());
+        self::assertSame(10, $c->getLength());
+        self::assertSame(0x20, $c->getMemAddress());
+        self::assertSame(0x20, $c->getBytePos());
+        unset($c);
+
+        //<editor-fold desc="record">
+        $record = $table->nextRecord();
+        self::assertSame(40777, $record->getNum('idc'));
+        self::assertSame(1, $record->getNum('clv'));
+        self::assertSame(57310050.0, $record->getNum('idn'));
+        self::assertSame(51014, $record->getNum('pvz'));
+        self::assertSame('Rozhodnutie 1/2014/ROEP Modra o schválení registra zo dňa 31.3.2014 právoplatné dňa 24.4.2014', $record->getMemo('poz'));
+        //</editor-fold>
+
+        $table->close();
+    }
+
+
+}