diff --git a/.gitignore b/.gitignore index 70a6b71..22677d1 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,5 @@ python/ **/.DS_Store *.idea + +sed* diff --git a/adsmsg/protobuf/docmatch_pb2.py b/adsmsg/protobuf/docmatch_pb2.py index 59a7178..6631860 100644 --- a/adsmsg/protobuf/docmatch_pb2.py +++ b/adsmsg/protobuf/docmatch_pb2.py @@ -1,13 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: docmatch.proto - -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database -from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -20,7 +18,9 @@ name='docmatch.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x0e\x64ocmatch.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"U\n\x0e\x44ocMatchRecord\x12\x16\n\x0esource_bibcode\x18\x01 \x01(\t\x12\x17\n\x0fmatched_bibcode\x18\x02 \x01(\t\x12\x12\n\nconfidence\x18\x03 \x01(\x01\"f\n\x12\x44ocMatchRecordList\x12\x30\n\x10\x64ocmatch_records\x18\x01 \x03(\x0b\x32\x16.adsmsg.DocMatchRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3') + serialized_options=None, + create_key=_descriptor._internal_create_key, + serialized_pb=b'\n\x0e\x64ocmatch.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"U\n\x0e\x44ocMatchRecord\x12\x16\n\x0esource_bibcode\x18\x01 \x01(\t\x12\x17\n\x0fmatched_bibcode\x18\x02 \x01(\t\x12\x12\n\nconfidence\x18\x03 \x01(\x01\"f\n\x12\x44ocMatchRecordList\x12\x30\n\x10\x64ocmatch_records\x18\x01 \x03(\x0b\x32\x16.adsmsg.DocMatchRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -33,35 +33,36 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='source_bibcode', full_name='adsmsg.DocMatchRecord.source_bibcode', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='matched_bibcode', full_name='adsmsg.DocMatchRecord.matched_bibcode', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='confidence', full_name='adsmsg.DocMatchRecord.confidence', index=2, number=3, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -78,6 +79,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='docmatch_records', full_name='adsmsg.DocMatchRecordList.docmatch_records', index=0, @@ -85,21 +87,21 @@ has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.DocMatchRecordList.status', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -115,19 +117,19 @@ DESCRIPTOR.message_types_by_name['DocMatchRecordList'] = _DOCMATCHRECORDLIST _sym_db.RegisterFileDescriptor(DESCRIPTOR) -DocMatchRecord = _reflection.GeneratedProtocolMessageType('DocMatchRecord', (_message.Message,), dict( - DESCRIPTOR = _DOCMATCHRECORD, - __module__ = 'docmatch_pb2' +DocMatchRecord = _reflection.GeneratedProtocolMessageType('DocMatchRecord', (_message.Message,), { + 'DESCRIPTOR' : _DOCMATCHRECORD, + '__module__' : 'docmatch_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DocMatchRecord) - )) + }) _sym_db.RegisterMessage(DocMatchRecord) -DocMatchRecordList = _reflection.GeneratedProtocolMessageType('DocMatchRecordList', (_message.Message,), dict( - DESCRIPTOR = _DOCMATCHRECORDLIST, - __module__ = 'docmatch_pb2' +DocMatchRecordList = _reflection.GeneratedProtocolMessageType('DocMatchRecordList', (_message.Message,), { + 'DESCRIPTOR' : _DOCMATCHRECORDLIST, + '__module__' : 'docmatch_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DocMatchRecordList) - )) + }) _sym_db.RegisterMessage(DocMatchRecordList) -# @@protoc_insertion_point(module_scope) +# @@protoc_insertion_point(module_scope) \ No newline at end of file diff --git a/adsmsg/protobuf/nonbibrecord_pb2.py b/adsmsg/protobuf/nonbibrecord_pb2.py index d84e202..0a25840 100644 --- a/adsmsg/protobuf/nonbibrecord_pb2.py +++ b/adsmsg/protobuf/nonbibrecord_pb2.py @@ -411,4 +411,4 @@ _sym_db.RegisterMessage(DataLinksRecordList) -# @@protoc_insertion_point(module_scope) +# @@protoc_insertion_point(module_scope) \ No newline at end of file diff --git a/specs/nonbibrecord.proto b/specs/nonbibrecord.proto index 2d12c41..be8d77b 100644 --- a/specs/nonbibrecord.proto +++ b/specs/nonbibrecord.proto @@ -51,4 +51,4 @@ message DataLinksRecord { message DataLinksRecordList { repeated DataLinksRecord datalinks_records = 1; Status status = 2; -} +} \ No newline at end of file