diff --git a/emdb_schemas/current/doc/Untitled.indexList.html b/emdb_schemas/current/doc/Untitled.indexList.html index ac2ea73..415b5f5 100644 --- a/emdb_schemas/current/doc/Untitled.indexList.html +++ b/emdb_schemas/current/doc/Untitled.indexList.html @@ -423,6 +423,7 @@

Table of Contents

chain_type
classification_type
code_type
+
complex_revision_change_type
complex_source_type
complex_supramolecule_type
contact_details_type
@@ -470,7 +471,6 @@

Table of Contents

macromolecules_and_complexes_type
map_statistics_type
map_type
-
metadata_revision_type
modelling_type
molecular_replacement_type
molecular_weight_type
diff --git a/emdb_schemas/current/doc/Untitled.indexListcomp.html b/emdb_schemas/current/doc/Untitled.indexListcomp.html index c632c2f..b5853c3 100644 --- a/emdb_schemas/current/doc/Untitled.indexListcomp.html +++ b/emdb_schemas/current/doc/Untitled.indexListcomp.html @@ -420,6 +420,7 @@

Table of Contents

chain_type
classification_type
code_type
+
complex_revision_change_type
complex_source_type
complex_supramolecule_type
contact_details_type
@@ -467,7 +468,6 @@

Table of Contents

macromolecules_and_complexes_type
map_statistics_type
map_type
-
metadata_revision_type
modelling_type
molecular_replacement_type
molecular_weight_type
diff --git a/emdb_schemas/current/doc/Untitled.indexListns.html b/emdb_schemas/current/doc/Untitled.indexListns.html index 1378da3..8cb29e0 100644 --- a/emdb_schemas/current/doc/Untitled.indexListns.html +++ b/emdb_schemas/current/doc/Untitled.indexListns.html @@ -423,6 +423,7 @@

Table of Contents

chain_type
classification_type
code_type
+
complex_revision_change_type
complex_source_type
complex_supramolecule_type
contact_details_type
@@ -470,7 +471,6 @@

Table of Contents

macromolecules_and_complexes_type
map_statistics_type
map_type
-
metadata_revision_type
modelling_type
molecular_replacement_type
molecular_weight_type
diff --git a/emdb_schemas/current/doc/emdb_xsd.html b/emdb_schemas/current/doc/emdb_xsd.html index 25119eb..4744676 100644 --- a/emdb_schemas/current/doc/emdb_xsd.html +++ b/emdb_schemas/current/doc/emdb_xsd.html @@ -367,11 +367,11 @@ 'properties_fsc', 'properties_additional_map', 'properties_model', + 'properties_complex_revision_change_type_categories', + 'properties_complex_revision_change_type_complex_revision_change_type_categories_category', + 'properties_complex_revision_change_type_items', + 'properties_complex_revision_change_type_complex_revision_change_type_items_item', 'properties_metadata', - 'properties_metadata_revision_type_categories', - 'properties_metadata_revision_type_metadata_revision_type_categories_category', - 'properties_metadata_revision_type_items', - 'properties_metadata_revision_type_metadata_revision_type_items_item', 'properties_journal_citation', 'properties_journal_citation_author', 'properties_journal_citation_title', @@ -1173,7 +1173,7 @@ 'usedBy_figure_type', 'usedBy_validation_type', 'usedBy_part_revision_change_type', - 'usedBy_metadata_revision_type', + 'usedBy_complex_revision_change_type', 'usedBy_revision_category_or_item_type', 'usedBy_author_order_type', 'usedBy_page_type', @@ -1759,11 +1759,11 @@ 'source_fsc', 'source_additional_map', 'source_model', + 'source_complex_revision_change_type_categories', + 'source_complex_revision_change_type_complex_revision_change_type_categories_category', + 'source_complex_revision_change_type_items', + 'source_complex_revision_change_type_complex_revision_change_type_items_item', 'source_metadata', - 'source_metadata_revision_type_categories', - 'source_metadata_revision_type_metadata_revision_type_categories_category', - 'source_metadata_revision_type_items', - 'source_metadata_revision_type_metadata_revision_type_items_item', 'source_journal_citation', 'source_journal_citation_author', 'source_journal_citation_title', @@ -2273,7 +2273,7 @@ 'source_figure_type', 'source_validation_type', 'source_part_revision_change_type', - 'source_metadata_revision_type', + 'source_complex_revision_change_type', 'source_revision_category_or_item_type', 'source_author_enums', 'source_author_order_type', @@ -2613,9 +2613,9 @@ 'instance_fsc', 'instance_additional_map', 'instance_model', + 'instance_complex_revision_change_type_categories', + 'instance_complex_revision_change_type_items', 'instance_metadata', - 'instance_metadata_revision_type_categories', - 'instance_metadata_revision_type_items', 'instance_journal_citation', 'instance_non_journal_citation', 'instance_cell_supramolecule', @@ -3147,11 +3147,11 @@ 'diagram_fsc', 'diagram_additional_map', 'diagram_model', + 'diagram_complex_revision_change_type_categories', + 'diagram_complex_revision_change_type_complex_revision_change_type_categories_category', + 'diagram_complex_revision_change_type_items', + 'diagram_complex_revision_change_type_complex_revision_change_type_items_item', 'diagram_metadata', - 'diagram_metadata_revision_type_categories', - 'diagram_metadata_revision_type_metadata_revision_type_categories_category', - 'diagram_metadata_revision_type_items', - 'diagram_metadata_revision_type_metadata_revision_type_items_item', 'diagram_journal_citation', 'diagram_journal_citation_author', 'diagram_journal_citation_title', @@ -3661,7 +3661,7 @@ 'diagram_figure_type', 'diagram_validation_type', 'diagram_part_revision_change_type', - 'diagram_metadata_revision_type', + 'diagram_complex_revision_change_type', 'diagram_revision_category_or_item_type', 'diagram_author_enums', 'diagram_author_order_type', @@ -3840,9 +3840,8 @@ 'attributes_mask', 'attributes_fsc', 'attributes_additional_map', - 'attributes_model', - 'attributes_metadata_revision_type_metadata_revision_type_categories_category', - 'attributes_metadata_revision_type_metadata_revision_type_items_item', + 'attributes_complex_revision_change_type_complex_revision_change_type_categories_category', + 'attributes_complex_revision_change_type_complex_revision_change_type_items_item', 'attributes_journal_citation', 'attributes_journal_citation_author', 'attributes_journal_citation_external_references', @@ -4147,9 +4146,9 @@ 'model_fsc', 'model_additional_map', 'model_model', + 'model_complex_revision_change_type_categories', + 'model_complex_revision_change_type_items', 'model_metadata', - 'model_metadata_revision_type_categories', - 'model_metadata_revision_type_items', 'model_journal_citation', 'model_non_journal_citation', 'model_cell_supramolecule', @@ -4369,7 +4368,7 @@ 'model_figure_type', 'model_validation_type', 'model_part_revision_change_type', - 'model_metadata_revision_type', + 'model_complex_revision_change_type', 'model_cell_supramolecule_type', 'model_cell_source_type', 'model_complex_supramolecule_type', @@ -6335,7 +6334,7 @@

Showing:

-
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#additional_mapemdb_xsd.tmp#fscemdb_xsd.tmp#half_mapemdb_xsd.tmp#imageemdb_xsd.tmp#maskemdb_xsd.tmp#metadataemdb_xsd.tmp#modelemdb_xsd.tmp#primary_map
+
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#additional_mapemdb_xsd.tmp#fscemdb_xsd.tmp#half_mapemdb_xsd.tmp#imageemdb_xsd.tmp#maskemdb_xsd.tmp#metadataemdb_xsd.tmp#modelemdb_xsd.tmp#primary_map
@@ -43188,19 +43187,19 @@

Showing:

-
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#part_revision_change_type_partemdb_xsd.tmp#part_revision_change_typeemdb_xsd.tmp#revision_change_sub_group
+
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#complex_revision_change_type_categoriesemdb_xsd.tmp#complex_revision_change_type_itemsemdb_xsd.tmp#complex_revision_change_typeemdb_xsd.tmp#revision_change_sub_group
Type - part_revision_change_type + complex_revision_change_type Type hierarchy @@ -43234,12 +43233,12 @@

Showing:

Model
-
revision_type , provider , description{0,1} , details{0,1} , revision_group{0,1}
+
revision_type , provider , description{0,1} , details{0,1} , revision_group{0,1} , categories{0,1} , items{0,1}
Children - description, details, provider, revision_group, revision_type + categories, description, details, items, provider, revision_group, revision_type @@ -43251,12 +43250,14 @@

Showing:

@@ -43264,34 +43265,6 @@

Showing:

- - - - -
-
<model part="">
+                                       
<model>
   <revision_type>{1,1}</revision_type>
   <provider>{1,1}</provider>
   <description>{0,1}</description>
   <details>{0,1}</details>
   <revision_group>{0,1}</revision_group>
+  <categories>{0,1}</categories>
+  <items>{0,1}</items>
 </model>
-
Attributes
-
-
-
- - - - - - - - - - - - - - - -
QNameTypeUse
partxs:positiveIntegeroptional -
-
-
-
Source
@@ -43302,7 +43275,7 @@

Showing:

