sql terminado y faltan servlets

src/java/saii/dominio/CodigoPais.java

+package saii.dominio;
+
+public class CodigoPais{
+
+    private String codigo;
+    private String nombre;
+
+    public CodigoPais(){
+        codigo = "";
+        nombre = "";
+    }
+
+    public String getCodigo() {
+        return codigo;
+    }
+
+    public String getNombre() {
+        return nombre;
+    }
+
+    public CodigoPais(String codigo){
+        if (codigo.equals("")){
+                throw new IllegalArgumentException("");
+        }
+        this.codigo = codigo;
+        this.nombre = conversorCodigoPais(codigo);
+    }
+
+    public String conversorCodigoPais(String codigoPais) {
+        String intermedio = "";
+        switch (codigoPais){
+        case "USA":
+                intermedio = "United States of America";
+                break;
+
+        case "CAN":
+                intermedio = "Canada";
+                break;
+
+        case "BHM":
+                intermedio = "Bahamas";
+                break;
+
+        case "CUB":
+                intermedio = "Cuba";
+                break;
+
+        case "HAI":
+                intermedio = "Haiti";
+                break;
+
+        case "DOM":
+                intermedio = "Dominican Republic";
+                break;
+
+        case "JAM":
+                intermedio = "Jamaica";
+                break;
+
+        case "TRI":
+                intermedio = "Trinidad and Tobago";
+                break;
+
+        case "BAR":
+                intermedio = "Barbados";
+                break;
+
+        case "DMA":
+                intermedio = "Dominica";
+                break;
+
+        case "GRN":
+                intermedio = "Grenada";
+                break;
+
+        case "SLU":
+                intermedio = "St. Lucia";
+                break;
+
+        case "SVG":
+                intermedio = "St. Vincent and the Grenadines";
+                break;
+
+        case "AAB":
+                intermedio = "Antigua & Barbuda";
+                break;
+
+        case "SKN":
+                intermedio = "St. Kitts and Nevis";
+                break;
+
+        case "MEX":
+                intermedio = "Mexico";
+                break;
+
+        case "BLZ":
+                intermedio = "Belize";
+                break;
+
+        case "GUA":
+                intermedio = "Guatemala";
+                break;
+
+        case "HON":
+                intermedio = "Honduras";
+                break;
+
+        case "SAL":
+                intermedio = "El Salvador";
+                break;
+
+        case "NIC":
+                intermedio = "Nicaragua";
+                break;
+
+        case "COS":
+                intermedio = "Costa Rica";
+                break;
+
+        case "PAN":
+                intermedio = "Panama";
+                break;
+
+        case "COL":
+                intermedio = "Colombia";
+                break;
+
+        case "VEN":
+                intermedio = "Venezuela";
+                break;
+
+        case "GUY":
+                intermedio = "Guyana";
+                break;
+
+        case "SUR":
+                intermedio = "Suriname";
+                break;
+
+        case "ECU":
+                intermedio = "Ecuador";
+                break;
+
+        case "PER":
+                intermedio = "Peru";
+                break;
+
+        case "BRA":
+                intermedio = "Brazil";
+                break;
+
+        case "BOL":
+                intermedio = "Bolivia";
+                break;
+
+        case "PAR":
+                intermedio = "Paraguay";
+                break;
+
+        case "CHL":
+                intermedio = "Chile";
+                break;
+
+        case "ARG":
+                intermedio = "Argentina";
+                break;
+
+        case "URU":
+                intermedio = "Uruguay";
+                break;
+
+        case "UKG":
+                intermedio = "United Kingdom";
+                break;
+
+        case "IRE":
+                intermedio = "Ireland";
+                break;
+
+        case "NTH":
+                intermedio = "Netherlands";
+                break;
+
+        case "BEL":
+                intermedio = "Belgium";
+                break;
+
+        case "LUX":
+                intermedio = "Luxembourg";
+                break;
+
+        case "FRN":
+                intermedio = "France";
+                break;
+
+        case "MNC":
+                intermedio = "Monaco";
+                break;
+
+        case "LIE":
+                intermedio = "Liechtenstein";
+                break;
+
+        case "SWZ":
+                intermedio = "Switzerland";
+                break;
+
+        case "SPN":
+                intermedio = "Spain";
+                break;
+
+        case "AND":
+                intermedio = "Andorra";
+                break;
+
+        case "POR":
+                intermedio = "Portugal";
+                break;
+
+        case "HAN":
+                intermedio = "Hanover";
+                break;
+
+        case "BAV":
+                intermedio = "Bavaria";
+                break;
+
+        case "GMY":
+                intermedio = "Germany";
+                break;
+
+        case "GFR":
+                intermedio = "German Federal Republic";
+                break;
+
+        case "GDR":
+                intermedio = "German Democratic Republic";
+                break;
+
+        case "BAD":
+                intermedio = "Baden";
+                break;
+
+        case "SAX":
+                intermedio = "Saxony";
+                break;
+
+        case "WRT":
+                intermedio = "Wuerttemburg";
+                break;
+
+        case "HSE":
+                intermedio = "Hesse Electoral";
+                break;
+
+        case "HSG":
+                intermedio = "Hesse Grand Ducal";
+                break;
+
+        case "MEC":
+                intermedio = "Mecklenburg Schwerin";
+                break;
+
+        case "POL":
+                intermedio = "Poland";
+                break;
+
+        case "AUS":
+                intermedio = "Austria";
+                break;
+
+        case "HUN":
+                intermedio = "Hungary";
+                break;
+
+        case "CZE":
+                intermedio = "Czechoslovakia";
+                break;
+
+        case "CZR":
+                intermedio = "Czech Republic";
+                break;
+
+        case "SLO":
+                intermedio = "Slovakia";
+                break;
+
+        case "ITA":
+                intermedio = "Italy";
+                break;
+
+        case "PAP":
+                intermedio = "Papal States";
+                break;
+
+        case "SIC":
+                intermedio = "Two Sicilies";
+                break;
+
+        case "SNM":
+                intermedio = "San Marino";
+                break;
+
+        case "MOD":
+                intermedio = "Modena";
+                break;
+
+        case "PMA":
+                intermedio = "Parma";
+                break;
+
+        case "TUS":
+                intermedio = "Tuscany";
+                break;
+
+        case "MLT":
+                intermedio = "Malta";
+                break;
+
+        case "ALB":
+                intermedio = "Albania";
+                break;
+
+        case "MNG":
+                intermedio = "Montenegro";
+                break;
+
+        case "MAC":
+                intermedio = "Macedonia";
+                break;
+
+        case "CRO":
+                intermedio = "Croatia";
+                break;
+
+        case "KOS":
+                intermedio = "Kosovo";
+                break;
+
+        case "SLV":
+                intermedio = "Slovenia";
+                break;
+
+        case "GRC":
+                intermedio = "Greece";
+                break;
+
+        case "CYP":
+                intermedio = "Cyprus";
+                break;
+
+        case "BUL":
+                intermedio = "Bulgaria";
+                break;
+
+        case "MLD":
+                intermedio = "Moldova";
+                break;
+
+        case "ROM":
+                intermedio = "Romania";
+                break;
+
+        case "RUS":
+                intermedio = "Russia";
+                break;
+
+        case "EST":
+                intermedio = "Estonia";
+                break;
+
+        case "LAT":
+                intermedio = "Latvia";
+                break;
+
+        case "LIT":
+                intermedio = "Lithuania";
+                break;
+
+        case "UKR":
+                intermedio = "Ukraine";
+                break;
+
+        case "BLR":
+                intermedio = "Belarus";
+                break;
+
+        case "ARM":
+                intermedio = "Armenia";
+                break;
+
+        case "GRG":
+                intermedio = "Georgia";
+                break;
+
+        case "AZE":
+                intermedio = "Azerbaijan";
+                break;
+
+        case "FIN":
+                intermedio = "Finland";
+                break;
+
+        case "SWD":
+                intermedio = "Sweden";
+                break;
+
+        case "NOR":
+                intermedio = "Norway";
+                break;
+
+        case "DEN":
+                intermedio = "Denmark";
+                break;
+
+        case "ICE":
+                intermedio = "Iceland";
+                break;
+
+        case "CAP":
+                intermedio = "Cape Verde";
+                break;
+
+        case "STP":
+                intermedio = "Sao Tome and Principe";
+                break;
+
+        case "GNB":
+                intermedio = "Guinea-Bissau";
+                break;
+
+        case "EQG":
+                intermedio = "Equatorial Guinea";
+                break;
+
+        case "GAM":
+                intermedio = "Gambia";
+                break;
+
+        case "MLI":
+                intermedio = "Mali";
+                break;
+
+        case "SEN":
+                intermedio = "Senegal";
+                break;
+
+        case "BEN":
+                intermedio = "Benin";
+                break;
+
+        case "MAA":
+                intermedio = "Mauritania";
+                break;
+
+        case "NIR":
+                intermedio = "Niger";
+                break;
+
+        case "CDI":
+                intermedio = "Ivory Coast";
+                break;
+
+        case "GUI":
+                intermedio = "Guinea";
+                break;
+
+        case "BFO":
+                intermedio = "Burkina Faso";
+                break;
+
+        case "LBR":
+                intermedio = "Liberia";
+                break;
+
+        case "SIE":
+                intermedio = "Sierra Leone";
+                break;
+
+        case "GHA":
+                intermedio = "Ghana";
+                break;
+
+        case "TOG":
+                intermedio = "Togo";
+                break;
+
+        case "CAO":
+                intermedio = "Cameroon";
+                break;
+
+        case "NIG":
+                intermedio = "Nigeria";
+                break;
+
+        case "GAB":
+                intermedio = "Gabon";
+                break;
+
+        case "CEN":
+                intermedio = "Central African Republic";
+                break;
+
+        case "CHA":
+                intermedio = "Chad";
+                break;
+
+        case "CON":
+                intermedio = "Democratic Republic of the Congo";
+                break;
+
+        case "UGA":
+                intermedio = "Uganda";
+                break;
+
+        case "KEN":
+                intermedio = "Kenya";
+                break;
+
+        case "TAZ":
+                intermedio = "Tanzania";
+                break;
+
+        case "ZAN":
+                intermedio = "Zanzibar";
+                break;
+
+        case "BUI":
+                intermedio = "Burundi";
+                break;
+
+        case "RWA":
+                intermedio = "Rwanda";
+                break;
+
+        case "SOM":
+                intermedio = "Somalia";
+                break;
+
+        case "DJI":
+                intermedio = "Djibouti";
+                break;
+
+        case "ERI":
+                intermedio = "Eritrea";
+                break;
+
+        case "ANG":
+                intermedio = "Angola";
+                break;
+
+        case "MZM":
+                intermedio = "Mozambique";
+                break;
+
+        case "ZAM":
+                intermedio = "Zambia";
+                break;
+
+        case "ZIM":
+                intermedio = "Zimbabwe";
+                break;
+
+        case "MAW":
+                intermedio = "Malawi";
+                break;
+
+        case "SAF":
+                intermedio = "South Africa";
+                break;
+
+        case "NAM":
+                intermedio = "Namibia";
+                break;
+
+        case "LES":
+                intermedio = "Lesotho";
+                break;
+
+        case "BOT":
+                intermedio = "Botswana";
+                break;
+
+        case "SWA":
+                intermedio = "Swaziland";
+                break;
+
+        case "MAG":
+                intermedio = "Madagascar";
+                break;
+
+        case "COM":
+                intermedio = "Comoros";
+                break;
+
+        case "MAS":
+                intermedio = "Mauritius";
+                break;
+
+        case "SEY":
+                intermedio = "Seychelles";
+                break;
+
+        case "MOR":
+                intermedio = "Morocco";
+                break;
+
+        case "ALG":
+                intermedio = "Algeria";
+                break;
+
+        case "TUN":
+                intermedio = "Tunisia";
+                break;
+
+        case "LIB":
+                intermedio = "Libya";
+                break;
+
+        case "SUD":
+                intermedio = "Sudan";
+                break;
+
+        case "SSD":
+                intermedio = "South Sudan";
+                break;
+
+        case "TUR":
+                intermedio = "Iran";
+                break;
+
+        case "IRQ":
+                intermedio = "Iraq";
+                break;
+
+        case "EGY":
+                intermedio = "Egypt";
+                break;
+
+        case "SYR":
+                intermedio = "Syria";
+                break;
+
+        case "LEB":
+                intermedio = "Lebanon";
+                break;
+
+        case "JOR":
+                intermedio = "Jordan";
+                break;
+
+        case "ISR":
+                intermedio = "Israel";
+                break;
+
+        case "SAU":
+                intermedio = "Saudi Arabia";
+                break;
+
+        case "YAR":
+                intermedio = "Yemen Arab Republic";
+                break;
+
+        case "YEM":
+                intermedio = "Yemen";
+                break;
+
+        case "YPR":
+                intermedio = "Yemen People Republic";
+                break;
+
+        case "KUW":
+                intermedio = "Kuwait";
+                break;
+
+        case "BAH":
+                intermedio = "Bahrain";
+                break;
+
+        case "QAT":
+                intermedio = "Qatar";
+                break;
+
+        case "UAE":
+                intermedio = "United Arab Emirates";
+                break;
+
+        case "OMA":
+                intermedio = "Oman";
+                break;
+
+        case "AFG":
+                intermedio = "Afghanistan";
+                break;
+
+        case "TKM":
+                intermedio = "Turkmenistan";
+                break;
+
+        case "TAJ":
+                intermedio = "Tajikistan";
+                break;
+
+        case "KYR":
+                intermedio = "Kyrgyzstan";
+                break;
+
+        case "UZB":
+                intermedio = "Uzbekistan";
+                break;
+
+        case "KZK":
+                intermedio = "Kazakhstan";
+                break;
+
+        case "China":
+                intermedio = "China";
+                break;
+
+        case "MON":
+                intermedio = "Mongolia";
+                break;
+
+        case "TAW":
+                intermedio = "Taiwan";
+                break;
+
+        case "KOR":
+                intermedio = "Korea";
+                break;
+
+        case "PRK":
+                intermedio = "North Korea";
+                break;
+
+        case "ROK":
+                intermedio = "South Korea";
+                break;
+
+        case "JPN":
+                intermedio = "Japan";
+                break;
+
+        case "IND":
+                intermedio = "India";
+                break;
+
+        case "BHU":
+                intermedio = "Bhutan";
+                break;
+
+        case "PAK":
+                intermedio = "Pakistan";
+                break;
+
+        case "BNG":
+                intermedio = "Bangladesh";
+                break;
+
+        case "MYA":
+                intermedio = "Myanmar";
+                break;
+
+        case "SRI":
+                intermedio = "Sri Lanka";
+                break;
+
+        case "MAD":
+                intermedio = "Maldives";
+                break;
+
+        case "NEP":
+                intermedio = "Nepal";
+                break;
+
+        case "THI":
+                intermedio = "Thailand";
+                break;
+
+        case "CAM":
+                intermedio = "Cambodia";
+                break;
+
+        case "LAO/":
+                intermedio = "Laos";
+                break;
+
+        case "DRV":
+                intermedio = "Vietnam";
+                break;
+
+        case "RVN":
+                intermedio = "Republic of Vietnam";
+                break;
+
+        case "MAL":
+                intermedio = "Malaysia";
+                break;
+
+        case "SIN":
+                intermedio = "Singapore";
+                break;
+
+        case "BRU":
+                intermedio = "Brunei";
+                break;
+
+        case "PHI":
+                intermedio = "Philippines";
+                break;
+
+        case "INS":
+                intermedio = "Indonesia";
+                break;
+
+        case "ETM":
+                intermedio = "East Timor";
+                break;
+
+        case "AUL":
+                intermedio = "Australia";
+                break;
+
+        case "PNG":
+                intermedio = "Papua New Guinea";
+                break;
+
+        case "NEW":
+                intermedio = "New Zealand";
+                break;
+
+        case "VAN":
+                intermedio = "Vanuatu";
+                break;
+
+        case "SOL":
+                intermedio = "Solomon Islands";
+                break;
+
+        case "KIR":
+                intermedio = "Kiribati";
+                break;
+
+        case "TUV":
+                intermedio = "Tuvalu";
+                break;
+
+        case "FIJ":
+                intermedio = "Fiji";
+                break;
+
+        case "TON":
+                intermedio = "Tonga";
+                break;
+
+        case "NAU":
+                intermedio = "Nauru";
+                break;
+
+        case "MSI":
+                intermedio = "Marshall Islands";
+                break;
+
+        case "PAL":
+                intermedio = "Palau";
+                break;
+
+        case "FSM":
+                intermedio = "Federated States of Micronesia";
+                break;
+
+        case "WSM":
+                intermedio = "Samoa";
+                break;
+        default:
+                intermedio = "";
+        }
+
+        return intermedio;
+    }
+}

src/java/saii/dominio/DB/EconomicDataDB.java

@@ -9,6 +9,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import saii.dominio.CodigoPais;
 import saii.dominio.EconomicData;
 
 
@@ -39,7 +40,8 @@ public class EconomicDataDB {
             rs = ps.executeQuery();
             if (rs.next()) {
                 economic = new EconomicData();
-                economic.setCountry(rs.getString("country"));
+                CodigoPais c1 =new CodigoPais(rs.getString("country"));
+                economic.setCountry(c1.getNombre());
                 economic.setYear(Integer.parseInt(rs.getString("year1")));
                 economic.setMilex(Double.parseDouble(rs.getString("milex")));
                 economic.setIrst(Double.parseDouble(rs.getString("irst")));
@@ -62,6 +64,8 @@ public class EconomicDataDB {
             rs = ps.executeQuery();
             if (rs.next()) {
                 economic.setPibPer(Double.parseDouble(rs.getString("value1")));
+                economic.setCountry(rs.getString("country"));
+                economic.setYear(Integer.parseInt(rs.getString("year1")));
             }
             rs.close();
             ps.close();

src/java/saii/dominio/DB/GeneralDataDB.java

@@ -5,6 +5,7 @@
  */
 package saii.dominio.DB;
 
+import static java.lang.Math.abs;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -69,13 +70,7 @@ public class GeneralDataDB {
                 general = new GeneralData();
                 general.setWarName(rs.getString("warName"));
                 general.setStartYear1(Integer.parseInt(rs.getString("startYear1")));
-                general.setEndYear2(Integer.parseInt(rs.getString("endYear2")));
-                
-               // general.setWarType(Integer.parseInt(rs.getString("warType")));
-               /* general.setStartYear1(Integer.parseInt(rs.getString("startYear1")));
-                general.setStartYear2(Integer.parseInt(rs.getString("startYear2")));
-                general.setEndYear1(Integer.parseInt(rs.getString("endYear1")));
-                general.setEndYear2(Integer.parseInt(rs.getString("endYear2")));*/
+                general.setEndYear1(Integer.parseInt(rs.getString("endYear2")));
                 general.setDuration(Integer.parseInt(rs.getString("duration")));
                 general.setDeadTot(Double.parseDouble(rs.getString("deadTot")));
                 general.setTargettedTot(Double.parseDouble(rs.getString("targettedTot")));
@@ -96,9 +91,19 @@ public class GeneralDataDB {
             ps.setString(1, warName + "");
             rs = ps.executeQuery();
             if (rs.next()) {             
-                general.setWarType(Integer.parseInt(rs.getString("warType")));
+
+                int final1 = Integer.parseInt(rs.getString("endYear1")), final2 = Integer.parseInt(rs.getString("endYear2"));
+                if(final1 > final2){
+                    general.setEndYear1(final1);
+                    general.setEndYear2(final2);
+                }else{
+                    general.setEndYear1(final2);
+                    general.setEndYear2(final1);
+                }   
+                general.setStartYear1(Integer.parseInt(rs.getString("startYear1")));
                 general.setStartYear2(Integer.parseInt(rs.getString("startYear2")));
-                general.setEndYear1(Integer.parseInt(rs.getString("endYear1")));
+                general.setWarName(rs.getString("warName"));
+                general.setWarType(Integer.parseInt(rs.getString("warType")));
             }
             rs.close();
             ps.close();

src/java/saii/dominio/DB/ReligionDataDB.java

@@ -9,6 +9,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import saii.dominio.CodigoPais;
 import saii.dominio.ReligionData;
 
 /**
@@ -74,7 +75,8 @@ public class ReligionDataDB {
             if (rs.next()) {
                 religion = new ReligionData();
                 religion.setYear1((int) Double.parseDouble(rs.getString("year1")));
-                religion.setCountry(rs.getString("country"));
+                CodigoPais c1 =new CodigoPais(rs.getString("country"));
+                religion.setCountry(c1.getNombre());
                 religion.setChrstprot(Double.parseDouble(rs.getString("chrstprot")));
                 religion.setChrstcat(Double.parseDouble(rs.getString("chrstcat")));
                 religion.setChrstorth(Double.parseDouble(rs.getString("chrstorth")));
@@ -121,7 +123,8 @@ public class ReligionDataDB {
             if (rs.next()) {
                 religion = new ReligionData();
                 religion.setYear1((int) Double.parseDouble(rs.getString("year1")));
-                religion.setCountry(rs.getString("country"));
+                CodigoPais c1 =new CodigoPais(rs.getString("country"));
+                religion.setCountry(c1.getNombre());
                 religion.setChrstprot(Double.parseDouble(rs.getString("chrstprot")));
                 religion.setChrstcat(Double.parseDouble(rs.getString("chrstcat")));
                 religion.setChrstorth(Double.parseDouble(rs.getString("chrstorth")));