[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets ResultPortlet.java,1
Brought to you by:
steinbeck
Menu
▾
▴
[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets ResultPortlet.java,1.1,1.2 SubmitPortlet.java,1.1,1.2
|
From: Stefan K. <sh...@us...> - 2002-02-19 17:04:09
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets
In directory usw-pr-cvs1:/tmp/cvs-serv19328/src/java/org/openscience/nmrshiftdb/portlets
Modified Files:
ResultPortlet.java SubmitPortlet.java
Log Message:
New code here
Index: ResultPortlet.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets/ResultPortlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ResultPortlet.java 13 Feb 2002 13:20:38 -0000 1.1
--- ResultPortlet.java 19 Feb 2002 17:04:06 -0000 1.2
***************
*** 11,15 ****
* Description of the Class
*
! *@author root
*@created 12. Februar 2002
*/
--- 11,15 ----
* Description of the Class
*
! *@author Stefan Kuhn
*@created 12. Februar 2002
*/
***************
*** 18,22 ****
* Gets the content attribute of the ResultPortlet object
*
! *@param runData Description of Parameter
*@return The content value
*/
--- 18,22 ----
* Gets the content attribute of the ResultPortlet object
*
! *@param runData Created by turbine
*@return The content value
*/
Index: SubmitPortlet.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/portlets/SubmitPortlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SubmitPortlet.java 18 Feb 2002 16:05:52 -0000 1.1
--- SubmitPortlet.java 19 Feb 2002 17:04:06 -0000 1.2
***************
*** 7,12 ****
--- 7,16 ----
import org.apache.ecs.html.*;
import org.apache.jetspeed.util.servlet.*;
+
+ import java.util.*;
import javax.servlet.http.*;
+ import org.openscience.nmrshiftdb.utils.*;
+
/**
* Description of the Class
***************
*** 19,31 ****
* Gets the content attribute of the ResultPortlet object
*
! *@param runData Description of Parameter
*@return The content value
*/
public ConcreteElement getContent(RunData runData) {
HttpServletRequest req = runData.getRequest();
! String spec = req.getParameter("spectrum");
! return (new StringElement("<html><body><table border=\"3\"><tr><th>Draw your structure</th><th colspan=\"3\">Here the assignment which will be uploaded</th><th>Enter your spectral data here</th></tr><tr><td>Here our applet</td><td>Atom No.</td><td>Shift</td><td>Intensity</td><td><form action=\"/jetspeed/portal/\" method=\"post\"><input type=\"hidden\" name=\"action\" value=\"submitSpectrumForAssignment\"><textarea name=\"spectrum\" cols=\"10\" rows=\"10\"></textarea><input type=\"submit\" value=\"submmit\"></form></td></tr></table></body></html>"));
}
-
}
--- 23,73 ----
* Gets the content attribute of the ResultPortlet object
*
! *@param runData Created by turbine
*@return The content value
*/
public ConcreteElement getContent(RunData runData) {
HttpServletRequest req = runData.getRequest();
! String action = req.getParameter("nmrshiftdbaction");
! HttpSession session= req.getSession();
! SubmittingData subData = (SubmittingData)session.getAttribute("subData");
! if(subData==null)subData=new SubmittingData();
! if(action=="submitSpectrumForAssignment"){
! String spectrum=req.getParameter("spectrum");
! char[] charSpectrum=spectrum.toCharArray();
! String shift="";
! String intensity="";
! ArrayList numberSpectrum=new ArrayList();
! boolean addingShift=true;
! for(int i=0;i<charSpectrum.length;i++){
! if(charSpectrum[i]==';'){
! intensity="";
! addingShift=false;
! }
! else{
! if(charSpectrum[i]=='\n'){
! IntTriple figures=new IntTriple();
! figures.value1=(new Integer(shift)).intValue();
! figures.value2=(new Integer(intensity)).intValue();
! numberSpectrum.add(figures);
! shift="";
! addingShift=true;
! }
! else{
! if(addingShift)shift=shift+charSpectrum[i];
! else intensity=intensity+charSpectrum[i];
! }
! }
! }
! for(int i=0;i<numberSpectrum.size();i++){
! subData.addToSignalstable(numberSpectrum.get(i));
! }
! }
! String returnValue="<html><body><table border=\"3\"><tr><th>Draw your structure</th><th colspan=\"3\">Here the assignment which will be uploaded</th><th>Enter your spectral data here</th></tr><tr><td colspan=\""+subData.getSignalstable().size()+"\">Here our applet</td><td>Atom No.</td><td>Shift</td><td>Intensity</td>";
! for(int i=0;i<subData.getSignalstable().size();i++){
! returnValue+="<tr><td>"+((IntTriple)subData.getSignalstable().get(i)).value1+"</td><td>"+((IntTriple)subData.getSignalstable().get(i)).value2+"</td><td>"+((IntTriple)subData.getSignalstable().get(i)).value3+"</td></tr>";
! }
! returnValue+="<td rowspan=\""+subData.getSignalstable().size()+"\"><form action=\"/jetspeed/portal/\" method=\"post\"><input type=\"hidden\" name=\"nmrshiftdbaction\" value=\"submitSpectrumForAssignment\"><textarea name=\"spectrum\" cols=\"10\" rows=\"10\"></textarea><input type=\"submit\" value=\"submmit\"></form></td></tr></table></body></html>";
! return (new StringElement(returnValue));
}
}
|
