--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/CsvUdtraek.java 2015/02/27 11:12:44 2402
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/admin/CsvUdtraek.java 2015/07/15 06:52:05 2608
@@ -1,9 +1,8 @@
-package dk.daoas.daoadresseservice;
+package dk.daoas.daoadresseservice.admin;
import java.io.IOException;
import java.io.PrintWriter;
-import java.sql.SQLException;
-import java.util.List;
+import java.net.URLEncoder;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@@ -11,11 +10,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import dk.daoas.daoadresseservice.AddressSearch;
import dk.daoas.daoadresseservice.beans.Address;
-import dk.daoas.daoadresseservice.beans.LoggedAddress;
-import dk.daoas.daoadresseservice.beans.SearchResult;
-import dk.daoas.daoadresseservice.beans.SearchResult.Status;
-import dk.daoas.daoadresseservice.db.DatabaseLayer;
/**
* Servlet implementation class CsvUdtraek
@@ -34,9 +30,9 @@
case "ikkedaekket":
str = udtraekIkkeDaekket();
break;
- case "sammenlign":
+ /*case "sammenlign":
str = udtraekSammenligning(request);
- break;
+ break;*/
default:
str = null;
break;
@@ -44,6 +40,7 @@
}
if (str != null) {
+ type = URLEncoder.encode(type, "UTF-8");
response.setContentType("text/csv");
response.setHeader("Content-Disposition", "filename=" + type + ".csv");
response.getWriter().print(str);
@@ -52,7 +49,7 @@
response.setContentType("text/html");
w.print("Type parameter is blank or invalid value
");
w.print("Type: ikkedaekket
");
- w.print("Type: sammenlign
");
+ //w.print("Type: sammenlign
"); - Deprecated
}
}
@@ -60,7 +57,7 @@
*
*/
private String udtraekIkkeDaekket() {
- AdressSearch search = (AdressSearch) getServletContext().getAttribute("search");
+ AddressSearch search = (AddressSearch) getServletContext().getAttribute("search");
if (search == null) {
return "data struktur ikke indlæst";
}
@@ -83,11 +80,12 @@
/* *******************************************
*
- */
+
+ @Deprecated
protected String udtraekSammenligning(HttpServletRequest request) throws IOException {
- AdressSearch search = (AdressSearch) getServletContext().getAttribute("search");
+ AddressSearch search = (AddressSearch) getServletContext().getAttribute("search");
if (search == null) {
return "data struktur ikke indlæst";
}
@@ -102,13 +100,16 @@
int antal_nyfejl_glfejl = 0;
int antal_nyok_glfejl = 0;
int antal_nyok_glgoogle = 0;
+ int antal_nygoogle_glgoogle = 0;
int antal_nyok_glok = 0;
try {
+ TimingHelper timer = new TimingHelper();
+
StringBuilder sb = new StringBuilder();
- sb.append("besked;postnr;adresse;gl status;ny status;ny split\n");
+ sb.append("besked;postnr;adresse;gl status;ny status;ny split;ny vej\n");
- List addrList = DatabaseLayer.getLoggedAdresses(antal_dage);
+ List addrList = DatabaseLayerImplementation.getLoggedAdresses(antal_dage);
for(LoggedAddress addr : addrList) {
SearchResult res = search.search("" + addr.postnr, addr.adresse);
@@ -136,7 +137,10 @@
appendLogLine("ny Direkte, gl Google", sb, addr, res);
antal_nyok_glgoogle++;
- }
+ } else {
+ appendLogLine("ny Google, gl Google", sb, addr, res);
+ antal_nygoogle_glgoogle++;
+ }
} else {
antal_nyok_glok++;
}
@@ -149,16 +153,33 @@
//
}
}
+
}
- sb.append("Antal adresser testet: ;").append(addrList.size()).append(";;;\n");
+
+
+
+ sb.append("Forbrugt tid: ;").append( timer.getElapsed() ).append(";;;\n");
+ sb.append("SearchData genereret: ;").append( search.getStatistics().buildTime ).append(";;;\n");
+ sb.append("Sammenligning csv genereret: ;").append( new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() ) ).append(";;;\n");
+
+
sb.append("Antal dage: ;").append( antal_dage ).append(";;;\n");
+ sb.append("Antal adresser testet: ;").append(addrList.size()).append(";;;\n");
+ double sekunder = timer.getElapsed() / 1000.0;
+ int adresserPrSekund = (int) Math.round( addrList.size() / sekunder );
+ sb.append("Antal adresser testet/s: ;").append(adresserPrSekund).append(";;;\n");
+
+
sb.append("Antal ny ok, gl ok: ;").append( antal_nyok_glok ).append(";;;\n");
sb.append("Antal ny ok, gl google: ;").append( antal_nyok_glgoogle ).append(";;;\n");
sb.append("Antal ny ok, gl fejl: ;").append( antal_nyok_glfejl ).append(";;;\n");
+ sb.append("Antal ny google, gl google: ;").append( antal_nygoogle_glgoogle ).append(";;;\n");
sb.append("Antal ny fejl, gl ok: ;").append( antal_nyfejl_glok ).append(";;;\n");
sb.append("Antal ny fejl, gl fejl: ;").append( antal_nyfejl_glfejl ).append(";;;\n");
+
+
return sb.toString();
@@ -167,6 +188,7 @@
}
}
+
private void appendLogLine(String msg, StringBuilder sb, LoggedAddress addr, SearchResult res) {
sb.append(msg).append(";")
@@ -175,8 +197,10 @@
.append(addr.status).append(";")
.append(res.status).append(";")
.append(res.splitResult).append(";")
+ .append(res.vej)
.append("\n");
}
+ */
}