[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/om NmrshiftdbUser.java, 1.27, 1.28 TurbineUserAdapter.java, 1.19, 1.20

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

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

Modified Files:
	NmrshiftdbUser.java TurbineUserAdapter.java 
Log Message:
the new affiliations are entered/edited along user data input


Index: NmrshiftdbUser.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/NmrshiftdbUser.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** NmrshiftdbUser.java	11 Jan 2006 15:30:46 -0000	1.27
--- NmrshiftdbUser.java	18 Nov 2006 17:03:12 -0000	1.28
***************
*** 171,175 ****
    public void save() throws Exception {
      super.save();
!     String sql = "UPDATE TURBINE_USER set HALL_OF_FAME=\"" + getHallOfFame() + "\", LABGROUP=\"" + getLabGroup()+ "\", BROKENEDIT=\""+getBrokenEdit()+"\", OLD_LITERATURE=\""+getOldLiterature()+"\" where USER_ID=" + super.getUserId() + ";";
      NmrshiftdbUserPeer.executeStatement(sql);
    }
--- 171,175 ----
    public void save() throws Exception {
      super.save();
!     String sql = "UPDATE TURBINE_USER set HALL_OF_FAME=\"" + getHallOfFame() + "\", LABGROUP=\"" + getLabGroup()+ "\", BROKENEDIT=\""+getBrokenEdit()+"\", OLD_LITERATURE=\""+getOldLiterature()+"\", AFFILIATION_1=\""+this.getAffiliation1()+"\", AFFILIATION_2=\""+this.getAffiliation2()+"\" where USER_ID=" + super.getUserId() + ";";
      NmrshiftdbUserPeer.executeStatement(sql);
    }

Index: TurbineUserAdapter.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/TurbineUserAdapter.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** TurbineUserAdapter.java	17 Nov 2006 20:18:09 -0000	1.19
--- TurbineUserAdapter.java	18 Nov 2006 17:03:12 -0000	1.20
***************
*** 200,209 ****
  		return tmp;
  	}
! 	public String getAffiliation() throws Exception
  	{
! 		/*String tmp = null;
  		try
  		{
! 			tmp = (String) getPerm(AFFILIATION);
  			if ( tmp.length() == 0 )
  				tmp = null;
--- 200,209 ----
  		return tmp;
  	}
! 	public String getAffiliation1() throws Exception
  	{
! 		String tmp = null;
  		try
  		{
! 			tmp = (String) getPerm(AFFILIATION_1);
  			if ( tmp.length() == 0 )
  				tmp = null;
***************
*** 212,219 ****
  		{
  		}
! 		return tmp;*/
!     String sql="SELECT AFFILIATION from TURBINE_USER where USER_ID="+getUserId()+";";
      List l=NmrshiftdbUserPeer.executeQuery(sql);
!     return(((Record) l.get(0)).getValue(1).asString());
  	}
  	public String getBrokenSubmit()
--- 212,236 ----
  		{
  		}
! 		return tmp;
!     /*String sql="SELECT AFFILIATION_1 from TURBINE_USER where USER_ID="+getUserId()+";";
      List l=NmrshiftdbUserPeer.executeQuery(sql);
!     return(((Record) l.get(0)).getValue(1).asString());*/
! 	}
! 	public String getAffiliation2() throws Exception
! 	{
! 		String tmp = null;
! 		try
! 		{
! 			tmp = (String) getPerm(AFFILIATION_2);
! 			if ( tmp.length() == 0 )
! 				tmp = null;
! 		}
! 		catch ( Exception e )
! 		{
! 		}
! 		return tmp;
!     /*String sql="SELECT AFFILIATION_2 from TURBINE_USER where USER_ID="+getUserId()+";";
!     List l=NmrshiftdbUserPeer.executeQuery(sql);
!     return(((Record) l.get(0)).getValue(1).asString());*/
  	}
  	public String getBrokenSubmit()