shuber 2004/10/15 18:32:15 CEST
Modified files:
war/src/java/org/jahia/tools Tools.java
war/src/java/org/jahia/webapps/timereporting DataExporter.java
TimeReportHandler.java
Log:
JAHIA-196 : Webapps 4.0.5: various bugs
Corrected :
- Export feature: same problem as the Address Book; use ";" separator instead of ","
Revision Changes Path
1.2 +5 -16 timereporting/war/src/java/org/jahia/tools/Tools.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/timereporting/war/src/java/org/jahia/tools/Tools.java.diff?r1=1.1&r2=1.2&f=h
1.2 +5 -6
timereporting/war/src/java/org/jahia/webapps/timereporting/DataExporter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/timereporting/war/src/java/org/jahia/webapps/timereporting/DataExporter.java.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2
timereporting/war/src/java/org/jahia/webapps/timereporting/TimeReportHandler.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/timereporting/war/src/java/org/jahia/webapps/timereporting/TimeReportHandler.java.diff?r1=1.1&r2=1.2&f=h
Index: Tools.java
===================================================================
RCS file:
/home/cvs/repository/timereporting/war/src/java/org/jahia/tools/Tools.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Tools.java 10 Sep 2004 18:08:14 -0000 1.1
+++ Tools.java 15 Oct 2004 16:32:14 -0000 1.2
@@ -203,23 +203,12 @@
*/
public static String toExportFormat(String input, char separator) {
StringBuffer sb = new StringBuffer(input);
- int counter = 0;
- char repSep = separator == ',' ? ';' : ',';
- for (int i = 0; i < sb.length(); i++) {
-
- char c = sb.charAt(i);
- if (c == '\r') {
- sb.deleteCharAt(i);
- sb.insert(i,' ');
- sb.deleteCharAt(i+1);
- i += 1;
- }
- if (c == separator) {
- sb.deleteCharAt(i);
- sb.insert(i, repSep);
- }
+ if (input.indexOf(",") != -1) {
+ String result = replace(input, "\"", "\"\"");
+ return "\"" + result + "\"";
+ } else {
+ return input;
}
- return sb.toString();
}
/**
Index: DataExporter.java
===================================================================
RCS file:
/home/cvs/repository/timereporting/war/src/java/org/jahia/webapps/timereporting/DataExporter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataExporter.java 10 Sep 2004 18:08:15 -0000 1.1
+++ DataExporter.java 15 Oct 2004 16:32:15 -0000 1.2
@@ -47,7 +47,7 @@
* export files
*/
public DataExporter(HttpServletRequest request, SimpleDateFormat form,
- String startDate, String endDate, char separator) {
+ String startDate, String endDate) {
try {
req = request;
this.form = form;
@@ -63,7 +63,7 @@
contextId = 0;
logger.error("DataExporter - constructor: error retrieving contextId
- using '0' as default value", n);
}
- this.separator = separator == ' ' ? ';' : separator;
+ this.separator = ',';
} catch (Exception e) {
logger.error("DataExporter - constructor", e);
}
@@ -492,8 +492,7 @@
out.append(p.getProjectId()); out.append(separator);
out.append(p.getType()); out.append(separator);
out.append(p.getCode()); out.append(separator);
- out.append(addBefore.toString());
- out.append(Tools.toExportFormat(p.getProjectName(), separator));
+ out.append(Tools.toExportFormat(addBefore.toString() +
p.getProjectName(), separator));
out.append(separator);
out.append(Tools.toExportFormat(p.getDescription(), separator));
out.append("\r\n");
@@ -544,8 +543,7 @@
out.append(p.getProjectId()); out.append(separator);
out.append(p.getType()); out.append(separator);
out.append(p.getCode()); out.append(separator);
- out.append(addBefore.toString());
- out.append(Tools.toExportFormat(p.getProjectName(),
separator));
+ out.append(Tools.toExportFormat(addBefore.toString() +
p.getProjectName(), separator));
out.append(separator);
out.append(Tools.toExportFormat(p.getDescription(),
separator));
out.append(separator);
@@ -602,5 +600,6 @@
// out.toString());
return out.toString();
}
+
}
Index: TimeReportHandler.java
===================================================================
RCS file:
/home/cvs/repository/timereporting/war/src/java/org/jahia/webapps/timereporting/TimeReportHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimeReportHandler.java 10 Sep 2004 18:08:15 -0000 1.1
+++ TimeReportHandler.java 15 Oct 2004 16:32:15 -0000 1.2
@@ -2202,7 +2202,7 @@
eDate = p.getEndDate();
}
- DataExporter DExp = new DataExporter(request, form, sDate, eDate,
';');
+ DataExporter DExp = new DataExporter(request, form, sDate, eDate);
String projsFilePath = DExp.exportProjects();
String expsFilePath = DExp.exportExpenses();
String hoursFilePath = DExp.exportHours();
@@ -2262,7 +2262,7 @@
String maxDate = lastP.getEndDate();
eDate = Tools.compareDates(form, eDate, maxDate) > 0 ? maxDate :
eDate;
- DataExporter DExp = new DataExporter(request, form, sDate, eDate,
';');
+ DataExporter DExp = new DataExporter(request, form, sDate, eDate);
session.setAttribute("startDate", sDate);
session.setAttribute("endDate", eDate);
if (projId != 0) {
