General/sharplib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some data fixes

Browse Source
This commit is contained in:
Marc Hernandez 2024-05-04 17:21:43 -07:00
parent c44706124b
commit 43d62557dd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
imm/Imm.cs
View File

@ -83,6 +83,7 @@ public interface Imm
public record class Versioned<T> : Imm public record class Versioned<T> : Imm
where T : Versioned<T> where T : Versioned<T>
{ {
public delegate void ChangeDelegate( T ZZOld, T next ); public delegate void ChangeDelegate( T ZZOld, T next );
public record class MetaData : Meta public record class MetaData : Meta
@ -94,8 +95,8 @@ public record class Versioned<T> : Imm
} }
protected Versioned( ) protected Versioned( )
: this( new MetaData { Version = 1, Reason = $"Versioned.cons" } )
{ {
MetaStorage = new MetaData { Version = 1, Reason = $"Creation" };
} }
internal Versioned( MetaData meta ) internal Versioned( MetaData meta )

9
ser/XmlFormatter2.cs
View File

@ -559,15 +559,22 @@ namespace lib
if( FilterField( filterFields, doImpls, whitelistFields, childFi as MemberInfo, name ) ) if( FilterField( filterFields, doImpls, whitelistFields, childFi as MemberInfo, name ) )
continue; continue;
var useFieldName = true;
//Get the value from an attribute named after the field
string attValue = elem.GetAttribute( name ); string attValue = elem.GetAttribute( name );
//Now, if we dont have one, grab one from the property name
if( !string.IsNullOrWhiteSpace( propName ) && string.IsNullOrWhiteSpace( attValue ) ) if( !string.IsNullOrWhiteSpace( propName ) && string.IsNullOrWhiteSpace( attValue ) )
{
useFieldName = false;
attValue = elem.GetAttribute( propName ); attValue = elem.GetAttribute( propName );
}
if( !string.IsNullOrWhiteSpace( attValue ) ) if( !string.IsNullOrWhiteSpace( attValue ) )
{ {
object existingObj = childFi.GetValue( obj ); object existingObj = childFi.GetValue( obj );
object childObj = DeserializeConcrete( elem, childFi, attValue, childFi.FieldType ); object childObj = DeserializeConcrete( elem, childFi, useFieldName ? name : propName, childFi.FieldType );
childFi.SetValue( obj, childObj ); childFi.SetValue( obj, childObj );
} }