commit 342183eeb0f5f4e82d9353738cc0f90025ad86fc · hailey.at/photocopy

+20 -12
plc_models.go
···

       138
       138
        
       		che.PlcOpType = pop.Type

     

       139
       139
        
       		che.PlcOpAlsoKnownAs = pop.AlsoKnownAs

     

       140
       140
        
       		che.PlcOpRotationKeys = pop.RotationKeys

     

       141
       141
       -
       		if e.Operation.PLCOperation.Services != nil {

     

       142
       142
       -
       			b, err := json.Marshal(e.Operation.PLCOperation.Services)

     

       143
       143
       -
       			if err != nil {

     

       144
       144
       -
       				return nil, fmt.Errorf("error marshaling services: %w", err)

     

       145
       145
       -
       			}

     

       146
       146
       -
       			che.PlcOpServices = string(b)

     

       141
       141
       +
       		if e.Operation.PLCOperation.Services == nil {

     

       142
       142
       +
       			ps := map[string]PLCService{}

     

       143
       143
       +
       			e.Operation.PLCOperation.Services = ps

     

       147
       144
        
       		}

     

       148
       148
       -
       		if e.Operation.PLCOperation.VerificationMethods != nil {

     

       149
       149
       -
       			b, err := json.Marshal(e.Operation.PLCOperation.VerificationMethods)

     

       150
       150
       -
       			if err != nil {

     

       151
       151
       -
       				return nil, fmt.Errorf("error marshaling verification methods: %w", err)

     

       152
       152
       -
       			}

     

       153
       153
       -
       			che.PlcOpVerificationMethods = string(b)

     

       145
       145
       +
       

     

       146
       146
       +
       		b, err := json.Marshal(e.Operation.PLCOperation.Services)

     

       147
       147
       +
       		if err != nil {

     

       148
       148
       +
       			return nil, fmt.Errorf("error marshaling services: %w", err)

     

       154
       149
        
       		}

     

       150
       150
       +
       		che.PlcOpServices = string(b)

     

       151
       151
       +
       

     

       152
       152
       +
       		if e.Operation.PLCOperation.VerificationMethods == nil {

     

       153
       153
       +
       			vm := map[string]string{}

     

       154
       154
       +
       			e.Operation.PLCOperation.VerificationMethods = vm

     

       155
       155
       +
       		}

     

       156
       156
       +
       

     

       157
       157
       +
       		b, err = json.Marshal(e.Operation.PLCOperation.VerificationMethods)

     

       158
       158
       +
       		if err != nil {

     

       159
       159
       +
       			return nil, fmt.Errorf("error marshaling verification methods: %w", err)

     

       160
       160
       +
       		}

     

       161
       161
       +
       		che.PlcOpVerificationMethods = string(b)

     

       162
       162
       +
       

     

       155
       163
        
       		return che, nil

     

       156
       164
        
       	} else if e.Operation.PLCTombstone != nil {

     

       157
       165
        
       		che.PlcTombSig = e.Operation.PLCTombstone.Sig