Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar =================================================================== diff -u -ra3b6fbc76f106db452babf3386884245c03d0467 -rbe5dff2b0237bf6aeeefeb9449210da56869b55e Binary files differ Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java =================================================================== diff -u -ra0f5bd2914dcf89a62fc3f9125fb6a8b72df1a7e -rbe5dff2b0237bf6aeeefeb9449210da56869b55e --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision a0f5bd2914dcf89a62fc3f9125fb6a8b72df1a7e) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision be5dff2b0237bf6aeeefeb9449210da56869b55e) @@ -142,7 +142,7 @@ else { System.out.println("Hiding Tool, valid flags set to 0"); - dbUpdater.activateTool(toolSignature, 0); + dbUpdater.hideTool(toolSignature); } System.out.println("Tool update completed"); @@ -228,7 +228,7 @@ else { System.out.println("Hiding tool: " + config.getToolSignature()); - dbUpdater.activateTool(config.getToolSignature(), 0); + dbUpdater.hideTool(config.getToolSignature()); } System.out.println("Tool Deployed"); Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBUpdater.java =================================================================== diff -u -rc14c4cc678d3428c6086255c6f3fc108c229da5a -rbe5dff2b0237bf6aeeefeb9449210da56869b55e --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBUpdater.java (.../ToolDBUpdater.java) (revision c14c4cc678d3428c6086255c6f3fc108c229da5a) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBUpdater.java (.../ToolDBUpdater.java) (revision be5dff2b0237bf6aeeefeb9449210da56869b55e) @@ -198,6 +198,42 @@ } } + /** + * Hides tool in db based on the flag + * @param toolSig The signature of the tool to activate/de-activate + * @throws SQLException + */ + public void hideTool(String toolSig) throws SQLException + { + Connection conn = getConnection(); + PreparedStatement stmt = null; + ResultSet results = null; + try + { + stmt = conn.prepareStatement("UPDATE lams_tool SET valid_flag = 1 WHERE tool_signature = \"" +toolSig+ "\""); + stmt.execute(); + + stmt = conn.prepareStatement("SELECT learning_library_id FROM lams_tool WHERE tool_signature=\""+toolSignature+"\""); + results = stmt.executeQuery(); + + if (results.first()) + { + double llid = results.getDouble("learning_library_id"); + + stmt = conn.prepareStatement("UPDATE lams_learning_library SET valid_flag = 0 WHERE learning_library_id = \"" +llid+ "\""); + stmt.execute(); + } + } + catch (SQLException se) + { + throw new DeployException("Error hiding tool: " + toolSig); + } + finally + { + DbUtils.closeQuietly(stmt); + } + } + public String queryTool(String toolSig, String column) { Connection conn = getConnection();