[GME-commit] GMESRC/GME/Parser Helper.cpp,1.3,1.4 Helper.h,1.3,1.4
MgaParser.h,1.13,1.14 MgaParserClosureHelper.cpp,1.4,1.5
MgaParserSC.cpp,1.6,1.7
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Thu Jul 21 15:32:16 CDT 2005
- Previous message: [GME-commit]
GMESRC/GME/Gme MainFrm.cpp,1.31,1.32 GME.rc,1.141,1.142
- Next message: [GME-commit] GMESRC/GME/MgaUtil ClosureSimple.cpp,1.1,1.2
ClosureSimple.h,1.1,1.2 MakeSimpleClosure.cpp,1.1,1.2
MakeSimpleClosure.h,1.1,1.2 MgaClosure.cpp,1.8,1.9
MgaUtil.rc,1.49,1.50 resource.h,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /project/gme-repository/GMESRC/GME/Parser
In directory escher:/tmp/cvs-serv27405
Modified Files:
Helper.cpp Helper.h MgaParser.h MgaParserClosureHelper.cpp
MgaParserSC.cpp
Log Message:
User notifications.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: MgaParserSC.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/MgaParserSC.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MgaParserSC.cpp 19 Jul 2005 17:29:52 -0000 1.6
--- MgaParserSC.cpp 21 Jul 2005 14:32:14 -0000 1.7
***************
*** 98,102 ****
if( ++pass_count >= 1 )//<!> reduced from 100 to 5
{
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( CComBSTR("[Smartcopy Parser] Exception during parsing."), MSG_ERROR));
HR_THROW(E_TOOMANYPASSES);
}
--- 98,102 ----
if( ++pass_count >= 1 )//<!> reduced from 100 to 5
{
! msgSC( CComBSTR("Exception during parsing."), MSG_ERROR);
HR_THROW(E_TOOMANYPASSES);
}
***************
*** 110,117 ****
if( isNeedFor2ndStep())
{
! CComBSTR bstr1("[Smartcopy Parser] Some objects were not found during parsing.");
! CComBSTR bstr2("[Smartcopy Parser] Invoking 2nd step...");
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( bstr1, MSG_ERROR));
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( bstr2, MSG_INFO));
tryToFindMissedReferreds();
--- 110,117 ----
if( isNeedFor2ndStep())
{
! CComBSTR bstr1("Some objects were not found during parsing.");
! CComBSTR bstr2("Invoking 2nd step...");
! msgSC( bstr1, MSG_ERROR);
! msgSC( bstr2, MSG_INFO);
tryToFindMissedReferreds();
***************
*** 190,197 ****
else if( m_GME)
{
! CComBSTR bstr("[Smartcopy Parser] Archetype can not be found in library. Basetype lost. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable(*s).c_str());
! COMTHROW( m_GME->ConsoleMessage(bstr, MSG_ERROR));
}
--- 190,197 ----
else if( m_GME)
{
! CComBSTR bstr("Archetype can not be found in library. Basetype lost. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable(*s).c_str());
! msgSC( bstr, MSG_ERROR);
}
***************
*** 233,240 ****
else if( m_GME) // error report
{
! CComBSTR bstr("[Smartcopy Parser] Archetype can not be found. Basetype lost. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable(rel_path_changed).c_str());
! COMTHROW( m_GME->ConsoleMessage(bstr, MSG_ERROR));
}
}
--- 233,240 ----
else if( m_GME) // error report
{
! CComBSTR bstr("Archetype can not be found. Basetype lost. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable(rel_path_changed).c_str());
! msgSC( bstr, MSG_ERROR);
}
}
***************
*** 291,296 ****
msg.Append( " connection derived from ");
msg.AppendBSTR( makeLink( deriv.from));
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else
--- 291,295 ----
msg.Append( " connection derived from ");
msg.AppendBSTR( makeLink( deriv.from));
! msgSC( msg, MSG_INFO);
}
else
***************
*** 338,343 ****
msg.Append( " connection derived from ");
msg.AppendBSTR( makeLink( deriv.from));
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else
--- 337,341 ----
msg.Append( " connection derived from ");
msg.AppendBSTR( makeLink( deriv.from));
! msgSC( msg, MSG_INFO);
}
else
***************
*** 384,388 ****
// user info
! CComBSTR msg( ("[Smartcopy Parser] " + viewable_name + " connection").c_str());
msg.Append(" could not be created in ");
--- 382,386 ----
// user info
! CComBSTR msg( (viewable_name + " connection").c_str());
msg.Append(" could not be created in ");
***************
*** 393,397 ****
msg.AppendBSTR( makeLink( prev));
}
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_ERROR));
return;
--- 391,395 ----
msg.AppendBSTR( makeLink( prev));
}
! msgSC( msg, MSG_ERROR);
return;
***************
*** 464,469 ****
msg.AppendBSTR( makeLink( prev));
}
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
--- 462,466 ----
msg.AppendBSTR( makeLink( prev));
}
! msgSC( msg, MSG_INFO);
}
***************
*** 569,573 ****
{
// error, could not find a correct reference chain
! CComBSTR bstr("[Smartcopy Parser] Connection \"");
bstr.Append( viewable_name.c_str());
bstr.Append("\": references involved not found. ");
--- 566,570 ----
{
// error, could not find a correct reference chain
! CComBSTR bstr("Connection \"");
bstr.Append( viewable_name.c_str());
bstr.Append("\": references involved not found. ");
***************
*** 642,647 ****
msg.Append( " reference derived from ");
msg.AppendBSTR( makeLink( deriv.from));
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
--- 639,643 ----
msg.Append( " reference derived from ");
msg.AppendBSTR( makeLink( deriv.from));
! msgSC( msg, MSG_INFO);
}
***************
*** 666,671 ****
CComBSTR msg = makeLink( fco, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " reference created.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else // will skip contained elements/attribute values/regnode entries/constraints/name element
--- 662,666 ----
CComBSTR msg = makeLink( fco, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " reference created.");
! msgSC( msg, MSG_INFO);
}
else // will skip contained elements/attribute values/regnode entries/constraints/name element
***************
*** 679,684 ****
if( needs_target) msg.Append(" null");
msg.Append( " reference.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
}
--- 674,678 ----
if( needs_target) msg.Append(" null");
msg.Append( " reference.");
! msgSC( msg, MSG_INFO);
}
}
***************
*** 717,722 ****
msg.Append( " reference derived from ");
msg.AppendBSTR( makeLink( deriv.from));
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else
--- 711,715 ----
msg.Append( " reference derived from ");
msg.AppendBSTR( makeLink( deriv.from));
! msgSC( msg, MSG_INFO);
}
else
***************
*** 735,740 ****
CComBSTR msg = makeLink( fco, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " reference created.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else // will skip contained elements/attribute values/regnode entries/constraints/name element
--- 728,732 ----
CComBSTR msg = makeLink( fco, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " reference created.");
! msgSC( msg, MSG_INFO);
}
else // will skip contained elements/attribute values/regnode entries/constraints/name element
***************
*** 748,753 ****
if( needs_target) msg.Append(" null");
msg.Append( " reference.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
}
--- 740,744 ----
if( needs_target) msg.Append(" null");
msg.Append( " reference.");
! msgSC( msg, MSG_INFO);
}
}
***************
*** 769,778 ****
else // report error
{
! CComBSTR bstr("[Smartcopy Parser] Reference \"");
bstr.Append( makeNameViewable( GetByName( attributes, "closurename")).c_str());
bstr.Append("\": target not found in library. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable( *s).c_str());
! if( m_GME) COMTHROW( m_GME->ConsoleMessage(bstr, MSG_ERROR));
}
}
--- 760,769 ----
else // report error
{
! CComBSTR bstr("Reference \"");
bstr.Append( makeNameViewable( GetByName( attributes, "closurename")).c_str());
bstr.Append("\": target not found in library. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable( *s).c_str());
! msgSC(bstr, MSG_ERROR);
}
}
***************
*** 790,799 ****
else // report error
{
! CComBSTR bstr("[Smartcopy Parser] Reference \"");
bstr.Append( makeNameViewable( GetByName( attributes, "closurename")).c_str());
bstr.Append("\": target not found. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable( *s).c_str());
! if( m_GME) COMTHROW( m_GME->ConsoleMessage(bstr, MSG_ERROR));
// store data to process in 2nd step
--- 781,790 ----
else // report error
{
! CComBSTR bstr("Reference \"");
bstr.Append( makeNameViewable( GetByName( attributes, "closurename")).c_str());
bstr.Append("\": target not found. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable( *s).c_str());
! msgSC(bstr, MSG_ERROR);
// store data to process in 2nd step
***************
*** 844,850 ****
msg.Append( " set derived from ");
msg.AppendBSTR( makeLink( deriv.from));
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
!
}
else
--- 835,839 ----
msg.Append( " set derived from ");
msg.AppendBSTR( makeLink( deriv.from));
! msgSC( msg, MSG_INFO);
}
else
***************
*** 868,878 ****
CComBSTR msg = makeLink( fco, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " set created.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else // will skip contained connpoints/elements/attribute values/regnode entries/constraints/name element
{ // will use the object found
skip_inner_elements = true;
! needs_members = isEmptySet( fco);
// user info
--- 857,866 ----
CComBSTR msg = makeLink( fco, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " set created.");
! msgSC( msg, MSG_INFO);
}
else // will skip contained connpoints/elements/attribute values/regnode entries/constraints/name element
{ // will use the object found
skip_inner_elements = true;
! //needs_members = isEmptySet( fco); //try to add to each set new members
// user info
***************
*** 881,886 ****
if( needs_members) msg.Append(" empty");
msg.Append( " set.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
}
--- 869,873 ----
if( needs_members) msg.Append(" empty");
msg.Append( " set.");
! msgSC( msg, MSG_INFO);
}
}
***************
*** 921,927 ****
msg.Append( " set derived from ");
msg.AppendBSTR( makeLink( deriv.from));
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
!
}
else
--- 908,912 ----
msg.Append( " set derived from ");
msg.AppendBSTR( makeLink( deriv.from));
! msgSC( msg, MSG_INFO);
}
else
***************
*** 940,950 ****
CComBSTR msg = makeLink( fco, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " set created.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else // will skip contained connpoints/elements/attribute values/regnode entries/constraints/name element
{ // will use the object found
skip_inner_elements = true;
! needs_members = isEmptySet( fco);
// user info
--- 925,934 ----
CComBSTR msg = makeLink( fco, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " set created.");
! msgSC( msg, MSG_INFO);
}
else // will skip contained connpoints/elements/attribute values/regnode entries/constraints/name element
{ // will use the object found
skip_inner_elements = true;
! //needs_members = isEmptySet( fco); //try to add to each set new members
// user info
***************
*** 953,958 ****
if( needs_members) msg.Append(" empty");
msg.Append( " set.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
}
--- 937,941 ----
if( needs_members) msg.Append(" empty");
msg.Append( " set.");
! msgSC( msg, MSG_INFO);
}
}
***************
*** 988,997 ****
else // error report
{
! CComBSTR bstr("[Smartcopy Parser] Set \"");
bstr.Append( makeNameViewable( GetByName( attributes, "closurename")).c_str());
bstr.Append("\": member not found. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable( member_str).c_str());
! if( m_GME) COMTHROW( m_GME->ConsoleMessage(bstr, MSG_ERROR));
// insert data to process in 2nd step
--- 971,980 ----
else // error report
{
! CComBSTR bstr("Set \"");
bstr.Append( makeNameViewable( GetByName( attributes, "closurename")).c_str());
bstr.Append("\": member not found. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable( member_str).c_str());
! msgSC(bstr, MSG_ERROR);
// insert data to process in 2nd step
***************
*** 1047,1052 ****
msg.Append( " model derived from ");
msg.AppendBSTR( makeLink( deriv.from));
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else
--- 1030,1034 ----
msg.Append( " model derived from ");
msg.AppendBSTR( makeLink( deriv.from));
! msgSC( msg, MSG_INFO);
}
else
***************
*** 1068,1073 ****
CComBSTR msg = makeLink( model, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " model created.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else // will use the object found
--- 1050,1054 ----
CComBSTR msg = makeLink( model, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " model created.");
! msgSC( msg, MSG_INFO);
}
else // will use the object found
***************
*** 1079,1084 ****
msg.AppendBSTR(makeLink( model));
msg.Append( " model.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
}
--- 1060,1064 ----
msg.AppendBSTR(makeLink( model));
msg.Append( " model.");
! msgSC( msg, MSG_INFO);
}
}
***************
*** 1118,1123 ****
msg.Append( " model derived from ");
msg.AppendBSTR( makeLink( deriv.from));
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else
--- 1098,1102 ----
msg.Append( " model derived from ");
msg.AppendBSTR( makeLink( deriv.from));
! msgSC( msg, MSG_INFO);
}
else
***************
*** 1136,1141 ****
CComBSTR msg = makeLink( model, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " model created.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else // will use the object found
--- 1115,1119 ----
CComBSTR msg = makeLink( model, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " model created.");
! msgSC( msg, MSG_INFO);
}
else // will use the object found
***************
*** 1147,1152 ****
msg.AppendBSTR(makeLink( model));
msg.Append( " model.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
}
--- 1125,1129 ----
msg.AppendBSTR(makeLink( model));
msg.Append( " model.");
! msgSC( msg, MSG_INFO);
}
}
***************
*** 1187,1192 ****
msg.Append( " atom derived from ");
msg.AppendBSTR( makeLink( deriv.from));
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else
--- 1164,1168 ----
msg.Append( " atom derived from ");
msg.AppendBSTR( makeLink( deriv.from));
! msgSC( msg, MSG_INFO);
}
else
***************
*** 1210,1215 ****
CComBSTR msg = makeLink( atom, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " atom created.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else // will use the object found
--- 1186,1190 ----
CComBSTR msg = makeLink( atom, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " atom created.");
! msgSC( msg, MSG_INFO);
}
else // will use the object found
***************
*** 1221,1226 ****
msg.AppendBSTR(makeLink( atom));
msg.Append( " atom.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
}
--- 1196,1200 ----
msg.AppendBSTR(makeLink( atom));
msg.Append( " atom.");
! msgSC( msg, MSG_INFO);
}
}
***************
*** 1259,1264 ****
msg.Append( " atom derived from ");
msg.AppendBSTR( makeLink( deriv.from));
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else
--- 1233,1237 ----
msg.Append( " atom derived from ");
msg.AppendBSTR( makeLink( deriv.from));
! msgSC( msg, MSG_INFO);
}
else
***************
*** 1276,1281 ****
CComBSTR msg = makeLink( atom, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " atom created.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else // will skip contained elements
--- 1249,1253 ----
CComBSTR msg = makeLink( atom, makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " atom created.");
! msgSC( msg, MSG_INFO);
}
else // will skip contained elements
***************
*** 1287,1292 ****
msg.AppendBSTR(makeLink( atom));
msg.Append( " atom.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
}
--- 1259,1263 ----
msg.AppendBSTR(makeLink( atom));
msg.Append( " atom.");
! msgSC( msg, MSG_INFO);
}
}
***************
*** 1340,1345 ****
CComBSTR msg = makeLink(CComObjPtr<IMgaObject>(folder), makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " folder created.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
else // will use the object found
--- 1311,1315 ----
CComBSTR msg = makeLink(CComObjPtr<IMgaObject>(folder), makeNameViewable( GetByName(attributes, "closurename")));
msg.Append( " folder created.");
! msgSC( msg, MSG_INFO);
}
else // will use the object found
***************
*** 1351,1356 ****
msg.AppendBSTR(makeLink( CComObjPtr<IMgaObject>(folder)));
msg.Append( " folder.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage( msg, MSG_INFO));
}
}
--- 1321,1325 ----
msg.AppendBSTR(makeLink( CComObjPtr<IMgaObject>(folder)));
msg.Append( " folder.");
! msgSC( msg, MSG_INFO);
}
}
Index: Helper.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/Helper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Helper.h 19 Jul 2005 17:29:52 -0000 1.3
--- Helper.h 21 Jul 2005 14:32:14 -0000 1.4
***************
*** 18,21 ****
--- 18,23 ----
CComBSTR makeLink( CComObjPtr<IMgaFCO> obj, const std::string& nm_2 = "", bool use_anyway_nm_2 = false);
+ CComBSTR makeLink( CComObjPtr<IMgaReference> obj, const std::string& nm_2 = "", bool use_anyway_nm_2 = false);
+ CComBSTR makeLink( CComObjPtr<IMgaSet> obj, const std::string& nm_2 = "", bool use_anyway_nm_2 = false);
Index: Helper.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/Helper.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Helper.cpp 19 Jul 2005 17:29:52 -0000 1.3
--- Helper.cpp 21 Jul 2005 14:32:14 -0000 1.4
***************
*** 135,136 ****
--- 135,146 ----
return makeLink( CComObjPtr<IMgaObject>( p_fco), nm_2, use_anyway_nm_2);
}
+
+ CComBSTR makeLink( CComObjPtr<IMgaSet> p_fco, const std::string& nm_2, bool use_anyway_nm_2)
+ {
+ return makeLink( CComObjPtr<IMgaObject>( p_fco), nm_2, use_anyway_nm_2);
+ }
+
+ CComBSTR makeLink( CComObjPtr<IMgaReference> p_fco, const std::string& nm_2, bool use_anyway_nm_2)
+ {
+ return makeLink( CComObjPtr<IMgaObject>( p_fco), nm_2, use_anyway_nm_2);
+ }
Index: MgaParserClosureHelper.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/MgaParserClosureHelper.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MgaParserClosureHelper.cpp 19 Jul 2005 17:29:52 -0000 1.4
--- MgaParserClosureHelper.cpp 21 Jul 2005 14:32:14 -0000 1.5
***************
*** 191,207 ****
if( m_GME)
{
! CComBSTR bstr;//, id, nm;
! //COMTHROW( p_obj->get_ID( &id));
! //COMTHROW( p_obj->get_Name( &nm));
! bstr.Append("[Smartcopy Parser] Name ambiguity, selected: ");
bstr.AppendBSTR( makeLink( p_obj));
- //bstr.Append("[Smartcopy Parser] Name ambiguity, selected: <A HREF=\"mga:");
- //bstr.AppendBSTR( id);
- //bstr.Append("\">");
- //if( nm.Length()!= 0)
- // bstr.AppendBSTR( nm);
- //else
- // bstr.Append("emptyname");
- //bstr.Append("</A>");
if( !text.empty())
--- 191,197 ----
if( m_GME)
{
! CComBSTR bstr;
! bstr.Append("Name ambiguity, selected: ");
bstr.AppendBSTR( makeLink( p_obj));
if( !text.empty())
***************
*** 213,218 ****
bstr.Append(". Search path used: ");
bstr.Append( makeViewable(p_absPath).c_str());
!
! COMTHROW( m_GME->ConsoleMessage(bstr, MSG_WARNING));
}
}
--- 203,207 ----
bstr.Append(". Search path used: ");
bstr.Append( makeViewable(p_absPath).c_str());
! msgSC( bstr, MSG_WARNING);
}
}
***************
*** 283,300 ****
if( m_GME)
{
! CComBSTR bstr;//, id, nm;
! //COMTHROW( obj->get_ID( &id));
! //COMTHROW( obj->get_Name( &nm));
! bstr.Append("[Smartcopy Parser] Name ambiguity, selected: ");
bstr.AppendBSTR( makeLink( obj));
- //bstr.Append("[Smartcopy Parser] Name ambiguity, selected: <A HREF=\"mga:");
- //bstr.AppendBSTR( id);
- //bstr.Append("\">");
- //if( nm.Length()!= 0)
- // bstr.AppendBSTR( nm);
- //else
- // bstr.Append("emptyname");
- //bstr.Append("</A>");
-
if( !text.empty())
{
--- 272,278 ----
if( m_GME)
{
! CComBSTR bstr;
! bstr.Append("Name ambiguity, selected: ");
bstr.AppendBSTR( makeLink( obj));
if( !text.empty())
{
***************
*** 305,310 ****
bstr.Append(". Search path used: ");
bstr.Append( makeViewable(relpath).c_str());
!
! COMTHROW( m_GME->ConsoleMessage(bstr, MSG_WARNING));
}
}
--- 283,287 ----
bstr.Append(". Search path used: ");
bstr.Append( makeViewable(relpath).c_str());
! msgSC( bstr, MSG_WARNING);
}
}
***************
*** 359,378 ****
place = m_target;//<!> let's try this
! CComBSTR id, nm, bstr("[Smartcopy Parser] Correct place not found for object: ");
bstr.Append( makeNameViewable( GetByName( attributes, "closurename")).c_str());
bstr.Append(". Search path used: ");
bstr.Append( makeViewable( GetByName(attributes, "closurepath")).c_str());
! bstr.Append(". Trying to insert into the target object: <A HREF=\"mga:");
! COMTHROW( place->get_ID( &id));
! COMTHROW( place->get_Name( &nm));
! bstr.AppendBSTR( id);
! bstr.Append("\">");
! if( nm.Length() != 0)
! bstr.AppendBSTR( nm);
! else
! bstr.Append("emptyname");
! bstr.Append("</A>.");
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage(bstr, MSG_ERROR));
place.QueryInterface( place_folder);
--- 336,347 ----
place = m_target;//<!> let's try this
! CComBSTR bstr("Correct place not found for object: ");
bstr.Append( makeNameViewable( GetByName( attributes, "closurename")).c_str());
bstr.Append(". Search path used: ");
bstr.Append( makeViewable( GetByName(attributes, "closurepath")).c_str());
! bstr.Append(". Trying to insert into the target object: ");
! bstr.AppendBSTR( makeLink( place));
! bstr.Append(".");
! msgSC(bstr, MSG_ERROR);
place.QueryInterface( place_folder);
***************
*** 514,540 ****
COMTHROW( ref->put_Referred( fco_target));
! CComBSTR id1, nm1, id2, nm2, bstr("[Smartcopy Parser] Reference <A HREF=\"mga:");
! COMTHROW( ref->get_ID( &id1));
! COMTHROW( ref->get_Name( &nm1));
! COMTHROW( fco_target->get_ID( &id2));
! COMTHROW( fco_target->get_Name( &nm2));
!
! bstr.AppendBSTR( id1);
! bstr.Append("\">");
! if( nm1.Length() != 0)
! bstr.AppendBSTR( nm1);
! else
! bstr.Append("emptyname");
!
! bstr.Append("</A> set to refer to <A HREF=\"mga:");
! bstr.AppendBSTR( id2);
! bstr.Append("\">");
! if( nm2.Length() != 0)
! bstr.AppendBSTR( nm2);
! else
! bstr.Append("emptyname");
!
! bstr.Append("</A> in 2nd step successfully.");
! if( m_GME) COMTHROW( m_GME->ConsoleMessage(bstr, MSG_INFO));
}
else
--- 483,492 ----
COMTHROW( ref->put_Referred( fco_target));
! CComBSTR bstr( "Reference ");
! bstr.AppendBSTR( makeLink( ref));
! bstr.Append( " set to refer to ");
! bstr.AppendBSTR( makeLink( fco_target));
! bstr.Append(" in 2nd step successfully.");
! msgSC(bstr, MSG_INFO);
}
else
***************
*** 546,564 ****
if( error)
{
! CComBSTR id1, nm1, bstr( "[Smartcopy Parser] Reference <A HREF=\"mga:");
! COMTHROW( it->first->get_ID( &id1));
! COMTHROW( it->first->get_Name( &nm1));
! bstr.AppendBSTR( id1);
! bstr.Append("\">");
! if( nm1.Length() != 0)
! bstr.AppendBSTR( nm1);
! else
! bstr.Append("emptyname");
!
! bstr.Append("</A>: target not found in 2nd step. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable( it->second).c_str());
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage(bstr, MSG_ERROR));
}
}
--- 498,507 ----
if( error)
{
! CComBSTR bstr( "Reference ");
! bstr.AppendBSTR( makeLink( it->first ));
! bstr.Append( ": target not found in 2nd step. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable( it->second).c_str());
! msgSC(bstr, MSG_ERROR);
}
}
***************
*** 596,622 ****
COMTHROW( set->AddMember( fco_member));
! CComBSTR id1, nm1, id2, nm2, bstr("[Smartcopy Parser] Member <A HREF=\"mga:");
! COMTHROW( set->get_ID( &id1));
! COMTHROW( set->get_Name( &nm1));
! COMTHROW( fco_member->get_ID( &id2));
! COMTHROW( fco_member->get_Name( &nm2));
!
! bstr.AppendBSTR( id2);
! bstr.Append("\">");
! if( nm2.Length() != 0)
! bstr.AppendBSTR( nm2);
! else
! bstr.Append("emptyname");
!
! bstr.Append("</A> added to set <A HREF=\"mga:");
! bstr.AppendBSTR( id1);
! bstr.Append("\">");
! if( nm1.Length() != 0)
! bstr.AppendBSTR( nm1);
! else
! bstr.Append("emptyname");
!
! bstr.Append("</A> in 2nd step successfully.");
! if( m_GME) COMTHROW( m_GME->ConsoleMessage(bstr, MSG_INFO));
}
else
--- 539,548 ----
COMTHROW( set->AddMember( fco_member));
! CComBSTR bstr( "Member");
! bstr.AppendBSTR( makeLink( fco_member));
! bstr.Append( " added to set ");
! bstr.AppendBSTR( makeLink( set));
! bstr.Append(" in 2nd step successfully.");
! msgSC(bstr, MSG_INFO);
}
else
***************
*** 628,646 ****
if( error)
{
! CComBSTR id1, nm1, bstr( "[Smartcopy Parser] Set <A HREF=\"mga:");
! COMTHROW( set->get_ID( &id1));
! COMTHROW( set->get_Name( &nm1));
! bstr.AppendBSTR( id1);
! bstr.Append("\">");
! if( nm1.Length() != 0)
! bstr.AppendBSTR( nm1);
! else
! bstr.Append("emptyname");
!
! bstr.Append("</A>: member not found in 2nd step. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable( *member_it).c_str());
!
! if( m_GME) COMTHROW( m_GME->ConsoleMessage(bstr, MSG_ERROR));
}
}
--- 554,563 ----
if( error)
{
! CComBSTR bstr( "Set ");
! bstr.AppendBSTR( makeLink( set));
! bstr.Append(": member not found in 2nd step. ");
bstr.Append("Search path used: ");
bstr.Append( makeViewable( *member_it).c_str());
! msgSC(bstr, MSG_ERROR);
}
}
***************
*** 682,683 ****
--- 599,617 ----
return null;
}
+
+ void CMgaParser::msgSC( CComBSTR& msg, msgtype_enum type)
+ {
+ static const char * sc_text = "[Smartcopy Parser] ";
+ CComBSTR m2;
+ std::string t;
+ CopyTo( msg, t);
+ if( t.substr( 0, strlen( sc_text)) != sc_text)
+ {
+ m2.Append( sc_text);
+ m2.AppendBSTR( msg);
+ }
+ else
+ m2 = msg;
+
+ if( m_GME) COMTHROW( m_GME->ConsoleMessage( m2, type));
+ }
\ No newline at end of file
Index: MgaParser.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Parser/MgaParser.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MgaParser.h 19 Jul 2005 17:29:52 -0000 1.13
--- MgaParser.h 21 Jul 2005 14:32:14 -0000 1.14
***************
*** 221,224 ****
--- 221,225 ----
void StartSCAtom(const attributes_type &attributes);
void StartSCModel(const attributes_type &attributes);
+ void msgSC( CComBSTR& msg, msgtype_enum type);
void EndSCConnection();
- Previous message: [GME-commit]
GMESRC/GME/Gme MainFrm.cpp,1.31,1.32 GME.rc,1.141,1.142
- Next message: [GME-commit] GMESRC/GME/MgaUtil ClosureSimple.cpp,1.1,1.2
ClosureSimple.h,1.1,1.2 MakeSimpleClosure.cpp,1.1,1.2
MakeSimpleClosure.h,1.1,1.2 MgaClosure.cpp,1.8,1.9
MgaUtil.rc,1.49,1.50 resource.h,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list