Fixing a format problem with strings due to a bad decision

AbelPau · Apr 17, 2024 · aef5884 · aef5884
1 parent 306655c
commit aef5884
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/ogr/ogrsf_frmts/miramon/mm_gdal_functions.h b/ogr/ogrsf_frmts/miramon/mm_gdal_functions.h
@@ -129,7 +129,7 @@ int MM_ModifyFieldNameAndDescriptorIfPresentBD_XP(
     struct MM_FIELD *camp, struct MM_DATA_BASE_XP *bd_xp,
     MM_BOOLEAN no_modifica_descriptor, size_t mida_nom);
 
-int MMWritePreformatedValueToRecordDBXP(
+int MMWritePreformatedNumberValueToRecordDBXP(
     struct MiraMonVectLayerInfo *hMiraMonLayer, char *registre,
     const struct MM_FIELD *camp, const char *valor);
 int MMWriteValueToRecordDBXP(struct MiraMonVectLayerInfo *hMiraMonLayer,

diff --git a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
@@ -6652,7 +6652,7 @@ MMWriteValueToszStringToOperate(struct MiraMonVectLayerInfo *hMiraMonLayer,
     return 0;
 }
 
-int MMWritePreformatedValueToRecordDBXP(
+int MMWritePreformatedNumberValueToRecordDBXP(
     struct MiraMonVectLayerInfo *hMiraMonLayer, char *registre,
     const struct MM_FIELD *camp, const char *valor)
 {
@@ -6735,12 +6735,22 @@ static int MMAddFeatureRecordToMMDB(struct MiraMonVectLayerInfo *hMiraMonLayer,
                 continue;
             }
             if (pBD_XP->pField[nIField + nNumPrivateMMField].FieldType == 'C' ||
-                pBD_XP->pField[nIField + nNumPrivateMMField].FieldType == 'D' ||
-                (pBD_XP->pField[nIField + nNumPrivateMMField].FieldType ==
-                     'N' &&
-                 !pBD_XP->pField[nIField + nNumPrivateMMField].Is64))
+                pBD_XP->pField[nIField + nNumPrivateMMField].FieldType == 'D')
             {
-                if (MMWritePreformatedValueToRecordDBXP(
+                if (MMWriteValueToRecordDBXP(hMiraMonLayer, pszRecordOnCourse,
+                                             pBD_XP->pField + nIField +
+                                                 nNumPrivateMMField,
+                                             hMMFeature->pRecords[nIRecord]
+                                                 .pField[nIField]
+                                                 .pDinValue,
+                                             FALSE))
+                    return 1;
+            }
+            else if (pBD_XP->pField[nIField + nNumPrivateMMField].FieldType ==
+                         'N' &&
+                     !pBD_XP->pField[nIField + nNumPrivateMMField].Is64)
+            {
+                if (MMWritePreformatedNumberValueToRecordDBXP(
                         hMiraMonLayer, pszRecordOnCourse,
                         pBD_XP->pField + nIField + nNumPrivateMMField,
                         hMMFeature->pRecords[nIRecord]