[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/webservices NMRShiftDBServiceBindingImpl.java, 1.26, 1.27

[Stefan K. <sh...@us...>]

Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/webservices
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5233/src/java/org/openscience/nmrshiftdb/webservices

Modified Files:
	NMRShiftDBServiceBindingImpl.java 
Log Message:
modification in web service


Index: NMRShiftDBServiceBindingImpl.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/webservices/NMRShiftDBServiceBindingImpl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** NMRShiftDBServiceBindingImpl.java	18 Oct 2006 16:29:11 -0000	1.26
--- NMRShiftDBServiceBindingImpl.java	19 Oct 2006 10:46:51 -0000	1.27
***************
*** 43,48 ****
  import org.openscience.nmrshiftdb.om.DBMolecule;
  import org.openscience.nmrshiftdb.om.DBMoleculePeer;
- import org.openscience.nmrshiftdb.om.DBShift;
- import org.openscience.nmrshiftdb.om.DBSignal;
  import org.openscience.nmrshiftdb.om.DBSpectrumPeer;
  import org.openscience.nmrshiftdb.om.DBSpectrumType;
--- 43,46 ----
***************
*** 58,61 ****
--- 56,60 ----
  import org.openscience.nmrshiftdb.util.ValuesForVelocityBean;
  import org.openscience.nmrshiftdb.util.exception.NmrshiftdbException;
+ import org.xmlcml.cml.base.CMLElement;
  import org.xmlcml.cml.base.CMLElements;
  import org.xmlcml.cml.base.CMLUtil;
***************
*** 401,405 ****
  	  	  	for(int i=0;i<results.size();i++){
  	  	  		DBMolecule mol=DBMoleculePeer.retrieveByPK((NumberKey)results.get(i));
! 	  	  		CMLMolecule cmlmol=(CMLMolecule)mol.getCML(1);
  	  	  		CMLMetadataList mdl=new CMLMetadataList();
  	  	  		CMLMetadata metadata=new CMLMetadata();
--- 400,406 ----
  	  	  	for(int i=0;i<results.size();i++){
  	  	  		DBMolecule mol=DBMoleculePeer.retrieveByPK((NumberKey)results.get(i));
! 	            CMLCml parent=(CMLCml)mol.getCML(1);
! 	            CMLElement cmlmol = parent.getChildCMLElements().get(0);
! 	            parent.removeChildren();
  	  	  		CMLMetadataList mdl=new CMLMetadataList();
  	  	  		CMLMetadata metadata=new CMLMetadata();
***************
*** 408,412 ****
  	  	  		mdl.addMetadata(metadata);
  	  	  		mdl.addMetadata(metadata);
! 	  	  		cmlmol.addMetadataList(mdl);
  	  	  		cmlcml.appendChild(cmlmol);
  	  	  	}
--- 409,413 ----
  	  	  		mdl.addMetadata(metadata);
  	  	  		mdl.addMetadata(metadata);
! 	  	  		cmlmol.appendChild(mdl);
  	  	  		cmlcml.appendChild(cmlmol);
  	  	  	}