[MOBY-guts] biomoby commit

Yan Wong yanwong at pub.open-bio.org
Tue Apr 5 16:00:53 UTC 2005


yanwong
Tue Apr  5 12:00:51 EDT 2005
Update of /home/repository/moby/moby-live/Python/bioMoby/ontology
In directory pub.open-bio.org:/tmp/cvs-serv24263

Modified Files:
	Alignment.py AlleleAssociation.py Allele_freq.py 
	AminoAcidSequence.py B64_Encoded_PNG.py 
	B64_Encoded_Postscript.py B64_encoded_PDB.py 
	B64_encoded_gif.py B64_encoded_jpeg.py BLASTText.py 
	BasicGFFSequenceFeature.py ClustalAlnFormattedText.py 
	ClustalMsfFormattedText.py CommentedAASequence.py 
	CommentedDNASequence.py CommentedRNASequence.py DNASequence.py 
	DNASequenceWithGFFFeatures.py DateTime.py Decypher_Text.py 
	Edge.py EmblFlatfile.py FASTA.py FASTA_AA.py FASTA_NA.py 
	FASTA_NA_multi.py FASTA_Text.py GFF.py GFF1.py GFF2.py 
	GFF2_5.py GFF3.py GO_Term.py GenbankFlatfile.py 
	Gene_Expression_data.py GenericSequence.py GeneticElement.py 
	Genotype.py Germplasm_Details.py Germplasm_List.py 
	Global_Keyword.py HBond_Pair.py HFormatText.py 
	Haplotyping_Study_obj.py ICIS_Query.py ICIS_Query2.py 
	ICIS_Query3.py IntAct_XML.py Interaction.py 
	InteractionMethod.py Interaction_partner.py Interactor.py 
	MEME_Text.py MGIS_ACCESSION.py MMP_Locus.py MSF.py 
	MmCIFText.py Multi_key_value_pair.py 
	MyTestingDataType_11024145298313.py MyTree.py 
	NCBI_BLAST_Text.py NCBI_Blast_XML.py NCBI_Blast_XML_Gif.py 
	NCBI_Blast_XML_Gif_Map.py NCBI_MEME_Text.py 
	NucleotideSequence.py PDBFormattedText.py PDBText.py PDGJOB.py 
	PHDText.py PMUTText.py PSeaTextFormatted.py 
	PhenotypeDescription.py PubMedMEDLINE.py RNASequence.py 
	SINGER_ACCESSION.py Sample.py SchematikonMotifID.py 
	SchematikonMotifSupport.py SchematikonSegmentAttributes.py 
	SchematikonSegmentID.py SchematikonStructureAnnotation.py 
	SchematikonVorocodeName.py Scored_acronym_string.py 
	SimpleAnnotatedGIFImage.py SimpleAnnotatedJPEGImage.py 
	Simple_key_value_pair.py Snp_allele.py Snp_genotype.py 
	Study.py TEST.py TargetP_result.py Testout.py TextBase64.py 
	TextFormatted.py TextHtml.py TextPlain.py TextUuencoded.py 
	TextXml.py Text_plain.py Trait_Details.py Tree.py 
	TropGENE_ACCESSION.py TropGENE_Diversity_Matrix.py 
	TropGENE_LOCUS.py VirtualSequence.py WU_BLAST_Text.py 
	Wildcard_Query.py __init__.py 
Log Message:
The classes was generated again by the moby2python script


moby-live/Python/bioMoby/ontology Alignment.py,1.2,1.3 AlleleAssociation.py,1.6,1.7 Allele_freq.py,1.6,1.7 AminoAcidSequence.py,1.6,1.7 B64_Encoded_PNG.py,1.6,1.7 B64_Encoded_Postscript.py,1.6,1.7 B64_encoded_PDB.py,1.6,1.7 B64_encoded_gif.py,1.6,1.7 B64_encoded_jpeg.py,1.6,1.7 BLASTText.py,1.6,1.7 BasicGFFSequenceFeature.py,1.6,1.7 ClustalAlnFormattedText.py,1.6,1.7 ClustalMsfFormattedText.py,1.6,1.7 CommentedAASequence.py,1.6,1.7 CommentedDNASequence.py,1.6,1.7 CommentedRNASequence.py,1.6,1.7 DNASequence.py,1.6,1.7 DNASequenceWithGFFFeatures.py,1.6,1.7 DateTime.py,1.6,1.7 Decypher_Text.py,1.6,1.7 Edge.py,1.6,1.7 EmblFlatfile.py,1.6,1.7 FASTA.py,1.6,1.7 FASTA_AA.py,1.6,1.7 FASTA_NA.py,1.6,1.7 FASTA_NA_multi.py,1.2,1.3 FASTA_Text.py,1.6,1.7 GFF.py,1.6,1.7 GFF1.py,1.6,1.7 GFF2.py,1.6,1.7 GFF2_5.py,1.6,1.7 GFF3.py,1.6,1.7 GO_Term.py,1.6,1.7 GenbankFlatfile.py,1.6,1.7 Gene_Expression_data.py,1.2,1.3 GenericSequence.py,1.6,1.7 GeneticElement.py,1.6,1.7 Genotype.py,1.6,1.7 Germpl!
asm_Details.py,1.6,1.7 Germplasm_List.py,1.6,1.7 Global_Keyword.py,1.6,1.7 HBond_Pair.py,1.6,1.7 HFormatText.py,1.6,1.7 Haplotyping_Study_obj.py,1.6,1.7 ICIS_Query.py,1.6,1.7 ICIS_Query2.py,1.6,1.7 ICIS_Query3.py,1.6,1.7 IntAct_XML.py,1.6,1.7 Interaction.py,1.6,1.7 InteractionMethod.py,1.6,1.7 Interaction_partner.py,1.6,1.7 Interactor.py,1.6,1.7 MEME_Text.py,1.6,1.7 MGIS_ACCESSION.py,1.6,1.7 MMP_Locus.py,1.6,1.7 MSF.py,1.2,1.3 MmCIFText.py,1.6,1.7 Multi_key_value_pair.py,1.6,1.7 MyTestingDataType_11024145298313.py,1.6,1.7 MyTree.py,1.6,1.7 NCBI_BLAST_Text.py,1.6,1.7 NCBI_Blast_XML.py,1.6,1.7 NCBI_Blast_XML_Gif.py,1.6,1.7 NCBI_Blast_XML_Gif_Map.py,1.6,1.7 NCBI_MEME_Text.py,1.6,1.7 NucleotideSequence.py,1.6,1.7 PDBFormattedText.py,1.6,1.7 PDBText.py,1.6,1.7 PDGJOB.py,1.6,1.7 PHDText.py,1.6,1.7 PMUTText.py,1.6,1.7 PSeaTextFormatted.py,1.6,1.7 PhenotypeDescription.py,1.6,1.7 PubMedMEDLINE.py,1.6,1.7 RNASequence.py,1.6,1.7 SINGER_ACCESSION.py,1.6,1.7 Sample.py,1.6,1.7 Schematikon!
MotifID.py,1.6,1.7 SchematikonMotifSupport.py,1.6,1.7 Schemat!
ikonSegmentAttributes.py,1.6,1.7 SchematikonSegmentID.py,1.6,1.7 SchematikonStructureAnnotation.py,1.6,1.7 SchematikonVorocodeName.py,1.6,1.7 Scored_acronym_string.py,1.6,1.7 SimpleAnnotatedGIFImage.py,1.6,1.7 SimpleAnnotatedJPEGImage.py,1.6,1.7 Simple_key_value_pair.py,1.6,1.7 Snp_allele.py,1.6,1.7 Snp_genotype.py,1.6,1.7 Study.py,1.6,1.7 TEST.py,1.6,1.7 TargetP_result.py,1.6,1.7 Testout.py,1.6,1.7 TextBase64.py,1.6,1.7 TextFormatted.py,1.6,1.7 TextHtml.py,1.6,1.7 TextPlain.py,1.6,1.7 TextUuencoded.py,1.6,1.7 TextXml.py,1.6,1.7 Text_plain.py,1.6,1.7 Trait_Details.py,1.6,1.7 Tree.py,1.6,1.7 TropGENE_ACCESSION.py,1.6,1.7 TropGENE_Diversity_Matrix.py,1.6,1.7 TropGENE_LOCUS.py,1.6,1.7 VirtualSequence.py,1.6,1.7 WU_BLAST_Text.py,1.6,1.7 Wildcard_Query.py,1.6,1.7 __init__.py,1.3,1.4
===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Alignment.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Alignment.py	2005/02/07 14:23:32	1.2
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Alignment.py	2005/04/05 16:00:51	1.3
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/AlleleAssociation.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/AlleleAssociation.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/AlleleAssociation.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,17 +52,16 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="snp" or elt.getAttribute("moby:articleName")=="snp"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Snp" or elt.getAttribute("moby:articleName")=="Snp"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Snp=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="pValue" or elt.getAttribute("moby:articleName")=="pValue"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="PValue" or elt.getAttribute("moby:articleName")=="PValue"):
                 t=MobyFloat()
                 t.fromMoby(elt)
                 self.PValue=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="validity" or elt.getAttribute("moby:articleName")=="validity"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Validity" or elt.getAttribute("moby:articleName")=="Validity"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Validity=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Allele_freq.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Allele_freq.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Allele_freq.py	2005/04/05 16:00:51	1.7
