Attachment #163842 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch

Lines 74-80 Link Here

(-)src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx (-1 / +1 lines)
74	ostream & GraphBase::Base::AnyValue( const CORBA::Any & anAny ) {	74	ostream & GraphBase::Base::AnyValue( const CORBA::Any & anAny ) {
75	switch (anAny.type()->kind()) {	75	switch (anAny.type()->kind()) {
76	case CORBA::tk_string: {	76	case CORBA::tk_string: {
77	char * t;	77	const char * t;
78	anAny >>= t;	78	anAny >>= t;
79	*_fdebug << " " << t << " (tk_string)" << endl ;	79	*_fdebug << " " << t << " (tk_string)" << endl ;
80	break;	80	break;




#endif
  switch (aDataValue->type()->kind()) { // Input Value
  case CORBA::tk_string: { // Input string Value
    const char * t;
    *aDataValue >>= t;
#if ValueTrace
    cdebug << t << " (string)" ;

        char t[40] ;
        sprintf( t , "%ld" , ll ) ;
        *theValue <<=  t ;
        const char *tt ;
        *theValue >>= tt ;
#if ValueTrace
        cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ;

        char t[40] ;
        sprintf( t , "%lf" , d ) ;
        *theValue <<=  t ;
        const char *tt ;
        *theValue >>= tt ;
#if ValueTrace
        cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ;

//JR 30.03.2005    switch ( theValue->type()->kind() ) {
    switch ( theValue.type()->kind() ) {
    case CORBA::tk_string: {
      const char * t;
//JR 30.03.2005      *theValue >>= t;
      theValue >>= t;
//      cdebug << "GraphBase::DataPort::Value() : " << t << " (string) " << endl ;

    const CORBA::Any * theValue = *_Value ;
    switch (theValue->type()->kind()) {
    case CORBA::tk_string:
      const char * t;
      *theValue >>= t;
      f << t << " (string)" ;
      break;

Lines 1598-1604 Link Here

(-)src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx (-2 / +2 lines)
1598	bool isUnknown = false;	1598	bool isUnknown = false;
1599	switch (aValue.type()->kind()) {	1599	switch (aValue.type()->kind()) {
1600	case CORBA::tk_string:	1600	case CORBA::tk_string:
1601	char * t;	1601	const char * t;
1602	aValue >>= t;	1602	aValue >>= t;
1603	cdebug << t << " (string) " ;	1603	cdebug << t << " (string) " ;
1604	if ( !strcmp( t, "Unknown CORBA::Any Type" ) )	1604	if ( !strcmp( t, "Unknown CORBA::Any Type" ) )
Lines 1688-1694 Link Here
1688	<< ToServiceParameterName << "' , Any " ;	1688	<< ToServiceParameterName << "' , Any " ;
1689	switch (aValue.type()->kind()) {	1689	switch (aValue.type()->kind()) {
1690	case CORBA::tk_string:	1690	case CORBA::tk_string:
1691	char * t;	1691	const char * t;
1692	aValue >>= t;	1692	aValue >>= t;
1693	cdebug << t << " (string) " ;	1693	cdebug << t << " (string) " ;
1694	break;	1694	break;

Lines 718-724 Link Here

(-)src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx (-2 / +2 lines)
718	case CORBA::tk_string: {	718	case CORBA::tk_string: {
719	//Mandrake 10.1/Salome 3 aLink.aLinkValue <<= (char *) NULL ;	719	//Mandrake 10.1/Salome 3 aLink.aLinkValue <<= (char *) NULL ;
720	aLink.aLinkValue <<= (char *) "" ;	720	aLink.aLinkValue <<= (char *) "" ;
721	char * t;	721	const char * t;
722	aLink.aLinkValue >>= t;	722	aLink.aLinkValue >>= t;
723	#if TRACE	723	#if TRACE
724	MESSAGE( t << " (string)" );	724	MESSAGE( t << " (string)" );
Lines 778-784 Link Here
778	switch ( aLink.aLinkValue.type()->kind() ) {	778	switch ( aLink.aLinkValue.type()->kind() ) {
779	case CORBA::tk_string: {	779	case CORBA::tk_string: {
780	aLink.aLinkValue <<= fieldvalue[depth].c_str() ;	780	aLink.aLinkValue <<= fieldvalue[depth].c_str() ;
781	char * t;	781	const char * t;
782	aLink.aLinkValue >>= t;	782	aLink.aLinkValue >>= t;
783	#if TRACE	783	#if TRACE
784	MESSAGE( t << " (string)" );	784	MESSAGE( t << " (string)" );

Lines 1200-1206 Link Here

(-)src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx (-2 / +2 lines)
1200	valuetype.appendChild( aField ) ;	1200	valuetype.appendChild( aField ) ;
1201	switch (aLink.aLinkValue.type()->kind()) {	1201	switch (aLink.aLinkValue.type()->kind()) {
1202	case CORBA::tk_string: {	1202	case CORBA::tk_string: {
1203	char* retstr ;	1203	const char* retstr ;
1204	aLink.aLinkValue >>= retstr;	1204	aLink.aLinkValue >>= retstr;
1205	// f << Tabs << " <value>" << retstr << "</value>" << endl ;	1205	// f << Tabs << " <value>" << retstr << "</value>" << endl ;
1206	QDomElement value = Graph.createElement( "value" ) ;	1206	QDomElement value = Graph.createElement( "value" ) ;
Lines 1345-1351 Link Here
1345	<< ".Input( " ;	1345	<< ".Input( " ;
1346	switch (aLink.aLinkValue.type()->kind()) {	1346	switch (aLink.aLinkValue.type()->kind()) {
1347	case CORBA::tk_string: {	1347	case CORBA::tk_string: {
1348	char* retstr ;	1348	const char* retstr ;
1349	aLink.aLinkValue >>= retstr;	1349	aLink.aLinkValue >>= retstr;
1350	f << "'" << retstr << "'" ;	1350	f << "'" << retstr << "'" ;
1351	break ;	1351	break ;




      const char * Type = anInPort->GetServicesParameter().Parametertype ;
      switch ( D.Value.type()->kind() ) { // { string , long , double , objref }
      case CORBA::tk_string:
        const char * t;
        D.Value >>= t;
#if InParametersSetTrace
        cdebug << t << " (string)" ;

#if InParametersSetTrace
    switch (D.Value.type()->kind()) { // { string , long , double , objref }
    case CORBA::tk_string:
      const char * t;
      D.Value >>= t;
      cdebug << ThreadNo() << " " << t << "(string)" << endl ;
      break;

        ServicesAnyData D = OutParametersList[i] ;
        switch (D.Value.type()->kind()) { // { string , long , double , objref }
        case CORBA::tk_string: {
          const char * t;
          D.Value >>= t;
#if OutParametersSetTrace
          cdebug << ThreadNo() << " " << t << "(string)" << endl ;

#if OutParametersSetTrace
        switch ( anOutPort->Value().type()->kind() ) {
        case CORBA::tk_string:
          const char * t;
          (anOutPort->Value()) >>= t;
          cdebug << ThreadNo() << " Out" << i << " : " << t << "(string)" << endl ;
          break;

Lines 320-326 Link Here

(-)src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx (-1 / +1 lines)
320	sname = InParametersList[i].Name.c_str() ;	320	sname = InParametersList[i].Name.c_str() ;
321	switch ( data.type()->kind() ) {	321	switch ( data.type()->kind() ) {
322	case CORBA::tk_string : {	322	case CORBA::tk_string : {
323	char * t ;	323	const char * t ;
324	data >>= t ;	324	data >>= t ;
325	PyObject * ArgValue = Py_BuildValue( "s" , t ) ;	325	PyObject * ArgValue = Py_BuildValue( "s" , t ) ;
326	PyTuple_SetItem( ArgsList , i , ArgValue ) ;	326	PyTuple_SetItem( ArgsList , i , ArgValue ) ;

Return to bug 155974

Lines 151-157 Link Here

(-)src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx (-5 / +5 lines)
151	#endif	151	#endif
152	switch (aDataValue->type()->kind()) { // Input Value	152	switch (aDataValue->type()->kind()) { // Input Value
153	case CORBA::tk_string: { // Input string Value	153	case CORBA::tk_string: { // Input string Value
154	char * t;	154	const char * t;
155	*aDataValue >>= t;	155	*aDataValue >>= t;
156	#if ValueTrace	156	#if ValueTrace
157	cdebug << t << " (string)" ;	157	cdebug << t << " (string)" ;
Lines 242-248 Link Here
242	char t[40] ;	242	char t[40] ;
243	sprintf( t , "%ld" , ll ) ;	243	sprintf( t , "%ld" , ll ) ;
244	*theValue <<= t ;	244	*theValue <<= t ;
245	char *tt ;	245	const char *tt ;
246	*theValue >>= tt ;	246	*theValue >>= tt ;
247	#if ValueTrace	247	#if ValueTrace
248	cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ;	248	cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ;
Lines 311-317 Link Here
311	char t[40] ;	311	char t[40] ;
312	sprintf( t , "%lf" , d ) ;	312	sprintf( t , "%lf" , d ) ;
313	*theValue <<= t ;	313	*theValue <<= t ;
314	char *tt ;	314	const char *tt ;
315	*theValue >>= tt ;	315	*theValue >>= tt ;
316	#if ValueTrace	316	#if ValueTrace
317	cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ;	317	cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ;
Lines 473-479 Link Here
473	//JR 30.03.2005 switch ( theValue->type()->kind() ) {	473	//JR 30.03.2005 switch ( theValue->type()->kind() ) {
474	switch ( theValue.type()->kind() ) {	474	switch ( theValue.type()->kind() ) {
475	case CORBA::tk_string: {	475	case CORBA::tk_string: {
476	char * t;	476	const char * t;
477	//JR 30.03.2005 *theValue >>= t;	477	//JR 30.03.2005 *theValue >>= t;
478	theValue >>= t;	478	theValue >>= t;
479	// cdebug << "GraphBase::DataPort::Value() : " << t << " (string) " << endl ;	479	// cdebug << "GraphBase::DataPort::Value() : " << t << " (string) " << endl ;
Lines 583-589 Link Here
583	const CORBA::Any * theValue = *_Value ;	583	const CORBA::Any * theValue = *_Value ;
584	switch (theValue->type()->kind()) {	584	switch (theValue->type()->kind()) {
585	case CORBA::tk_string:	585	case CORBA::tk_string:
586	char * t;	586	const char * t;
587	*theValue >>= t;	587	*theValue >>= t;
588	f << t << " (string)" ;	588	f << t << " (string)" ;
589	break;	589	break;

Lines 3277-3283 Link Here

(-)src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx (-4 / +4 lines)
3277	const char * Type = anInPort->GetServicesParameter().Parametertype ;	3277	const char * Type = anInPort->GetServicesParameter().Parametertype ;
3278	switch ( D.Value.type()->kind() ) { // { string , long , double , objref }	3278	switch ( D.Value.type()->kind() ) { // { string , long , double , objref }
3279	case CORBA::tk_string:	3279	case CORBA::tk_string:
3280	char * t;	3280	const char * t;
3281	D.Value >>= t;	3281	D.Value >>= t;
3282	#if InParametersSetTrace	3282	#if InParametersSetTrace
3283	cdebug << t << " (string)" ;	3283	cdebug << t << " (string)" ;
Lines 3675-3681 Link Here
3675	#if InParametersSetTrace	3675	#if InParametersSetTrace
3676	switch (D.Value.type()->kind()) { // { string , long , double , objref }	3676	switch (D.Value.type()->kind()) { // { string , long , double , objref }
3677	case CORBA::tk_string:	3677	case CORBA::tk_string:
3678	char * t;	3678	const char * t;
3679	D.Value >>= t;	3679	D.Value >>= t;
3680	cdebug << ThreadNo() << " " << t << "(string)" << endl ;	3680	cdebug << ThreadNo() << " " << t << "(string)" << endl ;
3681	break;	3681	break;
Lines 3764-3770 Link Here
3764	ServicesAnyData D = OutParametersList[i] ;	3764	ServicesAnyData D = OutParametersList[i] ;
3765	switch (D.Value.type()->kind()) { // { string , long , double , objref }	3765	switch (D.Value.type()->kind()) { // { string , long , double , objref }
3766	case CORBA::tk_string: {	3766	case CORBA::tk_string: {
3767	char * t;	3767	const char * t;
3768	D.Value >>= t;	3768	D.Value >>= t;
3769	#if OutParametersSetTrace	3769	#if OutParametersSetTrace
3770	cdebug << ThreadNo() << " " << t << "(string)" << endl ;	3770	cdebug << ThreadNo() << " " << t << "(string)" << endl ;
Lines 3999-4005 Link Here
3999	#if OutParametersSetTrace	3999	#if OutParametersSetTrace
4000	switch ( anOutPort->Value().type()->kind() ) {	4000	switch ( anOutPort->Value().type()->kind() ) {
4001	case CORBA::tk_string:	4001	case CORBA::tk_string:
4002	char * t;	4002	const char * t;
4003	(anOutPort->Value()) >>= t;	4003	(anOutPort->Value()) >>= t;
4004	cdebug << ThreadNo() << " Out" << i << " : " << t << "(string)" << endl ;	4004	cdebug << ThreadNo() << " Out" << i << " : " << t << "(string)" << endl ;
4005	break;	4005	break;