Author: cmailleux
Date: Thu Jun 21 18:20:22 2007
New Revision: 17697
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17697&repname=
=3Djahia
Log:
Correctly activate metadata and avoid too many changes in db
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ect.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaS=
mallTextSharedLangField.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aFieldsDataDAO.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entObject.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentObject.java&rev=3D17697&repn=
ame=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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ect.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ect.java Thu Jun 21 18:20:22 2007
@@ -1393,7 +1393,7 @@
}
}
} catch (Throwable t) {
- logger.debug("Exception activating content object's metadatas =
", t);
+ logger.error("Exception activating content object's metadatas =
", t);
}
return result;
}
@@ -1678,7 +1678,7 @@
if ( withOldEntryStates ){
oldEntryStates =3D jahiaFieldsDataManager.findOldEntryStateFor=
Metadatas(objectKey);
}
- id =3D (Integer)((Object[])ids.get(0))[0];
+ id =3D (Integer)ids.get(0);
if ( ContentFieldTools.getInstance().getFieldFromCacheOnly(id.intV=
alue()) =3D=3D null ){
try {
if (stagedOnly) {
@@ -1692,7 +1692,7 @@
}
=
for ( int i=3D0 ; i<ids.size(); i++ ){
- id =3D (Integer)((Object[])ids.get(i))[0];
+ id =3D (Integer)ids.get(i);
try {
contentField =3D ContentField.getField(id.intValue());
if ( contentField !=3D null ){
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
JahiaSmallTextSharedLangField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/JahiaSmallTextSharedLangField.j=
ava&rev=3D17697&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaS=
mallTextSharedLangField.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaS=
mallTextSharedLangField.java Thu Jun 21 18:20:22 2007
@@ -116,16 +116,12 @@
=
final ContentSmallTextSharedLangField contentField =3D (ContentSma=
llTextSharedLangField) ContentField.getField(getID());
=
- final String value =3D getValue();
+ final String value =3D getValue().trim().equals("")?null:getValue(=
);
final String savedValue =3D contentField.getValue(jParams,EntryLoa=
dRequest.CURRENT);
=
final boolean b =3D ((value =3D=3D null && savedValue =3D=3D null)=
|| (value !=3D null && getValue().equals(savedValue)));
if (b) {
- if ( !contentField.isMetadata() ||
- (!this.getDefinition().getName().equals(CoreMetadataCo=
nstant.LAST_CONTRIBUTOR)
- && !this.getDefinition().getName().equals(CoreMetadata=
Constant.LAST_MODIFICATION_DATE)) ){
return true;
- }
} else {
jParams.getSessionState().setAttribute("FireContainerUpdated",=
"true");
logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidat=
eEsiInvalidateEsiInvalidateEsi");
@@ -135,7 +131,7 @@
logger.debug("contentField.getValue(jParams): " + savedValue);
}
final EntrySaveRequest saveRequest =3D new EntrySaveRequest(jParam=
s.getUser(), getLanguageCode());
- contentField.setText(value, saveRequest);
+ contentField.setText(value=3D=3Dnull?"":value, saveRequest);
return true;
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/da=
o/JahiaFieldsDataDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java&rev=
=3D17697&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aFieldsDataDAO.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aFieldsDataDAO.java Thu Jun 21 18:20:22 2007
@@ -273,7 +273,7 @@
}
=
public List findMetadatasByOwner(JahiaObjectPK ownerKey) {
- String hql =3D "select distinct f.comp_id.id, f.fieldDefinition.id=
from JahiaFieldsData f where f.isMetadata=3D1 AND f.metadataOwner.comp_id.=
id=3D? AND f.metadataOwner.comp_id.type=3D? order by f.fieldDefinition.id";
+ String hql =3D "select distinct f.comp_id.id from JahiaFieldsData =
f where f.isMetadata=3D1 AND f.metadataOwner.comp_id.id=3D? AND f.metadataO=
wner.comp_id.type=3D?";
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