@@ -29,7 +29,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -46,18 +46,18 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Object" or elt.nodeName=="moby:Object") and (elt.getAttribute("articleName")=="panel_lsid" or elt.getAttribute("moby:articleName")=="panel_lsid"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Object" or elt.nodeName=="moby:Object") and (elt.getAttribute("articleName")=="Panel_lsid" or elt.getAttribute("moby:articleName")=="Panel_lsid"):
                 self.Panel_lsid=MobyObject()
                 self.Panel_lsid.fromMoby(elt)
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Object" or elt.nodeName=="moby:Object") and (elt.getAttribute("articleName")=="snp_lsid" or elt.getAttribute("moby:articleName")=="snp_lsid"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Object" or elt.nodeName=="moby:Object") and (elt.getAttribute("articleName")=="Snp_lsid" or elt.getAttribute("moby:articleName")=="Snp_lsid"):
                 self.Snp_lsid=MobyObject()
                 self.Snp_lsid.fromMoby(elt)
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="snp_allele" or elt.nodeName=="moby:snp_allele") and (elt.getAttribute("articleName")=="allele_freq" or elt.getAttribute("moby:articleName")=="allele_freq"):
-                self.Allele_freq=MobySnp_allele()
-                self.Allele_freq.fromMoby(elt)
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="frequency" or elt.getAttribute("moby:articleName")=="frequency"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="snp_allele" or elt.nodeName=="moby:snp_allele") and (elt.getAttribute("articleName")=="Allele_freq" or elt.getAttribute("moby:articleName")=="Allele_freq"):
+                auxObject=MobySnp_allele()
+                auxObject.fromMoby(elt)
+                self.Allele_freq.append(auxObject)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Frequency" or elt.getAttribute("moby:articleName")=="Frequency"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Frequency.append(t.content)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/AminoAcidSequence.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/AminoAcidSequence.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/AminoAcidSequence.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,8 +51,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_Encoded_PNG.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_Encoded_PNG.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_Encoded_PNG.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_Encoded_Postscript.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_Encoded_Postscript.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_Encoded_Postscript.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_encoded_PDB.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_encoded_PDB.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_encoded_PDB.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_encoded_gif.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_encoded_gif.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_encoded_gif.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_encoded_jpeg.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_encoded_jpeg.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/B64_encoded_jpeg.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/BLASTText.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/BLASTText.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/BLASTText.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/BasicGFFSequenceFeature.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/BasicGFFSequenceFeature.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/BasicGFFSequenceFeature.py	2005/04/05 16:00:51	1.7
@@ -40,7 +40,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -62,44 +62,44 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="reference" or elt.getAttribute("moby:articleName")=="reference"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Reference" or elt.getAttribute("moby:articleName")=="Reference"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Reference=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="source" or elt.getAttribute("moby:articleName")=="source"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Source" or elt.getAttribute("moby:articleName")=="Source"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Source=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="method" or elt.getAttribute("moby:articleName")=="method"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Method" or elt.getAttribute("moby:articleName")=="Method"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Method=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="start" or elt.getAttribute("moby:articleName")=="start"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Start" or elt.getAttribute("moby:articleName")=="Start"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Start=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="stop" or elt.getAttribute("moby:articleName")=="stop"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Stop" or elt.getAttribute("moby:articleName")=="Stop"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Stop=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="score" or elt.getAttribute("moby:articleName")=="score"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="Score" or elt.getAttribute("moby:articleName")=="Score"):
                 t=MobyFloat()
                 t.fromMoby(elt)
                 self.Score=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="strand" or elt.getAttribute("moby:articleName")=="strand"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Strand" or elt.getAttribute("moby:articleName")=="Strand"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Strand=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="frame" or elt.getAttribute("moby:articleName")=="frame"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Frame" or elt.getAttribute("moby:articleName")=="Frame"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Frame=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="phase" or elt.getAttribute("moby:articleName")=="phase"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Phase" or elt.getAttribute("moby:articleName")=="Phase"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Phase=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="multi_key_value_pair" or elt.nodeName=="moby:multi_key_value_pair") and (elt.getAttribute("articleName")=="column9_tag_value" or elt.getAttribute("moby:articleName")=="column9_tag_value"):
-                self.Column9_tag_value=MobyMulti_key_value_pair()
-                self.Column9_tag_value.fromMoby(elt)
\ No newline at end of file
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="multi_key_value_pair" or elt.nodeName=="moby:multi_key_value_pair") and (elt.getAttribute("articleName")=="Column9_tag_value" or elt.getAttribute("moby:articleName")=="Column9_tag_value"):
+                auxObject=MobyMulti_key_value_pair()
+                auxObject.fromMoby(elt)
+                self.Column9_tag_value.append(auxObject)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/ClustalAlnFormattedText.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/ClustalAlnFormattedText.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/ClustalAlnFormattedText.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/ClustalMsfFormattedText.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/ClustalMsfFormattedText.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/ClustalMsfFormattedText.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/CommentedAASequence.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/CommentedAASequence.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/CommentedAASequence.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,8 +52,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/CommentedDNASequence.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/CommentedDNASequence.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/CommentedDNASequence.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,8 +52,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/CommentedRNASequence.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/CommentedRNASequence.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/CommentedRNASequence.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,8 +52,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/DNASequence.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/DNASequence.py	2005/02/07 14:23:32	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/DNASequence.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,8 +51,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/DNASequenceWithGFFFeatures.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/DNASequenceWithGFFFeatures.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/DNASequenceWithGFFFeatures.py	2005/04/05 16:00:51	1.7
@@ -32,7 +32,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -54,8 +54,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)
@@ -65,5 +64,6 @@
                 t.fromMoby(elt)
                 self.SequenceString=t.content
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="BasicGFFSequenceFeature" or elt.nodeName=="moby:BasicGFFSequenceFeature") and (elt.getAttribute("articleName")=="DNASequenceWithGFFFeatures" or elt.getAttribute("moby:articleName")=="DNASequenceWithGFFFeatures"):
-                self.DNASequenceWithGFFFeatures=MobyBasicGFFSequenceFeature()
-                self.DNASequenceWithGFFFeatures.fromMoby(elt)
\ No newline at end of file
+                auxObject=MobyBasicGFFSequenceFeature()
+                auxObject.fromMoby(elt)
+                self.DNASequenceWithGFFFeatures.append(auxObject)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/DateTime.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/DateTime.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/DateTime.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Decypher_Text.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Decypher_Text.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Decypher_Text.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Edge.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Edge.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Edge.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,13 +51,12 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="partner" or elt.getAttribute("moby:articleName")=="partner"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Partner" or elt.getAttribute("moby:articleName")=="Partner"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Partner=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="direction" or elt.getAttribute("moby:articleName")=="direction"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Direction" or elt.getAttribute("moby:articleName")=="Direction"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Direction=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/EmblFlatfile.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/EmblFlatfile.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/EmblFlatfile.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_AA.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_AA.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_AA.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_NA.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_NA.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_NA.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_NA_multi.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_NA_multi.py	2005/02/07 14:23:33	1.2
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_NA_multi.py	2005/04/05 16:00:51	1.3
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_Text.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_Text.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/FASTA_Text.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF1.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF1.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF1.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF2.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF2.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF2.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF2_5.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF2_5.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF2_5.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF3.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF3.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/GFF3.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/GO_Term.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/GO_Term.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/GO_Term.py	2005/04/05 16:00:51	1.7
@@ -29,7 +29,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -50,8 +50,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Term" or elt.getAttribute("moby:articleName")=="Term"):
                 t=MobyString()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/GenbankFlatfile.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/GenbankFlatfile.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/GenbankFlatfile.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Gene_Expression_data.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Gene_Expression_data.py	2005/02/07 14:23:33	1.2
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Gene_Expression_data.py	2005/04/05 16:00:51	1.3
@@ -28,7 +28,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -49,9 +49,8 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Expression data" or elt.getAttribute("moby:articleName")=="Expression data"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="ExpressionData" or elt.getAttribute("moby:articleName")=="ExpressionData"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.ExpressionData=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/GenericSequence.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/GenericSequence.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/GenericSequence.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,8 +51,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/GeneticElement.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/GeneticElement.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/GeneticElement.py	2005/04/05 16:00:51	1.7
@@ -28,7 +28,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -49,8 +49,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="GeneticElement" or elt.getAttribute("moby:articleName")=="GeneticElement"):
                 t=MobyString()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Genotype.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Genotype.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Genotype.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,17 +51,16 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="snp" or elt.getAttribute("moby:articleName")=="snp"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Snp" or elt.getAttribute("moby:articleName")=="Snp"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Snp=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="sample" or elt.getAttribute("moby:articleName")=="sample"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Sample" or elt.getAttribute("moby:articleName")=="Sample"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Sample=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="result" or elt.getAttribute("moby:articleName")=="result"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Result" or elt.getAttribute("moby:articleName")=="Result"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Result=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Germplasm_Details.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Germplasm_Details.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Germplasm_Details.py	2005/04/05 16:00:51	1.7
