Changeset e481d13 in observatorio for simulacion/ModuloDinamico

Timestamp:

Jan 16, 2015, 11:29:08 AM (9 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

faed520

Parents:

23f4971

Message:

reparado error al agrupar proveedores declarados multiples veces

Location:

simulacion/ModuloDinamico

Files:

• io_manager.H (modified) (1 diff)
• queries.C (modified) (2 diffs)

simulacion/ModuloDinamico/io_manager.H

@@ -532 +532 @@
                       )
                     );
+
+                    if (input.get_nationality() != "E")
+                      {
+                        Imported_Product * ptr_imported_product =
+                          static_cast<Imported_Product *>(
+                            src->get_info().get());
+
+                        ptr_imported_product->set_imports(
+                          ptr_imported_product->get_imports() +
+                          ip_relationship.get_bought_quantity()
+                        );
+                      }
 
                     src->get_info()->set_level(

simulacion/ModuloDinamico/queries.C

@@ -245 +245 @@
 }
 
-std::string get_supplier_name(const std::string & rif)
-{
-  AutoConnection conn;
-
-  DBQuery query(conn);
-
-  StrQuery str_query;
-
-  str_query.addSelect(DB::NAME);
-  str_query.addFrom(DB::SUPPLIER_TABLE_NAME);
-  str_query.addWhere(op(DB::RIF, single_quote(rif)));
-
-  if (not query.exec(str_query))
-    {
-      std::string msg = "Cannot execute query: " + std::string(str_query);
-
-      throw std::logic_error(msg);
-    }
-
-  if (not query.next())
-    {
-      std::stringstream msg;
-
-      msg << "Supplier with R.I.F. = " << rif
-          << " does not exists in database";
-
-      throw std::domain_error(msg.str());
-    }
-
-  return query.getValue(0);
-}
-
 void list_inputs(const db_id_t & input_id, const std::string & year,
                  List<Input> & inputs)
@@ -324 +292 @@
   query.clear();
 
-  std::string strquery =
-    "SELECT " +
-    concatas(DB::SUPPLIER_TABLE_NAME, DB::RIF) + ',' +
-    concatas(DB::SUPPLIER_TABLE_NAME, DB::NATIONALITY) + ',' +
-    concatas(DB::COUNTRY_TABLE_NAME, DB::NAME) +
-    " FROM " +
-    DB::INPUT_SUPPLIER_TABLE_NAME + ',' +
-    DB::SUPPLIER_TABLE_NAME + ',' +
-    DB::COUNTRY_TABLE_NAME +
-    " WHERE " +
-    op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::YEAR_R), year) + " AND " +
-    op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::INPUT_ID),
-                       id_to_str(input_id)) + " AND " +
-    op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::SUPPLIER_ID),
-       concat(DB::SUPPLIER_TABLE_NAME, DB::ID)) + " AND " +
-    op(concat(DB::COUNTRY_TABLE_NAME, DB::ID),
-       concat(DB::SUPPLIER_TABLE_NAME, DB::ORIG_COUNTRY_ID)) +
-    " GROUP BY " +
-    concat(DB::SUPPLIER_TABLE_NAME, DB::RIF, '_') + ',' +
-    concat(DB::SUPPLIER_TABLE_NAME, DB::NATIONALITY, '_') + ',' +
-    concat(DB::COUNTRY_TABLE_NAME, DB::NAME, '_');
-
-
-  if (not query.exec(strquery))
-    {
-      std::string msg = "Cannot execute query: " + std::string(strquery);
-      throw std::logic_error(msg);
-    }
+  str_query.addSelect(concatas(DB::SUPPLIER_TABLE_NAME, DB::RIF));
+  str_query.addSelect(concatas(DB::SUPPLIER_TABLE_NAME, DB::NAME));
+  str_query.addSelect(concatas(DB::SUPPLIER_TABLE_NAME, DB::NATIONALITY));
+  str_query.addSelect(concatas(DB::COUNTRY_TABLE_NAME, DB::NAME));
+
+  str_query.addFrom(DB::INPUT_SUPPLIER_TABLE_NAME);
+  str_query.addFrom(DB::SUPPLIER_TABLE_NAME);
+  str_query.addFrom(DB::COUNTRY_TABLE_NAME);
+
+  str_query.addWhere(op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::YEAR_R),
+                        year));
+  str_query.addWhere(op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::INPUT_ID),
+                     id_to_str(input_id)));
+  str_query.addWhere(op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::SUPPLIER_ID),
+                        concat(DB::SUPPLIER_TABLE_NAME, DB::ID)));
+  str_query.addWhere(op(concat(DB::COUNTRY_TABLE_NAME, DB::ID),
+                        concat(DB::SUPPLIER_TABLE_NAME,
+                               DB::ORIG_COUNTRY_ID)));
+
+  str_query.addOrderBy(concat(DB::SUPPLIER_TABLE_NAME, DB::RIF));
+  str_query.setOrderByOption("ASC");
+
+  if (not query.exec(str_query))
+    {
+      std::string msg = "Cannot execute query: " + std::string(str_query);
+      throw std::logic_error(msg);
+    }
+
+  std::string last_rif = "";
 
   while (query.next())
     {
-      input.set_company_rif(
-        query.getValue(concat(DB::SUPPLIER_TABLE_NAME, DB::RIF, '_'))
+      std::string rif =
+        query.getValue(concat(DB::SUPPLIER_TABLE_NAME, DB::RIF, '_'));
+
+      std::string nationality = query.getValue(concat(DB::SUPPLIER_TABLE_NAME,
+                                                      DB::NATIONALITY, '_'));
+
+      if (nationality != "E" and rif == last_rif)
+        continue;
+
+      last_rif = rif;
+
+      input.set_company_rif(rif);
+      input.set_company_name(
+        query.getValue(concat(DB::SUPPLIER_TABLE_NAME, DB::NAME, '_'))
       );
-      input.set_company_name(get_supplier_name(input.get_company_rif()));
       input.set_company_location(
         query.getValue(concat(DB::COUNTRY_TABLE_NAME, DB::NAME, '_'))
       );
-      input.set_nationality(query.getValue(concat(DB::SUPPLIER_TABLE_NAME,
-                                                  DB::NATIONALITY, '_')));
+      input.set_nationality(nationality);
       inputs.append(input);
     }