Commit 2e48d91c authored by Roque Porchetto's avatar Roque Porchetto

Adding Data Descriptor methods. Corresponding script refactoring.

parent a1ece2d0
...@@ -4,10 +4,10 @@ import json ...@@ -4,10 +4,10 @@ import json
from Products.ERP5Type.Log import log from Products.ERP5Type.Log import log
def getJSONMetadata(raw_info): def getJSONMetadata(raw_info):
info = { 'filename': raw_info['filename'], info = { 'filename': 'FILENAME', #raw_info['filename'],
'nchan': raw_info['nchan'], 'nchan': raw_info['nchan'],
'ch_names': raw_info['ch_names'], 'ch_names': raw_info['ch_names'],
'sfreq': raw_info['sfreq'] 'sfreq': raw_info['sfreq']
} }
return json.dumps(info) return json.dumps(info)
...@@ -19,8 +19,8 @@ def processRawData(data_stream, data_array, data_descriptor): ...@@ -19,8 +19,8 @@ def processRawData(data_stream, data_array, data_descriptor):
fif_file.write(data_stream_content) fif_file.write(data_stream_content)
raw = mne.io.read_raw_fif(raw_file, preload=True) raw = mne.io.read_raw_fif(raw_file, preload=True)
json_metadata = getJSONMetadata(raw.info) json_metadata = getJSONMetadata(raw.info)
#data_descriptor.setTextContent(json_metadata) data_descriptor.setTextContent(json_metadata)
#log("Data Descriptor metadata: " + str(data_descriptor.getTextContent())) log("Data Descriptor metadata: " + str(data_descriptor.getTextContent()))
data_array.setArray(raw._data) data_array.setArray(raw._data)
log("Data Array array: " + str(data_array.getArray())) log("Data Array array: " + str(data_array.getArray()))
os.remove(raw_file) os.remove(raw_file)
......
...@@ -51,9 +51,7 @@ ...@@ -51,9 +51,7 @@
<item> <item>
<key> <string>text_content_warning_message</string> </key> <key> <string>text_content_warning_message</string> </key>
<value> <value>
<tuple> <tuple/>
<string>W: 21, 4: Unused variable \'json_metadata\' (unused-variable)</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -5,4 +5,4 @@ log("Processing raw data from Data Stream " + str(input_stream_data.getReference ...@@ -5,4 +5,4 @@ log("Processing raw data from Data Stream " + str(input_stream_data.getReference
result = str(context.processRawData(input_stream_data, output_array, output_descriptor)) result = str(context.processRawData(input_stream_data, output_array, output_descriptor))
log(result) log(result)
log("Metadata stored in Data Descriptor " + str(output_descriptor))#.getReference())) log("Metadata stored in Data Descriptor " + str(output_descriptor))
from Products.ERP5Type.Log import log from Products.ERP5Type.Log import log
record = reference.rsplit('.') record = reference.rsplit('.')
filename = record[2] if (len(record) >= 5) else reference
extension = record[3] if (len(record) >= 5) else "fif"
eof = record[4] if (len(record) >= 5) else "eof"
specialise_reference = record[0] if (len(record) >= 5) else "default"
aggregate_data_set_reference = record[1] if (len(record) >= 5) else "default"
dict = { 'filename': record[2], dict = { 'filename': filename,
'extension': record[3], 'extension': extension,
'eof': record[4], 'eof': eof,
'specialise_reference': record[0], 'specialise_reference': specialise_reference,
'aggregate_data_set_reference': record[1], 'aggregate_data_set_reference': aggregate_data_set_reference,
'resource_reference': 'fif' 'resource_reference': 'fif'
} }
......
<property_sheet_list>
<portal_type id="Data Descriptor">
<item>DataDescriptor</item>
<item>TextDocument</item>
</portal_type>
</property_sheet_list>
\ No newline at end of file
Data Descriptor | DataDescriptor
Data Descriptor | TextDocument
\ No newline at end of file
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