Skip to content

Erinevad veaparandused projektis (null ref.,db connectionid ja dropdown filter) #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ekople wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Erinevad veaparandused projektis (null ref.,db connectionid ja dropdown filter) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71319e4
null reference parandus vormil (andis sisselogimisel kohe null reffi)
ekople Dec 17, 2011
9feaaa0
db propertite kokkutõmbamine
ekople Dec 18, 2011
fd15a3c
kuupäevaga arvestamine dropdownides
ekople Dec 18, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions src/main/java/controllers/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.text.SimpleDateFormat;
import java.util.*;
import javax.sql.*;

Expand All @@ -22,13 +23,18 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;

import org.hibernate.type.DateType;

/**
* Servlet implementation class Main
*/
@WebServlet("/Main")
public class Main extends HttpServlet {
private static final long serialVersionUID = 1L;

private static String DBurl= "jdbc:hsqldb:file:${user.home}/i377/Team18/db;shutdown=true";
private static String DBid= "sa";
private static String DBpass = "";
private static String DBdriverName = "org.hsqldb.jdbcDriver";
/**
* @see HttpServlet#HttpServlet()
*/
Expand All @@ -38,8 +44,8 @@ public Main() {
}
public void init() {
try {
Class.forName("org.hsqldb.jdbcDriver");
Connection conn = DriverManager.getConnection("jdbc:hsqldb:file:${user.home}/i377/Team18/db;shutdown=true");
Class.forName(DBdriverName);
Connection conn = DriverManager.getConnection(DBurl);

Statement s = conn.createStatement();
s.execute("INSERT INTO PIIRIPUNKT (PIIRIPUNKT_ID,KOOD,NIMETUS,GPS_LONGITUIDE,GPS_LATITUDE,KORGUS_MEREPINNAST,KOMMENTAAR,ALATES,KUNI,AVAJA,AVATUD,MUUTJA,MUUDETUD,SULGEJA,SULETUD) VALUES (IDENTITY(),'P101','Ikla',42482, 41378, 331,'Test_kommentaar','2011-11-11','2011-11-13','Henrik','2011-11-11','','','','')");
Expand Down Expand Up @@ -149,13 +155,9 @@ private void lisaVahtkond(HttpServletRequest request, HttpServletResponse respon
s=null;
rs=null;


String url= "jdbc:hsqldb:file:${user.home}/i377/Team18/db;shutdown=true";
String id= "sa";
String pass = "";
try{
Class.forName("org.hsqldb.jdbcDriver");
con = java.sql.DriverManager.getConnection(url, id, pass);
Class.forName(DBdriverName);
con = java.sql.DriverManager.getConnection(DBurl, DBid, DBpass);
}
catch(ClassNotFoundException cnfex){
cnfex.printStackTrace();
Expand Down Expand Up @@ -206,19 +208,15 @@ private static ResultSet Piiripunkt() throws SQLException {
Connection con = null;
Statement s = null;
ResultSet piiripunkt = null;

String url= "jdbc:hsqldb:file:${user.home}/i377/Team18/db;shutdown=true";
String id= "sa";
String pass = "";
try{
Class.forName("org.hsqldb.jdbcDriver");
con = java.sql.DriverManager.getConnection(url, id, pass);
Class.forName(DBdriverName);
con = java.sql.DriverManager.getConnection(DBurl, DBid, DBpass);
}
catch(ClassNotFoundException cnfex){
cnfex.printStackTrace();
}

String sql = "SELECT * FROM PIIRIPUNKT";
String sql = "SELECT * FROM PIIRIPUNKT WHERE suletud < '"+ getDateNowStr() +"'";
try{
s = con.createStatement();
piiripunkt = s.executeQuery(sql);
Expand All @@ -236,18 +234,15 @@ private static ResultSet Piirivalvur() throws SQLException {
Statement s = null;
ResultSet piirivalvur = null;

String url= "jdbc:hsqldb:file:${user.home}/i377/Team18/db;shutdown=true";
String id= "sa";
String pass = "";
try{
Class.forName("org.hsqldb.jdbcDriver");
con = java.sql.DriverManager.getConnection(url, id, pass);
Class.forName(DBdriverName);
con = java.sql.DriverManager.getConnection(DBurl, DBid, DBpass);
}
catch(ClassNotFoundException cnfex){
cnfex.printStackTrace();
}

String sql = "SELECT * FROM PIIRIVALVUR";
String sql = "SELECT * FROM PIIRIVALVUR WHERE suletud < '"+ getDateNowStr() +"'";
try{
s = con.createStatement();
piirivalvur = s.executeQuery(sql);
Expand All @@ -260,5 +255,12 @@ private static ResultSet Piirivalvur() throws SQLException {

return piirivalvur;
}

private static String getDateNowStr()
{
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss");
Date myDate = new Date();
return sdf.format(myDate);
}

}
10 changes: 8 additions & 2 deletions src/main/webapp/vahtkond.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,13 @@
<div class="span5">
<select name="piiripunkt">
<%
while( rs.next() ){
if(rs != null)
{
while( rs.next() ){
%>
<option value="<%= rs.getString("PIIRIPUNKT_ID") %>"><%= rs.getString("NIMETUS") %></option>
<%
}
}
%>
</select>
Expand Down Expand Up @@ -150,10 +153,13 @@
<div class="span5">
<select name="piirivalvur">
<%
while( piirivalvur.next() ){
if(piirivalvur != null)
{
while( piirivalvur.next() ){
%>
<option value="<%= piirivalvur.getString("PIIRIVALVUR_ID") %>"><%= piirivalvur.getString("EESNIMED") %> <%=piirivalvur.getString("PEREKONNANIMI") %></option>
<%
}
}
%>
</select>
Expand Down