Changeset faed520 in observatorio for simulacion/SimEscenariosEconomicos

Timestamp:

Jan 16, 2015, 2:36:56 PM (9 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

d7bfb1f

Parents:

e481d13

Message:

eliminacion de un ASC innecesario

File:

• simulacion/SimEscenariosEconomicos/queries.C (modified) (2 diffs)

simulacion/SimEscenariosEconomicos/queries.C

@@ -197 +197 @@
 }
 
-std::string getSupplierName(const std::string & rif) {
-
-    AutoConnection conn;
-
-    DBQuery query(conn);
-
-    StrQuery strQuery;
-
-    strQuery.addSelect(DB::NAME);
-    strQuery.addFrom(DB::SUPPLIER_TABLE_NAME);
-    strQuery.addWhere(op(DB::RIF, singleQuote(rif)));
-
-    if (not query.exec(strQuery)) {
-
-        std::string msg = "Cannot execute query: " + std::string(strQuery);
-
-        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 listInputs(const size_t & inputId, const std::string & year,
                 List <InputInfo> & inputs) {
@@ -290 +258 @@
     query.clear();
 
-    std::string sum = "SUM(" + concat(DB::INPUT_SUPPLIER_TABLE_NAME,
-                                      DB::BOUGHT_QUANTITY)
-                             + ") AS " +
-                       concat(DB::INPUT_SUPPLIER_TABLE_NAME,
-                              DB::BOUGHT_QUANTITY, '_');
-
-    std::string strquery =
-      "SELECT " +
-      concatas(DB::SUPPLIER_TABLE_NAME, DB::RIF) + ',' +
-      concatas(DB::SUPPLIER_TABLE_NAME, DB::NATIONALITY) + ',' + sum +
-      " FROM " +
-      DB::INPUT_SUPPLIER_TABLE_NAME + ',' +
-      DB::SUPPLIER_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),
-                         idToStr(inputId)) + " AND " +
-      op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::SUPPLIER_ID),
-         concat(DB::SUPPLIER_TABLE_NAME, DB::ID)) +
-      " GROUP BY " +
-      concat(DB::SUPPLIER_TABLE_NAME, DB::RIF, '_') + ',' +
-      concat(DB::SUPPLIER_TABLE_NAME, DB::NATIONALITY, '_');
-
-
-    if (not query.exec(strquery)) {
-
-        std::string msg = "Cannot execute query: " + strquery;
-
-        throw std::logic_error(msg);
-    }
+    strQuery.addSelect(concatas(DB::SUPPLIER_TABLE_NAME, DB::RIF));
+    strQuery.addSelect(concatas(DB::SUPPLIER_TABLE_NAME, DB::NAME));
+    strQuery.addSelect(concatas(DB::SUPPLIER_TABLE_NAME, DB::NATIONALITY));
+    strQuery.addSelect(concatas(DB::INPUT_SUPPLIER_TABLE_NAME,
+                                DB::BOUGHT_QUANTITY));
+
+    strQuery.addFrom(DB::INPUT_SUPPLIER_TABLE_NAME);
+    strQuery.addFrom(DB::SUPPLIER_TABLE_NAME);
+
+    strQuery.addWhere(op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::YEAR_R),
+                         year));
+    strQuery.addWhere(op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::INPUT_ID),
+                         idToStr(inputId)));
+    strQuery.addWhere(op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::SUPPLIER_ID),
+         concat(DB::SUPPLIER_TABLE_NAME, DB::ID)));
+
+    strQuery.addOrderBy(concat(DB::SUPPLIER_TABLE_NAME, DB::RIF));
+
+
+    if (not query.exec(strQuery)) {
+
+        std::string msg = "Cannot execute query: " + std::string(strQuery);
+
+        throw std::logic_error(msg);
+    }
+
+    std::string lastRif = "";
+
+    inputInfo.quantity = 0.0;
 
     while (query.next()) {
 
-        inputInfo.companyRif =
+        std::string rif =
             query.getValue(concat(DB::SUPPLIER_TABLE_NAME, DB::RIF, '_'));
-        inputInfo.companyName = getSupplierName(inputInfo.companyRif);
-        inputInfo.quantity = std::atof(
+
+        std::string nationality = query.getValue(concat(DB::SUPPLIER_TABLE_NAME,
+                                                        DB::NATIONALITY, '_'));
+
+        inputInfo.quantity += std::atof(
             query.getValue(concat(DB::INPUT_SUPPLIER_TABLE_NAME,
                                   DB::BOUGHT_QUANTITY, '_')));
 
-        char * nat = query.getValue(concat(DB::SUPPLIER_TABLE_NAME,
-                                           DB::NATIONALITY, '_'));
-
-        inputInfo.nationality = nat[0];
+        if (nationality != "E" and rif == lastRif) {
+            continue;
+        }
+
+        lastRif = rif;
+
+        inputInfo.companyRif = rif;
+
+        inputInfo.companyName =
+            query.getValue(concat(DB::SUPPLIER_TABLE_NAME, DB::NAME, '_'));
+
+        inputInfo.nationality = nationality[0];
 
         long supplierId = std::atol(query.getValue(0));