[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb NmrshiftdbServlet.java, 1.9
Brought to you by:
steinbeck
|
From: Stefan K. <sh...@us...> - 2006-10-24 17:17:28
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22673/src/java/org/openscience/nmrshiftdb Modified Files: NmrshiftdbServlet.java Log Message: updated the cml generation code Index: NmrshiftdbServlet.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/NmrshiftdbServlet.java,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -r1.94 -r1.95 *** NmrshiftdbServlet.java 11 Oct 2006 16:54:34 -0000 1.94 --- NmrshiftdbServlet.java 24 Oct 2006 17:17:22 -0000 1.95 *************** *** 43,49 **** import javax.xml.transform.stream.StreamSource; import nu.xom.Element; import nu.xom.Node; - import nu.xom.Text; import org.apache.fop.apps.FOUserAgent; --- 43,49 ---- import javax.xml.transform.stream.StreamSource; + import nu.xom.Attribute; import nu.xom.Element; import nu.xom.Node; import org.apache.fop.apps.FOUserAgent; *************** *** 200,206 **** }else{ Element cmlElement = new Element("cml"); Element parent=((DBSpectrum)spectra.get(0)).getDBMolecule().getCML(1); nu.xom.Node cmldoc = parent.getChild(0); ! ((Element)cmldoc).setNamespaceURI("http://www.xml-cml.org/schema/cml2/core"); parent.removeChildren(); cmlElement.appendChild(cmldoc); --- 200,208 ---- }else{ Element cmlElement = new Element("cml"); + cmlElement.addAttribute(new Attribute("convention","nmrshiftdb-convention")); + cmlElement.setNamespaceURI("http://www.xml-cml.org/schema"); Element parent=((DBSpectrum)spectra.get(0)).getDBMolecule().getCML(1); nu.xom.Node cmldoc = parent.getChild(0); ! ((Element)cmldoc).setNamespaceURI("http://www.xml-cml.org/schema"); parent.removeChildren(); cmlElement.appendChild(cmldoc); *************** *** 210,214 **** parentspec.removeChildren(); cmlElement.appendChild(spectrumel); ! ((Element)spectrumel).setNamespaceURI("http://www.xml-cml.org/schema/cml2/spect"); } out.write(cmlElement.toXML()); --- 212,216 ---- parentspec.removeChildren(); cmlElement.appendChild(spectrumel); ! ((Element)spectrumel).setNamespaceURI("http://www.xml-cml.org/schema"); } out.write(cmlElement.toXML()); *************** *** 564,570 **** if(format.equals("cmlboth")){ Element cmlElement = new Element("cml"); Element parent=spectrum.getDBMolecule().getCML(1, spectrum.getDBSpectrumType().getName().equals("1H")); nu.xom.Node cmldoc = parent.getChild(0); ! ((Element)cmldoc).setNamespaceURI("http://www.xml-cml.org/schema/cml2/core"); parent.removeChildren(); cmlElement.appendChild(cmldoc); --- 566,574 ---- if(format.equals("cmlboth")){ Element cmlElement = new Element("cml"); + cmlElement.addAttribute(new Attribute("convention","nmrshiftdb-convention")); + cmlElement.setNamespaceURI("http://www.xml-cml.org/schema"); Element parent=spectrum.getDBMolecule().getCML(1, spectrum.getDBSpectrumType().getName().equals("1H")); nu.xom.Node cmldoc = parent.getChild(0); ! ((Element)cmldoc).setNamespaceURI("http://www.xml-cml.org/schema"); parent.removeChildren(); cmlElement.appendChild(cmldoc); *************** *** 573,577 **** parentspec.removeChildren(); cmlElement.appendChild(spectrumel); ! ((Element)spectrumel).setNamespaceURI("http://www.xml-cml.org/schema/cml2/spect"); out.write(cmlElement.toXML()); } --- 577,581 ---- parentspec.removeChildren(); cmlElement.appendChild(spectrumel); ! ((Element)spectrumel).setNamespaceURI("http://www.xml-cml.org/schema"); out.write(cmlElement.toXML()); } |