Merge pull request #257 from ContinuumIO/bhard/crawl_changes

Bhard/crawl changes
nasa-jpl-memex · Jan 12, 2015 · 7630986 · 7630986
2 parents 6a800ca + ad91e5b
commit 7630986
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/app/templates/crawl.html b/app/templates/crawl.html
@@ -61,6 +61,31 @@
             show_error();
           }
         });
+        $.ajax({ type: "GET", url: "/{{ project.slug }}/crawls/{{ crawl.slug }}/stats",
+          success: function(data) {
+                console.log("stats-data" + data);
+                if (data.nutch) {
+                  $.ajax({
+                    type: "POST",
+                    url: "/{{ project.slug }}/crawls/{{ crawl.slug }}/update_stats",
+                    contentType: 'application/json',
+                    data: JSON.stringify({crawled: data.num_crawled, crawler: 'nutch'}),
+                  });
+                } else {
+                  $.ajax({
+                    type: "POST",
+                    url: "/{{ project.slug }}/crawls/{{ crawl.slug }}/update_stats",
+                    contentType: 'application/json',
+                    data: JSON.stringify({crawled: data.num_crawled, harvest: data.harvest_rate, crawler:'ache'}),
+                  });
+                }
+            },
+          failure: function() {
+                  $( '#stats-data' ).html(
+                  '<h4>(Statistics are not yet available for this crawl.)</h4>'
+                    );
+          }
+        });
     });
 
     (function pollStatus() {
@@ -97,12 +122,6 @@
                       + data.num_crawled 
                       + '</td></tr></table>'
                     );
-                  $.ajax({
-                    type: "POST", 
-                    url: "/{{ project.slug }}/crawls/{{ crawl.slug }}/update_stats",
-                    contentType: 'application/json',
-                    data: JSON.stringify({crawled: data.num_crawled, crawler: 'nutch'}),
-                  });
                 } else {
                   $( '#stats-data' ).html(
                       '<div class="col-sm-12"><table class="table table-striped"><tr><th>Harvest Rate</th><th>Site(s) crawled</th></tr><tr><td>' 
@@ -111,12 +130,6 @@
                       + data.num_crawled 
                       +'</td></tr></table></div>'
                     );
-                  $.ajax({
-                    type: "POST", 
-                    url: "/{{ project.slug }}/crawls/{{ crawl.slug }}/update_stats",
-                    contentType: 'application/json',
-                    data: JSON.stringify({crawled: data.num_crawled, harvest: data.harvest_rate, crawler:'ache'}),
-                  });
                 }
             },
           failure: function() {

diff --git a/app/templates/crawls.html b/app/templates/crawls.html
@@ -24,20 +24,12 @@ <h1>Crawls</h1>
                 <th>Pages Crawled</th>
             </tr>
             <tr>
-                <td>{{ crawl.pages_crawled }}</td>
-                {% if image_spaces[0] %}
-                {% for image_space in image_spaces %} 
-                {% if crawl.id == image_space.crawl_id %}
-                    {% if image_space.images %}
-                        <td>{{ image_space.images.all() | length }}</td>
-                    {% else %}
-                        <td>None</td>
-                    {% endif %}
-                {% endif %}
-                {% endfor %}
+                {% if crawl.image_space %}
+                    <td>{{ crawl.image_space.images.all() | length }}</td>
                 {% else %}
                     <td>None</td>
                 {% endif %}
+                <td>{{ crawl.pages_crawled }}</td>
             </tr>
         </table>
         {% else %}