svn commit: r784045 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java

[ltheussl]

Author: ltheussl
Date: Fri Jun 12 09:16:46 2009
New Revision: 784045

URL: http://svn.apache.org/viewvc?rev=784045&view=rev
Log:
Ignore anything within <articleinfo>, meta data has to be implemented

Modified:
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java?rev=784045&r1=784044&r2=784045&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
 Fri Jun 12 09:16:46 2009
@@ -145,12 +145,21 @@
             sink.body();
         }
 
+        if ( isParent( SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() ) )
+        {
+            return; // TODO: meta data are ignored, implement!
+        }
+
         SinkEventAttributeSet attribs = getAttributesFromParser( parser );
 
         if ( parser.getName().equals( 
SimplifiedDocbookMarkup.ARTICLE_TAG.toString() ) )
         {
             handleArticleStart( sink, attribs );
         }
+        else if ( parser.getName().equals( 
SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() ) )
+        {
+            parent.push( SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() );
+        }
         else if ( HIER_ELEMENTS.contains( parser.getName() ) )
         {
             handleSectionElements( sink, parser.getName(), attribs );
@@ -212,6 +221,14 @@
         {
             sink.body_();
         }
+        else if ( parser.getName().equals( 
SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() ) )
+        {
+            parent.pop();
+        }
+        else if ( isParent( SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() 
) )
+        {
+            return; // TODO: meta data are ignored, implement!
+        }
         else if ( HIER_ELEMENTS.contains( parser.getName() ) )
         {
             sink.section_( level );
@@ -265,8 +282,7 @@
         else if ( parser.getName().equals( 
SimplifiedDocbookMarkup.IMAGEOBJECT_TAG.toString() )
                 || parser.getName().equals( 
SimplifiedDocbookMarkup.FIGURE_TAG.toString() )
                 || parser.getName().equals( 
SimplifiedDocbookMarkup.THEAD_TAG.toString() )
-                || parser.getName().equals( 
SimplifiedDocbookMarkup.TBODY_TAG.toString() )
-                || parser.getName().equals( 
SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() ) )
+                || parser.getName().equals( 
SimplifiedDocbookMarkup.TBODY_TAG.toString() ) )
         {
             parent.pop();
         }
@@ -399,6 +415,36 @@
         return false;
     }
 
+    /** {...@inheritdoc} */
+    protected void handleCdsect( XmlPullParser parser, Sink sink )
+            throws XmlPullParserException
+    {
+        if ( !isParent( SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() ) )
+        {
+            super.handleCdsect( parser, sink );
+        }
+    }
+
+    /** {...@inheritdoc} */
+    protected void handleEntity( XmlPullParser parser, Sink sink )
+            throws XmlPullParserException
+    {
+        if ( !isParent( SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() ) )
+        {
+            super.handleEntity( parser, sink );
+        }
+    }
+
+    /** {...@inheritdoc} */
+    protected void handleText( XmlPullParser parser, Sink sink )
+            throws XmlPullParserException
+    {
+        if ( !isParent( SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() ) )
+        {
+            super.handleText( parser, sink );
+        }
+    }
+
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
@@ -597,8 +643,7 @@
         {
             sink.tableCaption( attribs );
         }
-        else if ( isParent( SimplifiedDocbookMarkup.ARTICLE_TAG.toString() )
-                || isParent( 
SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() ) )
+        else if ( isParent( SimplifiedDocbookMarkup.ARTICLE_TAG.toString() ) )
         {
             sink.title( attribs );
         }
@@ -623,8 +668,7 @@
         {
             sink.sectionTitle_( level );
         }
-        else if ( isParent( SimplifiedDocbookMarkup.ARTICLE_TAG.toString() )
-                || isParent( 
SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() ) )
+        else if ( isParent( SimplifiedDocbookMarkup.ARTICLE_TAG.toString() ) )
         {
             sink.title_();
         }
@@ -762,8 +806,7 @@
             handleFigureStart( sink, attribs );
         }
         else if ( name.equals( 
SimplifiedDocbookMarkup.IMAGEOBJECT_TAG.toString() )
-                || name.equals( SimplifiedDocbookMarkup.FIGURE_TAG.toString() )
-                || name.equals( 
SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() ) )
+                || name.equals( SimplifiedDocbookMarkup.FIGURE_TAG.toString() 
) )
         {
             parent.push( name );
         }