-
<xs:element name="model" substitutionGroup="revision_change_sub_group" type="part_revision_change_type"/>
+
<xs:element name="model" substitutionGroup="revision_change_sub_group" type="complex_revision_change_type"/>
@@ -43319,7 +43292,7 @@

Showing:

Element metadata
+
Element complex_revision_change_type / categories
@@ -43338,146 +43311,19 @@

Showing:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Diagram
-
+
-
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#metadata_revision_type_categoriesemdb_xsd.tmp#metadata_revision_type_itemsemdb_xsd.tmp#metadata_revision_typeemdb_xsd.tmp#revision_change_sub_group
-
Typemetadata_revision_type
Type hierarchy - +
Diagramemdb_xsd.tmp#complex_revision_change_type_complex_revision_change_type_categories_category
Properties
-
+
-
- - - - - -
contentcomplex
-
-
Substitution Group Affiliation - -
Model
-
- -
Childrencategories, description, details, items, provider, revision_group, revision_type
-
Instance
-
-
-
- - - - -
-
<metadata>
-  <revision_type>{1,1}</revision_type>
-  <provider>{1,1}</provider>
-  <description>{0,1}</description>
-  <details>{0,1}</details>
-  <revision_group>{0,1}</revision_group>
-  <categories>{0,1}</categories>
-  <items>{0,1}</items>
-</metadata>
-
-
-
-
Source
-
-
-
- - - - -
-
<xs:element name="metadata" substitutionGroup="revision_change_sub_group" type="metadata_revision_type"/>
-
-
-
- - - - - - - - -
Element metadata_revision_type / categories
- - - - - - - - -
- - - - - - - - - - - - -
NamespaceNo namespace
-
Diagram
-
-
-
Diagramemdb_xsd.tmp#metadata_revision_type_metadata_revision_type_categories_category
-
-
Properties
-
-
-
+
@@ -43492,23 +43338,23 @@

Showing:

- - +
content
Model
+
Model
- +
Childrencategorycategory
Instance
-
+
-
+
@@ -43524,10 +43370,10 @@

Showing:

Source
-
+
-
+
-
@@ -43554,7 +43400,7 @@

Showing:

Element metadata_revision_type / categories / category
+
@@ -43573,10 +43419,10 @@

Showing:

@@ -43586,10 +43432,10 @@

Showing:

Diagram
-
+
-
Diagramemdb_xsd.tmp#revision_category_or_item_type_revision_typeemdb_xsd.tmp#revision_category_or_item_type_partemdb_xsd.tmp#revision_category_or_item_type_revision_actionemdb_xsd.tmp#revision_category_or_item_type
+
Diagramemdb_xsd.tmp#revision_category_or_item_type_revision_typeemdb_xsd.tmp#revision_category_or_item_type_partemdb_xsd.tmp#revision_category_or_item_type_revision_actionemdb_xsd.tmp#revision_category_or_item_type
Properties
-
+
-
+
@@ -43610,10 +43456,10 @@

Showing:

content
Attributes
-
+
-
+
@@ -43654,10 +43500,10 @@

Showing:

Source
-
+
-
+
-
@@ -43678,7 +43524,7 @@

Showing:

Element metadata_revision_type / items
+
@@ -43697,19 +43543,19 @@

Showing:

Diagram
-
+
-
Diagramemdb_xsd.tmp#metadata_revision_type_metadata_revision_type_items_item
+
Diagramemdb_xsd.tmp#complex_revision_change_type_complex_revision_change_type_items_item
Properties
-
+
-
+
@@ -43724,23 +43570,23 @@

Showing:

- - +
content
Model
+
Model
- +
Childrenitemitem
Instance
-
+
-
+
@@ -43756,10 +43602,10 @@

Showing:

Source
-
+
-
+
-
@@ -43786,7 +43632,7 @@

Showing:

Element metadata_revision_type / items / item
+
@@ -43805,10 +43651,10 @@

Showing:

@@ -43818,10 +43664,10 @@

Showing:

Diagram
-
+
-
Diagramemdb_xsd.tmp#revision_category_or_item_type_revision_typeemdb_xsd.tmp#revision_category_or_item_type_partemdb_xsd.tmp#revision_category_or_item_type_revision_actionemdb_xsd.tmp#revision_category_or_item_type
+
Diagramemdb_xsd.tmp#revision_category_or_item_type_revision_typeemdb_xsd.tmp#revision_category_or_item_type_partemdb_xsd.tmp#revision_category_or_item_type_revision_actionemdb_xsd.tmp#revision_category_or_item_type
Properties
-
+
-
+
@@ -43842,10 +43688,10 @@

Showing:

content
Attributes
-
+
-
+
@@ -43886,10 +43732,10 @@

Showing:

-
Source
-
+
-
+
+
@@ -43910,6 +43756,133 @@

Showing:

Element metadata
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NamespaceNo namespace
+
Diagram
+
+
+
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#complex_revision_change_type_categoriesemdb_xsd.tmp#complex_revision_change_type_itemsemdb_xsd.tmp#complex_revision_change_typeemdb_xsd.tmp#revision_change_sub_group
+
Typecomplex_revision_change_type
Type hierarchy + +
+
Properties
+
+
+
+ + + + + +
contentcomplex
+
+
Substitution Group Affiliation + +
Model
+
+ +
Childrencategories, description, details, items, provider, revision_group, revision_type
+
Instance
+
+
+
+ + + + +
+
<metadata>
+  <revision_type>{1,1}</revision_type>
+  <provider>{1,1}</provider>
+  <description>{0,1}</description>
+  <details>{0,1}</details>
+  <revision_group>{0,1}</revision_group>
+  <categories>{0,1}</categories>
+  <items>{0,1}</items>
+</metadata>
+
+
+
+
Source
+
+
+
+ + + + +
+
<xs:element name="metadata" substitutionGroup="revision_change_sub_group" type="complex_revision_change_type"/>
+
+
+
+
Element journal_citation
@@ -88939,7 +88912,7 @@

Showing:

- +
Complex Types metadata_revision_type, part_revision_change_typecomplex_revision_change_type, part_revision_change_type
@@ -99342,7 +99315,7 @@

Showing:

- +
Elements additional_map, fsc, half_map, image, mask, modeladditional_map, fsc, half_map, image, mask
@@ -99420,7 +99393,7 @@

Showing:

Complex Type metadata_revision_type
+
Complex Type complex_revision_change_type
@@ -99439,10 +99412,10 @@

Showing:

@@ -99454,7 +99427,7 @@

Showing:

- - + - - - - - - - -
Diagram
-
+
-
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#metadata_revision_type_categoriesemdb_xsd.tmp#metadata_revision_type_items
+
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#complex_revision_change_type_categoriesemdb_xsd.tmp#complex_revision_change_type_items
@@ -99463,41 +99436,41 @@

Showing:

Used by
-
+
-
+
- - + +
Element metadataElements metadata, model
Model
+
Model
- +
Childrencategories, description, details, items, provider, revision_group, revision_typecategories, description, details, items, provider, revision_group, revision_type
Source
-
+
-
+
@@ -43188,19 +43187,19 @@

Showing:

- + - +
-
<xs:complexType name="metadata_revision_type">
+                                       
<xs:complexType name="complex_revision_change_type">
   <xs:complexContent>
     <xs:extension base="base_revision_change_type">
       <xs:sequence>
@@ -99574,7 +99547,7 @@ 

Showing:

