Changeset d29162d in observatorio

Timestamp:

Oct 28, 2014, 2:16:22 PM (10 years ago)

Author:

eparedes <eparedes@…>

Branches:

master

Children:

e2ec529

Parents:

5e28f2c (diff), fc98c49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://miv.cenditel.gob.ve/cadenas/scm/git/observatorio

Location:

procesos

Files:

• apps/geocadena/views.py (modified) (1 diff)
• extapps/chains/_svg_sigesic_builder.so (modified) (previous)
• extapps/chains/svg_sigesic_builder.py (modified) (4 diffs)

procesos/apps/geocadena/views.py

@@ -614 +614 @@
                             dict_cadena['rif'] = rif
                             if planta:
-                                dict_cadena['nombre'] = ue.ue_rif.nombre
+                                try:
+                                    dict_cadena['nombre'] = ue.ue_rif.nombre
+                                except AttributeError:
+                                    try:
+                                        dict_cadena['nombre'] = ue.nombreestablecimiento
+                                    except AttributeError:
+                                        try:
+                                            dict_cadena['nombre'] = ue.nombre
+                                        except AttributeError:
+                                            dict_cadena['nombre'] = ue.nombre_comercial
+
                                 dict_cadena['planta'] = planta
                             else:

procesos/extapps/chains/svg_sigesic_builder.py

@@ -1 +1 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.7
+# Version 1.3.40
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
-
-
+# This file is compatible with both classic and new-style classes.
 
 from sys import version_info
@@ -41 +40 @@
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)
-    if (not static):
+    if (not static) or hasattr(self,name):
         self.__dict__[name] = value
     else:
@@ -78 +77 @@
     __del__ = lambda self : None;
     def value(self): return _svg_sigesic_builder.SwigPyIterator_value(self)
-    def incr(self, n=1): return _svg_sigesic_builder.SwigPyIterator_incr(self, n)
-    def decr(self, n=1): return _svg_sigesic_builder.SwigPyIterator_decr(self, n)
+    def incr(self, n = 1): return _svg_sigesic_builder.SwigPyIterator_incr(self, n)
+    def decr(self, n = 1): return _svg_sigesic_builder.SwigPyIterator_decr(self, n)
     def distance(self, *args): return _svg_sigesic_builder.SwigPyIterator_distance(self, *args)
     def equal(self, *args): return _svg_sigesic_builder.SwigPyIterator_equal(self, *args)
@@ -148 +147 @@
   return _svg_sigesic_builder.buildSvg(*args)
 buildSvg = _svg_sigesic_builder.buildSvg
-# This file is compatible with both classic and new-style classes.