performance improvement

catalog/management/commands/populate_products_l1c.py

@@ -44,8 +44,13 @@ class Command(BaseCommand):
         uri       = "https://scihub.copernicus.eu/dhus/odata/v1/Products?$filter=Name eq '" + product_name + "'"
         r         = requests.get(uri, auth=(usr, pwd))
         root      = ET.fromstring(r.content)
+        print root
         # base_link = root[5][0].text
-        uuid      = root[5][11][0].text
+        try:
+            uuid      = root[5][11][0].text
+        except:
+            print root
+            print "\n"
 
         data_dict = apiSentinel.get_product_odata(uuid, full=True)
 
@@ -68,18 +73,23 @@ class Command(BaseCommand):
             PRODUCT_EXISTS = Product_l1c.objects.filter(identifier=file_name).exists()
 
             if not PRODUCT_EXISTS:
-                data_dict = self.generate_json(file_name)
-                # print json.dumps(data_dict, indent=3, sort_keys=True, default=str)
-
-                product_l1c = Product_l1c(
-                    uuid       = data_dict['id'],
-                    identifier = data_dict['Identifier'],
-                    file_path  = path,
-                    json       = json.dumps(data_dict, indent=3, sort_keys=True, ensure_ascii=True, default=str)
-                )
-
-                product_l1c.save()
-                print "Id: " + data_dict['id']
+                try: 
+                    data_dict = self.generate_json(file_name)
+                    # print json.dumps(data_dict, indent=3, sort_keys=True, default=str)
+
+                    product_l1c = Product_l1c(
+                        uuid       = data_dict['id'],
+                        identifier = data_dict['Identifier'],
+                        file_path  = path,
+                        json       = json.dumps(data_dict, indent=3, sort_keys=True, ensure_ascii=True, default=str)
+                    )
+
+                    product_l1c.save()
+                    print "Id: " + data_dict['id']
+                
+                except:
+                    print "Error con el archivo " + file_name
             
             else:
-                print "Product " + file_name + "is already in DB."
+                # print "Product " + file_name + " is already in DB."
+                pass

catalog/management/commands/populate_products_l2a.py

@@ -33,13 +33,24 @@ class Command(BaseCommand):
         for file in file_list:
             file_name = file.replace(".zip", '')
 
-            prod_l1c = Product_l1c.objects.all().filter(identifier=file_name)[0]
-            
-            product_l2a = Product_l2a(
-                prod_l1c   = prod_l1c,
-                identifier = prod_l1c.identifier,
-                file_path  = path
-            )
-
-            product_l2a.save()
-            print prod_l1c.identifier
+            try:
+                PRODUCT_EXISTS = Product_l2a.objects.filter(identifier=file_name).exists()
+                
+                if not PRODUCT_EXISTS:
+                    prod_l1c = Product_l1c.objects.filter(identifier=file_name)[0]
+
+                    product_l2a = Product_l2a(
+                        prod_l1c   = prod_l1c,
+                        identifier = prod_l1c.identifier,
+                        file_path  = path
+                    )
+
+                    product_l2a.save()
+                    print prod_l1c.identifier
+
+                else:
+                    "Existe"
+        
+
+            except:
+                print "Error con archivo " + file_name

catalog/models.py

@@ -27,11 +27,6 @@ class Polygon(models.Model):
     wkt_polygon = models.TextField(null=True)
 
 
-class KeyNameTable(models.Model):
-    id   = models.CharField(max_length=10, primary_key=True, unique=True)
-    name = models.CharField(max_length=65)
-
-
 class Product_l1c(models.Model):
     uuid       = models.CharField(max_length=50)
     identifier = models.CharField(max_length=50)

catalog/static/css/body.css

@@ -361,6 +361,12 @@ div .sidebar-button button {
     bottom: 30px;
 }
 
+.single-product-input input[type=checkbox] {
+    float        : right;
+    margin-right : 5%;
+    margin-top   : 8%;
+}
+
 /*ul.control-sidebar-menu input[type=checkbox] {*/
     /*position: absolute;*/
     /*right: 20px;*/

catalog/templates/map.html

@@ -243,7 +243,7 @@
 {% endblock %}
 
 {% block templates %}{% include "templates.html" %}{% endblock %}
-{% block modal1 %}{% include "noProductsModal.html" %}{% endblock %}
+{% block modal1 %}{% include "mssgModal.html" %}{% endblock %}
 
 {% block scripts %}
   <script>

catalog/templates/templates.html

@@ -22,14 +22,17 @@
 
 <!-- product list template -->
 <template id="product_list_template">
+  <div id="" class="single-product-input">
+    <input type="checkbox" name="product_selected" value="" checked>
+  </div>
   <li id="" onclick="drawApiResponse(this);">
     <a href="javascript:void(0)">
-        <i class="menu-icon glyphicon glyphicon-bookmark bg-red"></i>
-        <div class="menu-info">
-            <h4 id="" class="control-sidebar-subheading"></h4>
-            <p></p>
-            <input type="checkbox" name="product_selected" value="" checked>
-        </div>
+      <i class="menu-icon glyphicon glyphicon-bookmark bg-red"></i>
+      <div class="menu-info">
+        <h4 id="" class="control-sidebar-subheading"></h4>
+        <p></p>
+        <!-- <input type="checkbox" name="product_selected" value="" checked> -->
+      </div>
     </a>
     <div class="info-product-box bg-geo">
       <span class="info-product-box-img">