[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb ReadGaussian.java,1.13,1.14

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

Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb
In directory usw-pr-cvs1:/tmp/cvs-serv12976/src/java/org/openscience/nmrshiftdb

Modified Files:
	ReadGaussian.java 
Log Message:
Corrected an error


Index: ReadGaussian.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/ReadGaussian.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** ReadGaussian.java	29 May 2002 09:52:16 -0000	1.13
--- ReadGaussian.java	30 May 2002 15:35:09 -0000	1.14
***************
*** 238,258 ****
  		jetspeedprops.load(new FileInputStream(jetspeedpropsFile));
  		AllInOne aio = new AllInOne(dbmol, spectrum, sd.dbconditions, sd.spectrumConditions, sd.signals, sd.shifts, sd.signalAtoms, dbatoms, bondAtoms, dbbonds, chemNames);
! 		if (nmrprops.getProperty("writeserializedtodir").equals("true"))
! 		{
! 			FileOutputStream out = new FileOutputStream(nmrprops.getProperty("serializeddir") + File.separatorChar + "bulkload" + now.toString().replace(' ', '_') + "_" + time.substring(time.length() - 4) + "ms" + ".ser");
! 			ObjectOutputStream s = new ObjectOutputStream(out);
! 			s.writeObject(aio);
! 			s.flush();
  		}
! 		if (nmrprops.getProperty("sendserializedemail").equals("true"))
! 		{
! 			ByteArrayOutputStream out = new ByteArrayOutputStream();
! 			ObjectOutputStream s = new ObjectOutputStream(out);
! 			s.writeObject(aio);
! 			s.flush();
! 			MailMessage email = new MailMessage(jetspeedprops.getProperty("mail.server"), nmrprops.getProperty("serializedemail"), jetspeedprops.getProperty("mail.support"), "Serialized input by bulkload from" + now.toString(), out.toString());
! 			if (email.send() == false)
! 			{
! 				Log.error("Sending email with serialized input by bulkload from " + now.toString() + " failed for spectrum " + spectrum.getSpectrumId());
  			}
  		}
--- 238,250 ----
  		jetspeedprops.load(new FileInputStream(jetspeedpropsFile));
  		AllInOne aio = new AllInOne(dbmol, spectrum, sd.dbconditions, sd.spectrumConditions, sd.signals, sd.shifts, sd.signalAtoms, dbatoms, bondAtoms, dbbonds, chemNames);
! 		if (nmrprops.getProperty("writeserializedtodir").equals("true")) {
! 			FileWriter out = new FileWriter(nmrprops.getProperty("serializeddir")+File.separatorChar+now.toString().replace(' ','_')+"_"+time.substring(time.length()-4)+"ms"+".ser");
! 			out.write(aio.serializeMe());
! 			out.close();
  		}
! 		if (nmrprops.getProperty("sendserializedemail").equals("true")) {
! 			MailMessage email = new org.apache.turbine.util.mail.MailMessage(jetspeedprops.getProperty("mail.server"), nmrprops.getProperty("serializedemail"), jetspeedprops.getProperty("mail.support"), "Serialized input from" + now.toString(), aio.serializeMe());
! 			if (email.send() == false) {
! 				Log.error("Sending email with serialized input from " + now.toString() +" failed for spectrum " + spectrum.getSpectrumId());
  			}
  		}