@@ -36,7 +36,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -57,37 +57,36 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="date" or elt.getAttribute("moby:articleName")=="date"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Date" or elt.getAttribute("moby:articleName")=="Date"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Date=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="country" or elt.getAttribute("moby:articleName")=="country"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Country" or elt.getAttribute("moby:articleName")=="Country"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Country=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="prefered_name" or elt.getAttribute("moby:articleName")=="prefered_name"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Prefered_name" or elt.getAttribute("moby:articleName")=="Prefered_name"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Prefered_name=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="alternative_names" or elt.getAttribute("moby:articleName")=="alternative_names"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Alternative_names" or elt.getAttribute("moby:articleName")=="Alternative_names"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Alternative_names=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="name_type" or elt.getAttribute("moby:articleName")=="name_type"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Name_type" or elt.getAttribute("moby:articleName")=="Name_type"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Name_type=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="method" or elt.getAttribute("moby:articleName")=="method"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Method" or elt.getAttribute("moby:articleName")=="Method"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Method=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="location" or elt.getAttribute("moby:articleName")=="location"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Location" or elt.getAttribute("moby:articleName")=="Location"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Location=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="germplasm_id" or elt.getAttribute("moby:articleName")=="germplasm_id"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Germplasm_id" or elt.getAttribute("moby:articleName")=="Germplasm_id"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Germplasm_id=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Germplasm_List.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Germplasm_List.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Germplasm_List.py	2005/04/05 16:00:51	1.7
@@ -36,7 +36,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -57,37 +57,36 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="germplasm_id" or elt.getAttribute("moby:articleName")=="germplasm_id"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Germplasm_id" or elt.getAttribute("moby:articleName")=="Germplasm_id"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Germplasm_id=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="germplasm_name" or elt.getAttribute("moby:articleName")=="germplasm_name"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Germplasm_name" or elt.getAttribute("moby:articleName")=="Germplasm_name"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Germplasm_name=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="trait_value" or elt.getAttribute("moby:articleName")=="trait_value"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Trait_value" or elt.getAttribute("moby:articleName")=="Trait_value"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Trait_value=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="trait_id" or elt.getAttribute("moby:articleName")=="trait_id"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Trait_id" or elt.getAttribute("moby:articleName")=="Trait_id"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Trait_id=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="scale" or elt.getAttribute("moby:articleName")=="scale"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Scale" or elt.getAttribute("moby:articleName")=="Scale"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Scale=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="scale_desc" or elt.getAttribute("moby:articleName")=="scale_desc"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Scale_desc" or elt.getAttribute("moby:articleName")=="Scale_desc"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Scale_desc=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="method" or elt.getAttribute("moby:articleName")=="method"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Method" or elt.getAttribute("moby:articleName")=="Method"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Method=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="study_id" or elt.getAttribute("moby:articleName")=="study_id"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Study_id" or elt.getAttribute("moby:articleName")=="Study_id"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Study_id=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Global_Keyword.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Global_Keyword.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Global_Keyword.py	2005/04/05 16:00:51	1.7
@@ -26,7 +26,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -47,5 +47,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/HBond_Pair.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/HBond_Pair.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/HBond_Pair.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,8 +51,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="A" or elt.getAttribute("moby:articleName")=="A"):
                 t=MobyString()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/HFormatText.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/HFormatText.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/HFormatText.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Haplotyping_Study_obj.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Haplotyping_Study_obj.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Haplotyping_Study_obj.py	2005/04/05 16:00:51	1.7
@@ -26,7 +26,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -47,5 +47,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/ICIS_Query.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/ICIS_Query.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/ICIS_Query.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,17 +52,16 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="end_row" or elt.getAttribute("moby:articleName")=="end_row"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="End_row" or elt.getAttribute("moby:articleName")=="End_row"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.End_row=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="start_row" or elt.getAttribute("moby:articleName")=="start_row"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Start_row" or elt.getAttribute("moby:articleName")=="Start_row"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Start_row=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="search_text" or elt.getAttribute("moby:articleName")=="search_text"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Search_text" or elt.getAttribute("moby:articleName")=="Search_text"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Search_text=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/ICIS_Query2.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/ICIS_Query2.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/ICIS_Query2.py	2005/04/05 16:00:51	1.7
@@ -33,7 +33,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -54,25 +54,24 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="search_text1" or elt.getAttribute("moby:articleName")=="search_text1"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Search_text1" or elt.getAttribute("moby:articleName")=="Search_text1"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Search_text1=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="search_text2" or elt.getAttribute("moby:articleName")=="search_text2"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Search_text2" or elt.getAttribute("moby:articleName")=="Search_text2"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Search_text2=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="search_text3" or elt.getAttribute("moby:articleName")=="search_text3"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Search_text3" or elt.getAttribute("moby:articleName")=="Search_text3"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Search_text3=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="start_row" or elt.getAttribute("moby:articleName")=="start_row"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Start_row" or elt.getAttribute("moby:articleName")=="Start_row"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Start_row=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="end_row" or elt.getAttribute("moby:articleName")=="end_row"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="End_row" or elt.getAttribute("moby:articleName")=="End_row"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.End_row=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/ICIS_Query3.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/ICIS_Query3.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/ICIS_Query3.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,21 +52,20 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="search_text1" or elt.getAttribute("moby:articleName")=="search_text1"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Search_text1" or elt.getAttribute("moby:articleName")=="Search_text1"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Search_text1=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="search_text2" or elt.getAttribute("moby:articleName")=="search_text2"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Search_text2" or elt.getAttribute("moby:articleName")=="Search_text2"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Search_text2=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="start_row" or elt.getAttribute("moby:articleName")=="start_row"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Start_row" or elt.getAttribute("moby:articleName")=="Start_row"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Start_row=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="end_row" or elt.getAttribute("moby:articleName")=="end_row"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="End_row" or elt.getAttribute("moby:articleName")=="End_row"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.End_row=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/IntAct_XML.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/IntAct_XML.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/IntAct_XML.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Interaction.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Interaction.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Interaction.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -53,16 +53,16 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="result" or elt.getAttribute("moby:articleName")=="result"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Result" or elt.getAttribute("moby:articleName")=="Result"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Result=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="resultUnits" or elt.getAttribute("moby:articleName")=="resultUnits"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="ResultUnits" or elt.getAttribute("moby:articleName")=="ResultUnits"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.ResultUnits=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Interactor" or elt.nodeName=="moby:Interactor") and (elt.getAttribute("articleName")=="participant" or elt.getAttribute("moby:articleName")=="participant"):
-                self.Participant=MobyInteractor()
-                self.Participant.fromMoby(elt)
\ No newline at end of file
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Interactor" or elt.nodeName=="moby:Interactor") and (elt.getAttribute("articleName")=="Participant" or elt.getAttribute("moby:articleName")=="Participant"):
+                auxObject=MobyInteractor()
+                auxObject.fromMoby(elt)
+                self.Participant.append(auxObject)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/InteractionMethod.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/InteractionMethod.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/InteractionMethod.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,17 +51,16 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="shortlabel" or elt.getAttribute("moby:articleName")=="shortlabel"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Shortlabel" or elt.getAttribute("moby:articleName")=="Shortlabel"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Shortlabel=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="term" or elt.getAttribute("moby:articleName")=="term"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Term" or elt.getAttribute("moby:articleName")=="Term"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Term=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="definition" or elt.getAttribute("moby:articleName")=="definition"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Definition" or elt.getAttribute("moby:articleName")=="Definition"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Definition=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Interaction_partner.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Interaction_partner.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Interaction_partner.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,13 +51,12 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="direction" or elt.getAttribute("moby:articleName")=="direction"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Direction" or elt.getAttribute("moby:articleName")=="Direction"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Direction=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="partner" or elt.getAttribute("moby:articleName")=="partner"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Partner" or elt.getAttribute("moby:articleName")=="Partner"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Partner=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Interactor.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Interactor.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Interactor.py	2005/04/05 16:00:51	1.7
@@ -28,7 +28,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -49,9 +49,8 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="role" or elt.getAttribute("moby:articleName")=="role"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Role" or elt.getAttribute("moby:articleName")=="Role"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Role=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/MEME_Text.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/MEME_Text.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/MEME_Text.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/MGIS_ACCESSION.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/MGIS_ACCESSION.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/MGIS_ACCESSION.py	2005/04/05 16:00:51	1.7
@@ -47,7 +47,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -68,25 +68,24 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Biotic_stress_Yellowsig" or elt.getAttribute("moby:articleName")=="Biotic_stress_Yellowsig"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Biotic_stress_Yellowsig=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="mcpd:ORIGCTY" or elt.getAttribute("moby:articleName")=="mcpd:ORIGCTY"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="McpdORIGCTY" or elt.getAttribute("moby:articleName")=="McpdORIGCTY"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.McpdORIGCTY=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="mgis:SECTION" or elt.getAttribute("moby:articleName")=="mgis:SECTION"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="MgisSECTION" or elt.getAttribute("moby:articleName")=="MgisSECTION"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.MgisSECTION=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="mcpd:SPECIES" or elt.getAttribute("moby:articleName")=="mcpd:SPECIES"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="McpdSPECIES" or elt.getAttribute("moby:articleName")=="McpdSPECIES"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.McpdSPECIES=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="mcpd:COLLCODE" or elt.getAttribute("moby:articleName")=="mcpd:COLLCODE"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="McpdCOLLCODE" or elt.getAttribute("moby:articleName")=="McpdCOLLCODE"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.McpdCOLLCODE=t.content

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/MMP_Locus.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/MMP_Locus.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/MMP_Locus.py	2005/04/05 16:00:51	1.7
@@ -26,7 +26,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -47,5 +47,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/MSF.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/MSF.py	2005/02/07 14:23:33	1.2
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/MSF.py	2005/04/05 16:00:51	1.3
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/MmCIFText.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/MmCIFText.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/MmCIFText.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Multi_key_value_pair.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Multi_key_value_pair.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Multi_key_value_pair.py	2005/04/05 16:00:51	1.7
@@ -29,7 +29,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,13 +51,12 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="key" or elt.getAttribute("moby:articleName")=="key"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Key" or elt.getAttribute("moby:articleName")=="Key"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Key=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="value" or elt.getAttribute("moby:articleName")=="value"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Value" or elt.getAttribute("moby:articleName")=="Value"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Value.append(t.content)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/MyTestingDataType_11024145298313.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/MyTestingDataType_11024145298313.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/MyTestingDataType_11024145298313.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/MyTree.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/MyTree.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/MyTree.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_BLAST_Text.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_BLAST_Text.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_BLAST_Text.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_Blast_XML.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_Blast_XML.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_Blast_XML.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_Blast_XML_Gif.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_Blast_XML_Gif.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_Blast_XML_Gif.py	2005/04/05 16:00:51	1.7
@@ -29,7 +29,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -50,8 +50,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="b64_encoded_gif" or elt.nodeName=="moby:b64_encoded_gif") and (elt.getAttribute("articleName")=="hitGraph" or elt.getAttribute("moby:articleName")=="hitGraph"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="b64_encoded_gif" or elt.nodeName=="moby:b64_encoded_gif") and (elt.getAttribute("articleName")=="HitGraph" or elt.getAttribute("moby:articleName")=="HitGraph"):
                 self.HitGraph=MobyB64_encoded_gif()
                 self.HitGraph.fromMoby(elt)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_Blast_XML_Gif_Map.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_Blast_XML_Gif_Map.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_Blast_XML_Gif_Map.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,11 +52,10 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="b64_encoded_gif" or elt.nodeName=="moby:b64_encoded_gif") and (elt.getAttribute("articleName")=="hitGraph" or elt.getAttribute("moby:articleName")=="hitGraph"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="b64_encoded_gif" or elt.nodeName=="moby:b64_encoded_gif") and (elt.getAttribute("articleName")=="HitGraph" or elt.getAttribute("moby:articleName")=="HitGraph"):
                 self.HitGraph=MobyB64_encoded_gif()
                 self.HitGraph.fromMoby(elt)
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="text-html" or elt.nodeName=="moby:text-html") and (elt.getAttribute("articleName")=="areaMap" or elt.getAttribute("moby:articleName")=="areaMap"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="text-html" or elt.nodeName=="moby:text-html") and (elt.getAttribute("articleName")=="AreaMap" or elt.getAttribute("moby:articleName")=="AreaMap"):
                 self.AreaMap=MobyTextHtml()
                 self.AreaMap.fromMoby(elt)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_MEME_Text.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_MEME_Text.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/NCBI_MEME_Text.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/NucleotideSequence.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/NucleotideSequence.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/NucleotideSequence.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,8 +51,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/PDBFormattedText.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/PDBFormattedText.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/PDBFormattedText.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/PDBText.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/PDBText.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/PDBText.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/PDGJOB.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/PDGJOB.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/PDGJOB.py	2005/04/05 16:00:51	1.7
@@ -33,7 +33,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -54,24 +54,23 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="answerService" or elt.getAttribute("moby:articleName")=="answerService"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="AnswerService" or elt.getAttribute("moby:articleName")=="AnswerService"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.AnswerService=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="authURI" or elt.getAttribute("moby:articleName")=="authURI"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="AuthURI" or elt.getAttribute("moby:articleName")=="AuthURI"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.AuthURI=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="DateTime" or elt.nodeName=="moby:DateTime") and (elt.getAttribute("articleName")=="timeout" or elt.getAttribute("moby:articleName")=="timeout"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="DateTime" or elt.nodeName=="moby:DateTime") and (elt.getAttribute("articleName")=="Timeout" or elt.getAttribute("moby:articleName")=="Timeout"):
                 self.Timeout=MobyDateTime()
                 self.Timeout.fromMoby(elt)
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="killcode" or elt.getAttribute("moby:articleName")=="killcode"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Killcode" or elt.getAttribute("moby:articleName")=="Killcode"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Killcode=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="killService" or elt.getAttribute("moby:articleName")=="killService"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="KillService" or elt.getAttribute("moby:articleName")=="KillService"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.KillService=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/PHDText.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/PHDText.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/PHDText.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/PMUTText.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/PMUTText.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/PMUTText.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/PSeaTextFormatted.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/PSeaTextFormatted.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/PSeaTextFormatted.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/PhenotypeDescription.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/PhenotypeDescription.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/PhenotypeDescription.py	2005/04/05 16:00:51	1.7
@@ -28,7 +28,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -49,8 +49,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Phenotype" or elt.getAttribute("moby:articleName")=="Phenotype"):
                 t=MobyString()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/PubMedMEDLINE.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/PubMedMEDLINE.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/PubMedMEDLINE.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/RNASequence.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/RNASequence.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/RNASequence.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,8 +51,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/SINGER_ACCESSION.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/SINGER_ACCESSION.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/SINGER_ACCESSION.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,8 +52,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="ACCNO" or elt.getAttribute("moby:articleName")=="ACCNO"):
                 t=MobyString()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Sample.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Sample.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Sample.py	2005/04/05 16:00:51	1.7
