OpenMRS

src/org/openmrs/modulerepository/RepositoryService.java

@@ -178 +178 @@
-                }
-
-        }
+        
+        /**
+         * Delete a module
+         * 
+         * @param id
+         * @param version
+         * @param user
+         * @throws Throwable
+         */
+        public static void deleteModule(String id, String version, String user)
+                        throws Throwable {
+                checkPermissions(id, user);
-
+                Connection conn = getDatabaseConnection();
+                conn.setAutoCommit(false);
+
+                try {
+
+                        // remove module_version table entries
+                        PreparedStatement update = conn
+                                        .prepareStatement("delete from module_version where id = ? and version = ?");
+                        update.setString(1, id);
+                        update.setString(2, version);
+                        update.executeUpdate();
+                        update.close();
+
+                        // are there any versions for the module
+                        PreparedStatement versions = conn.prepareStatement(
+                                        "select m.id, version from module m join module_version mv on m.id = mv.id where m.id = ?");
+                        versions.setString(1, id);
+                        ResultSet resultSet = versions.executeQuery();
+                        
+                        // if there are no other versions then delete the module
+                        if(!resultSet.next()) {
+                                // remove all current editors
+                                PreparedStatement deleteEditors = conn
+                                                .prepareStatement("delete from module_edit_permission where id = ?");
+                                deleteEditors.setString(1, id);
+                                deleteEditors.executeUpdate();
+                                deleteEditors.close();
+                                
+                                // finally remove module entry
+                                PreparedStatement updateModule = conn
+                                                .prepareStatement("delete from module where id = ?");
+                                updateModule.setString(1, id);
+                                updateModule.executeUpdate();
+                                updateModule.close();
+                                
+                                // delete update.rdf
+                                RepositoryUtil.deleteRdfFile(id);
+                                
+                        } else {
+                                // other versions of the module exist. so remake the update.rdf.
+                                remakeUpdateFile(id);
+                        }
+                        resultSet.close();
+                        
+                        // delete module file .omod
+                        RepositoryUtil.deleteModuleFile(id, version);
+                        
+                        // remake the complete rss file
+                        remakeRssFile();
+                        
+                                                
+                } catch (Throwable t) {
+                        log.warn("error: ", t);
+                        conn.rollback();
+                        throw t;
+                } finally {
+                        conn.commit();
+                        conn.close();
+                }
+
+        }       
+
-        /**
-         * Checks to see if the user is the module owner or an editor
-         * 

src/org/openmrs/modulerepository/servlet/DeleteModuleServlet.java

@@ +1 @@
+package org.openmrs.modulerepository.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.openmrs.modulerepository.RepositoryService;
+import org.openmrs.modulerepository.RepositoryUtil;
+
+public class DeleteModuleServlet extends HttpServlet {
+
+        private Log log = LogFactory.getLog(this.getClass());
+
+        private static final long serialVersionUID = -8456919175340498522L;
+
+        @Override
+        protected void doGet(HttpServletRequest request,
+                        HttpServletResponse response) throws ServletException, IOException {
+                throw new ServletException("Invalid access");
+        }
+
+        @Override
+        protected void doPost(HttpServletRequest request,
+                        HttpServletResponse response) throws ServletException, IOException {
+                
+                String id = request.getParameter("id");
+                String version = request.getParameter("version");
+
+                String user;
+                try {
+                        user = RepositoryUtil.getUser(request);
+                } catch (Exception e) {
+                        throw new ServletException("Unable get user", e);
+                }
+                
+                String msg = "Module deleted";
+                try {
+                        RepositoryService.deleteModule(id, version, user);
+                } catch (Throwable e) {
+                        log.error("Error deleting module", e);
+                        msg = "Unable to delete module " + e.getMessage();
+                }
+                
+                response.sendRedirect("/modules/list.jsp?msg=" + msg);
+                
+        }
+
+}

src/org/openmrs/modulerepository/RepositoryUtil.java

@@ -150 +150 @@
-                }
-        }
-        
+        public static void deleteModuleFile(String id, String version) throws IOException {
+                File modFolder = new File(RepositoryUtil.MODULE_REPOSITORY_FILE_LOCATION, id);
+                File modFile = new File(modFolder, RepositoryUtil.getModuleFilename(id, version));
+                modFile.delete();
+        }
+        
+        public static void deleteRdfFile(String id) throws IOException {
+                File folder = new File(RepositoryUtil.MODULE_REPOSITORY_FILE_LOCATION, id);
+                File updateFile = new File(folder, RepositoryUtil.UPDATE_FILENAME);
+                updateFile.delete();
+        }       
+        
-        /**
-         * Removes seemingly random whitespace introduced by good formatting an xml file
-         * 

web/view.jsp

@@ -55 +55 @@
-                                                        <div id="editModule" style="width: 100%; text-align: right">
-                                                                <a href="/modules/admin/edit.jsp?module=${module}">Edit Module</a>
-                                                        </div>
-
+
+
+
-                                                </div>
-                                                
-                                                
@@ -80 +82 @@
-                                                <tr class="<c:choose><c:when test="${status.index % 2 == 0}">evenRow</c:when><c:otherwise>oddRow</c:otherwise></c:choose>">
-                                                        <td id="editLinks">
-                                                                <a href="/modules/download/${module}/${module}-${row.version}.omod">Download</a> |
-
+
+
-                                                        </td>
-                                                        <td class="version">${row.version}</td>
-                                                        <td class="requireOpenMRSVersion">${row.require_openmrs_version}</td>

web/admin/delete.jsp

@@ +1 @@
+<%@ include file="/WEB-INF/template/include.jsp" %>
+
+<%@ include file="/WEB-INF/template/header.jsp" %>
+
+<c:set var="module" value="${fn:escapeXml(param.module)}" />
+<c:set var="version" value="${fn:escapeXml(param.version)}" />
+
+<sql:query var="rs" dataSource="jdbc/modules" maxRows="1">
+        select 
+                m.id, version, name
+        from 
+                module m
+                left join module_version mv
+                on m.id = mv.id 
+        where 
+                m.id = '${module}' and mv.version = '${version}' 
+        order by 
+                version desc
+</sql:query>
+
+<c:forEach var="row" items="${rs.rows}" varStatus="status">
+        <c:if test="${status.index == 0}">
+                <p>Do you want to delete the module ${row.name} version ${row.version}?</p>
+                <form method="post" action="/modules/admin/deleteModule"><input type="submit" value="Delete Module"/>
+                        <input type="hidden" name="id" value="${row.id}"/>
+                        <input type="hidden" name="version" value="${row.version}"/>
+                </form>
+                <br/> 
+                <p><a href="/modules/view.jsp?module=${row.id}">Back</a></p>
+        </c:if>
+</c:forEach>
+
+<br />
+
+<%@ include file="/WEB-INF/template/footer.jsp" %>