diff --git a/Helper/HelperGdb.cs b/Helper/HelperGdb.cs index 8843c88..4ae5073 100644 --- a/Helper/HelperGdb.cs +++ b/Helper/HelperGdb.cs @@ -31,8 +31,7 @@ using Microsoft.Win32; namespace OliviaAddInPro.Helper { public static class HelperGdb - { - private static string ObjectId = "OBJECTID"; + { private static string out_str = string.Empty; public static string OutStr { @@ -898,7 +897,7 @@ namespace OliviaAddInPro.Helper for (i = 0; i < camps.Length; i++) { //if (!fields.Any(f=>f.ToUpper().Trim().Contains(camps[i].Substring (0,Math.Min(camps[i].Length, ComunDef.MaxCaracteresBBDD)).ToUpper().Trim()))) - if (!fields.Any(f=>f.ToUpper().Trim().Contains(camps[i].ToUpper().Trim()))) + if (!fields.Any(f=>f.ToUpper().Trim().Equals(camps[i].ToUpper().Trim()))) { OutStr = OutStr + camps[i] + " "; mal++; @@ -941,7 +940,7 @@ namespace OliviaAddInPro.Helper { //if (!fields.Any(f => f.ToUpper().Trim().Contains(camps[i].Substring(0, Math.Min(camps[i].Length, ComunDef.MaxCaracteresBBDD)).ToUpper().Trim()))) - if (!fields.Any(f => f.ToUpper().Trim().Contains(camps[i].ToUpper().Trim()))) + if (!fields.Any(f => f.ToUpper().Trim().Equals(camps[i].ToUpper().Trim()))) { OutStr = OutStr + camps[i] + " "; mal++; @@ -1491,7 +1490,7 @@ namespace OliviaAddInPro.Helper } //convierte la lista de ids a string para la clause de la forma //(id1, id2, id3..) - string whereClause = GetWhereClauseFromIds(ids); + string whereClause = GetWhereClauseFromIds(ids,fc.GetDefinition().GetObjectIDField()); /////////////////////////////////////////////////////////// ///Exporta @@ -1814,7 +1813,7 @@ namespace OliviaAddInPro.Helper * Dada una lista de ids de elemento, crea una consulta en la que se llama a todos esos elementos * campo IN (id1, id2, id3..) */ - public static string GetWhereClauseFromIds(List ids) + public static string GetWhereClauseFromIds(List ids, string ObjectId = "OBJECTID") { if (ids.Count <= 0) return string.Empty; @@ -1861,7 +1860,7 @@ namespace OliviaAddInPro.Helper public static bool RemoveRowsFromShp(FeatureClass fc, List quita) { //Crea la consulta - var consulta = GetWhereClauseFromIds(quita); + var consulta = GetWhereClauseFromIds(quita, fc.GetDefinition().GetObjectIDField()); if (String.IsNullOrEmpty(consulta)) return false; diff --git a/ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs index 1d24ec4..fca87ee 100644 --- a/ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs +++ b/ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs @@ -223,7 +223,7 @@ namespace OliviaAddInPro HelperGlobal.ponMsg(limpServ.ErrStr, System.Windows.MessageBoxImage.Warning); return false; } - + LimpiezaDef.forma_filtros(); amb_tra_gdb = limpServ.BuscAmbGdb(capa); bool hay_alguno = false; foreach (bool b in amb_tra_gdb)