zorba-coders team mailing list archive

[Sorin Marian Nasoi <sorin.marian.nasoi@xxxxxxxxx>]

Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bug_967151 into lp:zorba.

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)
  Rodolfo Ochoa (rodolfo-ochoa)
Related bugs:
  Bug #867197 in Zorba: "'nmake xqdoc\' fails on Windows"
  https://bugs.launchpad.net/zorba/+bug/867197
  Bug #967151 in Zorba: "xqdoc segmentation faults on Windows"
  https://bugs.launchpad.net/zorba/+bug/967151

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug_967151/+merge/101426

Fixed the XQDoc visitor on Windows that caused the "xqdoc-xml" project to fail to build.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug_967151/+merge/101426
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'doc/code/CMakeLists.txt'
--- doc/code/CMakeLists.txt	2012-03-28 05:19:57 +0000
+++ doc/code/CMakeLists.txt	2012-04-10 17:56:36 +0000
@@ -33,20 +33,20 @@
   FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/headers_svg/)
 
   # Add the headers_svg command for which a working zorba cmd is required.
-  ADD_CUSTOM_TARGET(headers_svg
-    ${ZORBA_EXE}
-      --omit-xml-declaration
-      -f
-      -q "\"${CMAKE_CURRENT_SOURCE_DIR}/headers_svg/generate-headers-dependencies-svg.xq\""
-      -e "\"doxygenCodePath:=${CMAKE_CURRENT_BINARY_DIR}/html\""
-      -o "\"${CMAKE_CURRENT_BINARY_DIR}/headers_svg/headers.svg\""
-      COMMENT "Building header dependencies SVG..."
-  )
-  SET_TARGET_PROPERTIES (headers_svg PROPERTIES
-    EXCLUDE_FROM_DEFAULT_BUILD 1
-    FOLDER "Docs"
-  )
+#  ADD_CUSTOM_TARGET(headers_svg
+#    ${ZORBA_EXE}
+#      --omit-xml-declaration
+#      -f
+#      -q "\"${CMAKE_CURRENT_SOURCE_DIR}/headers_svg/generate-headers-dependencies-svg.xq\""
+#      -e "\"doxygenCodePath:=${CMAKE_CURRENT_BINARY_DIR}/html\""
+#      -o "\"${CMAKE_CURRENT_BINARY_DIR}/headers_svg/headers.svg\""
+#      COMMENT "Building header dependencies SVG..."
+#  )
+#  SET_TARGET_PROPERTIES (headers_svg PROPERTIES
+#    EXCLUDE_FROM_DEFAULT_BUILD 1
+#    FOLDER "Docs"
+#  )
   
-  ADD_DEPENDENCIES(headers_svg "codedocs")
+#  ADD_DEPENDENCIES(headers_svg "codedocs")
   
 ENDIF(NOT ZORBA_WITH_FILE_ACCESS)
\ No newline at end of file

=== modified file 'doc/zorba/xqdoc/CMakeLists.txt'
--- doc/zorba/xqdoc/CMakeLists.txt	2012-03-28 05:19:57 +0000
+++ doc/zorba/xqdoc/CMakeLists.txt	2012-04-10 17:56:36 +0000
@@ -49,19 +49,19 @@
                 ${CMAKE_CURRENT_BINARY_DIR}/../../../xqdoc/generator/xqdoc-xml.xq COPYONLY)
 
 #   Add the modules_svg command for which a working zorba cmd is required.
-  ADD_CUSTOM_TARGET(modules_svg
-    ${ZORBA_EXE}
-      --omit-xml-declaration
-      -f
-      -q "\"${CMAKE_CURRENT_SOURCE_DIR}/src/generate-module-dependencies-svg.xq\""
-      -e "\"xqdocXMLPath:=${CMAKE_CURRENT_BINARY_DIR}/xml\""
-      -o "\"${CMAKE_CURRENT_BINARY_DIR}/xhtml/images/modules.svg\""
-      COMMENT "Building module dependencies SVG..."
-  )
-  SET_TARGET_PROPERTIES (modules_svg PROPERTIES
-    EXCLUDE_FROM_DEFAULT_BUILD 1
-    FOLDER "Docs"
-  )
-  ADD_DEPENDENCIES(modules_svg "xqdoc-zorba")
+#  ADD_CUSTOM_TARGET(modules_svg
+#    ${ZORBA_EXE}
+#      --omit-xml-declaration
+#      -f
+#      -q "\"${CMAKE_CURRENT_SOURCE_DIR}/src/generate-module-dependencies-svg.xq\""
+#      -e "\"xqdocXMLPath:=${CMAKE_CURRENT_BINARY_DIR}/xml\""
+#      -o "\"${CMAKE_CURRENT_BINARY_DIR}/xhtml/images/modules.svg\""
+#      COMMENT "Building module dependencies SVG..."
+#  )
+#  SET_TARGET_PROPERTIES (modules_svg PROPERTIES
+#    EXCLUDE_FROM_DEFAULT_BUILD 1
+#    FOLDER "Docs"
+#  )
+#  ADD_DEPENDENCIES(modules_svg "xqdoc-zorba")
 
 ENDIF(NOT ZORBA_WITH_FILE_ACCESS)

=== modified file 'src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp'
--- src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp	2012-03-28 05:19:57 +0000
+++ src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp	2012-04-10 17:56:36 +0000
@@ -170,8 +170,11 @@
 bool is_namespace_schema(zstring aPrefix, zstring aNamespace )
 {
   map<zstring, zstring>::iterator ite = theNamespaceSchemaMap.find(aPrefix);
-  return ((ite != theNamespaceSchemaMap.end()) ||
-          (ite->second ==  aNamespace));
+  if(ite != theNamespaceSchemaMap.end())
+  {
+    return (ite->second == aNamespace);
+  }
+  return false;
 }
 
 void print_namespaces()