@@ -30,7 +30,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,13 +51,12 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="code" or elt.getAttribute("moby:articleName")=="code"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Code" or elt.getAttribute("moby:articleName")=="Code"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Code=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="affectation" or elt.getAttribute("moby:articleName")=="affectation"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Affectation" or elt.getAttribute("moby:articleName")=="Affectation"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Affectation=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonMotifID.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonMotifID.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonMotifID.py	2005/04/05 16:00:51	1.7
@@ -28,7 +28,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -49,8 +49,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="ID" or elt.getAttribute("moby:articleName")=="ID"):
                 t=MobyString()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonMotifSupport.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonMotifSupport.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonMotifSupport.py	2005/04/05 16:00:51	1.7
@@ -29,7 +29,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -50,8 +50,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="UniqueSupport" or elt.getAttribute("moby:articleName")=="UniqueSupport"):
                 t=MobyInteger()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonSegmentAttributes.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonSegmentAttributes.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonSegmentAttributes.py	2005/04/05 16:00:51	1.7
@@ -33,7 +33,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -54,25 +54,24 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Length=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Insert code" or elt.getAttribute("moby:articleName")=="Insert code"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="InsertCode" or elt.getAttribute("moby:articleName")=="InsertCode"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.InsertCode=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Starting amino acid position" or elt.getAttribute("moby:articleName")=="Starting amino acid position"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="StartingAminoAcidPosition" or elt.getAttribute("moby:articleName")=="StartingAminoAcidPosition"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.StartingAminoAcidPosition=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Chain ID" or elt.getAttribute("moby:articleName")=="Chain ID"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="ChainID" or elt.getAttribute("moby:articleName")=="ChainID"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.ChainID=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="PDB ID" or elt.getAttribute("moby:articleName")=="PDB ID"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="PDBID" or elt.getAttribute("moby:articleName")=="PDBID"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.PDBID=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonSegmentID.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonSegmentID.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonSegmentID.py	2005/04/05 16:00:51	1.7
@@ -28,7 +28,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -49,8 +49,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="ID" or elt.getAttribute("moby:articleName")=="ID"):
                 t=MobyString()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonStructureAnnotation.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonStructureAnnotation.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonStructureAnnotation.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,13 +52,12 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="PROMOTIF gamma-turn" or elt.getAttribute("moby:articleName")=="PROMOTIF gamma-turn"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="PROMOTIFGammaTurn" or elt.getAttribute("moby:articleName")=="PROMOTIFGammaTurn"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.PROMOTIFGammaTurn=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="PROMOTIF beta-turn" or elt.getAttribute("moby:articleName")=="PROMOTIF beta-turn"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="PROMOTIFBetaTurn" or elt.getAttribute("moby:articleName")=="PROMOTIFBetaTurn"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.PROMOTIFBetaTurn=t.content

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonVorocodeName.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonVorocodeName.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/SchematikonVorocodeName.py	2005/04/05 16:00:51	1.7
@@ -28,7 +28,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -49,8 +49,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="VorocodeName" or elt.getAttribute("moby:articleName")=="VorocodeName"):
                 t=MobyString()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Scored_acronym_string.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Scored_acronym_string.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Scored_acronym_string.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,16 +52,15 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="score" or elt.getAttribute("moby:articleName")=="score"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="Score" or elt.getAttribute("moby:articleName")=="Score"):
                 t=MobyFloat()
                 t.fromMoby(elt)
                 self.Score=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Object" or elt.nodeName=="moby:Object") and (elt.getAttribute("articleName")=="string_component" or elt.getAttribute("moby:articleName")=="string_component"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Object" or elt.nodeName=="moby:Object") and (elt.getAttribute("articleName")=="String_component" or elt.getAttribute("moby:articleName")=="String_component"):
                 self.String_component=MobyObject()
                 self.String_component.fromMoby(elt)
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="acronym" or elt.getAttribute("moby:articleName")=="acronym"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Acronym" or elt.getAttribute("moby:articleName")=="Acronym"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Acronym=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/SimpleAnnotatedGIFImage.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/SimpleAnnotatedGIFImage.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/SimpleAnnotatedGIFImage.py	2005/04/05 16:00:51	1.7
@@ -29,7 +29,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -50,8 +50,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Description" or elt.getAttribute("moby:articleName")=="Description"):
                 t=MobyString()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/SimpleAnnotatedJPEGImage.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/SimpleAnnotatedJPEGImage.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/SimpleAnnotatedJPEGImage.py	2005/04/05 16:00:51	1.7
@@ -29,7 +29,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -51,8 +51,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Description" or elt.getAttribute("moby:articleName")=="Description"):
                 t=MobyString()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Simple_key_value_pair.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Simple_key_value_pair.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Simple_key_value_pair.py	2005/04/05 16:00:51	1.7
@@ -29,7 +29,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -50,13 +50,12 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="value" or elt.getAttribute("moby:articleName")=="value"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Value" or elt.getAttribute("moby:articleName")=="Value"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Value=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="key" or elt.getAttribute("moby:articleName")=="key"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Key" or elt.getAttribute("moby:articleName")=="Key"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Key=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Snp_allele.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Snp_allele.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Snp_allele.py	2005/04/05 16:00:51	1.7
@@ -24,7 +24,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -39,8 +39,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="DNASequence" or elt.nodeName=="moby:DNASequence") and (elt.getAttribute("articleName")=="snp_allele" or elt.getAttribute("moby:articleName")=="snp_allele"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="DNASequence" or elt.nodeName=="moby:DNASequence") and (elt.getAttribute("articleName")=="Snp_allele" or elt.getAttribute("moby:articleName")=="Snp_allele"):
                 self.Snp_allele=MobyDNASequence()
                 self.Snp_allele.fromMoby(elt)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Snp_genotype.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Snp_genotype.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Snp_genotype.py	2005/04/05 16:00:51	1.7
@@ -25,7 +25,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -40,11 +40,10 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="snp_allele" or elt.nodeName=="moby:snp_allele") and (elt.getAttribute("articleName")=="allele1" or elt.getAttribute("moby:articleName")=="allele1"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="snp_allele" or elt.nodeName=="moby:snp_allele") and (elt.getAttribute("articleName")=="Allele1" or elt.getAttribute("moby:articleName")=="Allele1"):
                 self.Allele1=MobySnp_allele()
                 self.Allele1.fromMoby(elt)
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="snp_allele" or elt.nodeName=="moby:snp_allele") and (elt.getAttribute("articleName")=="allele2" or elt.getAttribute("moby:articleName")=="allele2"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="snp_allele" or elt.nodeName=="moby:snp_allele") and (elt.getAttribute("articleName")=="Allele2" or elt.getAttribute("moby:articleName")=="Allele2"):
                 self.Allele2=MobySnp_allele()
                 self.Allele2.fromMoby(elt)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Study.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Study.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Study.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,17 +52,16 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="study_name" or elt.getAttribute("moby:articleName")=="study_name"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Study_name" or elt.getAttribute("moby:articleName")=="Study_name"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Study_name=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="study_id" or elt.getAttribute("moby:articleName")=="study_id"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Study_id" or elt.getAttribute("moby:articleName")=="Study_id"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Study_id=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="study_desc" or elt.getAttribute("moby:articleName")=="study_desc"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Study_desc" or elt.getAttribute("moby:articleName")=="Study_desc"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Study_desc=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TEST.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TEST.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TEST.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TargetP_result.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TargetP_result.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TargetP_result.py	2005/04/05 16:00:51	1.7
@@ -3,25 +3,25 @@
 
 from xml.dom.minidom import parseString
 
-from bioMoby.mobyDataTypes import MobyFloat
 from bioMoby.mobyDataTypes import MobyString
-from bioMoby.mobyDataTypes import MobyObject
+from bioMoby.mobyDataTypes import MobyFloat
+from CompartmentPrediction import MobyCompartmentPrediction
 
 
-class MobyTargetP_result(MobyObject):
+class MobyTargetP_result(MobyCompartmentPrediction):
     """ Description: The results of a TargetP (http://www.cbs.dtu.dk/services/TargetP/) prediction
         Author: atidb.org
-        Contact: sean.walsh at bbsrc.ac.uk
+        Contact: matthew.couchman at bbsrc.ac.uk
     """
