[MMBASE CVS] contributions/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary Glossary.java GlossaryFactory.java

[fpunt]

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

Modified Files:
      Tag: b1_5
        Glossary.java GlossaryFactory.java 
Log Message:
CMSC-1304 Also ignoring stuff in headers


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


Index: Glossary.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/Glossary.java,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -b -r1.8.2.3 -r1.8.2.4
--- Glossary.java       4 Mar 2009 14:56:29 -0000       1.8.2.3
+++ Glossary.java       25 Mar 2009 16:24:13 -0000      1.8.2.4
@@ -61,6 +61,14 @@
          return true;
       }
 
+      for(int h = 1; h <= 6; h++) {
+         int openH = materialBefore.lastIndexOf("<h"+h);
+         int closeH = materialBefore.lastIndexOf("/h"+h+">");
+         if(openH > closeH) {
+            return true;
+         }
+      }
+
       return false;
    }
    


Index: GlossaryFactory.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/glossary/src/java/com/finalist/cmsc/module/glossary/GlossaryFactory.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- GlossaryFactory.java        20 Feb 2009 14:24:13 -0000      1.6.2.1
+++ GlossaryFactory.java        25 Mar 2009 16:24:13 -0000      1.6.2.2
@@ -7,6 +7,8 @@
 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:
@@ -19,7 +21,9 @@
    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