From beed1f0488877d32cd3a32e6745bfddc6ce40437 Mon Sep 17 00:00:00 2001
From: "Eduardo L. Buratti" <elb09@c3sl.ufpr.br>
Date: Tue, 20 Aug 2013 11:13:35 -0300
Subject: [PATCH] webservice: Fix webservice insert queries
---
webservice/DataSID.java | 206 +++++++++++++++++++++-------------------
1 file changed, 107 insertions(+), 99 deletions(-)
diff --git a/webservice/DataSID.java b/webservice/DataSID.java
index dd37627..724aa9e 100644
--- a/webservice/DataSID.java
+++ b/webservice/DataSID.java
@@ -206,24 +206,25 @@ public class DataSID {
private static PreparedStatement createInventoryStatement(Connection con, CollectedData collectedData, java.sql.Date contactDate) throws SQLException {
final String query = "INSERT INTO " + SA_INVENTORY + " " +
- "(contact_date, telecentro_id, versao, machine, machine_type, " +
- "admin_name, tl_conection, tl_name, tl_beneficiary, " +
- "users_count, state, city, " +
- "tl_street, tl_number, zipcode, " +
- "tl_neighborhood, geolocation, mirrors_timestamp, " +
- "hd_model, hd_size, hd_used, " +
- "hd2_model, hd2_size, hd2_used, " +
- "extra_hds, memory_size, processor, " +
- "os_type, os_distro, kernel) VALUES " +
+ "(contact_date, machine_type, m_superid, macaddr, version" +
+ " os_type, os_distro, os_kernel, " +
+ " processor, memory, " +
+ " disk1_model, disk1_size, disk1_used, " +
+ " disk2_model, disk2_size, disk2_used, " +
+ " extra_hds, " +
+ " tl_name, tl_phone, tl_street, tl_numbr, " +
+ " tl_city, tl_zipcode, tl_neighborhood, " +
+ " tl_geolocation, tl_admin_name, tl_admin_phone " +
+ ") VALUES " +
"(?, ?, ?, ?, ?, " +
- "?, ?, ?, ?, " +
- "?, ?, ?, " +
- "?, ?, ?, " +
- "?, ?, ?, " +
- "?, ?, ?, " +
- "?, ?, ?, " +
- "?, ?, ?, " +
- "?, ?, ?);";
+ " ?, ?, ?, " +
+ " ?, ?, " +
+ " ?, ?, ?, " +
+ " ?, ?, ?, " +
+ " ?, " +
+ " ?, ?, ?, ?, " +
+ " ?, ?, ?, " +
+ " ?, ?, ?);";
PreparedStatement st = con.prepareStatement(query);
@@ -231,114 +232,121 @@ public class DataSID {
Inventory inventory = collectedData.getInventory();
List<Disk> disks = inventory.getDisks().getDisk();
- TeleCentroInfo teleCentroInfo = collectedData.getTelecentroInfo();
-
+ TeleCentroInfo teleCentroInfo = collectedData.getTelecentroInfo();
+
+ // contact_date
st.setDate(1, contactDate);
+
+ // machine_type
+ if(collectedData.getMachineType().compareTo("client") == 0)
+ st.setInt(2, 0);
+ else
+ st.setInt(2, 1);
- // telecentro_id
- st.setString(2, teleCentroInfo.getSuperid());
+ // m_superid
+ st.setString(3, teleCentroInfo.getSuperid());
- // machine
+ // macaddr
org.postgresql.util.PGobject macaddr = new org.postgresql.util.PGobject();
macaddr.setType("macaddr");
macaddr.setValue(interfaces.get(0).getMacAddress());
- st.setObject(3, macaddr);
+ st.setObject(4, macaddr);
// versao
- st.setString(4, collectedData.getAgentVersion());
-
- // machine_type
- if(collectedData.getMachineType().compareTo("client") == 0)
- st.setInt(5, 0);
- else
- st.setInt(5, 1);
-
- // admin_name
- st.setString(6, teleCentroInfo.getAdminName());
-
- // tl_conection
- st.setString(7, teleCentroInfo.getTlConnection());
-
- // tl_name
- st.setString(8, teleCentroInfo.getTlName());
-
- // tl_beneficiary
- st.setString(9, teleCentroInfo.getTlBeneficiary());
-
- // user_count
- st.setInt(10, teleCentroInfo.getUserCount().intValue());
-
- // state
- st.setString(11, teleCentroInfo.getState());
-
- // city
- st.setString(12, teleCentroInfo.getCity());
-
- // tl_street
- st.setString(13, teleCentroInfo.getTlStreet());
-
- // tl_number
- st.setString(14, teleCentroInfo.getTlNumber());
-
- // tl_zipcode
- st.setString(15, teleCentroInfo.getTlZipcode());
-
- // tl_neighborhood
- st.setString(16, teleCentroInfo.getTlNeighborhood());
-
- // geolocation
- st.setString(17, teleCentroInfo.getGeolocation());
-
- // mirrors_timestamp
- st.setString(18, collectedData.getMirrorsTimestamp());
-
- // hd_model
- st.setString(19, disks.get(0).getModel());
+ st.setString(5, collectedData.getAgentVersion());
+
+ // os_type
+ st.setString(6, inventory.getOs());
+
+ // os_distro
+ st.setString(7, inventory.getDistro());
+
+ // os_kernel
+ st.setString(8, inventory.getKernel());
+
+ // processor
+ st.setString(9, inventory.getProcessor());
+
+ // memory
+ st.setInt(10, inventory.getMemory().intValue());
+
+ // disk1_model
+ st.setString(11, disks.get(0).getModel());
- // hd_size
- st.setInt(20, disks.get(0).getSize().intValue());
+ // disk1_size
+ st.setInt(12, disks.get(0).getSize().intValue());
- // hd_used
- st.setInt(21, disks.get(0).getUsed().intValue());
+ // disk1_used
+ st.setInt(13, disks.get(0).getUsed().intValue());
if (disks.size() > 1) {
- // hd2_model
- st.setString(19, disks.get(1).getModel());
+ // disk2_model
+ st.setString(14, disks.get(1).getModel());
- // hd2_size
- st.setInt(20, disks.get(1).getSize().intValue());
+ // disk2_size
+ st.setInt(15, disks.get(1).getSize().intValue());
- // hd2_used
- st.setInt(21, disks.get(1).getUsed().intValue());
+ // disk2_used
+ st.setInt(16, disks.get(1).getUsed().intValue());
}
else {
- // hd2_model
- st.setNull(19, Types.VARCHAR);
+ // disk2_model
+ st.setNull(14, Types.VARCHAR);
- // hd2_size
- st.setNull(20, Types.INTEGER);
+ // disk2_size
+ st.setNull(15, Types.INTEGER);
- // hd2_used
- st.setNull(21, Types.INTEGER);
+ // disk2_used
+ st.setNull(16, Types.INTEGER);
}
// extra_hds
- st.setInt(22, (disks.size() > 2) ? (disks.size() - 2) : 0);
+ st.setInt(17, (disks.size() > 2) ? (disks.size() - 2) : 0);
- // memory_size
- st.setInt(23, inventory.getMemory().intValue());
+ // tl_name
+ st.setString(18, teleCentroInfo.getTlName());
- // processor
- st.setString(24, inventory.getProcessor());
+ // tl_phone
+ st.setString(19, "???"); // TODO
+
+ // tl_street
+ st.setString(20, teleCentroInfo.getTlStreet());
+
+ // tl_numbr
+ st.setString(21, teleCentroInfo.getTlNumber());
- // os_type
- st.setString(25, inventory.getOs());
+ //tl_city
+ st.setString(22, teleCentroInfo.getCity());
- // os_distro
- st.setString(26, inventory.getDistro());
+ // state
+ //st.setString(???, teleCentroInfo.getState());
+
+ // tl_zipcode
+ st.setString(23, teleCentroInfo.getTlZipcode());
+
+ // tl_neighborhood
+ st.setString(24, teleCentroInfo.getTlNeighborhood());
+
+ // tl_geolocation
+ st.setString(25, teleCentroInfo.getGeolocation());
+
+ // tl_admin_name
+ st.setString(26, teleCentroInfo.getAdminName());
+
+ // tl_admin_phone
+ st.setString(27, "???"); // TODO
+
+ // tl_conection
+ //st.setString(???, teleCentroInfo.getTlConnection());
+
+ // tl_beneficiary
+ //st.setString(???, teleCentroInfo.getTlBeneficiary());
+
+ // user_count
+ //st.setInt(???, teleCentroInfo.getUserCount().intValue());
- // kernel
- st.setString(27, inventory.getKernel());
+ // mirrors_timestamp
+ //st.setString(???, collectedData.getMirrorsTimestamp());
return st;
}
--
GitLab