Attachment #135634 for bug #276134

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
 *     Mukul Gandhi - bug 276134 - improvements to schema aware support for attribute nodes
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.function;

		for (Iterator i = args.iterator(); i.hasNext();) {
			ResultSequence rs = (ResultSequence) i.next();

			//FnData.fast_atomize(rs);
			rs = FnData.atomize(rs);

			if (rs.empty())
				return new ArrayList();




 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
 *     Mukul Gandhi - bug 276134 - improvements to schema aware support for attribute nodes 
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.function;

import java.util.Collection;
import java.util.Iterator;
import java.util.ListIterator;

import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyAtomicType;
import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType;
import org.eclipse.wst.xml.xpath2.processor.internal.types.NodeType;
import org.eclipse.wst.xml.xpath2.processor.internal.types.QName;

/**
 * fn:data takes a sequence of items and returns a sequence of atomic values.

		for (Iterator i = arg.iterator(); i.hasNext();) {
			AnyType at = (AnyType) i.next();

			if (at instanceof AnyAtomicType) {
				rs.add(at);
			}
			else if (at instanceof NodeType) {
				NodeType nt = (NodeType) at;

				rs.concat(nt.typed_value());
			} else {
				assert false;
			}
		}

		return rs;

Lines 6-12 Link Here

(-)src/org/eclipse/wst/xml/xpath2/processor/XercesLoader.java (-3 / +18 lines)
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0	9	* Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
		10	* Mukul Gandhi - bug 276134 - improvements to schema aware support for attribute nodes
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.wst.xml.xpath2.processor;	13	package org.eclipse.wst.xml.xpath2.processor;
Lines 15-20 Link Here
15		16
16	import org.w3c.dom.*;	17	import org.w3c.dom.*;
17	import javax.xml.parsers.*;	18	import javax.xml.parsers.*;
		19	import javax.xml.validation.Schema;
		20
18	import org.xml.sax.*;	21	import org.xml.sax.*;
19		22
20	/**	23	/**
Lines 41-46 Link Here
41	public static final String DOCUMENT_PSVI_IMPLEMENTATION = "org.apache.xerces.dom.PSVIDocumentImpl";	44	public static final String DOCUMENT_PSVI_IMPLEMENTATION = "org.apache.xerces.dom.PSVIDocumentImpl";
42		45
43	boolean _validating;	46	boolean _validating;
		47
		48	Schema _schema = null;;
44		49
45	/**	50	/**
46	* Constructor for Xerxes loader.	51	* Constructor for Xerxes loader.
Lines 48-53 Link Here
48	public XercesLoader() {	53	public XercesLoader() {
49	_validating = false;	54	_validating = false;
50	}	55	}
		56
		57	public XercesLoader(Schema schema) {
		58	_validating = false;
		59	_schema = schema;
		60	}
51		61
52	/**	62	/**
53	* The Xerces loader loads the XML docuemnt	63	* The Xerces loader loads the XML docuemnt
Lines 64-75 Link Here
64	DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();	74	DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
65		75
66	factory.setNamespaceAware(true);	76	factory.setNamespaceAware(true);
67	factory.setValidating(_validating);
68	factory.setAttribute(SCHEMA_VALIDATION_FEATURE,	77	factory.setAttribute(SCHEMA_VALIDATION_FEATURE,
69	new Boolean(_validating));	78	new Boolean(_validating));
70	factory.setAttribute(DOCUMENT_IMPLEMENTATION_PROPERTY,	79	factory.setAttribute(DOCUMENT_IMPLEMENTATION_PROPERTY,
71	DOCUMENT_PSVI_IMPLEMENTATION);	80	DOCUMENT_PSVI_IMPLEMENTATION);
72	// factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);	81
		82	if (_schema != null) {
		83	factory.setSchema(_schema);
		84	}
		85	else {
		86	factory.setValidating(_validating);
		87	}
73		88
74	try {	89	try {
75	DocumentBuilder builder = factory.newDocumentBuilder();	90	DocumentBuilder builder = factory.newDocumentBuilder();




 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
 *     Mukul Gandhi - bug 276134 - improvements to schema aware support for attribute nodes 
 *******************************************************************************/

package org.eclipse.wst.xml.xpath2.processor.internal.types;

import java.math.BigInteger;

import org.apache.xerces.dom.PSVIAttrNSImpl;
import org.apache.xerces.xs.XSTypeDefinition;
import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
import org.w3c.dom.Attr;

/**
 * A representation of the AttributeType datatype

	@Override
	public ResultSequence typed_value() {
		ResultSequence rs = ResultSequenceFactory.create_new();
		
		PSVIAttrNSImpl psviAttr = (PSVIAttrNSImpl)_value;
		XSTypeDefinition typeDef = psviAttr.getTypeDefinition();
		
		if (typeDef != null) {
		  if (typeDef.getName().equals("date")) {		
		     rs.add(XSDate.parse_date(string_value()));
		  }
		  else if (typeDef.getName().equals("int")) {		
	         rs.add(new XSInt(new BigInteger(string_value())));
		  }
		  else if (typeDef.getName().equals("long")) {		
		     rs.add(new XSLong(new BigInteger(string_value())));
	      }
		  else if (typeDef.getName().equals("integer")) {		
		     rs.add(new XSInteger(new BigInteger(string_value())));
		  }
		  else if (typeDef.getName().equals("double")) {		
		     rs.add(new XSDouble(Double.parseDouble(string_value())));
		  }
		  else if (typeDef.getName().equals("float")) {		
		    rs.add(new XSFloat(Float.parseFloat(string_value())));
	      }
		  else if (typeDef.getName().equals("decimal")) {		
		    rs.add(new XSDecimal(Double.parseDouble(string_value())));
		  }
	    } else {
		   // construct an 'untypedatomic' value
		   rs.add(new UntypedAtomic(string_value()));	
		}
		
		return rs;
	}


Return to bug 276134