Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory james.mmbase.org:/tmp/cvs-serv1594/forms
Modified Files:
AssetAction.java AssetSearchAction.java AssetSearchForm.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/forms
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: AssetAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AssetAction.java 23 Oct 2008 11:44:00 -0000 1.1
+++ AssetAction.java 24 Oct 2008 04:24:27 -0000 1.2
@@ -1,11 +1,9 @@
/*
-
-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.forms;
@@ -79,10 +77,11 @@
if (StringUtils.isNotEmpty(parentchannel)) {
Node channel = cloud.getNode(parentchannel);
- NodeList assets = RepositoryUtil.getCreatedAssets(channel, null,
orderby, direction, false, offset*maxNumber, maxNumber, -1, -1, -1);
+ NodeList assets = RepositoryUtil.getCreatedAssets(channel, null,
orderby, direction, false,
+ offset * maxNumber, maxNumber, -1, -1, -1);
NodeList created = RepositoryUtil.getCreatedAssets(channel);
int assetCount = 0;
- if(!created.isEmpty()){
+ if (!created.isEmpty()) {
assetCount = created.size();
}
addToRequest(request, "direction", direction);
Index: AssetSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AssetSearchAction.java 23 Oct 2008 11:44:00 -0000 1.1
+++ AssetSearchAction.java 24 Oct 2008 04:24:27 -0000 1.2
@@ -1,6 +1,8 @@
package com.finalist.cmsc.repository.forms;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -9,9 +11,18 @@
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import org.apache.commons.lang.StringUtils;
-import org.apache.struts.action.*;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.LabelValueBean;
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Field;
+import org.mmbase.bridge.FieldIterator;
+import org.mmbase.bridge.FieldList;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeList;
+import org.mmbase.bridge.NodeManager;
+import org.mmbase.bridge.NodeQuery;
import org.mmbase.bridge.util.Queries;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.Constraint;
@@ -26,7 +37,6 @@
import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.services.workflow.Workflow;
import com.finalist.cmsc.struts.PagerAction;
-import com.finalist.cmsc.util.KeywordUtil;
public class AssetSearchAction extends PagerAction {
@@ -46,9 +56,9 @@
*/
private static final Logger log =
Logging.getLoggerInstance(AssetSearchAction.class.getName());
-
@Override
- public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response, Cloud cloud) throws
Exception {
+ public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
+ HttpServletResponse response, Cloud cloud) throws Exception {
log.debug("Starting the search:");
@@ -58,10 +68,9 @@
String deleteAssetRequest = request.getParameter("deleteAssetRequest");
if (StringUtils.isNotEmpty(deleteAssetRequest)) {
- if(deleteAssetRequest.startsWith("massDelete:")) {
+ if (deleteAssetRequest.startsWith("massDelete:")) {
massDeleteAsset(deleteAssetRequest.substring(11));
- }
- else {
+ } else {
deleteAsset(deleteAssetRequest);
}
@@ -91,7 +100,7 @@
NodeManager nodeManager =
cloud.getNodeManager(searchForm.getAssettypes());
QueryStringComposer queryStringComposer = new QueryStringComposer();
- if(StringUtils.isNotEmpty(request.getParameter(MODE))) {
+ if (StringUtils.isNotEmpty(request.getParameter(MODE))) {
queryStringComposer.addParameter(MODE,
request.getParameter(MODE));
}
NodeQuery query = cloud.createNodeQuery();
@@ -107,8 +116,7 @@
theStep = query.addRelationStep(nodeManager,
RepositoryUtil.CREATIONREL, "SOURCE").getNext();
query.setNodeStep(theStep);
queryStringComposer.addParameter(PARENTCHANNEL,
searchForm.getParentchannel());
- }
- else {
+ } else {
theStep = query.addStep(nodeManager);
query.setNodeStep(theStep);
}
@@ -135,15 +143,13 @@
// Set some date constraints.
queryStringComposer.addParameter(AssetElementUtil.CREATIONDATE_FIELD,
"" + searchForm.getCreationdate());
- SearchUtil.addDayConstraint(query, nodeManager,
AssetElementUtil.CREATIONDATE_FIELD, searchForm
- .getCreationdate());
- queryStringComposer.addParameter(AssetElementUtil.PUBLISHDATE_FIELD,
"" + searchForm.getPublishdate());
SearchUtil
- .addDayConstraint(query, nodeManager,
AssetElementUtil.PUBLISHDATE_FIELD, searchForm.getPublishdate());
+ .addDayConstraint(query, nodeManager,
AssetElementUtil.CREATIONDATE_FIELD, searchForm.getCreationdate());
+ queryStringComposer.addParameter(AssetElementUtil.PUBLISHDATE_FIELD, ""
+ searchForm.getPublishdate());
+ SearchUtil.addDayConstraint(query, nodeManager,
AssetElementUtil.PUBLISHDATE_FIELD, searchForm.getPublishdate());
queryStringComposer.addParameter(AssetElementUtil.EXPIREDATE_FIELD, ""
+ searchForm.getExpiredate());
SearchUtil.addDayConstraint(query, nodeManager,
AssetElementUtil.EXPIREDATE_FIELD, searchForm.getExpiredate());
- queryStringComposer
- .addParameter(AssetElementUtil.LASTMODIFIEDDATE_FIELD, "" +
searchForm.getLastmodifieddate());
+
queryStringComposer.addParameter(AssetElementUtil.LASTMODIFIEDDATE_FIELD, "" +
searchForm.getLastmodifieddate());
SearchUtil.addDayConstraint(query, nodeManager,
AssetElementUtil.LASTMODIFIEDDATE_FIELD, searchForm
.getLastmodifieddate());
@@ -180,12 +186,10 @@
Integer objectId = null;
if (stringObjectId.matches("^\\d+$")) {
objectId = Integer.valueOf(stringObjectId);
- }
- else {
+ } else {
if (cloud.hasNode(stringObjectId)) {
objectId =
Integer.valueOf(cloud.getNode(stringObjectId).getNumber());
- }
- else {
+ } else {
objectId = Integer.valueOf(-1);
}
}
@@ -216,8 +220,7 @@
String resultsPerPage =
PropertiesUtil.getProperty(REPOSITORY_SEARCH_RESULTS_PER_PAGE);
if (resultsPerPage == null || !resultsPerPage.matches("\\d+")) {
query.setMaxNumber(25);
- }
- else {
+ } else {
query.setMaxNumber(Integer.parseInt(resultsPerPage));
}
@@ -241,9 +244,9 @@
}
private void massDeleteAsset(String deleteAsset) {
- if(StringUtils.isNotBlank(deleteAsset)){
+ if (StringUtils.isNotBlank(deleteAsset)) {
String[] deleteAssets = deleteAsset.split(",");
- for(String asset : deleteAssets) {
+ for (String asset : deleteAssets) {
deleteAsset(asset);
}
}
Index: AssetSearchForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AssetSearchForm.java 23 Oct 2008 11:44:00 -0000 1.1
+++ AssetSearchForm.java 24 Oct 2008 04:24:27 -0000 1.2
@@ -19,135 +19,108 @@
private String search = "true";
private String parentchannelpath = "";
-
public String getAssettypes() {
return assettypes;
}
-
public void setAssettypes(String contenttypes) {
this.assettypes = contenttypes;
}
-
public String getExpiredate() {
return expiredate;
}
-
public void setExpiredate(String expiredate) {
this.expiredate = expiredate;
}
-
public String getCreationdate() {
return creationdate;
}
-
public void setCreationdate(String creationdate) {
this.creationdate = creationdate;
}
-
public String getLastmodifieddate() {
return lastmodifieddate;
}
-
public void setLastmodifieddate(String lastmodifieddate) {
this.lastmodifieddate = lastmodifieddate;
}
-
public String getPublishdate() {
return publishdate;
}
-
public void setPublishdate(String publishdate) {
this.publishdate = publishdate;
}
-
public String getParentchannel() {
return parentchannel;
}
-
public void setParentchannel(String parentchannel) {
this.parentchannel = parentchannel;
}
-
public String getTitle() {
return title;
}
-
public void setTitle(String title) {
this.title = title;
}
-
public String getObjectid() {
return objectid;
}
-
public void setObjectid(String objectid) {
this.objectid = objectid;
}
-
public String getPersonal() {
return personal;
}
-
public void setPersonal(String personal) {
this.personal = personal;
}
-
public String getUseraccount() {
return useraccount;
}
-
public void setUseraccount(String useraccount) {
this.useraccount = useraccount;
}
-
public String getMode() {
return mode;
}
-
public void setMode(String mode) {
this.mode = mode;
}
-
public String getSearch() {
return search;
}
-
public void setSearch(String search) {
this.search = search;
}
-
public String getParentchannelpath() {
return parentchannelpath;
}
-
public void setParentchannelpath(String parentchannelpath) {
this.parentchannelpath = parentchannelpath;
}
-
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
