[MMBASE SCM] r35623 - CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary

[fpunt]

Author: fpunt
Date: 2009-06-03 16:34:09 +0200 (Wed, 03 Jun 2009)
New Revision: 35623

Modified:
   
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/Glossary.java
   
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/GlossaryEventListener.java
   
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/GlossaryFactory.java
Log:
CMSC-1304 Now also working good on live and ignoring text inside img tags

Modified: 
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/Glossary.java
===================================================================
--- 
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/Glossary.java
   2009-06-03 14:31:05 UTC (rev 35622)
+++ 
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/Glossary.java
   2009-06-03 14:34:09 UTC (rev 35623)
@@ -6,6 +6,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.mmbase.module.core.MMBase;
+
 public class Glossary {
    public static final String LINKPATTERN = "<dfn class=\"glossaryWord\" 
title=\"%2$s - %s\" id=\"_glossary_%2$s\">%2$s</dfn>";
    public static final String GLOSSARY = "glossary";
@@ -40,7 +42,7 @@
                break;
             }
          }
-      }
+      } 
       return material;
 
    }
@@ -75,6 +77,12 @@
          }
       }
 
+      int openImg = materialBefore.lastIndexOf("<img");
+      int closeImg = materialBefore.lastIndexOf(">");
+      if(openImg > closeImg) {
+         return true;
+      }
+
       return false;
    }
    
@@ -82,6 +90,7 @@
    public static synchronized Glossary instance() {
       if (null == glossary) {
          glossary = new Glossary();
+         MMBase.getMMBase().addNodeRelatedEventsListener("glossary", new 
GlossaryEventListener(glossary));
       }
       return glossary;
    }

Modified: 
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/GlossaryEventListener.java
===================================================================
--- 
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/GlossaryEventListener.java
      2009-06-03 14:31:05 UTC (rev 35622)
+++ 
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/GlossaryEventListener.java
      2009-06-03 14:34:09 UTC (rev 35623)
@@ -2,12 +2,14 @@
 
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
 
-import org.mmbase.bridge.Node; 
+import org.mmbase.bridge.Node;
 import org.mmbase.core.event.Event;
 import org.mmbase.core.event.NodeEvent;
 import org.mmbase.core.event.NodeEventListener;
 import org.mmbase.remotepublishing.util.PublishUtil;
 
+import com.finalist.cmsc.util.ServerUtil;
+
 public class GlossaryEventListener implements NodeEventListener {
 
    private Glossary glossary;
@@ -29,7 +31,9 @@
          String newTerm = (String)event.getNewValue("term");
          if(newTerm != null) {
             glossary.addTerm(newTerm, (String)event.getNewValue("definition"));
-            PublishUtil.publishOrUpdateNode(event.getNodeNumber());
+            if(ServerUtil.isStaging()) {
+               PublishUtil.publishOrUpdateNode(event.getNodeNumber());
+            }
          }
          break;
       case Event.TYPE_CHANGE:
@@ -58,7 +62,9 @@
          }
          
          if(changed) {
-            PublishUtil.publishOrUpdateNode(event.getNodeNumber());
+            if(ServerUtil.isStaging()) {
+               PublishUtil.publishOrUpdateNode(event.getNodeNumber());
+            }
          }
          break;
       

Modified: 
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/GlossaryFactory.java
===================================================================
--- 
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/GlossaryFactory.java
    2009-06-03 14:31:05 UTC (rev 35622)
+++ 
CMSContainer/branches/b1_5/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/GlossaryFactory.java
    2009-06-03 14:34:09 UTC (rev 35623)
@@ -1,19 +1,14 @@
 package com.finalist.cmsc.module.glossary;
 
+import java.util.Iterator;
+
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
 import org.mmbase.bridge.Cloud;
 import org.mmbase.bridge.Node;
 import org.mmbase.bridge.NodeList;
 import org.mmbase.bridge.NodeManager;
-import org.mmbase.module.core.MMBase;
 
-import com.finalist.cmsc.util.ServerUtil;
-
-import java.util.Iterator;
-
-// Referenced classes of package com.finalist.cmsc.module.glossary:
-//            Glossary
-
 public class GlossaryFactory {
 
 
@@ -21,10 +16,6 @@
    public static Glossary getGlossary() {
       Glossary glossary = Glossary.instance();
 
-      if(ServerUtil.isStaging()) {
-         MMBase.getMMBase().addNodeRelatedEventsListener("glossary", new 
GlossaryEventListener(glossary));
-      }
-
       if (glossary.getTerms().size() > 0)
          return glossary;
 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs