From c3c16e70154a50692f8001c0f98981dc1808bbbf Mon Sep 17 00:00:00 2001
From: pablomartincalvo <pablomartincalvo@gmail.com>
Date: Fri, 19 Oct 2018 17:22:09 +0200
Subject: [PATCH] Arreglos menores en capturer y refresher.

---
 .idea/workspace.xml            | 338 ++++++++++++++++++++-------------
 capturer/capturer.py           |  22 ++-
 db_layer/capturas_interface.py |   4 +-
 refresher/refresher.py         |   2 +-
 tests/capturer_tests.py        |  10 +-
 5 files changed, 224 insertions(+), 152 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9ca1ef8..70217a9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6e2fbba0-85ff-42d6-8e70-e4cdef1000c8" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/db_layer/__init__.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/refresher/__init__.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/capturer/capturer.py" beforeDir="false" afterPath="$PROJECT_DIR$/capturer/capturer.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/db_layer/capturas_interface.py" beforeDir="false" afterPath="$PROJECT_DIR$/db_layer/capturas_interface.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/refresher/refresher.py" beforeDir="false" afterPath="$PROJECT_DIR$/refresher/refresher.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/capturer_tests.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/capturer_tests.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -24,18 +26,19 @@
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.18" value="1" />
           <entry key="project.open.time.21" value="1" />
+          <entry key="project.open.time.22" value="1" />
           <entry key="project.open.time.26" value="1" />
-          <entry key="project.opened" value="11" />
+          <entry key="project.opened" value="12" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="py" value="54" />
+          <entry key="py" value="57" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="Python" value="51" />
+          <entry key="Python" value="54" />
           <entry key="Scratch" value="3" />
         </counts>
       </usages-collector>
@@ -44,16 +47,16 @@
           <entry key="Python Console" value="1579" />
           <entry key="capturer" value="862" />
           <entry key="dummy" value="14" />
-          <entry key="py" value="17120" />
+          <entry key="py" value="17298" />
           <entry key="scratch_1" value="489" />
-          <entry key="txt" value="1114" />
+          <entry key="txt" value="1172" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="PLAIN_TEXT" value="1128" />
-          <entry key="Python" value="19778" />
-          <entry key="Scratch" value="272" />
+          <entry key="PLAIN_TEXT" value="1186" />
+          <entry key="Python" value="19891" />
+          <entry key="Scratch" value="337" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages">
@@ -71,18 +74,31 @@
     <splitter split-orientation="horizontal" split-proportion="0.5">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file pinned="false" current-in-tab="true">
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/capturer/capturer.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="285">
-                  <caret line="19" selection-start-line="19" selection-end-line="19" />
+                <state relative-caret-position="1382">
+                  <caret line="264" column="45" selection-start-line="264" selection-start-column="45" selection-end-line="264" selection-end-column="45" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/db_layer/capturas_interface.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="550">
+                  <caret line="45" column="45" lean-forward="true" selection-start-line="45" selection-start-column="45" selection-end-line="45" selection-end-column="45" />
                 </state>
               </provider>
             </entry>
           </file>
           <file pinned="false" current-in-tab="false">
             <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py">
-              <provider selected="true" editor-type-id="text-editor" />
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="3045">
+                  <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+                </state>
+              </provider>
             </entry>
           </file>
           <file pinned="false" current-in-tab="false">
@@ -108,13 +124,28 @@
             </entry>
           </file>
           <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="285">
+                  <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/db_layer/capturing_tasks_interface.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="388">
-                  <caret line="66" column="36" selection-start-line="66" selection-start-column="36" selection-end-line="66" selection-end-column="36" />
-                  <folding>
-                    <element signature="e#0#11#0" expanded="true" />
-                  </folding>
+                <state relative-caret-position="15">
+                  <caret line="1" selection-start-line="1" selection-end-line="1" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/refresher/refresher.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="615">
+                  <caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
                 </state>
               </provider>
             </entry>
@@ -192,14 +223,14 @@
         <option value="$PROJECT_DIR$/mysql/capturing_tasks_interface.py" />
         <option value="$PROJECT_DIR$/mysql/capturas_interface.py" />
         <option value="$PROJECT_DIR$/tests/capturing_tests.py" />
-        <option value="$PROJECT_DIR$/tests/capturer_tests.py" />
         <option value="$PROJECT_DIR$/core/mysql_wrapper.py" />
         <option value="$PROJECT_DIR$/explorer/explorer.py" />
         <option value="$PROJECT_DIR$/db_layer/capturing_tasks_interface.py" />
-        <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py" />
-        <option value="$PROJECT_DIR$/capturer/capturer.py" />
         <option value="$PROJECT_DIR$/tests/refresher_tests.py" />
+        <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py" />
         <option value="$PROJECT_DIR$/refresher/refresher.py" />
+        <option value="$PROJECT_DIR$/tests/capturer_tests.py" />
+        <option value="$PROJECT_DIR$/capturer/capturer.py" />
         <option value="$PROJECT_DIR$/db_layer/capturas_interface.py" />
       </list>
     </option>
@@ -214,7 +245,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -237,11 +267,21 @@
               <item name="Drogon" type="462c0819:PsiDirectoryNode" />
               <item name="explorer" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Drogon" type="462c0819:PsiDirectoryNode" />
+              <item name="geocoder" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
               <item name="Drogon" type="462c0819:PsiDirectoryNode" />
               <item name="refresher" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Drogon" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
@@ -259,6 +299,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -267,6 +308,10 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/db_layer" />
+      <recent name="$PROJECT_DIR$/refresher" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/geocoder" />
     </key>
@@ -283,7 +328,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.refresher">
+  <component name="RunManager" selected="Python.capturer_tests">
     <configuration name="capturer" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="Drogon" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -305,7 +350,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="explorer" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="capturer_tests" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="Drogon" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -313,11 +358,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/explorer" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tests" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/explorer/explorer.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tests/capturer_tests.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -392,17 +437,17 @@
     <list>
       <item itemvalue="Python.scratch_1" />
       <item itemvalue="Python.capturer" />
-      <item itemvalue="Python.explorer" />
       <item itemvalue="Python.refresher_tests" />
       <item itemvalue="Python.refresher" />
+      <item itemvalue="Python.capturer_tests" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.capturer_tests" />
+        <item itemvalue="Python.scratch_1" />
         <item itemvalue="Python.refresher" />
         <item itemvalue="Python.refresher_tests" />
-        <item itemvalue="Python.scratch_1" />
         <item itemvalue="Python.capturer" />
-        <item itemvalue="Python.explorer" />
       </list>
     </recent_temporary>
   </component>
@@ -515,7 +560,35 @@
       <option name="project" value="LOCAL" />
       <updated>1539717575817</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="Añadidos varios __init__.py">
+      <created>1539895536301</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1539895536301</updated>
+    </task>
+    <task id="LOCAL-00016" summary="Añadidos varios __init__.py">
+      <created>1539895633918</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1539895633918</updated>
+    </task>
+    <task id="LOCAL-00017" summary="Añadidos varios __init__.py">
+      <created>1539895689933</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1539895689933</updated>
+    </task>
+    <task id="LOCAL-00018" summary="Corregido tiempo de sleep.">
+      <created>1539895990019</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1539895990019</updated>
+    </task>
+    <option name="localTasksCounter" value="19" />
     <servers />
   </component>
   <component name="TodoView" selected-index="1">
@@ -538,11 +611,11 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32983193" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.32983193" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.39915967" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.39915967" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49973643" weight="0.32878152" />
-      <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49973643" visible="true" weight="0.269958" />
+      <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49973643" weight="0.269958" />
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.32983193" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5007907" side_tool="true" weight="0.32983193" />
       <window_info anchor="bottom" id="Python Console" order="10" sideWeight="0.49920928" weight="0.32983193" />
@@ -615,7 +688,9 @@
     <MESSAGE value="Puesto bien mains en explorer y capturer." />
     <MESSAGE value="Iniciado refresher." />
     <MESSAGE value="Finalizado y testeado localmente refresher, listo para testear en&#10;entorno." />
-    <option name="LAST_COMMIT_MESSAGE" value="Finalizado y testeado localmente refresher, listo para testear en&#10;entorno." />
+    <MESSAGE value="Añadidos varios __init__.py" />
+    <MESSAGE value="Corregido tiempo de sleep." />
+    <option name="LAST_COMMIT_MESSAGE" value="Corregido tiempo de sleep." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -625,11 +700,6 @@
           <line>38</line>
           <option name="timeStamp" value="7" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/refresher/refresher.py</url>
-          <line>14</line>
-          <option name="timeStamp" value="13" />
-        </line-breakpoint>
       </breakpoints>
       <breakpoints-dialog>
         <breakpoints-dialog />
@@ -652,6 +722,31 @@
       </expression>
     </expressions>
     <expressions id="evaluateExpression">
+      <expression>
+        <expression-string>not re.match(r&quot;[0-9]{1,20}&quot;, self.ad_fields['telefono']['value'])</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>not 'Distrito' in self.ad_fields['distrito']['value']</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>not 'Barrio' in self.ad_fields['barrio']['value']</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>self.ad_fields['barrio']['value']</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>self.ad_fields['distrito']['value']</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
       <expression>
         <expression-string>capturas_interface.old_ads_exist()</expression-string>
         <language-id>Python</language-id>
@@ -672,31 +767,6 @@
         <language-id>Python</language-id>
         <evaluation-mode>EXPRESSION</evaluation-mode>
       </expression>
-      <expression>
-        <expression-string>return cursor.fetchone()[0]</expression-string>
-        <language-id>Python</language-id>
-        <evaluation-mode>EXPRESSION</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>capturing_interface.get_pending_task() is None</expression-string>
-        <language-id>Python</language-id>
-        <evaluation-mode>EXPRESSION</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>execution_cursor.execute(query_statement, query_parameters)</expression-string>
-        <language-id>Python</language-id>
-        <evaluation-mode>EXPRESSION</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>uuid_exploring</expression-string>
-        <language-id>Python</language-id>
-        <evaluation-mode>EXPRESSION</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>self.database_is_up()</expression-string>
-        <language-id>Python</language-id>
-        <evaluation-mode>EXPRESSION</evaluation-mode>
-      </expression>
     </expressions>
   </component>
   <component name="editorHistoryManager">
@@ -747,16 +817,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/alerts.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/lib/python3/dist-packages/html5lib/_inputstream.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="181">
@@ -799,23 +859,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/geocoder/geocoder.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="615">
-          <caret line="41" selection-start-line="41" selection-end-line="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/explorer/explorer.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4245">
-          <caret line="283" selection-start-line="283" selection-end-line="283" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/tests/refresher_tests.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
@@ -823,30 +866,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/mysql_wrapper.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
-          <caret line="47" selection-start-line="47" selection-end-line="47" />
-          <folding>
-            <element signature="e#24#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/capturer/capturer.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="19" selection-start-line="19" selection-end-line="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/lib/python3/dist-packages/apport_python_hook.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="316">
@@ -861,38 +880,87 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/db_layer/capturas_interface.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="370">
-          <caret line="52" column="15" lean-forward="true" selection-start-line="52" selection-start-column="15" selection-end-line="52" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/refresher/refresher.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="14" selection-start-line="14" selection-end-line="14" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/refresher/__init__.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/db_layer/__init__.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
+    <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3045">
+          <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/geocoder/geocoder.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="615">
+          <caret line="41" selection-start-line="41" selection-end-line="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/explorer/explorer.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4245">
+          <caret line="283" selection-start-line="283" selection-end-line="283" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/db_layer/capturing_tasks_interface.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="66" column="36" selection-start-line="66" selection-start-column="36" selection-end-line="66" selection-end-column="36" />
+        <state relative-caret-position="15">
+          <caret line="1" selection-start-line="1" selection-end-line="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/mysql_wrapper.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="690">
+          <caret line="47" selection-start-line="47" selection-end-line="47" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#24#46#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/core/alerts.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/refresher/refresher.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="615">
+          <caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/capturer/capturer.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1382">
+          <caret line="264" column="45" selection-start-line="264" selection-start-column="45" selection-end-line="264" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db_layer/capturas_interface.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="550">
+          <caret line="45" column="45" lean-forward="true" selection-start-line="45" selection-start-column="45" selection-end-line="45" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/capturer/capturer.py b/capturer/capturer.py
index 18bbbc3..2c47108 100644
--- a/capturer/capturer.py
+++ b/capturer/capturer.py
@@ -1,4 +1,5 @@
 import sys
+
 sys.path.append('..')
 from time import sleep
 from bs4 import BeautifulSoup
@@ -9,11 +10,13 @@ from db_layer.capturas_interface import capturas_interface
 from core.scrapping_utils import UrlAttack
 from refresher.refresher import Refresher
 
+
 class Capturer:
     sleep_time_no_work = 60
     minimum_seconds_between_tries = 120
     working_hours = {'start': datetime.time(9, 0, 0),
                      'end': datetime.time(21, 0, 0)}
+
     def start(self):
 
         while True:
@@ -42,7 +45,6 @@ class Capturer:
         return Capturer.working_hours['start'] <= datetime.datetime.now().time() <= Capturer.working_hours['end']
 
 
-
 class CapturingTask:
     sleep_time_failed_request = 60
 
@@ -90,14 +92,14 @@ class CapturingTask:
         self.parser.parse()
 
     def _check_data(self):
-        if not self.parser.all_fields_are_valid():
-            self._update_status('Invalid value fields')
-            return
-
         if self.parser.fields_missing():
             self._update_status('Fields missing')
             return
 
+        if not self.parser.all_fields_are_valid():
+            self._update_status('Invalid value fields')
+            return
+
         self._update_status('Data ready')
 
     def get_ad_data(self):
@@ -190,7 +192,8 @@ class AdHtmlParser:
 
         if soup.find('div', {'class': 'info-features'}) is not None:
             try:
