Metacat

Adding the call to normalize function for now -- too many calls to normalize function are made and this needs to be looked into. Removing call to normalize function caused trouble in text like this "A&B"

Fixed a bug in last commit. Doing a search like
pathquery version="1.2">
<returndoctype>eml://ecoinformatics.org/eml-2.0.0</returndoctype><returnfield>originator/individualName/surName</returnfield><querygroup operator="INTERSECT"><queryterm casesensitive="false" searchmode="contains"><value>%</value></queryterm><queryterm casesensitive="false" searchmode="contains"><value>National Center for Ecological Analysis and Synthesis</value><pathexpr>organizationName</pathexpr></queryterm></querygroup></pathquery>...

Fixed a bug - when returnfield_id is not found in xml_returnfield, records are not added to xml_queryresults

1. removed the call to QuerySpecification.printAttributeSQL() from QuerySpecification.printExtendedSQL()
2. in QuerySpecification.printExtendedSQL() if ( returnFieldList.size() == 0 ) then it returns null
3. DBQuery.addReturnfield() doesnt execute the element query if printExtendedSQL returns null

A minor change from containAtrributeReturnField to
containsAttributeReturnField

I've added in a test in QuerySpecification.printExtendedSQL that checks
to see if attributes, and sometimes only attributes, are in the original
returnfield request. If so, the printAttributeQuery is called.

Changed the handleReturnField() method so that it handles path expressions with
only attributes in the path.

Added a check if printAttributeQuery() for returnPath to see that it is not null so that that this doesnt happen

xml_index.path like 'null' AND xml_nodes.nodename like 'id'

Fixed a bug in previous commit

Modified code for computing the returnfield string - earlier only elements were used to construct the string. e.g. /dataset/title
Now attributes are also added to the returnfield. e.g. title/@id