[Treebase-guts] SF.net SVN: treebase:[788] trunk/treebase-core/src/main/java/org/cipres/ treebase/domain/nexus/nexml/NexmlObjectConverter.java

[<rv...@us...>]

Revision: 788
          http://treebase.svn.sourceforge.net/treebase/?rev=788&view=rev
Author:   rvos
Date:     2011-04-19 11:10:53 +0000 (Tue, 19 Apr 2011)

Log Message:
-----------
Now setting the xml:base attribute to <phylowsPurl>/study/TB2: on every document.

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlObjectConverter.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlObjectConverter.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlObjectConverter.java	2011-04-19 10:59:49 UTC (rev 787)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlObjectConverter.java	2011-04-19 11:10:53 UTC (rev 788)
@@ -26,6 +26,7 @@
 	protected URI mTaxonBaseURI = URI.create(mBaseURI.toString() + "taxon/TB2:");
 	protected URI mMatrixBaseURI = URI.create(mBaseURI.toString() + "matrix/TB2:");
 	protected URI mTreeBaseURI = URI.create(mBaseURI.toString() + "tree/TB2:");
+	protected static URI mStudyBaseURI = URI.create(Constants.BaseURI.toString() + "study/TB2:");
 //	private static String mBaseURIString = "http://purl.org/PHYLO/TREEBASE/PHYLOWS/";
 //	private static String mDCIdentifier = "dcterms:identifier";	
 	public static String TreeBASE2Prefix = "TreeBASE2";
@@ -38,8 +39,7 @@
 	 */
 	public NexmlObjectConverter(Study study, TaxonLabelHome taxonLabelHome, Document document, String baseURI) {
 		if ( null != baseURI ) {
-			mBaseURI = URI.create(baseURI);
-			document.setBaseURI(mBaseURI);
+			document.setBaseURI(URI.create(baseURI));
 		}
 		document.setId(study.getTreebaseIDString().toString());
 		setTaxonLabelHome(taxonLabelHome);
@@ -48,7 +48,7 @@
 	}
 	
 	public NexmlObjectConverter(Study study, TaxonLabelHome taxonLabelHome, Document document) {
-		this(study,taxonLabelHome,document,Constants.BaseURI.toString());
+		this(study,taxonLabelHome,document,mStudyBaseURI.toString());
 	}
 
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.