Re: Parsing a MODS-document with validation fails

Index: src/java/org/jdom/input/SAXHandler.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/input/SAXHandler.java,v
retrieving revision 1.73
diff -u -r1.73 SAXHandler.java
--- src/java/org/jdom/input/SAXHandler.java	10 Nov 2007 05:29:00 -0000	1.73
+++ src/java/org/jdom/input/SAXHandler.java	25 Jul 2011 09:13:48 -0000
@@ -83,6 +83,9 @@
     /** Hash table to map SAX attribute type names to JDOM attribute types. */
     private static final Map attrNameToTypeMap = new HashMap(13);
 
+    /** If namespace prefix is undeclared use this a a prefix for nsPrefixCount */
+    private static final String UNDECLARED_NS_PREFIX = "ns";
+    
     /** <code>Document</code> object being built */
     private Document document;
 
@@ -120,6 +123,16 @@
       * startPrefixMapping, but are not yet available on the element */
     private List declaredNamespaces;
 
+    /** Temporary holder for namespaces that have not been declared with
+     * startPrefixMapping, but are required due to schema rules */
+    private List undeclaredNamespaces;
+    
+    /** Holds information of namespace the a currently available in the current context. */
+    private HashMap usedNamespaces;
+    
+    /** Counter for new namespace prefixes */
+    private int nsPrefixCount;
+
     /** Temporary holder for the internal subset */
     private StringBuffer internalSubset = new StringBuffer();
 
@@ -141,6 +154,9 @@
     /** The SAX Locator object provided by the parser */
     private Locator locator;
 
+    /** helps to find declared namespaces */
+    private Map nsURIMapping;
+
     /**
      * Class initializer: Populate a table to translate SAX attribute
      * type names into JDOM attribute type value (integer).
@@ -206,6 +222,9 @@
 
         atRoot = true;
         declaredNamespaces = new ArrayList();
+        undeclaredNamespaces = new ArrayList();
+        usedNamespaces = new HashMap();
+        nsURIMapping = new HashMap();
         externalEntities = new HashMap();
 
         document = this.factory.document(null);
@@ -333,6 +352,7 @@
         if (locator != null) {
             document.setBaseURI(locator.getSystemId());
         }
+        nsPrefixCount=0;
     }
 
     /**
@@ -496,7 +516,15 @@
         if (suppress) return;
 
         Namespace ns = Namespace.getNamespace(prefix, uri);
-        declaredNamespaces.add(ns);
+        
+        nsURIMapping.put(uri,ns); //removed in endPrefixMapping()
+        List namespaces = (List) usedNamespaces.get(prefix);
+        if (namespaces == null) {
+            namespaces = new ArrayList();
+            usedNamespaces.put(prefix, namespaces);
+        }
+        namespaces.add(ns); //removed in endPrefixMapping()
+        declaredNamespaces.add(ns); //removed in transferNamespaces()
     }
 
     /**
@@ -550,6 +578,7 @@
 
             String attLocalName = atts.getLocalName(i);
             String attQName = atts.getQName(i);
+            String attUri=atts.getURI(i);
             int attType = getAttributeType(atts.getType(i));
 
             // Bypass any xmlns attributes which might appear, as we got
@@ -567,10 +596,14 @@
             } else if (!attQName.equals(attLocalName)) {
                 String attPrefix = attQName.substring(0, attQName.indexOf(":"));
                 Namespace attNs = Namespace.getNamespace(attPrefix,
-                                                         atts.getURI(i));
+                                                         attUri);
 
                 attribute = factory.attribute(attLocalName, atts.getValue(i),
                                               attType, attNs);
+            } else if (!"".equals(attUri) && !namespaceURI.equals(attUri)) {
+                Namespace attNs = getUndeclaredNS(attUri);
+                attribute = factory.attribute(attLocalName, atts.getValue(i),
+                        attType, attNs);
             } else {
                 attribute = factory.attribute(attLocalName, atts.getValue(i),
                                               attType);
@@ -589,6 +622,32 @@
         currentElement = element;
     }
 
+    private Namespace getUndeclaredNS(String attUri) {
+        Namespace ns = (Namespace) nsURIMapping.get(attUri);
+        if (ns != null) {
+            return ns;
+        }
+        ns = createNamespaceWithPrefix(attUri);
+        return ns;
+    }
+
+    /**
+     * @param attUri
+     * @return
+     */
+    private Namespace createNamespaceWithPrefix(String attUri) {
+        Namespace ns = null;
+        boolean inUse=true;
+        while (inUse){
+            String prefix = UNDECLARED_NS_PREFIX + nsPrefixCount++;
+            ns = Namespace.getNamespace(prefix, attUri);
+            inUse = usedNamespaces.containsKey(prefix);
+        }
+        nsURIMapping.put(attUri, ns);
+        undeclaredNamespaces.add(ns);
+        return ns;
+    }
+
     /**
      * This will take the supplied <code>{@link Element}</code> and
      * transfer its namespaces to the global namespace storage.
@@ -604,6 +663,15 @@
             }
         }
         declaredNamespaces.clear();
+        i = undeclaredNamespaces.iterator();
+        while (i.hasNext()) {
+            Namespace ns = (Namespace)i.next();
+            if (ns != element.getNamespace()) {
+                element.addNamespaceDeclaration(ns);
+            }
+            nsURIMapping.remove(ns.getURI());
+        }
+        undeclaredNamespaces.clear();
     }
 
     /**
@@ -732,6 +800,23 @@
     }
 
     /**
+     * Receive notification of the end of a Namespace mapping.
+     *
+     * Will remove any information on prefix of that namespace.
+     *
+     * @param prefix The Namespace prefix being declared.
+     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception.
+     * @see org.xml.sax.ContentHandler#endPrefixMapping
+     */
+    public void endPrefixMapping(String prefix) throws SAXException {
+        List namespaces=(List) usedNamespaces.get(prefix);
+        int index = namespaces.size()-1;
+        Namespace ns = (Namespace) namespaces.remove(index);
+        nsURIMapping.values().remove(ns);
+    }
+
+    /**
      * This will signify that a DTD is being parsed, and can be
      * used to ensure that comments and other lexical structures
      * in the DTD are not added to the JDOM <code>Document</code>