From 19d0cc276b0b9fd0f6ba22d50e3bba945ccaf00d Mon Sep 17 00:00:00 2001
From: Joaquin Jose del Cerro Murciano <jjdelcerro@gvsig.com>
Date: Fri, 15 Jun 2018 10:31:09 +0200
Subject: [PATCH] Arreglado llamada al get del xml2dict para ponerle un valor
 por defecto y que no falle si no existe el elemento pedido.

---
 sigpac2csv.py | 104 +++++++++++++++++++++++++-------------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/sigpac2csv.py b/sigpac2csv.py
index 40803ef..99afb70 100644
--- a/sigpac2csv.py
+++ b/sigpac2csv.py
@@ -93,32 +93,32 @@ def convert2cvs(data, outf):
   out.write("WKT:Geometry:polygon\n")
 
   for linea in data["DECLARACION"]["LINEA_DECLARACION"]:
-    outint(out, linea.get("ID_ALE"))
-    outint(out, linea.get("ID_EXP"))
-    outstr(out, linea.get("EXP_COD"))
-    outstr(out, linea.get("TEX_NIF"))
-    outint(out, linea.get("ID_CROQUIS"))
-    outint(out, linea.get("PROV"))
-    outint(out, linea.get("MUN_CAT"))
-    outint(out, linea.get("AGREGADO"))
-    outint(out, linea.get("ZONA"))
-    outint(out, linea.get("POLIGONO"))
-    outint(out, linea.get("PARCELA"))
-    outint(out, linea.get("RECINTO"))
-    outstr(out, linea.get("COD_TIPO_ALE"))
-    outstr(out, linea.get("USO"))
-    outint(out, linea.get("SUPERFICIE_DECLARADA"))
-    outint(out, linea.get("COEF_REG"))
-    outint(out, linea.get("SECANO_REGADIO"))
-    outint(out, linea.get("ELEGIBILIDAD"))
-    outint(out, linea.get("FC_ALMENDROS"))
-    outint(out, linea.get("FC_ALGARROBOS"))
-    outint(out, linea.get("FC_AVELLANOS"))
-    outint(out, linea.get("FC_NOGALES"))
-    outint(out, linea.get("FC_PISTACHOS"))
-    outint(out, linea.get("FC_TOTAL"))
-    outint(out, linea.get("DN_SURFACE"))
-    outstr(out, linea.get("WKT"), last=True)
+    outint(out, linea.get("ID_ALE", None))
+    outint(out, linea.get("ID_EXP", None))
+    outstr(out, linea.get("EXP_COD", None))
+    outstr(out, linea.get("TEX_NIF", None))
+    outint(out, linea.get("ID_CROQUIS", None))
+    outint(out, linea.get("PROV", None))
+    outint(out, linea.get("MUN_CAT", None))
+    outint(out, linea.get("AGREGADO", None))
+    outint(out, linea.get("ZONA", None))
+    outint(out, linea.get("POLIGONO", None))
+    outint(out, linea.get("PARCELA", None))
+    outint(out, linea.get("RECINTO", None))
+    outstr(out, linea.get("COD_TIPO_ALE", None))
+    outstr(out, linea.get("USO", None))
+    outint(out, linea.get("SUPERFICIE_DECLARADA", None))
+    outint(out, linea.get("COEF_REG", None))
+    outint(out, linea.get("SECANO_REGADIO", None))
+    outint(out, linea.get("ELEGIBILIDAD", None))
+    outint(out, linea.get("FC_ALMENDROS", None))
+    outint(out, linea.get("FC_ALGARROBOS", None))
+    outint(out, linea.get("FC_AVELLANOS", None))
+    outint(out, linea.get("FC_NOGALES", None))
+    outint(out, linea.get("FC_PISTACHOS", None))
+    outint(out, linea.get("FC_TOTAL", None))
+    outint(out, linea.get("DN_SURFACE", None))
+    outstr(out, linea.get("WKT", None), last=True)
     out.write("\n")
   out.close()
 
@@ -159,32 +159,32 @@ def convert2shp(data, outf):
   
   for linea in data["DECLARACION"]["LINEA_DECLARACION"]:
     feature = store.createNewFeature()
