Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
In directory james.mmbase.org:/tmp/cvs-serv15270
Modified Files:
Tag: b1_5
RepositoryUtil.java
Log Message:
CMSC-1189(Modify the method which is used to get the Nodemanager.)
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-1189
Index: RepositoryUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -b -r1.21.2.2 -r1.21.2.3
--- RepositoryUtil.java 18 Dec 2008 09:22:31 -0000 1.21.2.2
+++ RepositoryUtil.java 22 Dec 2008 06:41:41 -0000 1.21.2.3
@@ -602,12 +602,8 @@
}
public static int countLinkedElements(Node channel, List<String>
contenttypes, String orderby, String direction, boolean useLifecycle, String
archive, int offset, int maxNumber, int year, int month, int day,int maxDays){
NodeQuery query = createLinkedContentQuery(channel, contenttypes,
orderby, direction, useLifecycle, archive, offset, maxNumber, year, month, day);
- String destinationManager = CONTENTELEMENT;
- if (contenttypes != null && contenttypes.size() == 1) {
- destinationManager = contenttypes.get(0);
- }
if(maxDays > 0){
- SearchUtil.addDayConstraint(query,
channel.getCloud().getNodeManager(destinationManager),
ContentElementUtil.CREATIONDATE_FIELD, "-" + maxDays);
+ SearchUtil.addDayConstraint(query, query.getNodeManager(),
ContentElementUtil.CREATIONDATE_FIELD, "-" + maxDays);
}
return Queries.count(query);
}
@@ -629,12 +625,8 @@
}
public static NodeList getLinkedElements(Node channel, List<String>
contenttypes, String orderby, String direction, boolean useLifecycle, String
archive, int offset, int maxNumber, int year, int month, int day, int maxDays) {
NodeQuery query = createLinkedContentQuery(channel, contenttypes,
orderby, direction, useLifecycle, archive, offset, maxNumber, year, month, day);
- String destinationManager = CONTENTELEMENT;
- if (contenttypes != null && contenttypes.size() == 1) {
- destinationManager = contenttypes.get(0);
- }
if(maxDays > 0){
- SearchUtil.addDayConstraint(query,
channel.getCloud().getNodeManager(destinationManager),
ContentElementUtil.CREATIONDATE_FIELD, "-" + maxDays);
+ SearchUtil.addDayConstraint(query, query.getNodeManager(),
ContentElementUtil.CREATIONDATE_FIELD, "-" + maxDays);
}
return query.getNodeManager().getList(query);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
