Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 2 additions & 25 deletions centrallix/osdrivers/objdrv_fp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1223,37 +1223,14 @@ fp_internal_ParseColumn(pFpColInf column, pObjData pod, char* data, char* row_da
int i,f;
double decimalOffsetValue = 10000;

// Currently columns are only ever DATA_T_STRING since automatic type detection hasn't been implemented yet
// See fp_internal_ParseDefinition()
switch(column->Type)
{
case DATA_T_INTEGER:
if (fp_internal_MappedCopy(ibuf, sizeof(ibuf), column, row_data) < 0) return -1;
pod->Integer = strtoi(ibuf, NULL, 10);
break;
case DATA_T_STRING:
pod->String = data;
if (fp_internal_MappedCopy(data, column->Length+1, column, row_data) < 0) return -1;
break;
case DATA_T_DATETIME:
pod->DateTime = (pDateTime)data;
if (fp_internal_MappedCopy(dtbuf, sizeof(dtbuf), column, row_data) < 0) return -1;
if (objDataToDateTime(DATA_T_STRING, dtbuf, pod->DateTime, NULL) < 0) return -1;
break;
case DATA_T_DOUBLE:
if (fp_internal_MappedCopy(ibuf, sizeof(ibuf), column, row_data) < 0) return -1;
pod->Double = strtol(ibuf, NULL, 10);
if (column->DecimalOffset) pod->Double /= pow(10, column->DecimalOffset);
break;
case DATA_T_MONEY:
//decimalOffsetValue is originally 10000 to convert v to 10000ths of a dollar
//decimalOffsetValue is divided by 10, column->DecimalOffset times,
//keeping the decimal as a double in case it drops below 0
//Finally, I multiple v by decimalOffsetValue to get my Money->Value
if (fp_internal_MappedCopy(ibuf, sizeof(ibuf), column, row_data) < 0) return -1;
v = strtoll(ibuf, NULL, 10);
decimalOffsetValue /= pow(10, column->DecimalOffset);
pod->Money = (pMoneyType)data;
pod->Money->Value = (v*decimalOffsetValue)+ 0.1;
break;
default:
mssError(1, "FP", "Bark! Unhandled data type for column '%s'", column->Name);
return -1;
Expand Down
51 changes: 0 additions & 51 deletions centrallix/tests/test_moneytype_objdrv_fp.c

This file was deleted.