Commit da333092 authored by claes's avatar claes

Input of 0 attrref

parent 4d575bbf
/* /*
* Proview $Id: wb_wnav.cpp,v 1.27 2005-10-25 15:28:11 claes Exp $ * Proview $Id: wb_wnav.cpp,v 1.28 2005-11-17 09:05:10 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -206,7 +206,7 @@ int wnav_attr_string_to_value( ldh_tSesContext ldhses, int type_id, char *value ...@@ -206,7 +206,7 @@ int wnav_attr_string_to_value( ldh_tSesContext ldhses, int type_id, char *value
{ {
pwr_tObjid objid; pwr_tObjid objid;
if ( strcmp( value_str, "") == 0) if ( strcmp( value_str, "0") == 0 || strcmp( value_str, "") == 0)
objid = pwr_cNObjid; objid = pwr_cNObjid;
else { else {
sts = ldh_NameToObjid ( ldhses, &objid, value_str); sts = ldh_NameToObjid ( ldhses, &objid, value_str);
...@@ -269,9 +269,13 @@ int wnav_attr_string_to_value( ldh_tSesContext ldhses, int type_id, char *value ...@@ -269,9 +269,13 @@ int wnav_attr_string_to_value( ldh_tSesContext ldhses, int type_id, char *value
{ {
pwr_sAttrRef attrref; pwr_sAttrRef attrref;
sts = ldh_NameToAttrRef( ldhses, value_str, &attrref); if ( strcmp( value_str, "0") == 0)
if (EVEN(sts)) return WNAV__OBJNOTFOUND; attrref = pwr_cNAttrRef;
memcpy( buffer_ptr, &attrref, sizeof(attrref)); else {
sts = ldh_NameToAttrRef( ldhses, value_str, &attrref);
if (EVEN(sts)) return WNAV__OBJNOTFOUND;
}
memcpy( buffer_ptr, &attrref, sizeof(attrref));
break; break;
} }
case pwr_eType_DataRef: case pwr_eType_DataRef:
...@@ -441,10 +445,16 @@ void wnav_attrvalue_to_string( ldh_tSesContext ldhses, int type_id, void *value ...@@ -441,10 +445,16 @@ void wnav_attrvalue_to_string( ldh_tSesContext ldhses, int type_id, void *value
else else
sts = ldh_AttrRefToName( ldhses, attrref, ldh_eName_ArefVol, &name_p, len); sts = ldh_AttrRefToName( ldhses, attrref, ldh_eName_ArefVol, &name_p, len);
if (EVEN(sts)) if (EVEN(sts)) {
{ if ( cdh_ObjidIsNull( attrref->Objid)) {
strcpy( str, ""); strcpy( str, "");
*len = 0; *len = 0;
}
else {
strcpy( str, "");
cdh_ArefToString( str, attrref, 1);
*len = strlen(str);
}
*buff = str; *buff = str;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment