[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/util UrlTool.java, 1.16, 1.17

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

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

Modified Files:
	UrlTool.java 
Log Message:
some changes


Index: UrlTool.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/util/UrlTool.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** UrlTool.java	22 May 2006 12:48:46 -0000	1.16
--- UrlTool.java	6 Oct 2006 14:27:48 -0000	1.17
***************
*** 5,8 ****
--- 5,9 ----
  import java.io.StringWriter;
  import java.net.URL;
+ import java.sql.ResultSet;
  import java.util.HashMap;
  import java.util.List;
***************
*** 31,34 ****
--- 32,36 ----
  import org.openscience.nmrshiftdb.om.DBLabGroupPeer;
  import org.openscience.nmrshiftdb.om.DBMoleculePeer;
+ import org.openscience.nmrshiftdb.om.NmrshiftdbUser;
  import org.openscience.nmrshiftdb.om.NmrshiftdbUserPeer;
  
***************
*** 158,163 ****
    public String getResetMessage() throws Exception {
      try{
!       NmrshiftdbUserPeer.executeStatement("update JETSPEED_USER_PROFILE set PROFILE =(select DISTINCT PROFILE from JETSPEED_ANON_PROFILE where MEDIA_TYPE ='html' and LANGUAGE ='en' and PAGE='default.psml') where USER_NAME ='" + data.getUser().getUserName() + "' and MEDIA_TYPE='html';");
!       return ("The user interface has been reset to initial configuration!");
      }catch(Exception ex){
        return(GeneralUtils.logError(ex,"reset user interface user "+data.getUser().getUserName(),data,true));
--- 160,173 ----
    public String getResetMessage() throws Exception {
      try{
!     	if(((NmrshiftdbUser)data.getUser()).isLabgroupUser(data)){
!     		Vector rs=NmrshiftdbUserPeer.executeQuery("select DISTINCT PROFILE from JETSPEED_USER_PROFILE where MEDIA_TYPE ='html' and PAGE='default.psml' and  USER_NAME='testuser'");
!        		NmrshiftdbUserPeer.executeStatement("update JETSPEED_USER_PROFILE set PROFILE ='"+((Record)rs.get(0)).getValue(1)+"' where USER_NAME ='" + data.getUser().getUserName() + "' and MEDIA_TYPE='html';");
!     	}else if(((NmrshiftdbUser)data.getUser()).isLabgroupUser(data)){
!     		Vector rs=NmrshiftdbUserPeer.executeQuery("select DISTINCT PROFILE from JETSPEED_USER_PROFILE where MEDIA_TYPE ='html' and PAGE='default.psml' and  USER_NAME='testworker'");
!     		NmrshiftdbUserPeer.executeStatement("update JETSPEED_USER_PROFILE set PROFILE ='"+((Record)rs.get(0)).getValue(1)+"' where USER_NAME ='" + data.getUser().getUserName() + "' and MEDIA_TYPE='html';");
!     	}else{
!     	    NmrshiftdbUserPeer.executeStatement("update JETSPEED_USER_PROFILE set PROFILE =(select DISTINCT PROFILE from JETSPEED_ANON_PROFILE where MEDIA_TYPE ='html' and LANGUAGE ='en' and PAGE='default.psml') where USER_NAME ='" + data.getUser().getUserName() + "' and MEDIA_TYPE='html';");
!     	}
!     	return ("The user interface has been reset to initial configuration!");
      }catch(Exception ex){
        return(GeneralUtils.logError(ex,"reset user interface user "+data.getUser().getUserName(),data,true));