[MMBASE CVS] contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule IndexUpdateTask.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule
In directory 
james.mmbase.org:/tmp/cvs-serv13393/luceus/src/java/com/finalist/cmsc/module/luceusmodule

Modified Files:
      Tag: b1_5
        IndexUpdateTask.java 
Log Message:
CMSC-1207 CollectionChannels are not always processed in the SearchService


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule
See also: http://www.mmbase.org/jira/browse/CMSC-1207


Index: IndexUpdateTask.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule/IndexUpdateTask.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -b -r1.10.2.1 -r1.10.2.2
--- IndexUpdateTask.java        9 Dec 2008 11:00:48 -0000       1.10.2.1
+++ IndexUpdateTask.java        29 Dec 2008 13:48:23 -0000      1.10.2.2
@@ -24,11 +24,13 @@
 import org.mmbase.bridge.NodeManager;
 import org.mmbase.bridge.NotFoundException;
 
+import com.finalist.cmsc.mmbase.ResourcesUtil;
 import com.finalist.cmsc.module.luceusmodule.luceus.Indexer;
 import com.finalist.cmsc.module.luceusmodule.luceus.LuceusUtil;
 import com.finalist.cmsc.navigation.NavigationUtil;
 import com.finalist.cmsc.navigation.PagesUtil;
 import com.finalist.cmsc.repository.ContentElementUtil;
+import com.finalist.cmsc.repository.RepositoryUtil;
 import com.finalist.cmsc.services.search.PageInfo;
 import com.finalist.cmsc.services.search.Search;
 import com.luceus.core.om.Envelope;
@@ -207,12 +209,6 @@
    }
 
 
-   private void executeUpdateContentChannelIndex(int nodeNumber) {
-      log.debug(id + " Update contentchannel index: " + nodeNumber);
-      executeUpdateRelatedContent(nodeNumber, "contentelement");
-   }
-
-
    private void executeUpdateSecondaryContentIndex(int nodeNumber) {
       log.debug(id + " Update secondary content: " + nodeNumber);
       Node node = fetchNode(nodeNumber);
@@ -233,11 +229,12 @@
    }
 
 
-   private void executeUpdateRelatedContent(int nodeNumber, String type) {
-      log.debug(id + " Update related content: " + nodeNumber);
+   private void executeUpdateContentChannelIndex(int nodeNumber) {
+      log.debug(id + " Update contentchannel index: " + nodeNumber);
       Node node = fetchNode(nodeNumber);
       if (node != null) {
-         NodeList relatedNodes = node.getRelatedNodes(type);
+         
+         NodeList relatedNodes = RepositoryUtil.getLinkedElements(node);
          for (NodeIterator i = relatedNodes.nodeIterator(); i.hasNext();) {
             Node relatedNode = i.nextNode();
             if (relatedNode.getNumber() != nodeNumber) {
@@ -330,7 +327,7 @@
       }
 
       if (module.isDoAttachments()) {
-         Set<Node> attachments = 
Search.findLinkedSecondaryContent(contentElement, "attachments");
+         Set<Node> attachments = 
Search.findLinkedSecondaryContent(contentElement, ResourcesUtil.ATTACHMENTS);
          for (Node attachment : attachments) {
             if (module.isDoSecondaryWithPrimary()) {
                LuceusUtil.nodeFields(attachment, doc);
@@ -342,7 +339,7 @@
       }
 
       if (module.isDoUrls()) {
-         Set<Node> urls = Search.findLinkedSecondaryContent(contentElement, 
"urls");
+         Set<Node> urls = Search.findLinkedSecondaryContent(contentElement, 
ResourcesUtil.URLS);
          for (Node url : urls) {
             if (module.isDoSecondaryWithPrimary()) {
                LuceusUtil.nodeFields(url, doc);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs