[DS-1291] Statistics no longer working.

This commit is contained in:
KevinVdV
2012-11-08 14:48:17 +01:00
parent 459d0d1068
commit 77393e42e2

View File

@@ -146,7 +146,7 @@ public class SolrLogger
LookupService service = null; LookupService service = null;
// Get the db file for the location // Get the db file for the location
String dbfile = ConfigurationManager.getProperty("solr-statistics", "dbfile"); String dbfile = ConfigurationManager.getProperty("usage-statistics", "dbfile");
if (dbfile != null) if (dbfile != null)
{ {
try try
@@ -298,30 +298,33 @@ public class SolrLogger
// Save the location information if valid, save the event without // Save the location information if valid, save the event without
// location information if not valid // location information if not valid
Location location = locationService.getLocation(ip); if(locationService != null)
if (location != null
&& !("--".equals(location.countryCode)
&& location.latitude == -180 && location.longitude == -180))
{ {
try Location location = locationService.getLocation(ip);
if (location != null
&& !("--".equals(location.countryCode)
&& location.latitude == -180 && location.longitude == -180))
{ {
doc1.addField("continent", LocationUtils try
.getContinentCode(location.countryCode)); {
} doc1.addField("continent", LocationUtils
catch (Exception e) .getContinentCode(location.countryCode));
{ }
System.out catch (Exception e)
.println("COUNTRY ERROR: " + location.countryCode); {
} System.out
doc1.addField("countryCode", location.countryCode); .println("COUNTRY ERROR: " + location.countryCode);
doc1.addField("city", location.city); }
doc1.addField("latitude", location.latitude); doc1.addField("countryCode", location.countryCode);
doc1.addField("longitude", location.longitude); doc1.addField("city", location.city);
doc1.addField("isBot",isSpiderBot); doc1.addField("latitude", location.latitude);
doc1.addField("longitude", location.longitude);
doc1.addField("isBot",isSpiderBot);
if(request.getHeader("User-Agent") != null) if(request.getHeader("User-Agent") != null)
{ {
doc1.addField("userAgent", request.getHeader("User-Agent")); doc1.addField("userAgent", request.getHeader("User-Agent"));
}
} }
} }
} }