- +
Elements metadata_revision_type/categories/category, metadata_revision_type/items/itemcomplex_revision_change_type/categories/category, complex_revision_change_type/items/item
diff --git a/emdb_schemas/current/doc/img/emdb_xsd_Complex_Type_metadata_revision_type.jpeg b/emdb_schemas/current/doc/img/emdb_xsd_Complex_Type_complex_revision_change_type.jpeg similarity index 57% rename from emdb_schemas/current/doc/img/emdb_xsd_Complex_Type_metadata_revision_type.jpeg rename to emdb_schemas/current/doc/img/emdb_xsd_Complex_Type_complex_revision_change_type.jpeg index 003de4a..1a4dde4 100644 Binary files a/emdb_schemas/current/doc/img/emdb_xsd_Complex_Type_metadata_revision_type.jpeg and b/emdb_schemas/current/doc/img/emdb_xsd_Complex_Type_complex_revision_change_type.jpeg differ diff --git a/emdb_schemas/current/doc/img/emdb_xsd_Element_metadata.jpeg b/emdb_schemas/current/doc/img/emdb_xsd_Element_metadata.jpeg index f480790..d98aa92 100644 Binary files a/emdb_schemas/current/doc/img/emdb_xsd_Element_metadata.jpeg and b/emdb_schemas/current/doc/img/emdb_xsd_Element_metadata.jpeg differ diff --git a/emdb_schemas/current/doc/img/emdb_xsd_Element_model_1.jpeg b/emdb_schemas/current/doc/img/emdb_xsd_Element_model_1.jpeg index 3ed19df..6e34ee8 100644 Binary files a/emdb_schemas/current/doc/img/emdb_xsd_Element_model_1.jpeg and b/emdb_schemas/current/doc/img/emdb_xsd_Element_model_1.jpeg differ diff --git a/emdb_schemas/current/doc/img/emdb_xsd_Element_revision_change_sub_group.jpeg b/emdb_schemas/current/doc/img/emdb_xsd_Element_revision_change_sub_group.jpeg index a0f4edb..2db8a66 100644 Binary files a/emdb_schemas/current/doc/img/emdb_xsd_Element_revision_change_sub_group.jpeg and b/emdb_schemas/current/doc/img/emdb_xsd_Element_revision_change_sub_group.jpeg differ diff --git a/emdb_schemas/current/emdb.py b/emdb_schemas/current/emdb.py index 5fe0310..c89b4b0 100644 --- a/emdb_schemas/current/emdb.py +++ b/emdb_schemas/current/emdb.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -# Generated Thu Jan 30 10:52:36 2025 by generateDS.py version 2.43.3. +# Generated Fri Jan 31 16:20:03 2025 by generateDS.py version 2.43.3. # Python 3.9.19 (main, Mar 21 2024, 12:08:14) [Clang 14.0.6 ] # # Command line options: @@ -3659,7 +3659,7 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle # end class primary_map -class metadata_revision_type(base_revision_change_type): +class complex_revision_change_type(base_revision_change_type): __hash__ = GeneratedsSuper.__hash__ subclass = None superclass = base_revision_change_type @@ -3669,7 +3669,7 @@ def __init__(self, revision_type=None, provider=None, description=None, details= self.original_tagname_ = None self.parent_object_ = kwargs_.get('parent_object_') self.ns_prefix_ = None - super(globals().get("metadata_revision_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) + super(globals().get("complex_revision_change_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) self.categories = categories self.categories_nsprefix_ = None self.items = items @@ -3677,13 +3677,13 @@ def __init__(self, revision_type=None, provider=None, description=None, details= def factory(*args_, **kwargs_): if CurrentSubclassModule_ is not None: subclass = getSubclassFromModule_( - CurrentSubclassModule_, metadata_revision_type) + CurrentSubclassModule_, complex_revision_change_type) if subclass is not None: return subclass(*args_, **kwargs_) - if metadata_revision_type.subclass: - return metadata_revision_type.subclass(*args_, **kwargs_) + if complex_revision_change_type.subclass: + return complex_revision_change_type.subclass(*args_, **kwargs_) else: - return metadata_revision_type(*args_, **kwargs_) + return complex_revision_change_type(*args_, **kwargs_) factory = staticmethod(factory) def get_ns_prefix_(self): return self.ns_prefix_ @@ -3701,38 +3701,38 @@ def has__content(self): if ( self.categories is not None or self.items is not None or - super(metadata_revision_type, self).has__content() + super(complex_revision_change_type, self).has__content() ): return True else: return False - def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', pretty_print=True): - imported_ns_def_ = GenerateDSNamespaceDefs_.get('metadata_revision_type') + def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', pretty_print=True): + imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex_revision_change_type') if imported_ns_def_ is not None: namespacedef_ = imported_ns_def_ if pretty_print: eol_ = '\n' else: eol_ = '' - if self.original_tagname_ is not None and name_ == 'metadata_revision_type': + if self.original_tagname_ is not None and name_ == 'complex_revision_change_type': name_ = self.original_tagname_ if UseCapturedNS_ and self.ns_prefix_: namespaceprefix_ = self.ns_prefix_ + ':' showIndent(outfile, level, pretty_print) outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', )) already_processed = set() - self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') + self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') if self.has__content(): outfile.write('>%s' % (eol_, )) - self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='metadata_revision_type', pretty_print=pretty_print) + self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='complex_revision_change_type', pretty_print=pretty_print) showIndent(outfile, level, pretty_print) outfile.write('%s' % (namespaceprefix_, name_, eol_)) else: outfile.write('/>%s' % (eol_, )) - def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='metadata_revision_type'): - super(metadata_revision_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') - def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', fromsubclass_=False, pretty_print=True): - super(metadata_revision_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) + def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex_revision_change_type'): + super(complex_revision_change_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') + def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', fromsubclass_=False, pretty_print=True): + super(complex_revision_change_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) if pretty_print: eol_ = '\n' else: @@ -3755,7 +3755,7 @@ def build(self, node, gds_collector_=None): self._buildChildren(child, node, nodeName_, gds_collector_=gds_collector_) return self def _buildAttributes(self, node, attrs, already_processed): - super(metadata_revision_type, self)._buildAttributes(node, attrs, already_processed) + super(complex_revision_change_type, self)._buildAttributes(node, attrs, already_processed) def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None): if nodeName_ == 'categories': obj_ = categoriesType.factory(parent_object_=self) @@ -3767,8 +3767,8 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle obj_.build(child_, gds_collector_=gds_collector_) self.items = obj_ obj_.original_tagname_ = 'items' - super(metadata_revision_type, self)._buildChildren(child_, node, nodeName_, True) -# end class metadata_revision_type + super(complex_revision_change_type, self)._buildChildren(child_, node, nodeName_, True) +# end class complex_revision_change_type class revision_category_or_item_type(GeneratedsSuper): @@ -25832,12 +25832,12 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'additional_map' elif nodeName_ == 'model': - obj_ = part_revision_change_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'model' elif nodeName_ == 'metadata': - obj_ = metadata_revision_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'metadata' @@ -45590,9 +45590,9 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle 'ligand': ligand_macromolecule_type, 'macromolecule': base_macromolecule_type, 'mask': part_revision_change_type, - 'metadata': metadata_revision_type, + 'metadata': complex_revision_change_type, 'microscopy': base_microscopy_type, - 'model': part_revision_change_type, + 'model': complex_revision_change_type, 'organelle_or_cellular_component_supramolecule': organelle_or_cellular_component_supramolecule_type, 'other_macromolecule': other_macromolecule_type, 'protein_or_peptide': protein_or_peptide_macromolecule_type, @@ -45875,6 +45875,7 @@ def main(): "classification_type", "code_type", "coma_freeType", + "complex_revision_change_type", "complex_source_type", "complex_supramolecule_type", "concentrationType", @@ -45990,7 +45991,6 @@ def main(): "map_type", "max", "max_angleType", - "metadata_revision_type", "microscopy_centerType", "microscopy_listType", "min", diff --git a/emdb_schemas/current/emdb.xsd b/emdb_schemas/current/emdb.xsd index a8a79b6..0b232ed 100644 --- a/emdb_schemas/current/emdb.xsd +++ b/emdb_schemas/current/emdb.xsd @@ -318,9 +318,9 @@ - - - + + + diff --git a/emdb_schemas/current/emdb_relaxed.py b/emdb_schemas/current/emdb_relaxed.py index 452205d..76ba71a 100644 --- a/emdb_schemas/current/emdb_relaxed.py +++ b/emdb_schemas/current/emdb_relaxed.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -# Generated Thu Jan 30 10:56:31 2025 by generateDS.py version 2.43.3. +# Generated Fri Jan 31 16:22:49 2025 by generateDS.py version 2.43.3. # Python 3.9.19 (main, Mar 21 2024, 12:08:14) [Clang 14.0.6 ] # # Command line options: @@ -3664,7 +3664,7 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle # end class primary_map -class metadata_revision_type(base_revision_change_type): +class complex_revision_change_type(base_revision_change_type): __hash__ = GeneratedsSuper.__hash__ subclass = None superclass = base_revision_change_type @@ -3674,7 +3674,7 @@ def __init__(self, revision_type=None, provider=None, description=None, details= self.original_tagname_ = None self.parent_object_ = kwargs_.get('parent_object_') self.ns_prefix_ = None - super(globals().get("metadata_revision_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) + super(globals().get("complex_revision_change_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) self.categories = categories self.categories_nsprefix_ = None self.items = items @@ -3682,13 +3682,13 @@ def __init__(self, revision_type=None, provider=None, description=None, details= def factory(*args_, **kwargs_): if CurrentSubclassModule_ is not None: subclass = getSubclassFromModule_( - CurrentSubclassModule_, metadata_revision_type) + CurrentSubclassModule_, complex_revision_change_type) if subclass is not None: return subclass(*args_, **kwargs_) - if metadata_revision_type.subclass: - return metadata_revision_type.subclass(*args_, **kwargs_) + if complex_revision_change_type.subclass: + return complex_revision_change_type.subclass(*args_, **kwargs_) else: - return metadata_revision_type(*args_, **kwargs_) + return complex_revision_change_type(*args_, **kwargs_) factory = staticmethod(factory) def get_ns_prefix_(self): return self.ns_prefix_ @@ -3706,38 +3706,38 @@ def has__content(self): if ( self.categories is not None or self.items is not None or - super(metadata_revision_type, self).has__content() + super(complex_revision_change_type, self).has__content() ): return True else: return False - def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', pretty_print=True): - imported_ns_def_ = GenerateDSNamespaceDefs_.get('metadata_revision_type') + def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', pretty_print=True): + imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex_revision_change_type') if imported_ns_def_ is not None: namespacedef_ = imported_ns_def_ if pretty_print: eol_ = '\n' else: eol_ = '' - if self.original_tagname_ is not None and name_ == 'metadata_revision_type': + if self.original_tagname_ is not None and name_ == 'complex_revision_change_type': name_ = self.original_tagname_ if UseCapturedNS_ and self.ns_prefix_: namespaceprefix_ = self.ns_prefix_ + ':' showIndent(outfile, level, pretty_print) outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', )) already_processed = set() - self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') + self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') if self.has__content(): outfile.write('>%s' % (eol_, )) - self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='metadata_revision_type', pretty_print=pretty_print) + self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='complex_revision_change_type', pretty_print=pretty_print) showIndent(outfile, level, pretty_print) outfile.write('%s' % (namespaceprefix_, name_, eol_)) else: outfile.write('/>%s' % (eol_, )) - def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='metadata_revision_type'): - super(metadata_revision_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') - def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', fromsubclass_=False, pretty_print=True): - super(metadata_revision_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) + def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex_revision_change_type'): + super(complex_revision_change_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') + def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', fromsubclass_=False, pretty_print=True): + super(complex_revision_change_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) if pretty_print: eol_ = '\n' else: @@ -3760,7 +3760,7 @@ def build(self, node, gds_collector_=None): self._buildChildren(child, node, nodeName_, gds_collector_=gds_collector_) return self def _buildAttributes(self, node, attrs, already_processed): - super(metadata_revision_type, self)._buildAttributes(node, attrs, already_processed) + super(complex_revision_change_type, self)._buildAttributes(node, attrs, already_processed) def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None): if nodeName_ == 'categories': obj_ = categoriesType.factory(parent_object_=self) @@ -3772,8 +3772,8 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle obj_.build(child_, gds_collector_=gds_collector_) self.items = obj_ obj_.original_tagname_ = 'items' - super(metadata_revision_type, self)._buildChildren(child_, node, nodeName_, True) -# end class metadata_revision_type + super(complex_revision_change_type, self)._buildChildren(child_, node, nodeName_, True) +# end class complex_revision_change_type class revision_category_or_item_type(GeneratedsSuper): @@ -25833,12 +25833,12 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'additional_map' elif nodeName_ == 'model': - obj_ = part_revision_change_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'model' elif nodeName_ == 'metadata': - obj_ = metadata_revision_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'metadata' @@ -45591,9 +45591,9 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle 'ligand': ligand_macromolecule_type, 'macromolecule': base_macromolecule_type, 'mask': part_revision_change_type, - 'metadata': metadata_revision_type, + 'metadata': complex_revision_change_type, 'microscopy': base_microscopy_type, - 'model': part_revision_change_type, + 'model': complex_revision_change_type, 'organelle_or_cellular_component_supramolecule': organelle_or_cellular_component_supramolecule_type, 'other_macromolecule': other_macromolecule_type, 'protein_or_peptide': protein_or_peptide_macromolecule_type, @@ -45876,6 +45876,7 @@ def main(): "classification_type", "code_type", "coma_freeType", + "complex_revision_change_type", "complex_source_type", "complex_supramolecule_type", "concentrationType", @@ -45991,7 +45992,6 @@ def main(): "map_type", "max", "max_angleType", - "metadata_revision_type", "microscopy_centerType", "microscopy_listType", "min", diff --git a/emdb_schemas/current/emdb_relaxed.xsd b/emdb_schemas/current/emdb_relaxed.xsd index 7a910d2..d4ba3bb 100644 --- a/emdb_schemas/current/emdb_relaxed.xsd +++ b/emdb_schemas/current/emdb_relaxed.xsd @@ -312,9 +312,9 @@ - - - + + + diff --git a/emdb_schemas/v3/current_v3/doc/Untitled.indexList.html b/emdb_schemas/v3/current_v3/doc/Untitled.indexList.html index ac2ea73..415b5f5 100644 --- a/emdb_schemas/v3/current_v3/doc/Untitled.indexList.html +++ b/emdb_schemas/v3/current_v3/doc/Untitled.indexList.html @@ -423,6 +423,7 @@

