Permalink
Browse files

[DS-1291] Statistics no longer working.

  • Loading branch information...
1 parent 459d0d1 commit 77393e42e291273d400aa240666d5f808896120a @KevinVdV KevinVdV committed Nov 8, 2012
Showing with 25 additions and 22 deletions.
  1. +25 −22 dspace-api/src/main/java/org/dspace/statistics/SolrLogger.java
View
47 dspace-api/src/main/java/org/dspace/statistics/SolrLogger.java
@@ -146,7 +146,7 @@ public boolean accept(File file) {
LookupService service = null;
// Get the db file for the location
- String dbfile = ConfigurationManager.getProperty("solr-statistics", "dbfile");
+ String dbfile = ConfigurationManager.getProperty("usage-statistics", "dbfile");
if (dbfile != null)
{
try
@@ -298,30 +298,33 @@ private static SolrInputDocument getCommonSolrDoc(DSpaceObject dspaceObject, Htt
// Save the location information if valid, save the event without
// location information if not valid
- Location location = locationService.getLocation(ip);
- if (location != null
- && !("--".equals(location.countryCode)
- && location.latitude == -180 && location.longitude == -180))
+ if(locationService != null)
{
- try
- {
- doc1.addField("continent", LocationUtils
- .getContinentCode(location.countryCode));
- }
- catch (Exception e)
+ Location location = locationService.getLocation(ip);
+ if (location != null
+ && !("--".equals(location.countryCode)
+ && location.latitude == -180 && location.longitude == -180))
{
- System.out
- .println("COUNTRY ERROR: " + location.countryCode);
- }
- doc1.addField("countryCode", location.countryCode);
- doc1.addField("city", location.city);
- doc1.addField("latitude", location.latitude);
- doc1.addField("longitude", location.longitude);
- doc1.addField("isBot",isSpiderBot);
+ try
+ {
+ doc1.addField("continent", LocationUtils
+ .getContinentCode(location.countryCode));
+ }
+ catch (Exception e)
+ {
+ System.out
+ .println("COUNTRY ERROR: " + location.countryCode);
+ }
+ doc1.addField("countryCode", location.countryCode);
+ doc1.addField("city", location.city);
+ doc1.addField("latitude", location.latitude);
+ doc1.addField("longitude", location.longitude);
+ doc1.addField("isBot",isSpiderBot);
- if(request.getHeader("User-Agent") != null)
- {
- doc1.addField("userAgent", request.getHeader("User-Agent"));
+ if(request.getHeader("User-Agent") != null)
+ {
+ doc1.addField("userAgent", request.getHeader("User-Agent"));
+ }
}
}
}

0 comments on commit 77393e4

Please sign in to comment.