-    def __init__(self,namespace="",id="",O_score=0.0,S_score=0.0,M_score=0.0,C_score=0.0,Compartment="",articleName=""):
-        self._articles={"O_score":"o_score","S_score":"s_score","M_score":"m_score","C_score":"c_score","Compartment":"compartment"}
+    def __init__(self,namespace="",id="",Compartment="",C_score=0.0,M_score=0.0,O_score=0.0,S_score=0.0,articleName=""):
+        self._articles={"Compartment":"compartment","C_score":"c_score","M_score":"m_score","O_score":"o_score","S_score":"s_score"}
         self.namespace=namespace
         self.id=id
+        self.Compartment=Compartment
+        self.C_score=C_score
+        self.M_score=M_score
         self.O_score=O_score
         self.S_score=S_score
-        self.M_score=M_score
-        self.C_score=C_score
-        self.Compartment=Compartment
         self.__prefix__="moby"
         self.__tag__="TargetP_result"
         self.articleName=articleName
@@ -33,7 +33,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -54,25 +54,24 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="o_score" or elt.getAttribute("moby:articleName")=="o_score"):
-                t=MobyFloat()
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Compartment" or elt.getAttribute("moby:articleName")=="Compartment"):
+                t=MobyString()
                 t.fromMoby(elt)
-                self.O_score=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="s_score" or elt.getAttribute("moby:articleName")=="s_score"):
+                self.Compartment=t.content
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="C_score" or elt.getAttribute("moby:articleName")=="C_score"):
                 t=MobyFloat()
                 t.fromMoby(elt)
-                self.S_score=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="m_score" or elt.getAttribute("moby:articleName")=="m_score"):
+                self.C_score=t.content
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="M_score" or elt.getAttribute("moby:articleName")=="M_score"):
                 t=MobyFloat()
                 t.fromMoby(elt)
                 self.M_score=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="c_score" or elt.getAttribute("moby:articleName")=="c_score"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="O_score" or elt.getAttribute("moby:articleName")=="O_score"):
                 t=MobyFloat()
                 t.fromMoby(elt)
-                self.C_score=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="compartment" or elt.getAttribute("moby:articleName")=="compartment"):
-                t=MobyString()
+                self.O_score=t.content
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Float" or elt.nodeName=="moby:Float") and (elt.getAttribute("articleName")=="S_score" or elt.getAttribute("moby:articleName")=="S_score"):
+                t=MobyFloat()
                 t.fromMoby(elt)
