Code impl

auditoria_elecciones/services.py

@@ -39,7 +39,7 @@ class E14DivipolaParsingError(Exception):
 candidates = ["Rodolfo Hernandez", "Jhon Rodriguez", "Federico Guitierrez","Sergio Fajardo","Enrique Gomez","Gustavo Petro","Luis Perez","Ingrid Betancurt"]
 candidates_to_test = ["Rodolfo Hernandez","Federico Guitierrez","Gustavo Petro"]
 
-def divipola_info(e14_info: dict, e14_url: str) -> dict:
+def divipola_info(e14_info: dict, origin_info, e14_url: str) -> dict:
     filename = e14_url.split("/")[-1].upper()
     if not filename.endswith(".PDF"):
         raise E14DivipolaParsingError("not a pdf file")
@@ -63,9 +63,10 @@ def divipola_info(e14_info: dict, e14_url: str) -> dict:
     #                             `- departamento
 
     return dict(
+        code=origin_info + e14_info['Clean'][0]['ID'].replace("-",""),
         # code="(SCRAPPER) " + e14_info['Clean'][0]["QR"],
         # qr=e14_info['Clean'][0]["QR"],
-        code="DIVSCRAP"+tokens[0],
+        # code="DIVSCRAP"+tokens[0],
         qr=tokens[0],
         cod_depto=tokens[4],
         cod_municipio=tokens[5],
@@ -76,15 +77,14 @@ def divipola_info(e14_info: dict, e14_url: str) -> dict:
 
 
 def divipola_google(e14_info: dict, origin_info, image_id) -> dict:
-    # code=origin_info + ' ' + e14_info['Clean'][0]["QR"],
-    # qr=e14_info['Clean'][0]["QR"],
+    code=origin_info + e14_info['Clean'][0]['ID'].replace("-","")
     cod_depto=e14_info['Clean'][0]["Departamento"][0:2]
     cod_municipio=e14_info['Clean'][0]["Municipio"][0:3]
     cod_zona=e14_info['Clean'][0]["ZPM"][0:3]
     cod_puesto=e14_info['Clean'][0]["ZPM"][10:12]
     cod_mesa=e14_info['Clean'][0]["ZPM"][18:21]
-    code='DIVGAPI%s%s%s%s%s%s' % (image_id,cod_depto,cod_municipio,cod_zona,cod_puesto,cod_mesa)
-    return dict(code=code.replace(" ",""), cod_depto=cod_depto, cod_municipio=cod_municipio, cod_zona=cod_zona, cod_puesto=cod_puesto, cod_mesa=cod_mesa)
+    # code='DIVGAPI%s%s%s%s%s%s' % (image_id,cod_depto,cod_municipio,cod_zona,cod_puesto,cod_mesa)
+    return dict(code=code, cod_depto=cod_depto, cod_municipio=cod_municipio, cod_zona=cod_zona, cod_puesto=cod_puesto, cod_mesa=cod_mesa)
 
 
 def getE14Reliability(e14_info, min_reliability):
@@ -119,7 +119,7 @@ def e14_processing_pdf(data):
     pdf_bytes = _download_e14(params.url)
     img = ImageFile(io.BytesIO(pdf_bytes), name=os.path.basename(params.url))
     e14_image = ReceivedE14Image.objects.create(image=img)
-    e14_image.message_origin_info = "SCRAPPER"
+    e14_image.message_origin_info = "OPDF"
     e14_image.message_origin_url = urllib.parse.urlparse(params.url).netloc
     try:
         e14_image.save()
@@ -130,7 +130,7 @@ def e14_processing_pdf(data):
     try:
         e14_info = get_info(e14_image.image.path)
         if (len(e14_info) != 0):
-            divipola = divipola_info(e14_info, params.url)
+            divipola = divipola_info(e14_info, e14_image.message_origin_info, params.url)
             logger.info("[SRVPDF] divipola: "+str(divipola['code']))
             save_e14(divipola,e14_info,e14_image) 
         else:
@@ -150,7 +150,7 @@ def e14_processing_img(data):
     else:
         pdf_img = ImageFile(io.BytesIO(convert(img)), name=os.path.splitext(os.path.basename(params.url))[0] + ".pdf")
         e14_image = ReceivedE14Image.objects.create(image=pdf_img)
-    e14_image.message_origin_info = "BOT"
+    e14_image.message_origin_info = "OBOT"
     e14_image.message_origin_url = urllib.parse.urlparse(params.url).netloc
     try:
         e14_image.save()