[GME-commit] GMESRC/GME/MgaUtil XsltDial.cpp,1.1,1.2 XsltFileSel.cpp,1.1,1.2

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/MgaUtil
In directory braindrain:/tmp/cvs-serv6143

Modified Files:
	XsltDial.cpp XsltFileSel.cpp 
Log Message:
Beautifying, adding error msg.
Modified Files:
 	XsltDial.cpp XsltFileSel.cpp 


CVS User: zolmol

Index: XsltDial.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/XsltDial.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XsltDial.cpp	8 Apr 2004 18:02:55 -0000	1.1
--- XsltDial.cpp	15 Apr 2004 22:46:04 -0000	1.2
***************
*** 57,61 ****
  	if( dlg.DoModal() == IDOK) 
  	{
! 		//m_styleSheetFile.SetWindowText( dlg.GetPathName());
  		m_stylesheetFileName = dlg.GetPathName();
  		int idx = m_stylesheetFileName.ReverseFind('\\');
--- 57,62 ----
  	if( dlg.DoModal() == IDOK) 
  	{
! 		this->UpdateData( TRUE);
! 
  		m_stylesheetFileName = dlg.GetPathName();
  		int idx = m_stylesheetFileName.ReverseFind('\\');
***************
*** 64,74 ****
  			dir = m_stylesheetFileName.Left( idx + 1);
  
! 		m_outputXmlFileName = dir;
  		if ( m_inputXmlFileName.IsEmpty())
  			m_inputXmlFileName = dir;
! 		this->UpdateData( false);
! 	}
! 	else  // IDCANCEL , using default name
! 	{
  	}
  }
--- 65,74 ----
  			dir = m_stylesheetFileName.Left( idx + 1);
  
! 		if ( m_outputXmlFileName.IsEmpty())
! 			m_outputXmlFileName = dir;
  		if ( m_inputXmlFileName.IsEmpty())
  			m_inputXmlFileName = dir;
! 
! 		this->UpdateData( FALSE);
  	}
  }
***************
*** 82,91 ****
  	if( dlg.DoModal() == IDOK) 
  	{
! 		//m_inputXmlFile.SetWindowText( dlg.GetPathName());
  		m_inputXmlFileName = dlg.GetPathName();
! 		this->UpdateData( false);
! 	}
! 	else  // IDCANCEL , using default name
! 	{
  	}
  }
--- 82,88 ----
  	if( dlg.DoModal() == IDOK) 
  	{
! 		this->UpdateData( TRUE);
  		m_inputXmlFileName = dlg.GetPathName();
! 		this->UpdateData( FALSE);
  	}
  }
***************
*** 99,108 ****
  	if( dlg.DoModal() == IDOK) 
  	{
! 		//m_outputXmlFile.SetWindowText( dlg.GetPathName());
  		m_outputXmlFileName = dlg.GetPathName();
! 		this->UpdateData( false);
! 	}
! 	else  // IDCANCEL , using default name
! 	{
  	}
  }
--- 96,102 ----
  	if( dlg.DoModal() == IDOK) 
  	{
! 		this->UpdateData( TRUE);
  		m_outputXmlFileName = dlg.GetPathName();
! 		this->UpdateData( FALSE);
  	}
  }
***************
*** 110,120 ****
  void CXSLTDial::OnOK() 
  {
- 	// TODO: Add extra validation here
  	this->UpdateData( TRUE);
  	if ( m_inputXmlFileName == ""
! 		|| m_outputXmlFileName == ""
! 		|| m_stylesheetFileName == "")
  	{
! 		AfxMessageBox("Please select input and output files!", MB_ICONEXCLAMATION | MB_OK);
  		return;
  	}
--- 104,114 ----
  void CXSLTDial::OnOK() 
  {
  	this->UpdateData( TRUE);
+ 
  	if ( m_inputXmlFileName == ""
! 		|| m_stylesheetFileName == ""
! 		|| m_outputXmlFileName == "" )
  	{
! 		AfxMessageBox("Please select stylesheet, input and output files!", MB_ICONEXCLAMATION | MB_OK);
  		return;
  	}

Index: XsltFileSel.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/XsltFileSel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XsltFileSel.cpp	8 Apr 2004 18:02:55 -0000	1.1
--- XsltFileSel.cpp	15 Apr 2004 22:46:04 -0000	1.2
***************
*** 11,19 ****
  	CXSLTDial dlg;
  	CopyTo( def_in_f_name, dlg.m_inputXmlFileName);
  
  	if ( dlg.DoModal() == IDOK)
  	{
  		w.Restore();
- 		//CComBstrObj error_msg; // will contain the error msg if XML error occurs
  
  		try
--- 11,19 ----
  	CXSLTDial dlg;
  	CopyTo( def_in_f_name, dlg.m_inputXmlFileName);
+ 	CComBstrObj error;
  
  	if ( dlg.DoModal() == IDOK)
  	{
  		w.Restore();
  
  		try
***************
*** 23,30 ****
  			ASSERT( xslt != NULL );
  			
! 			COMTHROW( xslt->ApplyXslt( PutInBstr( dlg.m_stylesheetFileName), 
! 				PutInBstr( dlg.m_inputXmlFileName),
! 				PutInBstr( dlg.m_outputXmlFileName)/*,
! 				PutOut( error_msg)*/));
  			
  			CopyTo( dlg.m_outputXmlFileName, out);
--- 23,33 ----
  			ASSERT( xslt != NULL );
  			
! 			COMTHROW( 
! 				xslt->ApplyXslt( 
! 								PutInBstr( dlg.m_stylesheetFileName), 
! 								PutInBstr( dlg.m_inputXmlFileName),
! 								PutInBstr( dlg.m_outputXmlFileName),
! 								PutOut( error) )
! 					);
  			
  			CopyTo( dlg.m_outputXmlFileName, out);
***************
*** 34,43 ****
  		catch(hresult_exception &e)
  		{
! 			/*CString err;
! 			CopyTo( error_msg.p, err);
! 			if ( !err.IsEmpty())
! 				AfxMessageBox("XSLT error: " + err, MB_ICONSTOP);
! 			else*/
! 				AfxMessageBox("Xslt error.", MB_ICONSTOP);
  
  			return e.hr;
--- 37,61 ----
  		catch(hresult_exception &e)
  		{
! 			CString msg;
! 			switch ( e.hr) {
! 			case E_XSLT_XERCES_INIT: 
! 				msg = "Xslt: Xerces initialization failed.";
! 				AfxMessageBox( msg, MB_ICONSTOP);
! 				break;
! 			case E_XSLT_COMPILE_ERROR:
! 				CopyTo( error, msg);
! 				msg = "Xslt: Stylesheet compilation failed. " + msg;
! 				AfxMessageBox( msg, MB_ICONSTOP);
! 				break;
! 			case E_XSLT_TRANSF_ERROR:
! 				CopyTo( error, msg);
! 				msg = "Xslt: Transformation failed. " + msg;
! 				AfxMessageBox( msg, MB_ICONSTOP);
! 				break;
! 			case E_XSLT_ERROR:
! 			default:
! 				msg = "Xslt error.";
! 				AfxMessageBox( msg, MB_ICONSTOP);
! 			};
  
  			return e.hr;