-                self.ad_fields['tamano_categorico']['value'] = soup.find('div', {'class': 'info-features'}).find('span').find('span').text
+                self.ad_fields['tamano_categorico']['value'] = soup.find('div', {'class': 'info-features'}).find(
+                    'span').find('span').text
                 self.ad_fields['tamano_categorico']['found'] = True
             except:
                 pass
@@ -198,7 +201,7 @@ class AdHtmlParser:
         posible_m2 = [tag.text for tag in soup.find('div', {'class': 'info-features'}).find_all('span')]
         if [posible for posible in posible_m2 if 'm²' in posible]:
             self.ad_fields['m2']['value'] = \
-            [''.join(re.findall(r'[0-9]', posible)) for posible in posible_m2 if 'm²' in posible][0]
+                [''.join(re.findall(r'[0-9]', posible)) for posible in posible_m2 if 'm²' in posible][0]
             self.ad_fields['m2']['found'] = True
 
         if soup.find('title') is not None:
@@ -265,7 +268,8 @@ class AdHtmlParser:
         if not 'Distrito' in self.ad_fields['distrito']['value']:
             self.invalid_fields.append('distrito')
 
-        if not re.match(r"[0-9]{1,20}", self.ad_fields['telefono']['value']):
+        if (self.ad_fields['telefono']['found']
+                and not re.match(r"[0-9]{1,20}", self.ad_fields['telefono']['value'])):
             self.invalid_fields.append('telefono')
 
     def all_fields_are_valid(self):
@@ -292,4 +296,4 @@ class AdHtmlParser:
 
 if __name__ == '__main__':
     capturer = Capturer()
-    capturer.start()
\ No newline at end of file
+    capturer.start()
diff --git a/db_layer/capturas_interface.py b/db_layer/capturas_interface.py
index f573643..6e3b499 100644
--- a/db_layer/capturas_interface.py
+++ b/db_layer/capturas_interface.py
@@ -28,7 +28,7 @@ class CapturasInterface():
                          FROM tasks.capturing_last as cl
                          WHERE cl.status = 'Dead ad') as da
         ON da.ad_url LIKE CONCAT('%', uc.referencia, '%')
-        WHERE uc.fecha_captura < (NOW() - INTERVAL 10 day)
+        WHERE uc.fecha_captura BETWEEN (NOW() - INTERVAL 10 day) AND (NOW() - INTERVAL 60 day)
         AND da.ad_url is null
         """
 
@@ -47,7 +47,7 @@ class CapturasInterface():
                          FROM tasks.capturing_last as cl
                          WHERE cl.status = 'Dead ad') as da
         ON da.ad_url LIKE CONCAT('%', uc.referencia, '%')
-        WHERE uc.fecha_captura < (NOW() - INTERVAL 10 day)
+        WHERE uc.fecha_captura BETWEEN (NOW() - INTERVAL 10 day) AND (NOW() - INTERVAL 60 day)
         AND da.ad_url is null
         ORDER BY RAND()
         LIMIT 1
diff --git a/refresher/refresher.py b/refresher/refresher.py
index 39c17bf..01e1d4f 100644
--- a/refresher/refresher.py
+++ b/refresher/refresher.py
@@ -21,7 +21,7 @@ class Refresher:
         """
         Comprueba si el html es de un anuncio dado de baja.
         :param html: HTML del anuncio en string.
-        :return: True si esta dado de baja, False si  no.
+        :return: True si esta dado de baja, False si no.
         """
         if ':-|' in html or 'El anunciante lo dio de baja' in html:
             return True
diff --git a/tests/capturer_tests.py b/tests/capturer_tests.py
index 3380123..7a5f57b 100644
--- a/tests/capturer_tests.py
+++ b/tests/capturer_tests.py
@@ -6,9 +6,9 @@ from capturer.capturer import CapturingTask, Capturer
 
 
 def test_CapturingTask():
-    parameters = {'uuid': 'f31af60a-1feb-4770-bee9-0085c678f08f',
-                  'ad_url': 'https://www.idealista.com/inmueble/81593047',
-                  'fk_uuid_exploring': 'e5f9c8d5-b6e9-47fc-b4de-6d78f40feccc',
+    parameters = {'uuid': 'testie test',
+                  'ad_url': 'https://www.idealista.com/inmueble/81514847',
+                  'fk_uuid_exploring': None,
                   'status': 'Pending'}
 
     task = CapturingTask(parameters)
@@ -22,6 +22,6 @@ def test_Capturer():
     capturer.start()
 
 
-#  test_CapturingTask()
+test_CapturingTask()
 
-test_Capturer()
\ No newline at end of file
+#  test_Capturer()
\ No newline at end of file