Table of Contents

+ @@ -470,7 +471,6 @@

Table of Contents

- diff --git a/emdb_schemas/v3/current_v3/doc/Untitled.indexListcomp.html b/emdb_schemas/v3/current_v3/doc/Untitled.indexListcomp.html index c632c2f..b5853c3 100644 --- a/emdb_schemas/v3/current_v3/doc/Untitled.indexListcomp.html +++ b/emdb_schemas/v3/current_v3/doc/Untitled.indexListcomp.html @@ -420,6 +420,7 @@

Table of Contents

+ @@ -467,7 +468,6 @@

Table of Contents

- diff --git a/emdb_schemas/v3/current_v3/doc/Untitled.indexListns.html b/emdb_schemas/v3/current_v3/doc/Untitled.indexListns.html index 1378da3..8cb29e0 100644 --- a/emdb_schemas/v3/current_v3/doc/Untitled.indexListns.html +++ b/emdb_schemas/v3/current_v3/doc/Untitled.indexListns.html @@ -423,6 +423,7 @@

Table of Contents

+ @@ -470,7 +471,6 @@

Table of Contents

- diff --git a/emdb_schemas/v3/current_v3/doc/emdb_xsd.html b/emdb_schemas/v3/current_v3/doc/emdb_xsd.html index 25119eb..4744676 100644 --- a/emdb_schemas/v3/current_v3/doc/emdb_xsd.html +++ b/emdb_schemas/v3/current_v3/doc/emdb_xsd.html @@ -367,11 +367,11 @@ 'properties_fsc', 'properties_additional_map', 'properties_model', + 'properties_complex_revision_change_type_categories', + 'properties_complex_revision_change_type_complex_revision_change_type_categories_category', + 'properties_complex_revision_change_type_items', + 'properties_complex_revision_change_type_complex_revision_change_type_items_item', 'properties_metadata', - 'properties_metadata_revision_type_categories', - 'properties_metadata_revision_type_metadata_revision_type_categories_category', - 'properties_metadata_revision_type_items', - 'properties_metadata_revision_type_metadata_revision_type_items_item', 'properties_journal_citation', 'properties_journal_citation_author', 'properties_journal_citation_title', @@ -1173,7 +1173,7 @@ 'usedBy_figure_type', 'usedBy_validation_type', 'usedBy_part_revision_change_type', - 'usedBy_metadata_revision_type', + 'usedBy_complex_revision_change_type', 'usedBy_revision_category_or_item_type', 'usedBy_author_order_type', 'usedBy_page_type', @@ -1759,11 +1759,11 @@ 'source_fsc', 'source_additional_map', 'source_model', + 'source_complex_revision_change_type_categories', + 'source_complex_revision_change_type_complex_revision_change_type_categories_category', + 'source_complex_revision_change_type_items', + 'source_complex_revision_change_type_complex_revision_change_type_items_item', 'source_metadata', - 'source_metadata_revision_type_categories', - 'source_metadata_revision_type_metadata_revision_type_categories_category', - 'source_metadata_revision_type_items', - 'source_metadata_revision_type_metadata_revision_type_items_item', 'source_journal_citation', 'source_journal_citation_author', 'source_journal_citation_title', @@ -2273,7 +2273,7 @@ 'source_figure_type', 'source_validation_type', 'source_part_revision_change_type', - 'source_metadata_revision_type', + 'source_complex_revision_change_type', 'source_revision_category_or_item_type', 'source_author_enums', 'source_author_order_type', @@ -2613,9 +2613,9 @@ 'instance_fsc', 'instance_additional_map', 'instance_model', + 'instance_complex_revision_change_type_categories', + 'instance_complex_revision_change_type_items', 'instance_metadata', - 'instance_metadata_revision_type_categories', - 'instance_metadata_revision_type_items', 'instance_journal_citation', 'instance_non_journal_citation', 'instance_cell_supramolecule', @@ -3147,11 +3147,11 @@ 'diagram_fsc', 'diagram_additional_map', 'diagram_model', + 'diagram_complex_revision_change_type_categories', + 'diagram_complex_revision_change_type_complex_revision_change_type_categories_category', + 'diagram_complex_revision_change_type_items', + 'diagram_complex_revision_change_type_complex_revision_change_type_items_item', 'diagram_metadata', - 'diagram_metadata_revision_type_categories', - 'diagram_metadata_revision_type_metadata_revision_type_categories_category', - 'diagram_metadata_revision_type_items', - 'diagram_metadata_revision_type_metadata_revision_type_items_item', 'diagram_journal_citation', 'diagram_journal_citation_author', 'diagram_journal_citation_title', @@ -3661,7 +3661,7 @@ 'diagram_figure_type', 'diagram_validation_type', 'diagram_part_revision_change_type', - 'diagram_metadata_revision_type', + 'diagram_complex_revision_change_type', 'diagram_revision_category_or_item_type', 'diagram_author_enums', 'diagram_author_order_type', @@ -3840,9 +3840,8 @@ 'attributes_mask', 'attributes_fsc', 'attributes_additional_map', - 'attributes_model', - 'attributes_metadata_revision_type_metadata_revision_type_categories_category', - 'attributes_metadata_revision_type_metadata_revision_type_items_item', + 'attributes_complex_revision_change_type_complex_revision_change_type_categories_category', + 'attributes_complex_revision_change_type_complex_revision_change_type_items_item', 'attributes_journal_citation', 'attributes_journal_citation_author', 'attributes_journal_citation_external_references', @@ -4147,9 +4146,9 @@ 'model_fsc', 'model_additional_map', 'model_model', + 'model_complex_revision_change_type_categories', + 'model_complex_revision_change_type_items', 'model_metadata', - 'model_metadata_revision_type_categories', - 'model_metadata_revision_type_items', 'model_journal_citation', 'model_non_journal_citation', 'model_cell_supramolecule', @@ -4369,7 +4368,7 @@ 'model_figure_type', 'model_validation_type', 'model_part_revision_change_type', - 'model_metadata_revision_type', + 'model_complex_revision_change_type', 'model_cell_supramolecule_type', 'model_cell_source_type', 'model_complex_supramolecule_type', @@ -6335,7 +6334,7 @@

