[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/webservices MyNmrshiftdbServices.java, 1.36, 1.37 NMRShiftDBServiceBindingImpl.java, 1.24, 1.25

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

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

Modified Files:
	MyNmrshiftdbServices.java NMRShiftDBServiceBindingImpl.java 
Log Message:
improved web service


Index: MyNmrshiftdbServices.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/webservices/MyNmrshiftdbServices.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** MyNmrshiftdbServices.java	28 Aug 2006 14:33:58 -0000	1.36
--- MyNmrshiftdbServices.java	18 Oct 2006 13:07:27 -0000	1.37
***************
*** 183,187 ****
        ObjectInputStream ois = new ObjectInputStream(bais);
        Vector sh = (Vector) ois.readObject();
!       Vector v = GeneralUtils.executeSearch(sh, searches, new StringAndInt(), new Vector(), calculatedonly, measuredonly, null, "/usr/local/jakarta-tomcat/webapps/jetspeed/WEB-INF/conf/normalizer.xml", false, true, otherspecified, DBSpectrumTypePeer.doSelect(new Criteria()));
        Vector results = new Vector();
        for (int i = 0; i < v.size(); i++) {
--- 183,187 ----
        ObjectInputStream ois = new ObjectInputStream(bais);
        Vector sh = (Vector) ois.readObject();
!       Vector v = GeneralUtils.executeSearch(sh, searches, new StringAndInt(), new Vector(), calculatedonly, measuredonly, null, "/usr/local/jakarta-tomcat/webapps/jetspeed/WEB-INF/conf/normalizer.xml", false, true, otherspecified, DBSpectrumTypePeer.doSelect(new Criteria()),true);
        Vector results = new Vector();
        for (int i = 0; i < v.size(); i++) {

Index: NMRShiftDBServiceBindingImpl.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/webservices/NMRShiftDBServiceBindingImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** NMRShiftDBServiceBindingImpl.java	18 Oct 2006 09:27:02 -0000	1.24
--- NMRShiftDBServiceBindingImpl.java	18 Oct 2006 13:07:27 -0000	1.25
***************
*** 23,26 ****
--- 23,27 ----
  import nu.xom.converters.DOMConverter;
  
+ import org.apache.jetspeed.services.rundata.DefaultJetspeedRunData;
  import org.apache.turbine.om.NumberKey;
  import org.apache.turbine.om.security.User;
***************
*** 399,403 ****
              }
              boolean sub = complete.getValue().equals("sub");
!             Vector v=null;
              if (sub) {
                v.add(new ValuesForVelocityBean(NmrshiftdbConstants.SUBSPECTRUM, "--", searchSpectrumBuffer.toString()));
--- 400,404 ----
              }
              boolean sub = complete.getValue().equals("sub");
!             Vector v=new Vector();
              if (sub) {
                v.add(new ValuesForVelocityBean(NmrshiftdbConstants.SUBSPECTRUM, "--", searchSpectrumBuffer.toString()));
***************
*** 407,411 ****
              //And we do the search
              Vector similarities=new Vector();
!             Vector results=GeneralUtils.executeSearch(v, new int[1], new StringAndInt(), similarities, true, true, null, null, false, false, false, DBSpectrumTypePeer.doSelect(new Criteria()));
  	  	  	CMLCml cmlcml=new CMLCml();
  	  	  	DecimalFormat format = new DecimalFormat("0.00");
--- 408,412 ----
              //And we do the search
              Vector similarities=new Vector();
!             Vector results=GeneralUtils.executeSearch(v, new int[1], new StringAndInt(), similarities, true, true, new DefaultJetspeedRunData(), null, false, false, false, DBSpectrumTypePeer.doSelect(new Criteria()),false);
  	  	  	CMLCml cmlcml=new CMLCml();
  	  	  	DecimalFormat format = new DecimalFormat("0.00");