hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 07:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Stuart Lewis)

Browse Source 
SF patch #1571522  for SF  bug #1571519 - UTF-8 in statistics


git-svn-id: http://scm.dspace.org/svn/repo/trunk@1637 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Claudia Juergen
2006-10-13 13:04:07 +00:00
parent a4fb82c239
commit 00b9945e74
3 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dspace/CHANGES
View File

@@ -39,6 +39,7 @@
- SF patch #1563523 for SF bug #1548865 Browse errors on withdrawn item - SF patch #1563523 for SF bug #1548865 Browse errors on withdrawn item
- SF patch #1556207 for SF bug #1554056 Community/collection handle URL with / redirects to homepage - SF patch #1556207 for SF bug #1554056 Community/collection handle URL with / redirects to homepage
- SF patch #1571494 for SF bug #1571490 - UTF-8 encoded characters in licence - SF patch #1571494 for SF bug #1571490 - UTF-8 encoded characters in licence
- SF patch #1571522 for SF bug #1571519 - UTF-8 in statistics
(Mark Diggory) (Mark Diggory)
- SF patch #1523824 robots.txt to limit bots navigating author and date pages - SF patch #1523824 robots.txt to limit bots navigating author and date pages

28
dspace/src/org/dspace/app/statistics/ReportGenerator.java
View File

@@ -40,15 +40,16 @@
package org.dspace.app.statistics; package org.dspace.app.statistics;
import org.dspace.app.statistics.Stat; import java.io.BufferedReader;
import org.dspace.app.statistics.ReportTools; import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
@@ -58,18 +59,9 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.SortedMap;
import java.util.StringTokenizer;
import java.util.TreeMap;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import org.dspace.content.DCValue; import org.dspace.content.DCValue;
import org.dspace.content.Item; import org.dspace.content.Item;
@@ -459,7 +451,9 @@ public class ReportGenerator
// finally write the string into the output file // finally write the string into the output file
try try
{ {
BufferedWriter out = new BufferedWriter(new FileWriter(output)); FileOutputStream fos = new FileOutputStream(output);
OutputStreamWriter osr = new OutputStreamWriter(fos, "UTF-8");
PrintWriter out = new PrintWriter(osr);
out.write(report.render()); out.write(report.render());
out.close(); out.close();
} }

22
dspace/src/org/dspace/app/webui/servlet/StatisticsServlet.java
View File

@@ -42,13 +42,12 @@ package org.dspace.app.webui.servlet;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileReader; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.text.DateFormat; import java.sql.SQLException;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
@@ -56,20 +55,15 @@ import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.sql.SQLException;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.dspace.app.webui.util.JSPManager; import org.dspace.app.webui.util.JSPManager;
import org.dspace.app.webui.util.UIUtil;
import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.core.ConfigurationManager; import org.dspace.core.ConfigurationManager;
import org.dspace.core.LogManager; import org.dspace.core.Context;
import org.dspace.eperson.Group; import org.dspace.eperson.Group;
/** /**
@@ -134,7 +128,8 @@ public class StatisticsServlet extends org.dspace.app.webui.servlet.DSpaceServle
File[] reports = reportDir.listFiles(); File[] reports = reportDir.listFiles();
File reportFile = null; File reportFile = null;
FileReader fr = null; FileInputStream fir = null;
InputStreamReader ir = null;
BufferedReader br = null; BufferedReader br = null;
List monthsList = new ArrayList(); List monthsList = new ArrayList();
@@ -235,8 +230,9 @@ public class StatisticsServlet extends org.dspace.app.webui.servlet.DSpaceServle
try try
{ {
fr = new FileReader(reportFile.getPath()); fir = new FileInputStream(reportFile.getPath());
br = new BufferedReader(fr); ir = new InputStreamReader(fir, "UTF-8");
br = new BufferedReader(ir);
} }
catch (IOException e) catch (IOException e)
{ {