Author: cmailleux
Date: Thu Jul 12 18:39:46 2007
New Revision: 17982
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17982&repname=
=3Djahia
Log:
Port [17424] Resolve issue JAHIA-1963
Modified:
trunk/core/src/java/org/jahia/admin/statistics/ManageStatistics.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaStatisticsDAO.java
trunk/core/src/java/org/jahia/services/statistics/JahiaStatisticsManage=
rDBService.java
trunk/core/src/java/org/jahia/services/statistics/JahiaStatisticsRecord=
Bean.java
Modified: trunk/core/src/java/org/jahia/admin/statistics/ManageStatistics.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/statistics/ManageStatistics.java&rev=3D17982&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/admin/statistics/ManageStatistics.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/admin/statistics/ManageStatistics.java Th=
u Jul 12 18:39:46 2007
@@ -58,7 +58,7 @@
* Company: Jahia Inc.
* </p>
* =
- * @author Nicol=C3=A1s Charczewski - Neoris Argentina
+ * @author Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina
* @version 3.1
*/
=
@@ -790,8 +790,8 @@
// detailsDescription: year / month
try {
int pos =3D detailsDescription.indexOf("/");
- Integer year =3D new
Integer(detailsDescription.substring(0,p=
os));
- Integer month =3D new
Integer(detailsDescription.substring(po=
s+1));
+ Integer year =3D new
Integer(detailsDescription.substring(0,p=
os).trim());
+ Integer month =3D new
Integer(detailsDescription.substring(po=
s+1).trim());
retMap.put("year", year);
retMap.put("month", month);
} catch (Exception e) { e.printStackTrace(); }
@@ -801,9 +801,9 @@
try {
int pos1 =3D detailsDescription.indexOf("/");
int pos2 =3D detailsDescription.indexOf("/", pos1 + 1);
- Integer year =3D new
Integer(detailsDescription.substring(0, =
pos1));
- Integer month =3D new
Integer(detailsDescription.substring(po=
s1 + 1, pos2));
- Integer day =3D new
Integer(detailsDescription.substring(pos2=
+ 1));
+ Integer year =3D new
Integer(detailsDescription.substring(0, =
pos1).trim());
+ Integer month =3D new
Integer(detailsDescription.substring(po=
s1 + 1, pos2).trim());
+ Integer day =3D new
Integer(detailsDescription.substring(pos2=
+ 1).trim());
retMap.put("year", year);
retMap.put("month", month);
retMap.put("day", day);
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaStatisticsDAO.ja=
va
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaStatisticsDAO.java&rev=3D17982&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/dao/JahiaStatisticsDAO.java (or=
iginal)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaStatisticsDAO.java Thu=
Jul 12 18:39:46 2007
@@ -33,7 +33,7 @@
/**
* <p>Title: Jahia Statistics DAO</p>
* Date: 04/04/2006
- * @author Nicol=C3=A1s Charczewski - Neoris Argentina
+ * @author Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina
* @version 1.0
*/
public class JahiaStatisticsDAO extends AbstractGeneratorDAO {
@@ -258,7 +258,7 @@
fieldList =3D "js." + selectFields[0];
fieldListOrderBy =3D "js." + selectFields[0] + orderByAppend;
for (int i =3D 1; i < selectFields.length; i++) {
- selectFieldList =3D selectFieldList + " || '/' || js." + s=
electFields[i];
+ selectFieldList =3D selectFieldList + ",js." + selectField=
s[i];
fieldList =3D fieldList + ", js." + selectFields[i];
fieldListOrderBy =3D fieldListOrderBy + ", js." + selectFi=
elds[i] + orderByAppend;
}
Modified: trunk/core/src/java/org/jahia/services/statistics/JahiaStatistics=
ManagerDBService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/statistics/JahiaStatisticsManagerDBService.java&rev=3D179=
82&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/statistics/JahiaStatisticsManage=
rDBService.java (original)
+++ trunk/core/src/java/org/jahia/services/statistics/JahiaStatisticsManage=
rDBService.java Thu Jul 12 18:39:46 2007
@@ -21,10 +21,14 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+import java.util.Collections;
+import java.text.SimpleDateFormat;
=
import org.jahia.exceptions.JahiaException;
import org.jahia.hibernate.manager.JahiaStatisticsManager;
import org.jahia.registries.JahiaListenersRegistry;
+import org.jahia.utils.comparator.NumericStringComparator;
+import org.apache.commons.lang.StringUtils;
=
=
/**
@@ -136,18 +140,19 @@
}
=
ArrayList retVal =3D new ArrayList();
-
+ =
for (int i =3D 0; i < list.size(); i++) {
Object [] reg =3D (Object [])list.get(i);
- String description =3D (String)(reg[0]);
- int value =3D ((Integer)(reg[1])).intValue();
+ StringBuffer description =3D new StringBuffer(reg[0].toString(=
));
+ if(reg.length=3D=3D3) description.append(" / ").append(StringU=
tils.leftPad(reg[1].toString(),2,"0"));
+ int value =3D ((Integer)(reg[reg.length-1])).intValue();
int percent =3D 0;
if (max >=3D 0) {
percent =3D Math.round((float)100 * (float)((float)value /=
(float)max));
}
- retVal.add(new JahiaStatisticsRecordBean(description, value, p=
ercent));
+ retVal.add(new JahiaStatisticsRecordBean(description.toString(=
), value, percent));
}
-
+ Collections.sort(retVal,new NumericStringComparator());
return retVal;
}
=
Modified: trunk/core/src/java/org/jahia/services/statistics/JahiaStatistics=
RecordBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/statistics/JahiaStatisticsRecordBean.java&rev=3D17982&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/statistics/JahiaStatisticsRecord=
Bean.java (original)
+++ trunk/core/src/java/org/jahia/services/statistics/JahiaStatisticsRecord=
Bean.java Thu Jul 12 18:39:46 2007
@@ -74,4 +74,9 @@
public void setValue(int value) {
this.value =3D value;
}
+
+
+ public String toString() {
+ return description;
+ }
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