Showing:

-
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#additional_mapemdb_xsd.tmp#fscemdb_xsd.tmp#half_mapemdb_xsd.tmp#imageemdb_xsd.tmp#maskemdb_xsd.tmp#metadataemdb_xsd.tmp#modelemdb_xsd.tmp#primary_map
+
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#additional_mapemdb_xsd.tmp#fscemdb_xsd.tmp#half_mapemdb_xsd.tmp#imageemdb_xsd.tmp#maskemdb_xsd.tmp#metadataemdb_xsd.tmp#modelemdb_xsd.tmp#primary_map
-
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#part_revision_change_type_partemdb_xsd.tmp#part_revision_change_typeemdb_xsd.tmp#revision_change_sub_group
+
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#complex_revision_change_type_categoriesemdb_xsd.tmp#complex_revision_change_type_itemsemdb_xsd.tmp#complex_revision_change_typeemdb_xsd.tmp#revision_change_sub_group
Typepart_revision_change_typecomplex_revision_change_type
Type hierarchy @@ -43234,12 +43233,12 @@

Showing:

Model
- +
Childrendescription, details, provider, revision_group, revision_typecategories, description, details, items, provider, revision_group, revision_type
@@ -43251,12 +43250,14 @@

Showing:

@@ -43264,34 +43265,6 @@

Showing:

- - - - -
-
<model part="">
+                                       
<model>
   <revision_type>{1,1}</revision_type>
   <provider>{1,1}</provider>
   <description>{0,1}</description>
   <details>{0,1}</details>
   <revision_group>{0,1}</revision_group>
+  <categories>{0,1}</categories>
+  <items>{0,1}</items>
 </model>
-
Attributes
-
-
-
- - - - - - - - - - - - - - - -
QNameTypeUse
partxs:positiveIntegeroptional -
-
-
-
Source
@@ -43302,7 +43275,7 @@

Showing:

-
<xs:element name="model" substitutionGroup="revision_change_sub_group" type="part_revision_change_type"/>
+
<xs:element name="model" substitutionGroup="revision_change_sub_group" type="complex_revision_change_type"/>
@@ -43319,7 +43292,7 @@

Showing:

Element metadata
+
Element complex_revision_change_type / categories
@@ -43338,146 +43311,19 @@

Showing:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Diagram
-
+
-
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#metadata_revision_type_categoriesemdb_xsd.tmp#metadata_revision_type_itemsemdb_xsd.tmp#metadata_revision_typeemdb_xsd.tmp#revision_change_sub_group
-
Typemetadata_revision_type
Type hierarchy - +
Diagramemdb_xsd.tmp#complex_revision_change_type_complex_revision_change_type_categories_category
Properties
-
+
-
- - - - - -
contentcomplex
-
-
Substitution Group Affiliation - -
Model
-
- -
Childrencategories, description, details, items, provider, revision_group, revision_type
-
Instance
-
-
-
- - - - -
-
<metadata>
-  <revision_type>{1,1}</revision_type>
-  <provider>{1,1}</provider>
-  <description>{0,1}</description>
-  <details>{0,1}</details>
-  <revision_group>{0,1}</revision_group>
-  <categories>{0,1}</categories>
-  <items>{0,1}</items>
-</metadata>
-
-
-
-
Source
-
-
-
- - - - -
-
<xs:element name="metadata" substitutionGroup="revision_change_sub_group" type="metadata_revision_type"/>
-
-
-
-
Element metadata_revision_type / categories
- - - - - - - - -
- - - - - - - - - - - - -
NamespaceNo namespace
-
Diagram
-
-
-
Diagramemdb_xsd.tmp#metadata_revision_type_metadata_revision_type_categories_category
-
-
Properties
-
-
-
+
@@ -43492,23 +43338,23 @@

Showing:

- - +
content
Model
+
Model
- +
Childrencategorycategory
Instance
-
+
-
+
@@ -43524,10 +43370,10 @@

Showing:

Source
-
+
-
+
-
@@ -43554,7 +43400,7 @@

Showing:

Element metadata_revision_type / categories / category
+
@@ -43573,10 +43419,10 @@

Showing:

@@ -43586,10 +43432,10 @@

Showing:

Diagram
-
+
-
Diagramemdb_xsd.tmp#revision_category_or_item_type_revision_typeemdb_xsd.tmp#revision_category_or_item_type_partemdb_xsd.tmp#revision_category_or_item_type_revision_actionemdb_xsd.tmp#revision_category_or_item_type
+
Diagramemdb_xsd.tmp#revision_category_or_item_type_revision_typeemdb_xsd.tmp#revision_category_or_item_type_partemdb_xsd.tmp#revision_category_or_item_type_revision_actionemdb_xsd.tmp#revision_category_or_item_type
Properties
-
+
-
+
@@ -43610,10 +43456,10 @@

Showing:

content
Attributes
-
+
-
+
@@ -43654,10 +43500,10 @@

Showing:

Source
-
+
-
+
-
@@ -43678,7 +43524,7 @@

Showing:

Element metadata_revision_type / items
+
@@ -43697,19 +43543,19 @@

Showing:

Diagram
-
+
-
Diagramemdb_xsd.tmp#metadata_revision_type_metadata_revision_type_items_item
+
Diagramemdb_xsd.tmp#complex_revision_change_type_complex_revision_change_type_items_item
Properties
-
+
-
+
@@ -43724,23 +43570,23 @@

Showing:

- - +
content
Model
+
Model
- +
Childrenitemitem
Instance
-
+
-
+
@@ -43756,10 +43602,10 @@

Showing:

Source
-
+
-
+
-
@@ -43786,7 +43632,7 @@

Showing:

Element metadata_revision_type / items / item
+
@@ -43805,10 +43651,10 @@

Showing:

@@ -43818,10 +43664,10 @@

Showing:

Diagram
-
+
-
Diagramemdb_xsd.tmp#revision_category_or_item_type_revision_typeemdb_xsd.tmp#revision_category_or_item_type_partemdb_xsd.tmp#revision_category_or_item_type_revision_actionemdb_xsd.tmp#revision_category_or_item_type
+
Diagramemdb_xsd.tmp#revision_category_or_item_type_revision_typeemdb_xsd.tmp#revision_category_or_item_type_partemdb_xsd.tmp#revision_category_or_item_type_revision_actionemdb_xsd.tmp#revision_category_or_item_type
Properties
-
+
-
+
@@ -43842,10 +43688,10 @@

Showing:

content
Attributes
-
+
-
+
@@ -43886,10 +43732,10 @@

Showing:

-
Source
-
+
-
+
+
@@ -43910,6 +43756,133 @@

Showing:

Element metadata
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NamespaceNo namespace
+
Diagram
+
+
+
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#complex_revision_change_type_categoriesemdb_xsd.tmp#complex_revision_change_type_itemsemdb_xsd.tmp#complex_revision_change_typeemdb_xsd.tmp#revision_change_sub_group
+
Typecomplex_revision_change_type
Type hierarchy + +
+
Properties
+
+
+
+ + + + + +
contentcomplex
+
+
Substitution Group Affiliation + +
Model
+
+ +
Childrencategories, description, details, items, provider, revision_group, revision_type
+
Instance
+
+
+
+ + + + +
+
<metadata>
+  <revision_type>{1,1}</revision_type>
+  <provider>{1,1}</provider>
+  <description>{0,1}</description>
+  <details>{0,1}</details>
+  <revision_group>{0,1}</revision_group>
+  <categories>{0,1}</categories>
+  <items>{0,1}</items>
+</metadata>
+
+
+
+
Source
+
+
+
+ + + + +
+
<xs:element name="metadata" substitutionGroup="revision_change_sub_group" type="complex_revision_change_type"/>
+
+
+
+
Element journal_citation
@@ -88939,7 +88912,7 @@

Showing:

- +
Complex Types metadata_revision_type, part_revision_change_typecomplex_revision_change_type, part_revision_change_type
@@ -99342,7 +99315,7 @@

Showing:

- +
Elements additional_map, fsc, half_map, image, mask, modeladditional_map, fsc, half_map, image, mask
@@ -99420,7 +99393,7 @@

Showing:

Complex Type metadata_revision_type
+
Complex Type complex_revision_change_type
@@ -99439,10 +99412,10 @@

Showing:

@@ -99454,7 +99427,7 @@

Showing:

