[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository RepositoryUtil.java

[fpunt]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
In directory 
james.mmbase.org:/tmp/cvs-serv14836/cmsc/contentrepository/src/java/com/finalist/cmsc/repository

Modified Files:
      Tag: b1_4
        RepositoryUtil.java 
Log Message:
Solved issue CMSC-849, now we can have secured content


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-849


Index: RepositoryUtil.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -b -r1.15.2.1 -r1.15.2.2
--- RepositoryUtil.java 3 Mar 2008 10:22:17 -0000       1.15.2.1
+++ RepositoryUtil.java 4 Apr 2008 14:17:36 -0000       1.15.2.2
@@ -29,6 +29,7 @@
 import org.mmbase.bridge.util.SearchUtil;
 import org.mmbase.storage.search.FieldValueDateConstraint;
 import org.mmbase.storage.search.StepField;
+import org.mmbase.storage.search.implementation.BasicFieldValueConstraint;
 import org.mmbase.storage.search.implementation.BasicFieldValueDateConstraint;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
@@ -614,7 +615,17 @@
     }
 
 
+    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, 
HashMap<String, Object> extraParameters) {
+        NodeQuery query = createLinkedContentQuery(channel, contenttypes, 
orderby, direction, useLifecycle, archive, offset, maxNumber, year, month, day, 
extraParameters);
+        return query.getNodeManager().getList(query);
+    }
+    
+
     public static NodeQuery createLinkedContentQuery(Node channel, 
List<String> contenttypes, String orderby, String direction, boolean 
useLifecycle, String archive, int offset, int maxNumber, int year, int month, 
int day) {
+       return createLinkedContentQuery(channel, contenttypes, orderby, 
direction, useLifecycle, archive, offset, maxNumber, year, month, day, null);
+    }
+    
+    public static NodeQuery createLinkedContentQuery(Node channel, 
List<String> contenttypes, String orderby, String direction, boolean 
useLifecycle, String archive, int offset, int maxNumber, int year, int month, 
int day, HashMap<String, Object> extraParameters) {
         String destinationManager = CONTENTELEMENT;
 
         if (contenttypes != null && contenttypes.size() == 1) {
@@ -673,6 +684,15 @@
            }
         }
 
+        if(extraParameters != null) {
+               for(String key:extraParameters.keySet()) {
+                       Object value = extraParameters.get(key);
+                       Field field = 
query.getCloud().getNodeManager("contentelement").getField(key);
+                StepField basicStepField = query.getStepField(field);
+                       SearchUtil.addConstraint(query, new 
BasicFieldValueConstraint(basicStepField, value));
+               }
+        }
+
         SearchUtil.addLimitConstraint(query, offset, maxNumber);
         return query;
     }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs