[Extras-wsdlpull-svn] SF.net SVN: extras-wsdlpull:[188] trunk/wsdlpull/src/wsdlparser

[<den...@us...>]

Revision: 188
          http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=188&view=rev
Author:   denis_arnaud
Date:     2009-06-22 20:08:41 +0000 (Mon, 22 Jun 2009)

Log Message:
-----------
Integrated upstream patches.

Modified Paths:
--------------
    trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp
    trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp

Modified: trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp
===================================================================
--- trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp	2009-06-06 21:55:53 UTC (rev 187)
+++ trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp	2009-06-22 20:08:41 UTC (rev 188)
@@ -447,7 +447,7 @@
     if (prt == Part::Elem){
       
       const Element * e = p->element();
-      serializeType((Schema::Type)e->getType(),e->getName(),sParser,1,1,parents,nsp,true);
+      serializeType((Schema::Type)e->getType(),e->getName(),sParser,1,1,parents,e->getTypeNamespace(),true);
     }
     else{
       

Modified: trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp
===================================================================
--- trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp	2009-06-06 21:55:53 UTC (rev 187)
+++ trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp	2009-06-22 20:08:41 UTC (rev 188)
@@ -1496,12 +1496,20 @@
 			
 		//check for definitions
 			
-    if ((isType && schemaParser_[i]->getType(name,false) != 0) ||
+      if ((isType && schemaParser_[i]->getType(name,false) != 0) ||
 		(!isType && schemaParser_[i]->getElement(name,false) != 0))
  		 
     	  return i;
 		
     }
+     else if (schemaParser_[i]->isImported(type.getNamespace())) {
+
+
+      if ((isType && schemaParser_[i]->getType(name) != 0) ||
+               (!isType && schemaParser_[i]->getElement(name) != 0))
+
+         return i;
+    }
   }
   return -1;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.