Changeset 1108 for extensions/net.sf.basedb.genepattern/trunk/resources

Timestamp:

Jun 4, 2009, 9:18:10 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #221: Configure GenePattern? server

The settings are now saved to the databas as user default settings.

Location:

extensions/net.sf.basedb.genepattern/trunk/resources

Files:

• edit_server.jsp (modified) (1 diff)
• options.jsp (modified) (1 diff)
• submit.jsp (modified) (6 diffs)

extensions/net.sf.basedb.genepattern/trunk/resources/edit_server.jsp

@@ -50 +50 @@
 
 final String gpServer = Values.getStringOrNull(request.getParameter("gpServer"));
-String presetsXml = sc.getUserClientSetting("net.sf.basedb.genepattern.options");
+String presetsXml = sc.getUserDefaultSetting("net.sf.basedb.genepattern.options");
 Presets presets = new Presets();
 if (presetsXml != null) presets.loadFrom(presetsXml);

extensions/net.sf.basedb.genepattern/trunk/resources/options.jsp

@@ -54 +54 @@
   dc = sc.newDbControl();
   final User user = User.getById(dc, sc.getLoggedInUserId());
-  String presetsXml = sc.getUserClientSetting("net.sf.basedb.genepattern.options");
+  String presetsXml = sc.getUserDefaultSetting("net.sf.basedb.genepattern.options");
   Presets presets = new Presets();
   if (presetsXml != null) presets.loadFrom(presetsXml);

extensions/net.sf.basedb.genepattern/trunk/resources/submit.jsp

@@ -1 @@
-<%-- $Id $
+
+<%@page import="net.sf.basedb.core.query.Restrictions"%>
+<%@page import="net.sf.basedb.core.UserDefaultSetting"%><%-- $Id $
   ------------------------------------------------------------------
   Copyright (C) 2009 Nicklas Nordborg
@@ -29 +31 @@
   import="net.sf.basedb.core.DbControl"
   import="net.sf.basedb.core.User"
+  import="net.sf.basedb.core.UserDefaultSetting"
+  import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.Presets"
+  import="net.sf.basedb.core.query.Restrictions"
+  import="net.sf.basedb.core.query.Hql"
+  import="net.sf.basedb.core.query.Expressions"
   import="net.sf.basedb.core.Presets.Preset"
   import="net.sf.basedb.clients.web.Base"
@@ -35 +42 @@
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.util.Values"
+  import="java.util.List"
 %>
-<%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
+<%!
+private void savePreset(DbControl dc, Presets presets)
+{
+  SessionControl sc = dc.getSessionControl();
+  String setting = "net.sf.basedb.genepattern.options";
+  String xml = presets.asXml();
+
+  // Save to memory
+  sc.setUserDefaultSetting(setting, xml);
+  
+  // Save to db
+  User user = User.getById(dc, sc.getLoggedInUserId());
+  ItemQuery<UserDefaultSetting> query = UserDefaultSetting.getQuery(user);
+  query.restrict(Restrictions.eq(Hql.property("name"), Expressions.string(setting)));
+  List<UserDefaultSetting> result = query.list(dc);
+  UserDefaultSetting gpServers = null;
+  if (result.size() > 0)
+  {
+    gpServers = result.get(0);
+    gpServers.setValue(xml);
+  }
+  else
+  {
+    gpServers = UserDefaultSetting.getNew(dc, user, setting, xml);
+    dc.saveItem(gpServers);
+  }
+}
+%>
 <%
 SessionControl sc = Base.getExistingSessionControl(pageContext, true);
@@ -45 +80 @@
 String redirect = null;
 String message = null;
-
+DbControl dc = null;
 try
 {
   if ("SaveServer".equals(cmd))
   {
-    String presetsXml = sc.getUserClientSetting("net.sf.basedb.genepattern.options");
+    dc = sc.newDbControl();
+    String presetsXml = sc.getUserDefaultSetting("net.sf.basedb.genepattern.options");
     Presets presets = new Presets();
     if (presetsXml != null) presets.loadFrom(presetsXml);
@@ -71 +107 @@
     server.setSetting("server.login", request.getParameter("gpLogin"));
     server.setSetting("server.password", request.getParameter("gpPassword"));
-    sc.setUserClientSetting("net.sf.basedb.genepattern.options", presets.asXml());
+    savePreset(dc, presets);
+    dc.commit();
     message = gpServer + " saved";
   }
   else if ("RemoveServer".equals(cmd))
   {
-    String presetsXml = sc.getUserClientSetting("net.sf.basedb.genepattern.options");
+    dc = sc.newDbControl();
+    String presetsXml = sc.getUserDefaultSetting("net.sf.basedb.genepattern.options");
     Presets presets = new Presets();
     if (presetsXml != null) presets.loadFrom(presetsXml);
     String gpServer = request.getParameter("gpServer");
     presets.deletePreset(gpServer);
-    sc.setUserClientSetting("net.sf.basedb.genepattern.options", presets.asXml());
+    savePreset(dc, presets);
+    dc.commit();
     message = gpServer + " deleted";    
   }
@@ -90 +129 @@
 }
 finally
-{}
+{
+  if (dc != null) dc.close(); 
+}
 if (message == null)
 {