- - +
Diagram
-
+
-
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#metadata_revision_type_categoriesemdb_xsd.tmp#metadata_revision_type_items
+
Diagramemdb_xsd.tmp#base_revision_change_type_revision_typeemdb_xsd.tmp#base_revision_change_type_provideremdb_xsd.tmp#base_revision_change_type_descriptionemdb_xsd.tmp#base_revision_change_type_detailsemdb_xsd.tmp#base_revision_change_type_revision_groupemdb_xsd.tmp#base_revision_change_typeemdb_xsd.tmp#complex_revision_change_type_categoriesemdb_xsd.tmp#complex_revision_change_type_items
@@ -99463,41 +99436,41 @@

Showing:

Used by
-
+
-
+
- - + +
Element metadataElements metadata, model
Model
+
Model
- +
Childrencategories, description, details, items, provider, revision_group, revision_typecategories, description, details, items, provider, revision_group, revision_type
Source
-
+
-
+
-
<xs:complexType name="metadata_revision_type">
+                                       
<xs:complexType name="complex_revision_change_type">
   <xs:complexContent>
     <xs:extension base="base_revision_change_type">
       <xs:sequence>
@@ -99574,7 +99547,7 @@ 

Showing:

- +
Elements metadata_revision_type/categories/category, metadata_revision_type/items/itemcomplex_revision_change_type/categories/category, complex_revision_change_type/items/item
diff --git a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Complex_Type_metadata_revision_type.jpeg b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Complex_Type_complex_revision_change_type.jpeg similarity index 57% rename from emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Complex_Type_metadata_revision_type.jpeg rename to emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Complex_Type_complex_revision_change_type.jpeg index 003de4a..1a4dde4 100644 Binary files a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Complex_Type_metadata_revision_type.jpeg and b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Complex_Type_complex_revision_change_type.jpeg differ diff --git a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_metadata.jpeg b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_metadata.jpeg index f480790..d98aa92 100644 Binary files a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_metadata.jpeg and b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_metadata.jpeg differ diff --git a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_model_1.jpeg b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_model_1.jpeg index 3ed19df..6e34ee8 100644 Binary files a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_model_1.jpeg and b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_model_1.jpeg differ diff --git a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_revision_change_sub_group.jpeg b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_revision_change_sub_group.jpeg index a0f4edb..2db8a66 100644 Binary files a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_revision_change_sub_group.jpeg and b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_revision_change_sub_group.jpeg differ diff --git a/emdb_schemas/v3/current_v3/emdb.py b/emdb_schemas/v3/current_v3/emdb.py index 5fe0310..c89b4b0 100644 --- a/emdb_schemas/v3/current_v3/emdb.py +++ b/emdb_schemas/v3/current_v3/emdb.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -# Generated Thu Jan 30 10:52:36 2025 by generateDS.py version 2.43.3. +# Generated Fri Jan 31 16:20:03 2025 by generateDS.py version 2.43.3. # Python 3.9.19 (main, Mar 21 2024, 12:08:14) [Clang 14.0.6 ] # # Command line options: @@ -3659,7 +3659,7 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle # end class primary_map -class metadata_revision_type(base_revision_change_type): +class complex_revision_change_type(base_revision_change_type): __hash__ = GeneratedsSuper.__hash__ subclass = None superclass = base_revision_change_type @@ -3669,7 +3669,7 @@ def __init__(self, revision_type=None, provider=None, description=None, details= self.original_tagname_ = None self.parent_object_ = kwargs_.get('parent_object_') self.ns_prefix_ = None - super(globals().get("metadata_revision_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) + super(globals().get("complex_revision_change_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) self.categories = categories self.categories_nsprefix_ = None self.items = items @@ -3677,13 +3677,13 @@ def __init__(self, revision_type=None, provider=None, description=None, details= def factory(*args_, **kwargs_): if CurrentSubclassModule_ is not None: subclass = getSubclassFromModule_( - CurrentSubclassModule_, metadata_revision_type) + CurrentSubclassModule_, complex_revision_change_type) if subclass is not None: return subclass(*args_, **kwargs_) - if metadata_revision_type.subclass: - return metadata_revision_type.subclass(*args_, **kwargs_) + if complex_revision_change_type.subclass: + return complex_revision_change_type.subclass(*args_, **kwargs_) else: - return metadata_revision_type(*args_, **kwargs_) + return complex_revision_change_type(*args_, **kwargs_) factory = staticmethod(factory) def get_ns_prefix_(self): return self.ns_prefix_ @@ -3701,38 +3701,38 @@ def has__content(self): if ( self.categories is not None or self.items is not None or - super(metadata_revision_type, self).has__content() + super(complex_revision_change_type, self).has__content() ): return True else: return False - def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', pretty_print=True): - imported_ns_def_ = GenerateDSNamespaceDefs_.get('metadata_revision_type') + def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', pretty_print=True): + imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex_revision_change_type') if imported_ns_def_ is not None: namespacedef_ = imported_ns_def_ if pretty_print: eol_ = '\n' else: eol_ = '' - if self.original_tagname_ is not None and name_ == 'metadata_revision_type': + if self.original_tagname_ is not None and name_ == 'complex_revision_change_type': name_ = self.original_tagname_ if UseCapturedNS_ and self.ns_prefix_: namespaceprefix_ = self.ns_prefix_ + ':' showIndent(outfile, level, pretty_print) outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', )) already_processed = set() - self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') + self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') if self.has__content(): outfile.write('>%s' % (eol_, )) - self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='metadata_revision_type', pretty_print=pretty_print) + self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='complex_revision_change_type', pretty_print=pretty_print) showIndent(outfile, level, pretty_print) outfile.write('%s' % (namespaceprefix_, name_, eol_)) else: outfile.write('/>%s' % (eol_, )) - def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='metadata_revision_type'): - super(metadata_revision_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') - def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', fromsubclass_=False, pretty_print=True): - super(metadata_revision_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) + def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex_revision_change_type'): + super(complex_revision_change_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') + def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', fromsubclass_=False, pretty_print=True): + super(complex_revision_change_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) if pretty_print: eol_ = '\n' else: @@ -3755,7 +3755,7 @@ def build(self, node, gds_collector_=None): self._buildChildren(child, node, nodeName_, gds_collector_=gds_collector_) return self def _buildAttributes(self, node, attrs, already_processed): - super(metadata_revision_type, self)._buildAttributes(node, attrs, already_processed) + super(complex_revision_change_type, self)._buildAttributes(node, attrs, already_processed) def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None): if nodeName_ == 'categories': obj_ = categoriesType.factory(parent_object_=self) @@ -3767,8 +3767,8 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle obj_.build(child_, gds_collector_=gds_collector_) self.items = obj_ obj_.original_tagname_ = 'items' - super(metadata_revision_type, self)._buildChildren(child_, node, nodeName_, True) -# end class metadata_revision_type + super(complex_revision_change_type, self)._buildChildren(child_, node, nodeName_, True) +# end class complex_revision_change_type class revision_category_or_item_type(GeneratedsSuper): @@ -25832,12 +25832,12 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'additional_map' elif nodeName_ == 'model': - obj_ = part_revision_change_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'model' elif nodeName_ == 'metadata': - obj_ = metadata_revision_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'metadata' @@ -45590,9 +45590,9 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle 'ligand': ligand_macromolecule_type, 'macromolecule': base_macromolecule_type, 'mask': part_revision_change_type, - 'metadata': metadata_revision_type, + 'metadata': complex_revision_change_type, 'microscopy': base_microscopy_type, - 'model': part_revision_change_type, + 'model': complex_revision_change_type, 'organelle_or_cellular_component_supramolecule': organelle_or_cellular_component_supramolecule_type, 'other_macromolecule': other_macromolecule_type, 'protein_or_peptide': protein_or_peptide_macromolecule_type, @@ -45875,6 +45875,7 @@ def main(): "classification_type", "code_type", "coma_freeType", + "complex_revision_change_type", "complex_source_type", "complex_supramolecule_type", "concentrationType", @@ -45990,7 +45991,6 @@ def main(): "map_type", "max", "max_angleType", - "metadata_revision_type", "microscopy_centerType", "microscopy_listType", "min", diff --git a/emdb_schemas/v3/current_v3/emdb.xsd b/emdb_schemas/v3/current_v3/emdb.xsd index a8a79b6..0b232ed 100644 --- a/emdb_schemas/v3/current_v3/emdb.xsd +++ b/emdb_schemas/v3/current_v3/emdb.xsd @@ -318,9 +318,9 @@ - - - + + + diff --git a/emdb_schemas/v3/current_v3/emdb_relaxed.py b/emdb_schemas/v3/current_v3/emdb_relaxed.py index 452205d..76ba71a 100644 --- a/emdb_schemas/v3/current_v3/emdb_relaxed.py +++ b/emdb_schemas/v3/current_v3/emdb_relaxed.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -# Generated Thu Jan 30 10:56:31 2025 by generateDS.py version 2.43.3. +# Generated Fri Jan 31 16:22:49 2025 by generateDS.py version 2.43.3. # Python 3.9.19 (main, Mar 21 2024, 12:08:14) [Clang 14.0.6 ] # # Command line options: @@ -3664,7 +3664,7 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle # end class primary_map -class metadata_revision_type(base_revision_change_type): +class complex_revision_change_type(base_revision_change_type): __hash__ = GeneratedsSuper.__hash__ subclass = None superclass = base_revision_change_type @@ -3674,7 +3674,7 @@ def __init__(self, revision_type=None, provider=None, description=None, details= self.original_tagname_ = None self.parent_object_ = kwargs_.get('parent_object_') self.ns_prefix_ = None - super(globals().get("metadata_revision_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) + super(globals().get("complex_revision_change_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) self.categories = categories self.categories_nsprefix_ = None self.items = items @@ -3682,13 +3682,13 @@ def __init__(self, revision_type=None, provider=None, description=None, details= def factory(*args_, **kwargs_): if CurrentSubclassModule_ is not None: subclass = getSubclassFromModule_( - CurrentSubclassModule_, metadata_revision_type) + CurrentSubclassModule_, complex_revision_change_type) if subclass is not None: return subclass(*args_, **kwargs_) - if metadata_revision_type.subclass: - return metadata_revision_type.subclass(*args_, **kwargs_) + if complex_revision_change_type.subclass: + return complex_revision_change_type.subclass(*args_, **kwargs_) else: - return metadata_revision_type(*args_, **kwargs_) + return complex_revision_change_type(*args_, **kwargs_) factory = staticmethod(factory) def get_ns_prefix_(self): return self.ns_prefix_ @@ -3706,38 +3706,38 @@ def has__content(self): if ( self.categories is not None or self.items is not None or - super(metadata_revision_type, self).has__content() + super(complex_revision_change_type, self).has__content() ): return True else: return False - def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', pretty_print=True): - imported_ns_def_ = GenerateDSNamespaceDefs_.get('metadata_revision_type') + def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', pretty_print=True): + imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex_revision_change_type') if imported_ns_def_ is not None: namespacedef_ = imported_ns_def_ if pretty_print: eol_ = '\n' else: eol_ = '' - if self.original_tagname_ is not None and name_ == 'metadata_revision_type': + if self.original_tagname_ is not None and name_ == 'complex_revision_change_type': name_ = self.original_tagname_ if UseCapturedNS_ and self.ns_prefix_: namespaceprefix_ = self.ns_prefix_ + ':' showIndent(outfile, level, pretty_print) outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', )) already_processed = set() - self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') + self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') if self.has__content(): outfile.write('>%s' % (eol_, )) - self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='metadata_revision_type', pretty_print=pretty_print) + self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='complex_revision_change_type', pretty_print=pretty_print) showIndent(outfile, level, pretty_print) outfile.write('%s' % (namespaceprefix_, name_, eol_)) else: outfile.write('/>%s' % (eol_, )) - def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='metadata_revision_type'): - super(metadata_revision_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') - def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', fromsubclass_=False, pretty_print=True): - super(metadata_revision_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) + def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex_revision_change_type'): + super(complex_revision_change_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') + def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', fromsubclass_=False, pretty_print=True): + super(complex_revision_change_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) if pretty_print: eol_ = '\n' else: @@ -3760,7 +3760,7 @@ def build(self, node, gds_collector_=None): self._buildChildren(child, node, nodeName_, gds_collector_=gds_collector_) return self def _buildAttributes(self, node, attrs, already_processed): - super(metadata_revision_type, self)._buildAttributes(node, attrs, already_processed) + super(complex_revision_change_type, self)._buildAttributes(node, attrs, already_processed) def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None): if nodeName_ == 'categories': obj_ = categoriesType.factory(parent_object_=self) @@ -3772,8 +3772,8 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle obj_.build(child_, gds_collector_=gds_collector_) self.items = obj_ obj_.original_tagname_ = 'items' - super(metadata_revision_type, self)._buildChildren(child_, node, nodeName_, True) -# end class metadata_revision_type + super(complex_revision_change_type, self)._buildChildren(child_, node, nodeName_, True) +# end class complex_revision_change_type class revision_category_or_item_type(GeneratedsSuper): @@ -25833,12 +25833,12 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'additional_map' elif nodeName_ == 'model': - obj_ = part_revision_change_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'model' elif nodeName_ == 'metadata': - obj_ = metadata_revision_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'metadata' @@ -45591,9 +45591,9 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle 'ligand': ligand_macromolecule_type, 'macromolecule': base_macromolecule_type, 'mask': part_revision_change_type, - 'metadata': metadata_revision_type, + 'metadata': complex_revision_change_type, 'microscopy': base_microscopy_type, - 'model': part_revision_change_type, + 'model': complex_revision_change_type, 'organelle_or_cellular_component_supramolecule': organelle_or_cellular_component_supramolecule_type, 'other_macromolecule': other_macromolecule_type, 'protein_or_peptide': protein_or_peptide_macromolecule_type, @@ -45876,6 +45876,7 @@ def main(): "classification_type", "code_type", "coma_freeType", + "complex_revision_change_type", "complex_source_type", "complex_supramolecule_type", "concentrationType", @@ -45991,7 +45992,6 @@ def main(): "map_type", "max", "max_angleType", - "metadata_revision_type", "microscopy_centerType", "microscopy_listType", "min", diff --git a/emdb_schemas/v3/current_v3/emdb_relaxed.xsd b/emdb_schemas/v3/current_v3/emdb_relaxed.xsd index 7a910d2..d4ba3bb 100644 --- a/emdb_schemas/v3/current_v3/emdb_relaxed.xsd +++ b/emdb_schemas/v3/current_v3/emdb_relaxed.xsd @@ -312,9 +312,9 @@ - - - + + + diff --git a/emdb_schemas/v3/v3_0_10_0/emdb.py b/emdb_schemas/v3/v3_0_10_0/emdb.py index 5fe0310..c89b4b0 100644 --- a/emdb_schemas/v3/v3_0_10_0/emdb.py +++ b/emdb_schemas/v3/v3_0_10_0/emdb.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -# Generated Thu Jan 30 10:52:36 2025 by generateDS.py version 2.43.3. +# Generated Fri Jan 31 16:20:03 2025 by generateDS.py version 2.43.3. # Python 3.9.19 (main, Mar 21 2024, 12:08:14) [Clang 14.0.6 ] # # Command line options: @@ -3659,7 +3659,7 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle # end class primary_map -class metadata_revision_type(base_revision_change_type): +class complex_revision_change_type(base_revision_change_type): __hash__ = GeneratedsSuper.__hash__ subclass = None superclass = base_revision_change_type @@ -3669,7 +3669,7 @@ def __init__(self, revision_type=None, provider=None, description=None, details= self.original_tagname_ = None self.parent_object_ = kwargs_.get('parent_object_') self.ns_prefix_ = None - super(globals().get("metadata_revision_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) + super(globals().get("complex_revision_change_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) self.categories = categories self.categories_nsprefix_ = None self.items = items @@ -3677,13 +3677,13 @@ def __init__(self, revision_type=None, provider=None, description=None, details= def factory(*args_, **kwargs_): if CurrentSubclassModule_ is not None: subclass = getSubclassFromModule_( - CurrentSubclassModule_, metadata_revision_type) + CurrentSubclassModule_, complex_revision_change_type) if subclass is not None: return subclass(*args_, **kwargs_) - if metadata_revision_type.subclass: - return metadata_revision_type.subclass(*args_, **kwargs_) + if complex_revision_change_type.subclass: + return complex_revision_change_type.subclass(*args_, **kwargs_) else: - return metadata_revision_type(*args_, **kwargs_) + return complex_revision_change_type(*args_, **kwargs_) factory = staticmethod(factory) def get_ns_prefix_(self): return self.ns_prefix_ @@ -3701,38 +3701,38 @@ def has__content(self): if ( self.categories is not None or self.items is not None or - super(metadata_revision_type, self).has__content() + super(complex_revision_change_type, self).has__content() ): return True else: return False - def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', pretty_print=True): - imported_ns_def_ = GenerateDSNamespaceDefs_.get('metadata_revision_type') + def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', pretty_print=True): + imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex_revision_change_type') if imported_ns_def_ is not None: namespacedef_ = imported_ns_def_ if pretty_print: eol_ = '\n' else: eol_ = '' - if self.original_tagname_ is not None and name_ == 'metadata_revision_type': + if self.original_tagname_ is not None and name_ == 'complex_revision_change_type': name_ = self.original_tagname_ if UseCapturedNS_ and self.ns_prefix_: namespaceprefix_ = self.ns_prefix_ + ':' showIndent(outfile, level, pretty_print) outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', )) already_processed = set() - self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') + self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') if self.has__content(): outfile.write('>%s' % (eol_, )) - self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='metadata_revision_type', pretty_print=pretty_print) + self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='complex_revision_change_type', pretty_print=pretty_print) showIndent(outfile, level, pretty_print) outfile.write('%s' % (namespaceprefix_, name_, eol_)) else: outfile.write('/>%s' % (eol_, )) - def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='metadata_revision_type'): - super(metadata_revision_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') - def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', fromsubclass_=False, pretty_print=True): - super(metadata_revision_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) + def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex_revision_change_type'): + super(complex_revision_change_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') + def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', fromsubclass_=False, pretty_print=True): + super(complex_revision_change_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) if pretty_print: eol_ = '\n' else: @@ -3755,7 +3755,7 @@ def build(self, node, gds_collector_=None): self._buildChildren(child, node, nodeName_, gds_collector_=gds_collector_) return self def _buildAttributes(self, node, attrs, already_processed): - super(metadata_revision_type, self)._buildAttributes(node, attrs, already_processed) + super(complex_revision_change_type, self)._buildAttributes(node, attrs, already_processed) def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None): if nodeName_ == 'categories': obj_ = categoriesType.factory(parent_object_=self) @@ -3767,8 +3767,8 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle obj_.build(child_, gds_collector_=gds_collector_) self.items = obj_ obj_.original_tagname_ = 'items' - super(metadata_revision_type, self)._buildChildren(child_, node, nodeName_, True) -# end class metadata_revision_type + super(complex_revision_change_type, self)._buildChildren(child_, node, nodeName_, True) +# end class complex_revision_change_type class revision_category_or_item_type(GeneratedsSuper): @@ -25832,12 +25832,12 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'additional_map' elif nodeName_ == 'model': - obj_ = part_revision_change_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'model' elif nodeName_ == 'metadata': - obj_ = metadata_revision_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'metadata' @@ -45590,9 +45590,9 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle 'ligand': ligand_macromolecule_type, 'macromolecule': base_macromolecule_type, 'mask': part_revision_change_type, - 'metadata': metadata_revision_type, + 'metadata': complex_revision_change_type, 'microscopy': base_microscopy_type, - 'model': part_revision_change_type, + 'model': complex_revision_change_type, 'organelle_or_cellular_component_supramolecule': organelle_or_cellular_component_supramolecule_type, 'other_macromolecule': other_macromolecule_type, 'protein_or_peptide': protein_or_peptide_macromolecule_type, @@ -45875,6 +45875,7 @@ def main(): "classification_type", "code_type", "coma_freeType", + "complex_revision_change_type", "complex_source_type", "complex_supramolecule_type", "concentrationType", @@ -45990,7 +45991,6 @@ def main(): "map_type", "max", "max_angleType", - "metadata_revision_type", "microscopy_centerType", "microscopy_listType", "min", diff --git a/emdb_schemas/v3/v3_0_10_0/emdb.xsd b/emdb_schemas/v3/v3_0_10_0/emdb.xsd index a8a79b6..0b232ed 100644 --- a/emdb_schemas/v3/v3_0_10_0/emdb.xsd +++ b/emdb_schemas/v3/v3_0_10_0/emdb.xsd @@ -318,9 +318,9 @@ - - - + + + diff --git a/emdb_schemas/v3/v3_0_10_0/emdb_relaxed.py b/emdb_schemas/v3/v3_0_10_0/emdb_relaxed.py index 452205d..76ba71a 100644 --- a/emdb_schemas/v3/v3_0_10_0/emdb_relaxed.py +++ b/emdb_schemas/v3/v3_0_10_0/emdb_relaxed.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -# Generated Thu Jan 30 10:56:31 2025 by generateDS.py version 2.43.3. +# Generated Fri Jan 31 16:22:49 2025 by generateDS.py version 2.43.3. # Python 3.9.19 (main, Mar 21 2024, 12:08:14) [Clang 14.0.6 ] # # Command line options: @@ -3664,7 +3664,7 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle # end class primary_map -class metadata_revision_type(base_revision_change_type): +class complex_revision_change_type(base_revision_change_type): __hash__ = GeneratedsSuper.__hash__ subclass = None superclass = base_revision_change_type @@ -3674,7 +3674,7 @@ def __init__(self, revision_type=None, provider=None, description=None, details= self.original_tagname_ = None self.parent_object_ = kwargs_.get('parent_object_') self.ns_prefix_ = None - super(globals().get("metadata_revision_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) + super(globals().get("complex_revision_change_type"), self).__init__(revision_type, provider, description, details, revision_group, **kwargs_) self.categories = categories self.categories_nsprefix_ = None self.items = items @@ -3682,13 +3682,13 @@ def __init__(self, revision_type=None, provider=None, description=None, details= def factory(*args_, **kwargs_): if CurrentSubclassModule_ is not None: subclass = getSubclassFromModule_( - CurrentSubclassModule_, metadata_revision_type) + CurrentSubclassModule_, complex_revision_change_type) if subclass is not None: return subclass(*args_, **kwargs_) - if metadata_revision_type.subclass: - return metadata_revision_type.subclass(*args_, **kwargs_) + if complex_revision_change_type.subclass: + return complex_revision_change_type.subclass(*args_, **kwargs_) else: - return metadata_revision_type(*args_, **kwargs_) + return complex_revision_change_type(*args_, **kwargs_) factory = staticmethod(factory) def get_ns_prefix_(self): return self.ns_prefix_ @@ -3706,38 +3706,38 @@ def has__content(self): if ( self.categories is not None or self.items is not None or - super(metadata_revision_type, self).has__content() + super(complex_revision_change_type, self).has__content() ): return True else: return False - def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', pretty_print=True): - imported_ns_def_ = GenerateDSNamespaceDefs_.get('metadata_revision_type') + def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', pretty_print=True): + imported_ns_def_ = GenerateDSNamespaceDefs_.get('complex_revision_change_type') if imported_ns_def_ is not None: namespacedef_ = imported_ns_def_ if pretty_print: eol_ = '\n' else: eol_ = '' - if self.original_tagname_ is not None and name_ == 'metadata_revision_type': + if self.original_tagname_ is not None and name_ == 'complex_revision_change_type': name_ = self.original_tagname_ if UseCapturedNS_ and self.ns_prefix_: namespaceprefix_ = self.ns_prefix_ + ':' showIndent(outfile, level, pretty_print) outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', )) already_processed = set() - self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') + self._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') if self.has__content(): outfile.write('>%s' % (eol_, )) - self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='metadata_revision_type', pretty_print=pretty_print) + self._exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='complex_revision_change_type', pretty_print=pretty_print) showIndent(outfile, level, pretty_print) outfile.write('%s' % (namespaceprefix_, name_, eol_)) else: outfile.write('/>%s' % (eol_, )) - def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='metadata_revision_type'): - super(metadata_revision_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='metadata_revision_type') - def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='metadata_revision_type', fromsubclass_=False, pretty_print=True): - super(metadata_revision_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) + def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='complex_revision_change_type'): + super(complex_revision_change_type, self)._exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='complex_revision_change_type') + def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='complex_revision_change_type', fromsubclass_=False, pretty_print=True): + super(complex_revision_change_type, self)._exportChildren(outfile, level, namespaceprefix_, namespacedef_, name_, True, pretty_print=pretty_print) if pretty_print: eol_ = '\n' else: @@ -3760,7 +3760,7 @@ def build(self, node, gds_collector_=None): self._buildChildren(child, node, nodeName_, gds_collector_=gds_collector_) return self def _buildAttributes(self, node, attrs, already_processed): - super(metadata_revision_type, self)._buildAttributes(node, attrs, already_processed) + super(complex_revision_change_type, self)._buildAttributes(node, attrs, already_processed) def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None): if nodeName_ == 'categories': obj_ = categoriesType.factory(parent_object_=self) @@ -3772,8 +3772,8 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle obj_.build(child_, gds_collector_=gds_collector_) self.items = obj_ obj_.original_tagname_ = 'items' - super(metadata_revision_type, self)._buildChildren(child_, node, nodeName_, True) -# end class metadata_revision_type + super(complex_revision_change_type, self)._buildChildren(child_, node, nodeName_, True) +# end class complex_revision_change_type class revision_category_or_item_type(GeneratedsSuper): @@ -25833,12 +25833,12 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'additional_map' elif nodeName_ == 'model': - obj_ = part_revision_change_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'model' elif nodeName_ == 'metadata': - obj_ = metadata_revision_type.factory(parent_object_=self) + obj_ = complex_revision_change_type.factory(parent_object_=self) obj_.build(child_, gds_collector_=gds_collector_) self.revision_change_sub_group.append(obj_) obj_.original_tagname_ = 'metadata' @@ -45591,9 +45591,9 @@ def _buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_colle 'ligand': ligand_macromolecule_type, 'macromolecule': base_macromolecule_type, 'mask': part_revision_change_type, - 'metadata': metadata_revision_type, + 'metadata': complex_revision_change_type, 'microscopy': base_microscopy_type, - 'model': part_revision_change_type, + 'model': complex_revision_change_type, 'organelle_or_cellular_component_supramolecule': organelle_or_cellular_component_supramolecule_type, 'other_macromolecule': other_macromolecule_type, 'protein_or_peptide': protein_or_peptide_macromolecule_type, @@ -45876,6 +45876,7 @@ def main(): "classification_type", "code_type", "coma_freeType", + "complex_revision_change_type", "complex_source_type", "complex_supramolecule_type", "concentrationType", @@ -45991,7 +45992,6 @@ def main(): "map_type", "max", "max_angleType", - "metadata_revision_type", "microscopy_centerType", "microscopy_listType", "min", diff --git a/emdb_schemas/v3/v3_0_10_0/emdb_relaxed.xsd b/emdb_schemas/v3/v3_0_10_0/emdb_relaxed.xsd index 7a910d2..d4ba3bb 100644 --- a/emdb_schemas/v3/v3_0_10_0/emdb_relaxed.xsd +++ b/emdb_schemas/v3/v3_0_10_0/emdb_relaxed.xsd @@ -312,9 +312,9 @@ - - - + + +