-    feature.set("ID_ALE", null2zero(linea.get("ID_ALE")))
-    feature.set("ID_EXP", null2zero(linea.get("ID_EXP")))
-    feature.set("EXP_COD", null2empty(linea.get("EXP_COD")))
-    feature.set("TEX_NIF", null2empty(linea.get("TEX_NIF")))
-    feature.set("ID_CROQUIS", null2zero(linea.get("ID_CROQUIS")))
-    feature.set("PROV", null2zero(linea.get("PROV")))
-    feature.set("MUN_CAT", null2zero(linea.get("MUN_CAT")))
-    feature.set("AGREGADO", null2zero(linea.get("AGREGADO")))
-    feature.set("ZONA", null2zero(linea.get("ZONA")))
-    feature.set("POLIGONO", null2zero(linea.get("POLIGONO")))
-    feature.set("PARCELA", null2zero(linea.get("PARCELA")))
-    feature.set("RECINTO", null2zero(linea.get("RECINTO")))
-    feature.set("COD_TIP_AL", null2empty(linea.get("COD_TIPO_ALE")))
-    feature.set("USO", null2empty(linea.get("USO")))
-    feature.set("SUPERF_DEC", null2zero(linea.get("SUPERFICIE_DECLARADA")))
-    feature.set("COEF_REG", null2zero(linea.get("COEF_REG")))
-    feature.set("SECANO_REG", null2zero(linea.get("SECANO_REGADIO")))
-    feature.set("ELEGIBILID", null2zero(linea.get("ELEGIBILIDAD")))
-    feature.set("FC_ALMENDR", null2zero(linea.get("FC_ALMENDROS")))
-    feature.set("FC_ALGARRO", null2zero(linea.get("FC_ALGARROBOS")))
-    feature.set("FC_AVELLAN", null2zero(linea.get("FC_AVELLANOS")))
-    feature.set("FC_NOGALES", null2zero(linea.get("FC_NOGALES")))
-    feature.set("FC_PISTACH", null2zero(linea.get("FC_PISTACHOS")))
-    feature.set("FC_TOTAL", null2zero(linea.get("FC_TOTAL")))
-    feature.set("DN_SURFACE", null2zero(linea.get("DN_SURFACE")))
-    feature.set("GEOMETRY", linea.get("WKT"))
+    feature.set("ID_ALE", null2zero(linea.get("ID_ALE", None)))
+    feature.set("ID_EXP", null2zero(linea.get("ID_EXP", None)))
+    feature.set("EXP_COD", null2empty(linea.get("EXP_COD", None)))
+    feature.set("TEX_NIF", null2empty(linea.get("TEX_NIF", None)))
+    feature.set("ID_CROQUIS", null2zero(linea.get("ID_CROQUIS", None)))
+    feature.set("PROV", null2zero(linea.get("PROV", None)))
+    feature.set("MUN_CAT", null2zero(linea.get("MUN_CAT", None)))
+    feature.set("AGREGADO", null2zero(linea.get("AGREGADO", None)))
+    feature.set("ZONA", null2zero(linea.get("ZONA", None)))
+    feature.set("POLIGONO", null2zero(linea.get("POLIGONO", None)))
+    feature.set("PARCELA", null2zero(linea.get("PARCELA", None)))
+    feature.set("RECINTO", null2zero(linea.get("RECINTO", None)))
+    feature.set("COD_TIP_AL", null2empty(linea.get("COD_TIPO_ALE", None)))
+    feature.set("USO", null2empty(linea.get("USO", None)))
+    feature.set("SUPERF_DEC", null2zero(linea.get("SUPERFICIE_DECLARADA", None)))
+    feature.set("COEF_REG", null2zero(linea.get("COEF_REG", None)))
+    feature.set("SECANO_REG", null2zero(linea.get("SECANO_REGADIO", None)))
+    feature.set("ELEGIBILID", null2zero(linea.get("ELEGIBILIDAD", None)))
+    feature.set("FC_ALMENDR", null2zero(linea.get("FC_ALMENDROS", None)))
+    feature.set("FC_ALGARRO", null2zero(linea.get("FC_ALGARROBOS", None)))
+    feature.set("FC_AVELLAN", null2zero(linea.get("FC_AVELLANOS", None)))
+    feature.set("FC_NOGALES", null2zero(linea.get("FC_NOGALES", None)))
+    feature.set("FC_PISTACH", null2zero(linea.get("FC_PISTACHOS", None)))
+    feature.set("FC_TOTAL", null2zero(linea.get("FC_TOTAL", None)))
+    feature.set("DN_SURFACE", null2zero(linea.get("DN_SURFACE", None)))
+    feature.set("GEOMETRY", linea.get("WKT", None))
     store.insert(feature)
   store.finishEditing()