[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/schemedit MetaDataFramework.java,1.27,1.28

[Jonathan O. <os...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/schemedit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31879

Modified Files:
	MetaDataFramework.java 
Log Message:
modified getNameSpaceInfo() - this method produces the namespaceinfo
that goes in the root element of xml records. changed how
noNamespaceSchemaLocation value is formatted to eliminate the "file:"
uri prefix, which isn't recognized by xml validators. we also normlize
the url to eliminate the ugly webapps-bog/../webapps that appears in
xml created by bolide instances.



Index: MetaDataFramework.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/schemedit/MetaDataFramework.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** MetaDataFramework.java	16 Nov 2005 22:27:19 -0000	1.27
--- MetaDataFramework.java	29 Nov 2005 21:48:50 -0000	1.28
***************
*** 783,787 ****
  		}
  		else {
! 			s += "xsi:noNamespaceSchemaLocation=\"" + getSchemaURI() + "\"";
  		}
  		return s;
--- 783,798 ----
  		}
  		else {
! 			String uriStr = getSchemaURI();
! 			// we don't want the "file:" part (scheme) in the noNamespaceSchemaLocation value
! 			// getSchemaURI() must return a complete URI string because it is used by schemaHelper to find
! 			// the actual schema file, so we chop off the "file:" part here rather than in getSchemaURI()
! 			try {
! 				URI uri = new URI (uriStr).normalize();
! 				if (uri.getScheme().equals("file"))
! 					uriStr = uri.getPath();
! 				s += "xsi:noNamespaceSchemaLocation=\"" + uriStr + "\"";
! 			} catch (Throwable t) {
! 				s += "xsi:noNamespaceSchemaLocation=\"" + getSchemaURI() + "\"";
! 			}
  		}
  		return s;
***************
*** 1117,1120 ****
--- 1128,1133 ----
  		throws DocumentException {
  		// prtln("getWritableRecordXml()");
+ 		// prtln ("xmlFormat: " + this.getXmlFormat());
+ 		// prtln ("nameSpaceInfo: " + this.getNameSpaceInfo());
  		try {
  			String fwrkRootElementName = getRootElementName();
***************
*** 1132,1137 ****
  
  			String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + Dom4jUtils.prettyPrint(delocalizedDoc);
! /* 			if (this.getXmlFormat().equals("adn"))
! 				prtln ("-------- about to write record -------------\n\n" + xml); */
  			return xml;
  		} catch (Exception e) {
--- 1145,1149 ----
  
  			String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + Dom4jUtils.prettyPrint(delocalizedDoc);
! 			// prtln ("-------- about to write record -------------\n\n" + xml);
  			return xml;
  		} catch (Exception e) {