[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-client-cvs
Subject:    [Client-cvs] encodesvc/common/xmlvalidator PSVIHandler.cpp,1.3,1.4
From:       psamuel () helixcommunity ! org
Date:       2010-03-26 19:46:20
Message-ID: 201003261946.o2QJkhBi030349 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/client/encodesvc/common/xmlvalidator
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv26022

Modified Files:
	PSVIHandler.cpp 
Log Message:
Synopsis
===============================================================
Changes for resolving g++ compiler issues on Linux.
 

Branches: HEAD

Suggested reviewer:  Eswar

Description
===============================================================

Files Affected
===============================================================
client\encodesvc\common\xmlvalidator\PSVIHandler.cpp

Testing Performed
===============================================================
Platforms Tested: win32-i386-vc9 , RHEL 5

Index: PSVIHandler.cpp
===================================================================
RCS file: /cvsroot/client/encodesvc/common/xmlvalidator/PSVIHandler.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PSVIHandler.cpp	14 Aug 2009 17:40:11 -0000	1.3
+++ PSVIHandler.cpp	26 Mar 2010 19:46:17 -0000	1.4
@@ -45,15 +45,17 @@
 #pragma pack(pop, r1)
 #pragma pack() 
 
-
-
 #include <string.h>
 #include <stdio.h>
 #include <algorithm>
+#include <iostream>
+
+
 
 XERCES_CPP_NAMESPACE_USE
-static const XMLCh typeHXDurationType[] = L"HxDurationType";
-static const XMLCh attribHXDuration[] = L"hxduration";
+
+static const XMLCh typeHXDurationType[] = {L"HxDurationType"};
+static const XMLCh attribHXDuration[] = {L"hxduration"};
 static const XMLCh fgSpace[] = { chSpace, chNull };
 static const XMLCh fgRoot[] = { chLatin_r, chLatin_o, chLatin_o, chLatin_t, chNull \
};  static const XMLCh fgChar[] = { chSpace, chLatin_C, chLatin_h, chLatin_a, \
chLatin_r, chNull }; // char @@ -216,10 +218,11 @@
 										const XMLCh* const  qname ,
 										const Attributes& attrs) {
 	
-	qnames.push_back(localname);
+   qnames.push_back((wchar_t *)localname);
+
+   std::vector<std::wstring>::const_iterator cii;
+   currentQname = L"";
 
-	std::vector<std::wstring>::const_iterator cii;
-	currentQname = L"";
    bool bFirst = true;
    for(cii=qnames.begin(); cii!=qnames.end(); cii++)
    {
@@ -302,26 +305,24 @@
 		std::wstring declarationRef = (*declarationRefMapIterator).second;
 
 		std::wstring elementType = typeMap[declarationRef];
-				
-		while(wcsstr(elementType.c_str(), L"."))
+
+        while(wcsstr(elementType.c_str(), L"."))
 		{
-			if(wcsstr(elementType.c_str(), typeHXDurationType))
+			if(wcsstr(elementType.c_str(), (wchar_t *)typeHXDurationType))
 			{
-				elementType = attribHXDuration;
+				elementType = (wchar_t *)attribHXDuration;
 				break;
 			}
 			elementType = typeMap[elementType];
 		}
-		
+
+
 		transform(  elementName.begin(), elementName.end(), elementName.begin(), \
towlower); // towlower for lower case  transform(  elementType.begin(), \
elementType.end(), elementType.begin(), towlower); // towlower for lower case  
 		const wchar_t* et = elementType.c_str();
 
 		elementTypeMap[elementName] = elementType;
-
-
-
 			
 	}
 }
@@ -1351,6 +1352,9 @@
 }
 
 void PSVIWriterHandlers::sendReferenceForSimpleType(const XMLCh* elementName, \
XSObject* obj, const XMLCh* eid){ +
+
+
 	if (obj==NULL) {
 		sendElementEmpty(elementName);
 	} else {
@@ -1359,17 +1363,21 @@
 		XMLCh* refName = (XMLCh*)getIdName(obj);
 		fAttrList->addElement(refName);
 		//fAttrList->addElement((XMLCh*)getIdName(obj));
-		if(refName && bProcessSchemaComponents && wcsstr(elementName, L"TypeDefinition"))
+
+    	if(refName && bProcessSchemaComponents && wcsstr((wchar_t*)elementName, \
(wchar_t*)L"TypeDefinition"))  {
 			//wprintf(L"\r\n Eswar SRST ==> %s %s \r\n", eid, refName);
-			typeMap[eid] = refName;
+			typeMap[(wchar_t*)eid] = refName;
 		}
+
 		fAttrList->addElement((XMLCh*)fgXsiNil);
 		fAttrList->addElement((XMLCh*)PSVIUni::fgTrue);
 		writeEmpty(elementName, fAttrList);
 	}
 }
 void PSVIWriterHandlers::sendReference(const XMLCh* elementName, XSObject* obj, \
const XMLCh* eid) { +
+
 	if (obj==NULL) {
 		sendElementEmpty(elementName);
 	} else {
@@ -1378,24 +1386,26 @@
 		//fAttrList->addElement((XMLCh*)getIdName(obj));
 		XMLCh* refName = (XMLCh*)getIdName(obj);
 		fAttrList->addElement(refName);
-		if(refName && bProcessSchemaComponents && wcsstr(elementName, L"TypeDefinition"))
+
+
+		if(refName && bProcessSchemaComponents && wcsstr((wchar_t*)elementName, \
(wchar_t*)(L"TypeDefinition")))  {
 			//std::wcout << "\r\n Eswar SR ==> " << refName;
 			//wprintf(L"\r\n Eswar SR ==> %s %s \r\n", eid, refName);
 			if(eid)
 			{
-				typeMap[eid] = refName;
+				typeMap[(wchar_t*)eid] = refName;
 			}
 		}
-		if(refName && !bProcessSchemaComponents && ( wcsstr(elementName, \
L"attributeDeclaration") || wcsstr(elementName, L"elementDeclaration"))) \
+		if(refName && !bProcessSchemaComponents && ( wcsstr((wchar_t*)elementName, \
(wchar_t*)(L"attributeDeclaration")) || wcsstr((wchar_t*)elementName, \
(wchar_t*)(L"elementDeclaration"))))  {
 			//std::wcout << "\r\n Eswar SR ==> " << refName;
 			//wprintf(L"\r\n Bala SR ==> %s %s \r\n", eid, refName);
 			std::wstring qualifiedName = currentQname;
 
-			if(wcsstr(elementName, L"attributeDeclaration")) {
+			if(wcsstr((wchar_t*)elementName,(wchar_t*)(L"attributeDeclaration"))) {
 				qualifiedName += L"@" ;
-				qualifiedName += eid;
+				qualifiedName += (wchar_t*)eid;
 			}
 			//wprintf(L"\r\n Bala SR ==> %s %s \r\n", qualifiedName.c_str(), refName);
 
@@ -1404,6 +1414,7 @@
 				declarationRefMap[qualifiedName] = refName;
 			}
 		}
+
 		fAttrList->addElement((XMLCh*)fgXsiNil);
 		fAttrList->addElement((XMLCh*)PSVIUni::fgTrue);
 		writeEmpty(elementName, fAttrList);


_______________________________________________
Client-cvs mailing list
Client-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/client-cvs


[prev in list] [next in list] [prev in thread] [next in thread]