Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
In directory james.mmbase.org:/tmp/cvs-serv1594
Modified Files:
AssetElementUtil.java
Log Message:
CMSC-681,Asset Maintenance model change Normal listing
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: AssetElementUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AssetElementUtil.java 23 Oct 2008 11:44:00 -0000 1.1
+++ AssetElementUtil.java 24 Oct 2008 04:24:27 -0000 1.2
@@ -1,26 +1,35 @@
/*
-
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
-
-The license (Mozilla version 1.0) can be read at the MMBase site.
-See http://www.MMBase.org/license
-
+ *
+ * This software is OSI Certified Open Source Software. OSI Certified is a
certification mark of the Open Source
+ * Initiative.
+ *
+ * The license (Mozilla version 1.0) can be read at the MMBase site. See
http://www.MMBase.org/license
*/
package com.finalist.cmsc.repository;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import org.apache.commons.lang.StringUtils;
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Field;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeManager;
+import org.mmbase.bridge.NodeManagerList;
+import org.mmbase.bridge.NodeQuery;
+import org.mmbase.bridge.NotFoundException;
import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.storage.search.*;
+import org.mmbase.storage.search.CompositeConstraint;
+import org.mmbase.storage.search.Constraint;
+import org.mmbase.storage.search.FieldCompareConstraint;
import com.finalist.cmsc.mmbase.PropertiesUtil;
-import com.finalist.cmsc.mmbase.TypeUtil;
-import com.finalist.cmsc.security.SecurityUtil;
public final class AssetElementUtil {
@@ -102,108 +111,77 @@
* @return is asset type
*/
public static boolean isAssetType(String type) {
- NodeManager nm = CloudProviderFactory.getCloudProvider()
- .getAnonymousCloud().getNodeManager(type);
+ NodeManager nm =
CloudProviderFactory.getCloudProvider().getAnonymousCloud().getNodeManager(type);
return isAssetType(nm);
}
public static void addLifeCycleConstraint(NodeQuery query, long date) {
- NodeManager assetManager = query.getCloud().getNodeManager(
- ASSETELEMENT);
+ NodeManager assetManager = query.getCloud().getNodeManager(ASSETELEMENT);
- Constraint useExpire = getUseExpireConstraint(query,
assetManager,
- Boolean.FALSE);
- Constraint expirydate = getExpireConstraint(query, date,
- assetManager, true);
- Constraint publishdate = getPublishConstraint(query, date,
- assetManager, false);
+ Constraint useExpire = getUseExpireConstraint(query, assetManager,
Boolean.FALSE);
+ Constraint expirydate = getExpireConstraint(query, date, assetManager,
true);
+ Constraint publishdate = getPublishConstraint(query, date, assetManager,
false);
- Constraint lifecycleComposite =
query.createConstraint(expirydate,
- CompositeConstraint.LOGICAL_AND, publishdate);
+ Constraint lifecycleComposite = query.createConstraint(expirydate,
CompositeConstraint.LOGICAL_AND, publishdate);
- Constraint composite = query.createConstraint(useExpire,
- CompositeConstraint.LOGICAL_OR,
lifecycleComposite);
+ Constraint composite = query.createConstraint(useExpire,
CompositeConstraint.LOGICAL_OR, lifecycleComposite);
SearchUtil.addConstraint(query, composite);
}
public static void addLifeCycleInverseConstraint(NodeQuery query, long
date) {
- NodeManager assetManager = query.getCloud().getNodeManager(
- ASSETELEMENT);
+ NodeManager assetManager = query.getCloud().getNodeManager(ASSETELEMENT);
- Constraint useExpire = getUseExpireConstraint(query,
assetManager,
- Boolean.TRUE);
- Constraint expirydate = getExpireConstraint(query, date,
- assetManager, false);
- Constraint publishdate = getPublishConstraint(query, date,
- assetManager, true);
+ Constraint useExpire = getUseExpireConstraint(query, assetManager,
Boolean.TRUE);
+ Constraint expirydate = getExpireConstraint(query, date, assetManager,
false);
+ Constraint publishdate = getPublishConstraint(query, date, assetManager,
true);
- Constraint lifecycleComposite =
query.createConstraint(expirydate,
- CompositeConstraint.LOGICAL_OR, publishdate);
+ Constraint lifecycleComposite = query.createConstraint(expirydate,
CompositeConstraint.LOGICAL_OR, publishdate);
- Constraint composite = query.createConstraint(useExpire,
- CompositeConstraint.LOGICAL_AND,
lifecycleComposite);
+ Constraint composite = query.createConstraint(useExpire,
CompositeConstraint.LOGICAL_AND, lifecycleComposite);
SearchUtil.addConstraint(query, composite);
}
- public static Constraint getUseExpireConstraint(NodeQuery query,
- NodeManager assetManager, Boolean value) {
+ public static Constraint getUseExpireConstraint(NodeQuery query,
NodeManager assetManager, Boolean value) {
Field useExpireField = assetManager.getField(USE_EXPIRY_FIELD);
- Constraint useExpire = query.createConstraint(query
- .getStepField(useExpireField),
FieldCompareConstraint.EQUAL,
+ Constraint useExpire =
query.createConstraint(query.getStepField(useExpireField),
FieldCompareConstraint.EQUAL,
value);
return useExpire;
}
- public static Constraint getExpireConstraint(NodeQuery query, long date,
- NodeManager assetManager, boolean greater) {
- int operator = (greater ? FieldCompareConstraint.GREATER_EQUAL
- : FieldCompareConstraint.LESS_EQUAL);
+ public static Constraint getExpireConstraint(NodeQuery query, long date,
NodeManager assetManager, boolean greater) {
+ int operator = (greater ? FieldCompareConstraint.GREATER_EQUAL :
FieldCompareConstraint.LESS_EQUAL);
Field expireField = assetManager.getField(EXPIREDATE_FIELD);
- Object expireDateObj = (expireField.getType() ==
Field.TYPE_DATETIME) ? new Date(
- date)
- : Long.valueOf(date);
- Constraint expirydate = query.createConstraint(query
- .getStepField(expireField), operator,
expireDateObj);
+ Object expireDateObj = (expireField.getType() == Field.TYPE_DATETIME) ?
new Date(date) : Long.valueOf(date);
+ Constraint expirydate =
query.createConstraint(query.getStepField(expireField), operator,
expireDateObj);
return expirydate;
}
- public static Constraint getPublishConstraint(NodeQuery query, long
date,
- NodeManager assetManager, boolean greater) {
- int operator = (greater ? FieldCompareConstraint.GREATER_EQUAL
- : FieldCompareConstraint.LESS_EQUAL);
+ public static Constraint getPublishConstraint(NodeQuery query, long date,
NodeManager assetManager, boolean greater) {
+ int operator = (greater ? FieldCompareConstraint.GREATER_EQUAL :
FieldCompareConstraint.LESS_EQUAL);
Field publishField = assetManager.getField(PUBLISHDATE_FIELD);
- Object publishDateObj = (publishField.getType() ==
Field.TYPE_DATETIME) ? new Date(
- date)
- : Long.valueOf(date);
- Constraint publishdate = query.createConstraint(query
- .getStepField(publishField), operator,
publishDateObj);
+ Object publishDateObj = (publishField.getType() == Field.TYPE_DATETIME)
? new Date(date) : Long.valueOf(date);
+ Constraint publishdate =
query.createConstraint(query.getStepField(publishField), operator,
publishDateObj);
return publishdate;
}
- public static void addArchiveConstraint(Node channel, NodeQuery query,
- Long date, String archive) {
+ public static void addArchiveConstraint(Node channel, NodeQuery query, Long
date, String archive) {
if (StringUtils.isEmpty(archive) ||
"all".equalsIgnoreCase(archive)) {
return;
}
- NodeManager contentManager = channel.getCloud().getNodeManager(
- ASSETELEMENT);
+ NodeManager contentManager =
channel.getCloud().getNodeManager(ASSETELEMENT);
Field archiveDateField =
contentManager.getField(ARCHIVEDATE_FIELD);
- Object archiveDateObj = (archiveDateField.getType() ==
Field.TYPE_DATETIME) ? new Date(
- date)
- : Long.valueOf(date);
+ Object archiveDateObj = (archiveDateField.getType() ==
Field.TYPE_DATETIME) ? new Date(date) : Long.valueOf(date);
Constraint archivedate = null;
if ("old".equalsIgnoreCase(archive)) {
- archivedate = query.createConstraint(query
- .getStepField(archiveDateField),
- FieldCompareConstraint.LESS_EQUAL,
archiveDateObj);
+ archivedate =
query.createConstraint(query.getStepField(archiveDateField),
FieldCompareConstraint.LESS_EQUAL,
+ archiveDateObj);
} else {
// "new".equalsIgnoreCase(archive)
- archivedate = query.createConstraint(query
- .getStepField(archiveDateField),
+ archivedate =
query.createConstraint(query.getStepField(archiveDateField),
FieldCompareConstraint.GREATER_EQUAL,
archiveDateObj);
}
SearchUtil.addConstraint(query, archivedate);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
