Merge pull request #3 from rchristie/fieldml-report-dependencies

Fieldml report dependencies, also fix iteration bug.

Author: hsorby

CMakeLists.txt

@@ -124,7 +124,7 @@ IF( ${FIELDML_NAMESPACE_NAME}_INSTALL_CONFIG )
 		"\nGET_FILENAME_COMPONENT( ${FIELDML_NAMESPACE_NAME}_INCLUDE_DIRS \"\${SELF_DIR}/../../include\" ABSOLUTE )"
 		"\nSET( ${FIELDML_NAMESPACE_NAME}_INCLUDE_DIRS \"\${${FIELDML_NAMESPACE_NAME}_INCLUDE_DIRS}\" \"${LIBXML2_INCLUDE_DIR}\" \"${HDF5_INCLUDE_DIRS}\" \"${MPI_INCLUDE_DIRS}\" )"
 		"\nSET( ${FIELDML_NAMESPACE_NAME}_LIBRARIES ${FIELDML_API_LIBRARY_TARGET_NAME} ${FIELDML_IO_API_LIBRARY_TARGET_NAME} ${HDF5_MINE_LIBRARIES} ${MPI_MINE_LIBRARIES})"
-		"\nSET( ${FIELDML_NAMESPACE_NAME}_DEFINITIONS )"
+		"\nSET( ${FIELDML_NAMESPACE_NAME}_DEFINITIONS ${LIBXML2_DEFINITIONS} )"
 		"\nSET( ${FIELDML_NAMESPACE_NAME}_FOUND TRUE )" 
 		"\nENDIF( NOT DEFINED _${FIELDML_NAMESPACE_NAME}_CONFIG_CMAKE )" 
 		"\n" )

core/CMakeLists.txt

@@ -98,6 +98,10 @@ ENDIF( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
 IF( WIN32 )
 	ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
 ENDIF( WIN32 )
+FOREACH( DEF ${LIBXML2_DEFINITIONS} )
+  ADD_DEFINITIONS( -D${DEF} )
+ENDFOREACH( DEF ${LIBXML2_DEFINITIONS} )
+SET( LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} PARENT_SCOPE )
 SET(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR})
 INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} )
 

core/src/FieldmlDOM.cpp

@@ -1434,8 +1434,9 @@ static int parseObjectNode( xmlNodePtr objectNode, ParseState &state )
 }
 
 // Work around of the current bug that data resource need to be defined beofre parameter evaluator uses it
-static int parseDataNode( xmlNodePtr objectNode, ParseState &state )
+static int parseDataNode( xmlNodePtr objectNode, ParseState &state , bool& isParsed)
 {
+    isParsed = false;
     if( FmlUtil::contains( state.parseStack, objectNode ) )
     {
         const char *name = getStringAttribute( objectNode, NAME_ATTRIB );
@@ -1453,10 +1454,7 @@ static int parseDataNode( xmlNodePtr objectNode, ParseState &state )
 
         state.parseStack.pop_back();
 
-        vector<xmlNodePtr>::iterator loc = find( state.unparsedNodes.begin(), state.unparsedNodes.end(), objectNode );
-
-        state.unparsedNodes.erase( loc );
-
+        isParsed = !err;
     }
 
     return err;
@@ -1490,11 +1488,21 @@ static int parseDoc( xmlDocPtr doc, ParseState &state )
 
     // To be improved: Required the following "for" loop to loop through all the top level elements and
     // parse the data resources before anything using them.
-    for( vector<xmlNodePtr>::iterator j = state.unparsedNodes.begin(); j != state.unparsedNodes.end();)
+    for( unsigned int index = 0; index < state.unparsedNodes.size(); )
     {
-    	xmlNodePtr temp_node = *j;
-    	j++;
-    	parseDataNode( temp_node, state );
+        bool isParsed = false;
+        xmlNodePtr objectNode = state.unparsedNodes[index];
+        parseDataNode( objectNode, state, isParsed );
+        if (isParsed)
+        {
+            // remove from unparsedNodes
+            vector<xmlNodePtr>::iterator loc = find( state.unparsedNodes.begin(), state.unparsedNodes.end(), objectNode );
+            state.unparsedNodes.erase( loc );
+        }
+        else
+        {
+            ++index;
+        }
     }
 
     while( state.unparsedNodes.size() != 0 )

io/CMakeLists.txt

@@ -91,7 +91,6 @@ IF( FIELDML_USE_HDF5 )
 ENDIF( FIELDML_USE_HDF5 )
 
 SET( CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX} )
-FIND_PACKAGE( LibXml2 REQUIRED )
 
 SET( FIELDML_IO_API_SRCS
 	src/ArrayDataReader.cpp