Changeset 8bf72f3 in observatorio

Timestamp:

Jul 31, 2014, 8:45:50 AM (10 years ago)

Author:

Ing. Roldan Vargas <rvargas@…>

Branches:

master

Children:

ee1a8ea

Parents:

501ee08

Message:

correcciones en código

File:

• procesos/apps/sigesic/unidadecon/views.py (modified) (13 diffs)

procesos/apps/sigesic/unidadecon/views.py

@@ -16 +16 @@
     from procesos.paginador import Paginador
 except ImportError:
-    #from paginador import Paginador
+    # from paginador import Paginador
     from django.core.paginator import Paginator as Paginador
 
@@ -22 +22 @@
 import subprocess
 
-@login_required
-@transaction.commit_on_success(using="sigesic")
+
+@login_required
+@transaction.commit_on_success_unless_managed(using="sigesic")
 def UnidadEcon(request):
     if request.method == 'POST':
@@ -80 +81 @@
 
     cuantos = unidadecon.count()
-    #return render_to_response('cadenas/directorio2005.html', {'formabusca': formu, 'username': request.user}, context_instance = RequestContext(request))
-
-    #plantilla = loader.get_template('unidadecon/unidadecon.html')
+
     plantilla = loader.get_template('unidadecon/unidadecon2.html')
     c = RequestContext(request, {'unidadecon': paginas,
@@ -161 +160 @@
         producto = formu.cleaned_data["producto"]
 
-        if codigoaran <> None:
-            if codigoaran <> "0":
+        if codigoaran is not None:
+            if not codigoaran == "0":
                 productos = productos.using('sigesic').filter(codigo_aran=codigoaran)
 
-        if producto <> None and producto <> "0":
+        if producto is not None and producto <> "0":
             precios = Produccion_precios_r.objects.using('sigesic').filter(producto_id=producto)
             producto_nombre = Producto.objects.using('sigesic').get(pk=producto).nombre
@@ -199 +198 @@
 
     listaDeOpciones = cargarCodigoAranConCodigo()
-    insumos = Insumo.objects.using('sigesic').all() 
+    insumos = Insumo.objects.using('sigesic').all()
 
     formu = FormularioCodigoAran()
@@ -213 +212 @@
         producto = formu.cleaned_data["producto"]
 
-        if codigoaran <> None:
-            if codigoaran <> "0":
+        if codigoaran is not None:
+            if not codigoaran == "0":
                 insumos = insumos.using('sigesic').filter(codigo_aran=codigoaran)
 
-        if producto <> None and producto <> "0":
+        if producto is not None and not producto == "0":
             precios = Consumo_precios_r.objects.using('sigesic').filter(insumo_id=producto)
             insumo_nombre = Insumo.objects.using('sigesic').get(pk=producto).nombre
@@ -256 +255 @@
     anyo = request.GET["annyo"]
     rif = request.GET["rif"]
-    if (narriba != '' and nabajo != ''):
-        if (narriba == '0' and nabajo == '0'):
+    if narriba != '' and nabajo != '':
+        if narriba == '0' and nabajo == '0':
             return render_to_response('404.html', {'username': str(request.user)},
                                       context_instance=RequestContext(request))
@@ -276 +275 @@
                 prod = prod + " " + str(e.producto_id_id)
 
-            os.system("cd " + os.path.join(settings.PATH, "tmp/") + ";" + os.path.join(settings.PATH,
-                                                                                       "extapps/chains/print_prod_chainv2") + " --host=" + settings.DATABASES['sigesic']['HOST'] + " --port=" + settings.DATABASES['sigesic']['PORT'] + " --username=" + settings.DATABASES['sigesic']['USER'] + " --password=" + settings.DATABASES['sigesic']['PASSWORD'] + " --dbname=" + settings.DATABASES['sigesic']['NAME'] + " --levelsup=" + narriba + " --levelsdown=" + nabajo + " --year=" + anyo + " --output=" + str(
-                request.user) + " PROD" + prod)
-            #os.system("mv -f " + os.path.join(settings.PATH, "tmp/grafico.html ") + os.path.join(settings.PATH, "templates/cadenas/" + str(request.user) + "_grafico.html") + ";")
-            #os.system("mv -f " + os.path.join(settings.PATH, "tmp/factores.xml ") + os.path.join(settings.PATH, "tmp/" + str(request.user) + "_factores.xml ") + ";")
-            #os.system("mv -f " + os.path.join(settings.PATH, "tmp/respuestas.xml ") + os.path.join(settings.PATH, "tmp/" + str(request.user) + "_respuestas.xml ") + ";")
+            comando = "cd %s;%s --host=%s --port=%s --username=%s --password=%s --dbname=%s --levelsup=%s " \
+                      "--leveldown=%s --year=%s --output=%s PROD%s"
+
+            os.system(comando % (
+                os.path.join(settings.PATH, "tmp/"), os.path.join(settings.PATH,"extapps/chains/print_prod_chainv2"),
+                settings.DATABASES['sigesic']['HOST'], settings.DATABASES['sigesic']['PORT'],
+                settings.DATABASES['sigesic']['USER'], settings.DATABASES['sigesic']['PASSWORD'],
+                settings.DATABASES['sigesic']['NAME'], narriba, nabajo, anyo, str(request.user), prod
+            ))
+
             return render_to_response('busqueda/grafico.html', {'productos': productos, 'nivel_cadena_arriba': narriba,
                                                                 'nivel_cadena_abajo': nabajo, 'anyo': anyo,
@@ -307 +310 @@
         rif = request.GET["ciiu"]
 
-    if (narriba != '' and nabajo != ''):
-        if (narriba == '0' and nabajo == '0'):
+    if narriba != '' and nabajo != '':
+        if narriba == '0' and nabajo == '0':
             return render_to_response('404.html', {'username': str(request.user)},
                                       context_instance=RequestContext(request))
@@ -314 +317 @@
             chequeados = []
             productos = []
-            #subuni = Subunidad_Economica.objects.using('sigesic').filter(ue_rif=rif)
-            #for j in subuni:
-            #    chequeados.append(j.id)
-            #prod_id = Producto.objects.using('sigesic').filter(planta_id__in = chequeados)
-            #chequeados = []
-            #for j in prod_id:
-            #    chequeados.append(j.id)
             prod_pr = Produccion_precios_r.objects.using('sigesic').filter(producto_id=rif, anho__year=anyo)
             prod = ""
@@ -327 +323 @@
                 prod = prod + " " + str(e.producto_id_id)
 
-            args = os.path.join(settings.PATH, "extapps/chains/svg_builder_canviz") + " --host=" + settings.DATABASES['sigesic']['HOST'] + " --port=" + settings.DATABASES['sigesic']['PORT'] + " --username=" + settings.DATABASES['sigesic']['USER'] + " --password=" + settings.DATABASES['sigesic']['PASSWORD'] + " --dbname=" + settings.DATABASES['sigesic']['NAME'] + " --levelsup=" + narriba + " --levelsdown=" + nabajo + " --year="+ anyo + " --output=" + os.path.join(settings.PATH, "tmp/")+str(request.user) + " PROD" + prod
-
-            ret = subprocess.call(args,shell=True)
-
+            args = "%s --host=%s --port=%s --username=%s --password=%s --dbname=%s --levelsup=%s --levelsdown=%s " \
+                   "--year=%s --output=%s PROD%s" \
+                   % (os.path.join(settings.PATH, "extapps/chains/svg_builder_canviz"),
+                      settings.DATABASES['sigesic']['HOST'], settings.DATABASES['sigesic']['PORT'],
+                      settings.DATABASES['sigesic']['USER'], settings.DATABASES['sigesic']['PASSWORD'],
+                      settings.DATABASES['sigesic']['NAME'], narriba, nabajo, anyo,
+                      os.path.join(settings.PATH, "tmp/") + str(request.user), prod)
+
+            ret = subprocess.call(args, shell=True)
 
             if ret == 0:
-                return render_to_response('busqueda/grafico.html', {'productos': productos, 'nivel_cadena_arriba': narriba,
-                                                                'nivel_cadena_abajo': nabajo, 'anyo': anyo,
-                                                                'username': str(request.user)},
-                                                                 context_instance=RequestContext(request))
+                return render_to_response('busqueda/grafico.html',
+                                          {'productos': productos, 'nivel_cadena_arriba': narriba,
+                                           'nivel_cadena_abajo': nabajo, 'anyo': anyo,
+                                           'username': str(request.user)},
+                                          context_instance=RequestContext(request))
             else:
-                return render_to_response('unidadecon/no_encontrado.html', {'username': str(request.user)}, context_instance=RequestContext(request))
-
+                return render_to_response('unidadecon/no_encontrado.html', {'username': str(request.user)},
+                                          context_instance=RequestContext(request))
 
     else:
@@ -361 +363 @@
         rif = request.GET["ciiu"]
 
-    if (narriba != '' and nabajo != ''):
-        if (narriba == '0' and nabajo == '0'):
+    if narriba != '' and nabajo != '':
+        if narriba == '0' and nabajo == '0':
             return render_to_response('404.html', {'username': str(request.user)},
                                       context_instance=RequestContext(request))
@@ -381 +383 @@
                 prod = prod + " " + str(e.producto_id_id)
 
-            args = os.path.join(settings.PATH, "extapps/chains/svg_builder_canviz") + " --host=" + settings.DATABASES['sigesic']['HOST'] + " --port=" + settings.DATABASES['sigesic']['PORT'] + " --username=" + settings.DATABASES['sigesic']['USER'] + " --password=" + settings.DATABASES['sigesic']['PASSWORD'] + " --dbname=" + settings.DATABASES['sigesic']['NAME'] + " --levelsup=" + narriba + " --levelsdown=" + nabajo + " --year="+ anyo + " --output=" + os.path.join(settings.PATH, "tmp/")+str(request.user) + " PROD" + prod
-
-        ret = subprocess.call(args,shell=True)
-
-
-        if ret == 0:
-            return render_to_response('busqueda/grafico.html', {'productos': productos, 'nivel_cadena_arriba': narriba,
-                                                                'nivel_cadena_abajo': nabajo, 'anyo': anyo,
-                                                                'username': str(request.user)},
-                                                                 context_instance=RequestContext(request))
-        else:
-            return render_to_response('unidadecon/no_encontrado.html', {'username': str(request.user)}, context_instance=RequestContext(request))
+            args = "%s --host=%s --port=%s --username=%s --password=%s --dbname=%s --levelsup=%s --levelsdown=%s " \
+                   "--year=%s --output=%s PROD%s" \
+                   % (os.path.join(settings.PATH, "extapps/chains/svg_builder_canviz"),
+                      settings.DATABASES['sigesic']['HOST'], settings.DATABASES['sigesic']['PORT'],
+                      settings.DATABASES['sigesic']['USER'], settings.DATABASES['sigesic']['PASSWORD'],
+                      settings.DATABASES['sigesic']['NAME'], narriba, nabajo, anyo,
+                      os.path.join(settings.PATH, "tmp/") + str(request.user), prod)
+
+            ret = subprocess.call(args, shell=True)
+
+            if ret == 0:
+                return render_to_response('busqueda/grafico.html',
+                                          {'productos': productos, 'nivel_cadena_arriba': narriba,
+                                           'nivel_cadena_abajo': nabajo, 'anyo': anyo,
+                                           'username': str(request.user)},
+                                          context_instance=RequestContext(request))
+            else:
+                return render_to_response('unidadecon/no_encontrado.html', {'username': str(request.user)},
+                                          context_instance=RequestContext(request))
 
     else: