Mejoras varias versión 2.0.0.5 para guardar númerico algunas columnas y respetar número de sector leído
parent
2885e59b2d
commit
1e46330dad
|
|
@ -37,4 +37,5 @@ OliviaTasks/[Rr]elease*/
|
||||||
OliviaTasks/[Dd]ebug*/
|
OliviaTasks/[Dd]ebug*/
|
||||||
lib/
|
lib/
|
||||||
bin/
|
bin/
|
||||||
bin/x64
|
bin/x64/debug
|
||||||
|
bin/x64/release
|
||||||
|
|
|
||||||
|
|
@ -16,13 +16,11 @@
|
||||||
#undef APSTUDIO_READONLY_SYMBOLS
|
#undef APSTUDIO_READONLY_SYMBOLS
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// English (U.S.) resources
|
// Inglés (Estados Unidos) resources
|
||||||
|
|
||||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||||
#ifdef _WIN32
|
|
||||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||||
#pragma code_page(1252)
|
#pragma code_page(1252)
|
||||||
#endif //_WIN32
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
|
|
@ -30,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 2,0,0,3
|
FILEVERSION 2,0,0,5
|
||||||
PRODUCTVERSION 2,0,0,3
|
PRODUCTVERSION 2,0,0,5
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
|
@ -48,12 +46,12 @@ BEGIN
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "VSM"
|
VALUE "CompanyName", "VSM"
|
||||||
VALUE "FileDescription", "Librería de la aplicación Olivia"
|
VALUE "FileDescription", "Librería de la aplicación Olivia"
|
||||||
VALUE "FileVersion", "2.0.0.3"
|
VALUE "FileVersion", "2.0.0.5"
|
||||||
VALUE "InternalName", "Olivia.dll"
|
VALUE "InternalName", "Olivia.dll"
|
||||||
VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved."
|
VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved."
|
||||||
VALUE "OriginalFilename", "Olivia.dll"
|
VALUE "OriginalFilename", "Olivia.dll"
|
||||||
VALUE "ProductName", "OLIVIA"
|
VALUE "ProductName", "OLIVIA"
|
||||||
VALUE "ProductVersion", "2.0.0.3"
|
VALUE "ProductVersion", "2.0.0.5"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
@ -62,18 +60,16 @@ BEGIN
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
|
|
||||||
#endif // English (U.S.) resources
|
#endif // Inglés (Estados Unidos) resources
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Spanish resources
|
// Español (España, alfabetización internacional) resources
|
||||||
|
|
||||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
|
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
|
||||||
#ifdef _WIN32
|
|
||||||
LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
|
LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
|
||||||
#pragma code_page(1252)
|
#pragma code_page(1252)
|
||||||
#endif //_WIN32
|
|
||||||
|
|
||||||
#ifdef APSTUDIO_INVOKED
|
#ifdef APSTUDIO_INVOKED
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
@ -113,7 +109,7 @@ END
|
||||||
|
|
||||||
#endif // APSTUDIO_INVOKED
|
#endif // APSTUDIO_INVOKED
|
||||||
|
|
||||||
#endif // Spanish resources
|
#endif // Español (España, alfabetización internacional) resources
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -105,15 +105,15 @@
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Command>copy ..\..\bin\$(IntDir)utiles.dll ..\bin\$(IntDir)
|
<Command>copy ..\..\bin\$(IntDir)utiles.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)utiles.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)utiles.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)LicUtiles.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)LicUtiles.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)LicUtiles.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)LicUtiles.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)ClientLic.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)ClientLic.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\ib\$(IntDir)ClientLic.lib ..\bin\$(IntDir)
|
copy ..\..\ib\$(IntDir)ClientLic.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)FileTransfer.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)FileTransfer.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)FileTransfer.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)FileTransfer.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)sqlite3.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)sqlite3.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)sqlite3.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)sqlite3.lib ..\lib\$(IntDir)
|
||||||
|
|
||||||
copy ..\bin\$(IntDir)utiles.dll $(OutDir)
|
copy ..\bin\$(IntDir)utiles.dll $(OutDir)
|
||||||
copy ..\lib\$(IntDir)utiles.lib $(OutDir)
|
copy ..\lib\$(IntDir)utiles.lib $(OutDir)
|
||||||
|
|
@ -162,15 +162,15 @@ copy $(OutDir)Olivia.lib ..\lib\$(IntDir)</Command>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Command>copy ..\..\bin\$(IntDir)utiles.dll ..\bin\$(IntDir)
|
<Command>copy ..\..\bin\$(IntDir)utiles.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)utiles.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)utiles.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)LicUtiles.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)LicUtiles.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)LicUtiles.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)LicUtiles.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)ClientLic.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)ClientLic.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\ib\$(IntDir)ClientLic.lib ..\bin\$(IntDir)
|
copy ..\..\ib\$(IntDir)ClientLic.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)FileTransfer.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)FileTransfer.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)FileTransfer.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)FileTransfer.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)sqlite3.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)sqlite3.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)sqlite3.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)sqlite3.lib ..\lib\$(IntDir)
|
||||||
|
|
||||||
copy ..\bin\$(IntDir)utiles.dll $(OutDir)
|
copy ..\bin\$(IntDir)utiles.dll $(OutDir)
|
||||||
copy ..\lib\$(IntDir)utiles.lib $(OutDir)
|
copy ..\lib\$(IntDir)utiles.lib $(OutDir)
|
||||||
|
|
@ -220,15 +220,15 @@ copy $(OutDir)Olivia.lib ..\lib\$(IntDir)</Command>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Command>copy ..\..\bin\$(IntDir)utiles.dll ..\bin\$(IntDir)
|
<Command>copy ..\..\bin\$(IntDir)utiles.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)utiles.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)utiles.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)LicUtiles.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)LicUtiles.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)LicUtiles.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)LicUtiles.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)ClientLic.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)ClientLic.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\ib\$(IntDir)ClientLic.lib ..\bin\$(IntDir)
|
copy ..\..\ib\$(IntDir)ClientLic.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)FileTransfer.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)FileTransfer.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)FileTransfer.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)FileTransfer.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)sqlite3.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)sqlite3.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)sqlite3.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)sqlite3.lib ..\lib\$(IntDir)
|
||||||
|
|
||||||
copy ..\bin\$(IntDir)utiles.dll $(OutDir)
|
copy ..\bin\$(IntDir)utiles.dll $(OutDir)
|
||||||
copy ..\lib\$(IntDir)utiles.lib $(OutDir)
|
copy ..\lib\$(IntDir)utiles.lib $(OutDir)
|
||||||
|
|
@ -279,15 +279,15 @@ copy $(OutDir)Olivia.lib ..\lib\$(IntDir)</Command>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Command>copy ..\..\bin\$(IntDir)utiles.dll ..\bin\$(IntDir)
|
<Command>copy ..\..\bin\$(IntDir)utiles.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)utiles.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)utiles.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)LicUtiles.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)LicUtiles.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)LicUtiles.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)LicUtiles.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)ClientLic.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)ClientLic.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\ib\$(IntDir)ClientLic.lib ..\bin\$(IntDir)
|
copy ..\..\ib\$(IntDir)ClientLic.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)FileTransfer.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)FileTransfer.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)FileTransfer.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)FileTransfer.lib ..\lib\$(IntDir)
|
||||||
copy ..\..\bin\$(IntDir)sqlite3.dll ..\bin\$(IntDir)
|
copy ..\..\bin\$(IntDir)sqlite3.dll ..\bin\$(IntDir)
|
||||||
copy ..\..\lib\$(IntDir)sqlite3.lib ..\bin\$(IntDir)
|
copy ..\..\lib\$(IntDir)sqlite3.lib ..\lib\$(IntDir)
|
||||||
|
|
||||||
copy ..\bin\$(IntDir)utiles.dll $(OutDir)
|
copy ..\bin\$(IntDir)utiles.dll $(OutDir)
|
||||||
copy ..\lib\$(IntDir)utiles.lib $(OutDir)
|
copy ..\lib\$(IntDir)utiles.lib $(OutDir)
|
||||||
|
|
|
||||||
|
|
@ -426,21 +426,29 @@ int Colv_limp::pon_config(char *config_)
|
||||||
{
|
{
|
||||||
if(!olv->dame_param(token, camps.campo_circ, sizeof(camps.campo_circ)))
|
if(!olv->dame_param(token, camps.campo_circ, sizeof(camps.campo_circ)))
|
||||||
break;
|
break;
|
||||||
|
if (strlen(camps.campo_circ) > OLV_MAX_COL_SHP)//10 porque el shp solo pasa con 10 caracteres en los nombres de columna
|
||||||
|
camps.campo_circ[OLV_MAX_COL_SHP] = 0;
|
||||||
}
|
}
|
||||||
else if(strstr(token,OliviaDef::GeneralDef::GTC_kph))
|
else if(strstr(token,OliviaDef::GeneralDef::GTC_kph))
|
||||||
{
|
{
|
||||||
if(!olv->dame_param(token, camps.campo_velo, sizeof(camps.campo_velo)))
|
if(!olv->dame_param(token, camps.campo_velo, sizeof(camps.campo_velo)))
|
||||||
break;
|
break;
|
||||||
|
if (strlen(camps.campo_velo) > OLV_MAX_COL_SHP)//10 porque el shp solo pasa con 10 caracteres en los nombres de columna
|
||||||
|
camps.campo_velo[OLV_MAX_COL_SHP] = 0;
|
||||||
}
|
}
|
||||||
else if(strstr(token,OliviaDef::GeneralDef::GTC_fow))
|
else if(strstr(token,OliviaDef::GeneralDef::GTC_fow))
|
||||||
{
|
{
|
||||||
if(!olv->dame_param(token, camps.campo_fow, sizeof(camps.campo_fow)))
|
if(!olv->dame_param(token, camps.campo_fow, sizeof(camps.campo_fow)))
|
||||||
break;
|
break;
|
||||||
|
if (strlen(camps.campo_fow) > OLV_MAX_COL_SHP)//10 porque el shp solo pasa con 10 caracteres en los nombres de columna
|
||||||
|
camps.campo_fow[OLV_MAX_COL_SHP] = 0;
|
||||||
}
|
}
|
||||||
else if(strstr(token,OliviaDef::GeneralDef::GTC_name))
|
else if(strstr(token,OliviaDef::GeneralDef::GTC_name))
|
||||||
{
|
{
|
||||||
if(!olv->dame_param(token, camps.campo_name, sizeof(camps.campo_name)))
|
if(!olv->dame_param(token, camps.campo_name, sizeof(camps.campo_name)))
|
||||||
break;
|
break;
|
||||||
|
if (strlen(camps.campo_name) > OLV_MAX_COL_SHP)//10 porque el shp solo pasa con 10 caracteres en los nombres de columna
|
||||||
|
camps.campo_name[OLV_MAX_COL_SHP] = 0;
|
||||||
}
|
}
|
||||||
else if(strstr(token,OliviaDef::GeneralDef::GTA_TF))
|
else if(strstr(token,OliviaDef::GeneralDef::GTA_TF))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -8569,6 +8569,7 @@ BOOL Colv_limp_thr::guarda_cols_ruta(char *path_shp)
|
||||||
}
|
}
|
||||||
else if(p==1) //M/M2/UDS
|
else if(p==1) //M/M2/UDS
|
||||||
{
|
{
|
||||||
|
sz = 0;
|
||||||
if(k==OLV_TTO)
|
if(k==OLV_TTO)
|
||||||
{
|
{
|
||||||
if(olv_limp->uds_tto==OliviaDef::GeneralDef::OlvTipTtoM2h || olv_limp->uds_tto==OliviaDef::GeneralDef::OlvTipTtoM2h_eje)
|
if(olv_limp->uds_tto==OliviaDef::GeneralDef::OlvTipTtoM2h || olv_limp->uds_tto==OliviaDef::GeneralDef::OlvTipTtoM2h_eje)
|
||||||
|
|
@ -8647,6 +8648,7 @@ BOOL Colv_limp_thr::guarda_cols_ruta(char *path_shp)
|
||||||
//sprintf_s(&info[isec_novac * OLV_SHP_SZ_CAMP_CHAR], OLV_SHP_SZ_CAMP_CHAR, "%.1f", tt);
|
//sprintf_s(&info[isec_novac * OLV_SHP_SZ_CAMP_CHAR], OLV_SHP_SZ_CAMP_CHAR, "%.1f", tt);
|
||||||
((double*)info)[isec_novac] = tt;
|
((double*)info)[isec_novac] = tt;
|
||||||
tipodato = GdataTable::Tdouble;
|
tipodato = GdataTable::Tdouble;
|
||||||
|
sz = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
isec_novac++;
|
isec_novac++;
|
||||||
|
|
|
||||||
|
|
@ -125,16 +125,22 @@ int Colv_reco::pon_config(char *config_)
|
||||||
{
|
{
|
||||||
if(!olv->dame_param(token, camps_r.campo_uds,sizeof(camps_r.campo_uds)))
|
if(!olv->dame_param(token, camps_r.campo_uds,sizeof(camps_r.campo_uds)))
|
||||||
break;
|
break;
|
||||||
|
if (strlen(camps_r.campo_uds) > OLV_MAX_COL_SHP)//10 porque el shp solo pasa con 10 caracteres en los nombres de columna
|
||||||
|
camps_r.campo_uds[OLV_MAX_COL_SHP] = 0;
|
||||||
}
|
}
|
||||||
else if(strstr(token,OliviaDef::GeneralDef::GR_camp_kgrec))
|
else if(strstr(token,OliviaDef::GeneralDef::GR_camp_kgrec))
|
||||||
{
|
{
|
||||||
if(!olv->dame_param(token, camps_r.campo_kgcont,sizeof(camps_r.campo_kgcont)))
|
if(!olv->dame_param(token, camps_r.campo_kgcont,sizeof(camps_r.campo_kgcont)))
|
||||||
break;
|
break;
|
||||||
|
if (strlen(camps_r.campo_kgcont) > OLV_MAX_COL_SHP)//10 porque el shp solo pasa con 10 caracteres en los nombres de columna
|
||||||
|
camps_r.campo_kgcont[OLV_MAX_COL_SHP] = 0;
|
||||||
}
|
}
|
||||||
else if(strstr(token,OliviaDef::GeneralDef::GR_camp_cap))
|
else if(strstr(token,OliviaDef::GeneralDef::GR_camp_cap))
|
||||||
{
|
{
|
||||||
if(!olv->dame_param(token, camps_r.campo_capa,sizeof(camps_r.campo_capa)))
|
if(!olv->dame_param(token, camps_r.campo_capa,sizeof(camps_r.campo_capa)))
|
||||||
break;
|
break;
|
||||||
|
if (strlen(camps_r.campo_capa) > OLV_MAX_COL_SHP)//10 porque el shp solo pasa con 10 caracteres en los nombres de columna
|
||||||
|
camps_r.campo_capa[OLV_MAX_COL_SHP] = 0;
|
||||||
}
|
}
|
||||||
else if(strstr(token,OliviaDef::GeneralDef::GR_kgrecog))
|
else if(strstr(token,OliviaDef::GeneralDef::GR_kgrecog))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -171,8 +171,7 @@ BOOL Colv_reco_thr::rellena_datos()
|
||||||
icampu=dbf.findCol(olv_reco->camps_r.campo_uds);
|
icampu=dbf.findCol(olv_reco->camps_r.campo_uds);
|
||||||
if(icampu==-1)
|
if(icampu==-1)
|
||||||
{
|
{
|
||||||
sprintf_s(err_str,OLV_MAX_ERR,"No encontrado campo %s en\n%s",olv_reco->camps_r.campo_uds,olv_limp->camps.campo_anch,
|
sprintf_s(err_str,OLV_MAX_ERR,"No encontrado campo %s en\n%s",olv_reco->camps_r.campo_uds,nfile);
|
||||||
olv_limp->camps.campo_tipo_ap,olv_limp->camps.campo_tipo_ent,nfile);
|
|
||||||
ret=FALSE;
|
ret=FALSE;
|
||||||
goto fin;
|
goto fin;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,11 @@
|
||||||
#undef APSTUDIO_READONLY_SYMBOLS
|
#undef APSTUDIO_READONLY_SYMBOLS
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// English (U.S.) resources
|
// Inglés (Estados Unidos) resources
|
||||||
|
|
||||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||||
#ifdef _WIN32
|
|
||||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||||
#pragma code_page(1252)
|
#pragma code_page(1252)
|
||||||
#endif //_WIN32
|
|
||||||
|
|
||||||
#ifdef APSTUDIO_INVOKED
|
#ifdef APSTUDIO_INVOKED
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
@ -52,23 +50,21 @@ END
|
||||||
// String Table
|
// String Table
|
||||||
//
|
//
|
||||||
|
|
||||||
STRINGTABLE
|
STRINGTABLE
|
||||||
BEGIN
|
BEGIN
|
||||||
IDS_APP_TITLE "OliviaTasks"
|
IDS_APP_TITLE "OliviaTasks"
|
||||||
END
|
END
|
||||||
|
|
||||||
#endif // English (U.S.) resources
|
#endif // Inglés (Estados Unidos) resources
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Spanish resources
|
// Español (España, alfabetización internacional) resources
|
||||||
|
|
||||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
|
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
|
||||||
#ifdef _WIN32
|
|
||||||
LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
|
LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
|
||||||
#pragma code_page(1252)
|
#pragma code_page(1252)
|
||||||
#endif //_WIN32
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
|
|
@ -79,14 +75,15 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
|
||||||
// remains consistent on all systems.
|
// remains consistent on all systems.
|
||||||
MAINICON ICON "favicon.ico"
|
MAINICON ICON "favicon.ico"
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Version
|
// Version
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 2,0,0,3
|
FILEVERSION 2,0,0,5
|
||||||
PRODUCTVERSION 2,0,0,3
|
PRODUCTVERSION 2,0,0,5
|
||||||
FILEFLAGSMASK 0x17L
|
FILEFLAGSMASK 0x17L
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
|
@ -103,12 +100,12 @@ BEGIN
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "VSM"
|
VALUE "CompanyName", "VSM"
|
||||||
VALUE "FileDescription", "Launcher de la aplicación Olivia"
|
VALUE "FileDescription", "Launcher de la aplicación Olivia"
|
||||||
VALUE "FileVersion", "2.0.0.3"
|
VALUE "FileVersion", "2.0.0.5"
|
||||||
VALUE "InternalName", "OliviaTasks"
|
VALUE "InternalName", "OliviaTasks"
|
||||||
VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved."
|
VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved."
|
||||||
VALUE "OriginalFilename", "OliviaTasks.exe"
|
VALUE "OriginalFilename", "OliviaTasks.exe"
|
||||||
VALUE "ProductName", "OliviaTasks"
|
VALUE "ProductName", "OliviaTasks"
|
||||||
VALUE "ProductVersion", "2.0.0.3"
|
VALUE "ProductVersion", "2.0.0.5"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
@ -117,7 +114,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
|
|
||||||
#endif // Spanish resources
|
#endif // Español (España, alfabetización internacional) resources
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue