casa-mp-base

--- libflatfile/MobileDB.cpp.orig   2003-06-19 19:37:46.000000000 -0400

+++ libflatfile/MobileDB.cpp    2007-07-10 06:33:33.000000000 -0400

@@ -213,7 +213,7 @@

         if (field == 0xFF) break;

         // Make sure that we don't go beyond the maximum number of fields.

-        if (field >= getMaxNumOfFields())

+        if (field > getMaxNumOfFields()) // css: chaanged >= to >

             throw PalmLib::error("maximum number of fields exceeded");

         // Expand the fields vector if this field goes beyond the end

@@ -302,7 +302,15 @@

     // Extract the field labels record.

     recNum = find_metadata_index(pdb, CATEGORY_FIELD_LABELS);

     mdb_record_t names = parse_record(pdb.getRecord(recNum));

-    numFields = names.size();

+

+    // css: Fields must have names, so zero-length field labels indicate

+    // fields that should be trimmed from the size.

+    int trim = 0;

+    for (mdb_record_t::reverse_iterator p = names.rbegin(); p < names.rend(); ++p) {

+        if ((*p).size() == 0)

+            ++trim;

+    }

+    numFields = names.size() - trim;

     // Extract the data types record.

     recNum = find_metadata_index(pdb, CATEGORY_DATA_TYPES);

@@ -321,7 +329,41 @@

     for (i = 0; i < numFields; ++i) {

         unsigned width;

-        appendField(names[i], Field::STRING);

+        // css: determine the field type

+        Field::FieldType fieldType;

+        switch (types[i][0]) {

+        case 's':

+        case 'T':

+        case 'P': // phone number

+        case 'M': // email address

+          fieldType = PalmLib::FlatFile::Field::STRING;

+          break;

+        case 'I':

+          fieldType = PalmLib::FlatFile::Field::INTEGER;

+          break;

+        case 'F':

+          fieldType = PalmLib::FlatFile::Field::FLOAT;

+          break;

+        case 'B':

+          fieldType = PalmLib::FlatFile::Field::BOOLEAN;

+          break;

+        case 'D':

+          fieldType = PalmLib::FlatFile::Field::DATE;

+          break;

+        case 'd':

+          fieldType = PalmLib::FlatFile::Field::TIME;

+          break;

+        case 'L':

+          fieldType = PalmLib::FlatFile::Field::LIST;

+          break;

+        case 'W':

+          fieldType = PalmLib::FlatFile::Field::LINK;

+          break;