-                self.Compartment=t.content
\ No newline at end of file
+                self.S_score=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Testout.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Testout.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Testout.py	2005/04/05 16:00:51	1.7
@@ -32,7 +32,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -53,21 +53,20 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="gid" or elt.getAttribute("moby:articleName")=="gid"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Gid" or elt.getAttribute("moby:articleName")=="Gid"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Gid=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="dvalue" or elt.getAttribute("moby:articleName")=="dvalue"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Dvalue" or elt.getAttribute("moby:articleName")=="Dvalue"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Dvalue=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="scaleid" or elt.getAttribute("moby:articleName")=="scaleid"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Scaleid" or elt.getAttribute("moby:articleName")=="Scaleid"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Scaleid=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="tmethid" or elt.getAttribute("moby:articleName")=="tmethid"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Tmethid" or elt.getAttribute("moby:articleName")=="Tmethid"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Tmethid=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TextBase64.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TextBase64.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TextBase64.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TextFormatted.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TextFormatted.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TextFormatted.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TextHtml.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TextHtml.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TextHtml.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TextPlain.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TextPlain.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TextPlain.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TextUuencoded.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TextUuencoded.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TextUuencoded.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TextXml.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TextXml.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TextXml.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Text_plain.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Text_plain.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Text_plain.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Trait_Details.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Trait_Details.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Trait_Details.py	2005/04/05 16:00:51	1.7
@@ -33,7 +33,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -54,25 +54,24 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="trait_desc" or elt.getAttribute("moby:articleName")=="trait_desc"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Trait_desc" or elt.getAttribute("moby:articleName")=="Trait_desc"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Trait_desc=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="num_studies" or elt.getAttribute("moby:articleName")=="num_studies"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Num_studies" or elt.getAttribute("moby:articleName")=="Num_studies"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Num_studies=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="trait_abbr" or elt.getAttribute("moby:articleName")=="trait_abbr"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Trait_abbr" or elt.getAttribute("moby:articleName")=="Trait_abbr"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Trait_abbr=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="trait_id" or elt.getAttribute("moby:articleName")=="trait_id"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Trait_id" or elt.getAttribute("moby:articleName")=="Trait_id"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Trait_id=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="trait_name" or elt.getAttribute("moby:articleName")=="trait_name"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Trait_name" or elt.getAttribute("moby:articleName")=="Trait_name"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Trait_name=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Tree.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Tree.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Tree.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TropGENE_ACCESSION.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TropGENE_ACCESSION.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TropGENE_ACCESSION.py	2005/04/05 16:00:51	1.7
@@ -37,7 +37,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -68,35 +68,44 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="TropGENE_LOCUS" or elt.nodeName=="moby:TropGENE_LOCUS") and (elt.getAttribute("articleName")=="RFLP" or elt.getAttribute("moby:articleName")=="RFLP"):
-                self.RFLP=MobyTropGENE_LOCUS()
-                self.RFLP.fromMoby(elt)
+                auxObject=MobyTropGENE_LOCUS()
+                auxObject.fromMoby(elt)
+                self.RFLP.append(auxObject)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="TropGENE_LOCUS" or elt.nodeName=="moby:TropGENE_LOCUS") and (elt.getAttribute("articleName")=="AFLP" or elt.getAttribute("moby:articleName")=="AFLP"):
-                self.AFLP=MobyTropGENE_LOCUS()
-                self.AFLP.fromMoby(elt)
+                auxObject=MobyTropGENE_LOCUS()
+                auxObject.fromMoby(elt)
+                self.AFLP.append(auxObject)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="TropGENE_LOCUS" or elt.nodeName=="moby:TropGENE_LOCUS") and (elt.getAttribute("articleName")=="RAPD" or elt.getAttribute("moby:articleName")=="RAPD"):
-                self.RAPD=MobyTropGENE_LOCUS()
-                self.RAPD.fromMoby(elt)
+                auxObject=MobyTropGENE_LOCUS()
+                auxObject.fromMoby(elt)
+                self.RAPD.append(auxObject)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="TropGENE_LOCUS" or elt.nodeName=="moby:TropGENE_LOCUS") and (elt.getAttribute("articleName")=="Isozyme" or elt.getAttribute("moby:articleName")=="Isozyme"):
-                self.Isozyme=MobyTropGENE_LOCUS()
-                self.Isozyme.fromMoby(elt)
+                auxObject=MobyTropGENE_LOCUS()
+                auxObject.fromMoby(elt)
+                self.Isozyme.append(auxObject)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="TropGENE_LOCUS" or elt.nodeName=="moby:TropGENE_LOCUS") and (elt.getAttribute("articleName")=="Polyphenol" or elt.getAttribute("moby:articleName")=="Polyphenol"):
-                self.Polyphenol=MobyTropGENE_LOCUS()
-                self.Polyphenol.fromMoby(elt)
+                auxObject=MobyTropGENE_LOCUS()
+                auxObject.fromMoby(elt)
+                self.Polyphenol.append(auxObject)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="TropGENE_LOCUS" or elt.nodeName=="moby:TropGENE_LOCUS") and (elt.getAttribute("articleName")=="Morphological" or elt.getAttribute("moby:articleName")=="Morphological"):
-                self.Morphological=MobyTropGENE_LOCUS()
-                self.Morphological.fromMoby(elt)
+                auxObject=MobyTropGENE_LOCUS()
+                auxObject.fromMoby(elt)
+                self.Morphological.append(auxObject)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="TropGENE_LOCUS" or elt.nodeName=="moby:TropGENE_LOCUS") and (elt.getAttribute("articleName")=="Microsatellite" or elt.getAttribute("moby:articleName")=="Microsatellite"):
-                self.Microsatellite=MobyTropGENE_LOCUS()
-                self.Microsatellite.fromMoby(elt)
+                auxObject=MobyTropGENE_LOCUS()
+                auxObject.fromMoby(elt)
+                self.Microsatellite.append(auxObject)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="TropGENE_LOCUS" or elt.nodeName=="moby:TropGENE_LOCUS") and (elt.getAttribute("articleName")=="SNP" or elt.getAttribute("moby:articleName")=="SNP"):
-                self.SNP=MobyTropGENE_LOCUS()
-                self.SNP.fromMoby(elt)
+                auxObject=MobyTropGENE_LOCUS()
+                auxObject.fromMoby(elt)
+                self.SNP.append(auxObject)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="TropGENE_LOCUS" or elt.nodeName=="moby:TropGENE_LOCUS") and (elt.getAttribute("articleName")=="CAPS" or elt.getAttribute("moby:articleName")=="CAPS"):
-                self.CAPS=MobyTropGENE_LOCUS()
-                self.CAPS.fromMoby(elt)
+                auxObject=MobyTropGENE_LOCUS()
+                auxObject.fromMoby(elt)
+                self.CAPS.append(auxObject)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="TropGENE_LOCUS" or elt.nodeName=="moby:TropGENE_LOCUS") and (elt.getAttribute("articleName")=="TAMPL" or elt.getAttribute("moby:articleName")=="TAMPL"):
-                self.TAMPL=MobyTropGENE_LOCUS()
-                self.TAMPL.fromMoby(elt)
\ No newline at end of file
+                auxObject=MobyTropGENE_LOCUS()
+                auxObject.fromMoby(elt)
+                self.TAMPL.append(auxObject)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TropGENE_Diversity_Matrix.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TropGENE_Diversity_Matrix.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TropGENE_Diversity_Matrix.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/TropGENE_LOCUS.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/TropGENE_LOCUS.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/TropGENE_LOCUS.py	2005/04/05 16:00:51	1.7
@@ -26,7 +26,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -47,5 +47,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/VirtualSequence.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/VirtualSequence.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/VirtualSequence.py	2005/04/05 16:00:51	1.7
@@ -28,7 +28,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -49,8 +49,7 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
+                    self.__cross__.append(ref)
             if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Length" or elt.getAttribute("moby:articleName")=="Length"):
                 t=MobyInteger()
                 t.fromMoby(elt)

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/WU_BLAST_Text.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/WU_BLAST_Text.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/WU_BLAST_Text.py	2005/04/05 16:00:51	1.7
@@ -27,7 +27,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -48,5 +48,4 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
\ No newline at end of file
+                    self.__cross__.append(ref)
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/Wildcard_Query.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/Wildcard_Query.py	2005/02/07 14:23:33	1.6
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/Wildcard_Query.py	2005/04/05 16:00:51	1.7
@@ -31,7 +31,7 @@
         """
         from bioMoby.mobyMarshal import MobyUnmarshaller
         doc=value
-        if isinstance(value, str):
+        if isinstance(value,str):
             doc=parseString(value).firstChild
         um=MobyUnmarshaller()
         self.content=""
@@ -52,17 +52,16 @@
             if elt.nodeName=="CrossReference" or elt.nodeName=="moby:CrossReference":
                 self.__cross__=[]
                 for ref in elt.childNodes:
-                    if ref.nodeType==ref.ELEMENT_NODE:
-                        self.__cross__.append(um.loadn(ref))
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="end_row" or elt.getAttribute("moby:articleName")=="end_row"):
+                    self.__cross__.append(ref)
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="End_row" or elt.getAttribute("moby:articleName")=="End_row"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.End_row=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="start_row" or elt.getAttribute("moby:articleName")=="start_row"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="Integer" or elt.nodeName=="moby:Integer") and (elt.getAttribute("articleName")=="Start_row" or elt.getAttribute("moby:articleName")=="Start_row"):
                 t=MobyInteger()
                 t.fromMoby(elt)
                 self.Start_row=t.content
-            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="germplasm_name" or elt.getAttribute("moby:articleName")=="germplasm_name"):
+            if elt.nodeType==elt.ELEMENT_NODE and (elt.nodeName=="String" or elt.nodeName=="moby:String") and (elt.getAttribute("articleName")=="Germplasm_name" or elt.getAttribute("moby:articleName")=="Germplasm_name"):
                 t=MobyString()
                 t.fromMoby(elt)
                 self.Germplasm_name=t.content
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/Python/bioMoby/ontology/__init__.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Python/bioMoby/ontology/__init__.py	2005/02/01 08:52:16	1.3
+++ /home/repository/moby/moby-live/Python/bioMoby/ontology/__init__.py	2005/04/05 16:00:51	1.4
@@ -1,111 +1,122 @@
 #All classes are declared in this generated file
 
-from Genotype import MobyGenotype
-from GFF import MobyGFF
-from TextBase64 import MobyTextBase64
-from MO_Term_Test import MobyMO_Term_Test
+from CompartmentPrediction import MobyCompartmentPrediction
+from DateTime import MobyDateTime
+from TextPlain import MobyTextPlain
+from TextFormatted import MobyTextFormatted
+from TropGENE_Diversity_Matrix import MobyTropGENE_Diversity_Matrix
+from VirtualSequence import MobyVirtualSequence
+from GenericSequence import MobyGenericSequence
+from NucleotideSequence import MobyNucleotideSequence
+from DNASequence import MobyDNASequence
 from CommentedDNASequence import MobyCommentedDNASequence
-from BasicGFFSequenceFeature import MobyBasicGFFSequenceFeature
-from MSF import MobyMSF
-from MyTestingDataType_11024145298313 import MobyMyTestingDataType_11024145298313
-from PDBFormattedText import MobyPDBFormattedText
-from Testout import MobyTestout
-from SchematikonSegmentAttributes import MobySchematikonSegmentAttributes
-from Interactor import MobyInteractor
-from GenbankFlatfile import MobyGenbankFlatfile
-from SimpleAnnotatedGIFImage import MobySimpleAnnotatedGIFImage
-from B64_encoded_gif import MobyB64_encoded_gif
-from GO_Term import MobyGO_Term
-from PSeaTextFormatted import MobyPSeaTextFormatted
-from SINGER_ACCESSION import MobySINGER_ACCESSION
-from CommentedRNASequence import MobyCommentedRNASequence
 from FASTA_Text import MobyFASTA_Text
-from TEST import MobyTEST
-from AminoAcidSequence import MobyAminoAcidSequence
-from BLASTText import MobyBLASTText
-from Allele_freq import MobyAllele_freq
-from GenericSequence import MobyGenericSequence
-from Alignment import MobyAlignment
-from ICIS_Query import MobyICIS_Query
-from PHDText import MobyPHDText
+from TextXml import MobyTextXml
+from IntAct_XML import MobyIntAct_XML
+from RNASequence import MobyRNASequence
 from WU_BLAST_Text import MobyWU_BLAST_Text
-from HBond_Pair import MobyHBond_Pair
-from GFF1 import MobyGFF1
-from GFF2 import MobyGFF2
-from GFF3 import MobyGFF3
-from PDGJOB import MobyPDGJOB
-from CommentedAASequence import MobyCommentedAASequence
+from TextBase64 import MobyTextBase64
+from B64_Encoded_Postscript import MobyB64_Encoded_Postscript
+from Tree import MobyTree
+from NCBI_Blast_XML import MobyNCBI_Blast_XML
+from NCBI_Blast_XML_Gif import MobyNCBI_Blast_XML_Gif
+from NCBI_MEME_Text import MobyNCBI_MEME_Text
+from GO_Term import MobyGO_Term
+from FASTA import MobyFASTA
+from FASTA_NA import MobyFASTA_NA
 from FASTA_NA_multi import MobyFASTA_NA_multi
-from ClustalMsfFormattedText import MobyClustalMsfFormattedText
-from Multi_key_value_pair import MobyMulti_key_value_pair
-from AlleleAssociation import MobyAlleleAssociation
-from TropGENE_LOCUS import MobyTropGENE_LOCUS
-from DNASequenceWithGFFFeatures import MobyDNASequenceWithGFFFeatures
-from TropGENE_Diversity_Matrix import MobyTropGENE_Diversity_Matrix
-from Interaction_partner import MobyInteraction_partner
-from DateTime import MobyDateTime
-from SchematikonVorocodeName import MobySchematikonVorocodeName
-from Trait_Details import MobyTrait_Details
-from B64_Encoded_PNG import MobyB64_Encoded_PNG
-from B64_encoded_jpeg import MobyB64_encoded_jpeg
-from Edge import MobyEdge
-from Simple_key_value_pair import MobySimple_key_value_pair
-from Study import MobyStudy
-from DNASequence import MobyDNASequence
-from Text_plain import MobyText_plain
+from EmblFlatfile import MobyEmblFlatfile
 from ICIS_Query2 import MobyICIS_Query2
 from ICIS_Query3 import MobyICIS_Query3
-from Sample import MobySample
+from MGIS_ACCESSION import MobyMGIS_ACCESSION
+from AminoAcidSequence import MobyAminoAcidSequence
+from BLASTText import MobyBLASTText
+from B64_encoded_PDB import MobyB64_encoded_PDB
+from PDGJOB import MobyPDGJOB
+from Gene_Expression_data import MobyGene_Expression_data
 from FASTA_AA import MobyFASTA_AA
+from Snp_genotype import MobySnp_genotype
+from MyTestingDataType_11103803700271 import MobyMyTestingDataType_11103803700271
+from MyTestingDataType_11103803700272 import MobyMyTestingDataType_11103803700272
+from MyTestingDataType_11103803700273 import MobyMyTestingDataType_11103803700273
+from MyTree import MobyMyTree
+from Genotype import MobyGenotype
+from SchematikonMotifSupport import MobySchematikonMotifSupport
+from Text_plain import MobyText_plain
+from PSeaTextFormatted import MobyPSeaTextFormatted
+from Haplotyping_Study_obj import MobyHaplotyping_Study_obj
+from MMP_Locus import MobyMMP_Locus
+from ICIS_Query import MobyICIS_Query
 from SchematikonSegmentID import MobySchematikonSegmentID
-from TropGENE_ACCESSION import MobyTropGENE_ACCESSION
-from FASTA_NA import MobyFASTA_NA
-from GeneticElement import MobyGeneticElement
-from PubMedMEDLINE import MobyPubMedMEDLINE
-from Germplasm_List import MobyGermplasm_List
-from NucleotideSequence import MobyNucleotideSequence
-from PhenotypeDescription import MobyPhenotypeDescription
+from SchematikonMotifID import MobySchematikonMotifID
+from Trait_Details import MobyTrait_Details
+from MyTestingDataType_11103812733071 import MobyMyTestingDataType_11103812733071
+from ClustalAlnFormattedText import MobyClustalAlnFormattedText
+from NCBI_Blast_XML_Gif_Map import MobyNCBI_Blast_XML_Gif_Map
+from HBond_Pair import MobyHBond_Pair
+from HFormatText import MobyHFormatText
+from SINGER_ACCESSION import MobySINGER_ACCESSION
 from Interaction import MobyInteraction
-from Decypher_Text import MobyDecypher_Text
+from InterProScanResult import MobyInterProScanResult
+from Multi_key_value_pair import MobyMulti_key_value_pair
+from Study import MobyStudy
+from CommentedRNASequence import MobyCommentedRNASequence
+from B64_Encoded_PNG import MobyB64_Encoded_PNG
+from NCut_Matrix import MobyNCut_Matrix
+from TestObject32 import MobyTestObject32
 from NCBI_BLAST_Text import MobyNCBI_BLAST_Text
-from TextXml import MobyTextXml
-from B64_encoded_PDB import MobyB64_encoded_PDB
-from TextPlain import MobyTextPlain
-from RNASequence import MobyRNASequence
-from B64_Encoded_Postscript import MobyB64_Encoded_Postscript
-from Gene_Expression_data import MobyGene_Expression_data
 from TextHtml import MobyTextHtml
-from NCBI_Blast_XML import MobyNCBI_Blast_XML
-from EmblFlatfile import MobyEmblFlatfile
+from MyTestingDataType_11024145298313 import MobyMyTestingDataType_11024145298313
+from Alignment import MobyAlignment
+from InteractionMethod import MobyInteractionMethod
+from Interactor import MobyInteractor
+from SchematikonVorocodeName import MobySchematikonVorocodeName
 from MmCIFText import MobyMmCIFText
-from SchematikonMotifSupport import MobySchematikonMotifSupport
-from PDBText import MobyPDBText
-from TargetP_result import MobyTargetP_result
-from IntAct_XML import MobyIntAct_XML
-from TextUuencoded import MobyTextUuencoded
-from MEME_Text import MobyMEME_Text
-from FASTA import MobyFASTA
-from Tree import MobyTree
-from SimpleAnnotatedJPEGImage import MobySimpleAnnotatedJPEGImage
+from BasicGFFSequenceFeature import MobyBasicGFFSequenceFeature
+from MyTestingDataType_11103807352603 import MobyMyTestingDataType_11103807352603
+from Allele_freq import MobyAllele_freq
+from GFF import MobyGFF
 from GFF2_5 import MobyGFF2_5
-from ClustalAlnFormattedText import MobyClustalAlnFormattedText
-from SchematikonStructureAnnotation import MobySchematikonStructureAnnotation
-from Snp_genotype import MobySnp_genotype
-from Scored_acronym_string import MobyScored_acronym_string
-from NCBI_Blast_XML_Gif import MobyNCBI_Blast_XML_Gif
-from MMP_Locus import MobyMMP_Locus
-from MGIS_ACCESSION import MobyMGIS_ACCESSION
-from TextFormatted import MobyTextFormatted
+from Wildcard_Query import MobyWildcard_Query
+from MyTestingDataType_11109812917781 import MobyMyTestingDataType_11109812917781
+from Germplasm_Details import MobyGermplasm_Details
+from MyTestingDataType_11103807352591 import MobyMyTestingDataType_11103807352591
+from Decypher_Text import MobyDecypher_Text
+from GeneticElement import MobyGeneticElement
+from PubMedMEDLINE import MobyPubMedMEDLINE
+from Edge import MobyEdge
+from NCut_Input import MobyNCut_Input
+from CommentedAASequence import MobyCommentedAASequence
 from PMUTText import MobyPMUTText
+from PHDText import MobyPHDText
+from DNASequenceWithGFFFeatures import MobyDNASequenceWithGFFFeatures
+from SchematikonSegmentAttributes import MobySchematikonSegmentAttributes
+from AlleleAssociation import MobyAlleleAssociation
+from Simple_key_value_pair import MobySimple_key_value_pair
+from MEME_Text import MobyMEME_Text
+from B64_encoded_gif import MobyB64_encoded_gif
+from SimpleAnnotatedGIFImage import MobySimpleAnnotatedGIFImage
+from GenbankFlatfile import MobyGenbankFlatfile
+from GFF1 import MobyGFF1
+from GFF3 import MobyGFF3
+from GFF2 import MobyGFF2
+from B64_encoded_jpeg import MobyB64_encoded_jpeg
+from SimpleAnnotatedJPEGImage import MobySimpleAnnotatedJPEGImage
 from Snp_allele import MobySnp_allele
-from NCBI_MEME_Text import MobyNCBI_MEME_Text
-from VirtualSequence import MobyVirtualSequence
-from InteractionMethod import MobyInteractionMethod
-from HFormatText import MobyHFormatText
-from MyTree import MobyMyTree
-from Wildcard_Query import MobyWildcard_Query
+from MSF import MobyMSF
+from Scored_acronym_string import MobyScored_acronym_string
+from Testout import MobyTestout
+from PDBFormattedText import MobyPDBFormattedText
+from TextUuencoded import MobyTextUuencoded
+from Interaction_partner import MobyInteraction_partner
+from ClustalMsfFormattedText import MobyClustalMsfFormattedText
+from TropGENE_LOCUS import MobyTropGENE_LOCUS
 from Global_Keyword import MobyGlobal_Keyword
-from SchematikonMotifID import MobySchematikonMotifID
-from Germplasm_Details import MobyGermplasm_Details
-from Haplotyping_Study_obj import MobyHaplotyping_Study_obj
-from NCBI_Blast_XML_Gif_Map import MobyNCBI_Blast_XML_Gif_Map
+from TargetP_result import MobyTargetP_result
+from PhenotypeDescription import MobyPhenotypeDescription
+from SchematikonStructureAnnotation import MobySchematikonStructureAnnotation
+from TropGENE_ACCESSION import MobyTropGENE_ACCESSION
+from Sample import MobySample
+from PDBText import MobyPDBText
+from Germplasm_List import MobyGermplasm_List
+from TEST import MobyTEST




More information about the MOBY-guts mailing list