cmailleux 2005/08/03 14:10:28 CEST
Modified files:
core/src/java/org/jahia/hibernate/dao JahiaContainerDAO.java
JahiaContainerDefinitionDAO.java
JahiaFieldsDataDAO.java
core/src/java/org/jahia/hibernate/manager
JahiaAuditLogManager.java
core/src/java/org/jahia/hibernate/model
JahiaCtnDefProperty.java
Log:
Correct bugs for logs
Revision Changes Path
1.6 +6 -1
jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java.diff?r1=1.5&r2=1.6&f=h
1.5 +26 -3
jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDefinitionDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDefinitionDAO.java.diff?r1=1.4&r2=1.5&f=h
1.8 +1 -1
jahia/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java.diff?r1=1.7&r2=1.8&f=h
1.4 +2 -2
jahia/core/src/java/org/jahia/hibernate/manager/JahiaAuditLogManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaAuditLogManager.java.diff?r1=1.3&r2=1.4&f=h
1.4 +1 -2
jahia/core/src/java/org/jahia/hibernate/model/JahiaCtnDefProperty.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaCtnDefProperty.java.diff?r1=1.3&r2=1.4&f=h
Index: JahiaContainerDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaContainerDAO.java 29 Jul 2005 17:52:17 -0000 1.5
+++ JahiaContainerDAO.java 3 Aug 2005 12:10:27 -0000 1.6
@@ -379,7 +379,12 @@
if (listId != null) {
final HibernateTemplate template = getHibernateTemplate();
template.setCacheQueries(true);
- retVal = template.find(hql.toString(), new Object[]{listId});
+ List list = template.find(hql.toString(), new Object[]{listId});
+ retVal = new FastArrayList(list.size());
+ for (int i = 0; i < list.size(); i++) {
+ Object[] objects = (Object[]) list.get(i);
+ retVal.add(objects[0]);
+ }
}
return retVal;
}
Index: JahiaContainerDefinitionDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDefinitionDAO.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JahiaContainerDefinitionDAO.java 13 Jul 2005 15:39:40 -0000 1.4
+++ JahiaContainerDefinitionDAO.java 3 Aug 2005 12:10:27 -0000 1.5
@@ -6,6 +6,9 @@
import org.jahia.hibernate.model.*;
import org.springframework.orm.hibernate3.HibernateTemplate;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+import org.hibernate.Session;
+import org.hibernate.CacheMode;
+import org.hibernate.Query;
import java.util.Iterator;
import java.util.List;
@@ -142,11 +145,11 @@
template.deleteAll(template.find("from
JahiaCtnStruct struct where
struct.comp_id.ctnsubdefid=?",property.getIdJahiaCtnDefProperties()));
template.flush();
template.clear();
- if(template.contains(property)) {
+// if(template.contains(property)) {
template.delete(property);
template.flush();
template.clear();
- }
+// }
} catch (Throwable e) {
logger.warn("Trying to delete non existing
entry",e);
try{
@@ -168,7 +171,7 @@
final HibernateTemplate template = getHibernateTemplate();
template.setCacheQueries(true);
StringBuffer hql = new StringBuffer("from JahiaCtnDef def ");
- hql.append("where def.subDefinitions.pageDefinitionId=? ");
+ hql.append("where def.subDefinitions.pageDefinitionId=? order by
def.id");
List retList = null;
if (templateId != null) {
retList = template.find(hql.toString(), new
Object[]{templateId});
@@ -179,5 +182,25 @@
}
return retList;
}
+
+ public List
fullyLoadContainerDefinitionInTemplateForTestingPurpose(Integer templateId) {
+ final Session template = getSession(true);
+ template.setCacheMode(CacheMode.GET);
+ StringBuffer hql = new StringBuffer("from JahiaCtnDef def ");
+ hql.append("where def.subDefinitions.pageDefinitionId=:id order by
def.id");
+ List retList = null;
+ if (templateId != null) {
+ Query query = template.createQuery(hql.toString());
+ query.setInteger("id",templateId.intValue());
+ retList = query.list();
+ for (int i = 0; i < retList.size(); i++) {
+ JahiaCtnDef jahiaCtnDef = (JahiaCtnDef) retList.get(i);
+ jahiaCtnDef.getSubDefinitions().isEmpty();
+ jahiaCtnDef.getProperties().isEmpty();
+ }
+ }
+ template.close();
+ return retList;
+ }
}
Index: JahiaFieldsDataDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JahiaFieldsDataDAO.java 1 Aug 2005 09:46:11 -0000 1.7
+++ JahiaFieldsDataDAO.java 3 Aug 2005 12:10:27 -0000 1.8
@@ -239,7 +239,7 @@
public List findNonDeletedFieldsIdInContainer(Integer containerID) {
List retVal = null;
StringBuffer hql = new StringBuffer("select distinct
f.comp_id.id,f.comp_id.workflowState from JahiaFieldsData f ");
- hql.append("where f.containerId=? and f.comp_id.workflowState>=1 and
c.comp_id.versionId <> -1");
+ hql.append("where f.containerId=? and f.comp_id.workflowState>=1 and
f.comp_id.versionId <> -1");
hql.append("order by f.comp_id.workflowState desc");
if (containerID != null) {
final HibernateTemplate template = getHibernateTemplate();
Index: JahiaAuditLogManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaAuditLogManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaAuditLogManager.java 5 Jul 2005 15:46:18 -0000 1.3
+++ JahiaAuditLogManager.java 3 Aug 2005 12:10:28 -0000 1.4
@@ -125,10 +125,10 @@
private void fillListWithArrayOfIntegers(List list, Integer integer,
List retList) {
for (int i = 0; i < list.size(); i++) {
- Object[] objects = (Object[]) list.get(i);
+ Integer objects = (Integer) list.get(i);
Integer[] child = new Integer[2];
child[0] = integer;
- child[1] = (Integer) objects[0];
+ child[1] = objects;
if (!retList.contains(child)) {
retList.add(child);
}
Index: JahiaCtnDefProperty.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaCtnDefProperty.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaCtnDefProperty.java 11 Jul 2005 15:01:22 -0000 1.3
+++ JahiaCtnDefProperty.java 3 Aug 2005 12:10:28 -0000 1.4
@@ -2,7 +2,6 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
import java.io.Serializable;
import java.util.Set;
@@ -99,7 +98,7 @@
}
/**
- * @hibernate.set lazy="true"
+ * @hibernate.set lazy="false"
* inverse="false"
* cascade="none" insert="false" update="false"
* @hibernate.collection-key column="ctnsubdefid_jahia_ctn_struct"
