|
@@ -99,15 +99,15 @@ class DataHandler(object):
|
99
|
99
|
# @throw RunTimeError if data construction fails
|
100
|
100
|
def construct_data(self, emcomponent, fname, datas, cur_value):
|
101
|
101
|
emcomponent_fields = emcomponent.fields()
|
102
|
|
- fname_data_handler = None
|
|
102
|
+ data_handler = None
|
103
|
103
|
if fname in emcomponent_fields:
|
104
|
|
- fname_data_handler = DataHandler.from_name(emcomponent_fields[fname])
|
|
104
|
+ data_handler = emcomponent_fields[fname]
|
105
|
105
|
|
106
|
106
|
if fname in datas.keys():
|
107
|
107
|
return cur_value
|
108
|
|
- elif fname_data_handler is not None and hasattr(fname_data_handler, 'default'):
|
109
|
|
- return fname_data_handler.default
|
110
|
|
- elif fname_data_handler is not None and fname_data_handler.nullable:
|
|
108
|
+ elif data_handler is not None and hasattr(data_handler, 'default'):
|
|
109
|
+ return data_handler.default
|
|
110
|
+ elif data_handler is not None and data_handler.nullable:
|
111
|
111
|
return None
|
112
|
112
|
|
113
|
113
|
return RuntimeError("Unable to construct data for field %s", fname)
|