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

[jkoster]

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

Modified Files:
      Tag: b1_5
        QueuedUpdate.java LuceusModule.java 
Log Message:
CMSC-1137 - Add nodemanager to the FullIndexTag of the CMSc Luceus module


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


Index: QueuedUpdate.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule/QueuedUpdate.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -b -r1.2 -r1.2.4.1
--- QueuedUpdate.java   26 Nov 2007 11:42:13 -0000      1.2
+++ QueuedUpdate.java   4 Nov 2008 10:04:02 -0000       1.2.4.1
@@ -45,11 +45,17 @@
 
    private int relatedNumber = 0;
 
+   private String nodemanager = null;
+
 
    public QueuedUpdate(int method) {
       this.method = method;
    }
 
+   public QueuedUpdate(int method, String nodemanager) {
+      this.method = method;
+      this.nodemanager = nodemanager;
+   }
 
    public QueuedUpdate(int method, int nodeNumber) {
       this.method = method;
@@ -97,4 +103,12 @@
       return code;
    }
 
+   public void setNodemanager(String nodemanager) {
+      this.nodemanager = nodemanager;
+   }
+
+   public String getNodemanager() {
+      return nodemanager;
+   }
+
 }


Index: LuceusModule.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/luceus/src/java/com/finalist/cmsc/module/luceusmodule/LuceusModule.java,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -b -r1.6 -r1.6.4.1
--- LuceusModule.java   26 Nov 2007 11:42:13 -0000      1.6
+++ LuceusModule.java   4 Nov 2008 10:04:02 -0000       1.6.4.1
@@ -25,6 +25,7 @@
 import org.mmbase.bridge.Node;
 import org.mmbase.bridge.NodeManager;
 import org.mmbase.bridge.NodeQuery;
+import org.mmbase.bridge.NotFoundException;
 import org.mmbase.bridge.util.HugeNodeListIterator;
 import org.mmbase.module.Module;
 
@@ -342,9 +343,11 @@
 
       private boolean erase = false;
 
+      private String nodemanager = null;
 
-      public FullIndexTimerTask(boolean erase) {
+      public FullIndexTimerTask(boolean erase, String nodemanager) {
          this.erase = erase;
+         this.nodemanager = nodemanager;
       }
 
 
@@ -352,12 +355,25 @@
          log.info("===>fullIndex starting<==");
          Cloud cloud = getAnonymousCloud();
 
+         NodeManager nm = 
cloud.getNodeManager(ContentElementUtil.CONTENTELEMENT);
+         
+         //Optionally use a specific Nodemanager to (re)index
+         if (nodemanager != null) {
+            log.info("===>only doing a fullIndex on nodemanager " + 
nodemanager + "<==");
+            try {
+               nm = cloud.getNodeManager(nodemanager);
+            } catch (NotFoundException e) {
+               log.error("===>Help, nodemanager '" + nodemanager + "' could 
not be found!<===");
+               log.info("===>fullIndex aborted<==");
+               return;
+            }
+         }
+         
          if (erase) {
             log.info("===>erasing index<==");
             eraseIndex();
          }
 
-         NodeManager nm = 
cloud.getNodeManager(ContentElementUtil.CONTENTELEMENT);
          NodeQuery q = nm.createQuery();
 
          // use this iterator because we can have many data to process
@@ -385,8 +401,8 @@
    }
 
 
-   public void startFullIndex(boolean erase) {
-      Thread runOnce = new Thread(new FullIndexTimerTask(erase));
+   public void startFullIndex(boolean erase, String nodemanager) {
+      Thread runOnce = new Thread(new FullIndexTimerTask(erase, nodemanager));
       runOnce.setDaemon(true);
       runOnce.start();
    }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs