Author: lulabad Date: 2008-03-15 11:37:20 +0100 (Sat, 15 Mar 2008) New Revision: 4564
Modified: trunk/htroot/ConfigUpdate_p.html trunk/htroot/ConfigUpdate_p.java Log: added "delete Release" to Update Page Modified: trunk/htroot/ConfigUpdate_p.html =================================================================== --- trunk/htroot/ConfigUpdate_p.html 2008-03-15 09:22:07 UTC (rev 4563) +++ trunk/htroot/ConfigUpdate_p.html 2008-03-15 10:37:20 UTC (rev 4564) @@ -1,5 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> <html xmlns="http://www.w3.org/1999/xhtml";> +#(forwardToSteering)#::<meta http-equiv="REFRESH" content="0; url=/Steering.html?update=1&releaseinstall=#[release]#">#(/forwardToSteering)# <head> <title>YaCy '#[clientname]#': System Update</title> #%env/templates/metas.template%# @@ -29,7 +30,7 @@ <input type="submit" name="checkRelease" value="Check for new Release" /> </form></dd> <dt><br />Downloaded Releases</dt> - <dd><form action="Steering.html" method="get"> + <dd><form action="ConfigUpdate_p.html" method="get"> <select name="releaseinstall"> #{downloadedreleases}# <option #(selected)#::selected#(/selected)# value="#[file]#">#[name]#</option> @@ -37,6 +38,7 @@ </select> #(deployenabled)#::no automated installation on development environments:: <input type="submit" name="update" value="Install Release" /> + <input type="submit" name="deleteRelease" value="Delete Release" /> #(/deployenabled)# </form></dd> <dt><br />Automatic Update</dt> Modified: trunk/htroot/ConfigUpdate_p.java =================================================================== --- trunk/htroot/ConfigUpdate_p.java 2008-03-15 09:22:07 UTC (rev 4563) +++ trunk/htroot/ConfigUpdate_p.java 2008-03-15 10:37:20 UTC (rev 4564) @@ -49,6 +49,12 @@ prop.put("candeploy_autoUpdate", "0"); if (post != null) { + if (post.containsKey("update")) { + prop.put("forwardToSteering", "1"); + prop.put("forwardToSteering_release",post.get("releaseinstall", "")); + return prop; + } + if (post.containsKey("downloadRelease")) { // download a release String release = post.get("releasedownload", ""); @@ -65,6 +71,16 @@ if (post.containsKey("checkRelease")) { yacyVersion.allReleases(true); } + if (post.containsKey("deleteRelease")) { + String release = post.get("releaseinstall", ""); + if(release.length() > 0) { + try { + new File(sb.releasePath, release).delete(); + } catch (NullPointerException e) { + sb.getLog().logSevere("AUTO-UPDATE: could not delete release " + release + ": " + e.getMessage()); + } + } + } if (post.containsKey("autoUpdate")) { yacyVersion updateVersion = yacyVersion.rulebasedUpdateInfo(true); _______________________________________________ YaCy-svn mailing list YaCy-svn@lists.berlios.de https://lists.berlios.de/mailman/listinfo/yacy-svn
