Mapping servlet, first version of history servlet

dspace-jspui/src/main/java/org/dspace/app/webui/servlet/admin/VersionHistoryServlet.java

@@ -0,0 +1,142 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.webui.servlet.admin;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.dspace.app.webui.servlet.DSpaceServlet;
+import org.dspace.app.webui.util.JSPManager;
+import org.dspace.app.webui.util.UIUtil;
+import org.dspace.app.webui.util.VersionUtil;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * 
+ * 
+ * @author Pascarelli Luigi Andrea
+ * @version $Revision$
+ */
+public class VersionHistoryServlet extends DSpaceServlet
+{
+
+    /** log4j category */
+    private static Logger log = Logger.getLogger(VersionHistoryServlet.class);
+
+    protected void doDSGet(Context context, HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException,
+            SQLException, AuthorizeException
+    {
+        Integer itemID = UIUtil.getIntParameter(request, "itemID");
+        String versionID = request.getParameter("versionID");
+        Item item = Item.find(context, itemID);
+
+        if (UIUtil.getSubmitButton(request, "submit_cancel") != null)
+        {
+            // Pressed the cancel button, redirect us to the item page
+            response.sendRedirect(request.getContextPath() + "/handle/"
+                    + item.getHandle());
+            context.complete();
+        }
+        else if (UIUtil.getSubmitButton(request, "submit_delete") != null)
+        {
+            String[] versionIDs = request.getParameterValues("remove");
+            Integer result = doDeleteVersions(request, itemID, versionIDs);
+            if (result != null)
+            {
+                // We have removed everything, redirect us to the home page !
+                response.sendRedirect(request.getContextPath());
+                context.complete();
+                return;
+            }
+
+        }
+        else if (UIUtil.getSubmitButton(request, "submit_restore") != null)
+        {
+
+            doRestoreVersion(request, itemID, versionID);
+        }
+        else if (UIUtil.getSubmitButton(request, "submit_update") != null)
+        {
+            doUpdateVersion(request, itemID, versionID);
+        }
+
+    }
+
+    protected void doDSPost(Context context, HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException,
+            SQLException, AuthorizeException
+    {
+        // If this is not overridden, we invoke the raw HttpServlet "doGet" to
+        // indicate that POST is not supported by this servlet.
+        super.doGet(request, response);
+    }
+
+    /**
+     * Confirm and delete the given version(s)
+     * 
+     * @throws IOException
+     * @throws AuthorizeException
+     * @throws SQLException
+     */
+    private Integer doDeleteVersions(HttpServletRequest request,
+            Integer itemID, String... versionIDs) throws SQLException,
+            AuthorizeException, IOException
+    {
+
+        return VersionUtil.processDeleteVersions(UIUtil.obtainContext(request),
+                itemID, versionIDs);
+
+    }
+
+    /**
+     * Restore the given version
+     * 
+     * @throws IOException
+     * @throws AuthorizeException
+     * @throws SQLException
+     * @throws NumberFormatException
+     */
+    private Integer doRestoreVersion(HttpServletRequest request,
+            Integer itemID, String versionID) throws NumberFormatException,
+            SQLException, AuthorizeException, IOException
+    {
+
+        String summary = request.getParameter("summary");
+        VersionUtil.processRestoreVersion(UIUtil.obtainContext(request),
+                Integer.parseInt(versionID), summary);
+        return itemID;
+    }
+
+    /**
+     * Update the given version
+     * 
+     * @throws IOException
+     * @throws AuthorizeException
+     * @throws SQLException
+     */
+    private Integer doUpdateVersion(HttpServletRequest request, Integer itemID,
+            String versionID) throws SQLException, AuthorizeException,
+            IOException
+    {
+
+        String summary = request.getParameter("summary");
+        VersionUtil.processUpdateVersion(UIUtil.obtainContext(request), itemID,
+                summary);
+        return itemID;
+
+    }
+
+}

dspace-jspui/src/main/java/org/dspace/app/webui/servlet/admin/VersionItemServlet.java

@@ -0,0 +1,77 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.webui.servlet.admin;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.dspace.app.webui.servlet.DSpaceServlet;
+import org.dspace.app.webui.util.JSPManager;
+import org.dspace.app.webui.util.UIUtil;
+import org.dspace.app.webui.util.VersionUtil;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * 
+ * 
+ * @author Pascarelli Luigi Andrea
+ * @version $Revision$
+ */
+public class VersionItemServlet extends DSpaceServlet
+{
+
+    /** log4j category */
+    private static Logger log = Logger.getLogger(VersionItemServlet.class);
+
+
+    protected void doDSGet(Context context, HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException, SQLException,
+            AuthorizeException
+    {
+        Integer itemID = UIUtil.getIntParameter(request,"itemID");
+        Item item = Item.find(context,itemID);        
+        if (UIUtil.getSubmitButton(request,"submit")!=null){
+            request.setAttribute("itemID", itemID);
+            JSPManager.showJSP(request, response,
+                    "/dspace-admin/version-summary.jsp");
+            return;
+        }
+
+        String summary = request.getParameter("summary");
+        if (UIUtil.getSubmitButton(request,"submit_version")!=null){                        
+            Integer wsid = VersionUtil.processCreateNewVersion(context, itemID, summary);            
+            response.sendRedirect(request.getContextPath()+"/submit?workspaceID=" + wsid);         
+        }
+        else if (UIUtil.getSubmitButton(request,"submit_update_version")!=null){
+            VersionUtil.processUpdateVersion(context, itemID, summary);
+        }
+
+        //Send us back to the item page if we cancel !
+        response.sendRedirect(request.getContextPath() + "/handle/" + item.getHandle());
+        context.complete();
+
+    }
+
+
+    protected void doDSPost(Context context, HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException,
+            SQLException, AuthorizeException
+    {
+        // If this is not overridden, we invoke the raw HttpServlet "doGet" to
+        // indicate that POST is not supported by this servlet.
+        super.doGet(request, response);
+    }
+
+}

dspace-jspui/src/main/webapp/WEB-INF/web.xml

@@ -460,7 +460,12 @@
     <servlet-name>version-item</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.admin.VersionItemServlet</servlet-class>
   </servlet>
-
+
+  <servlet>
+    <servlet-name>version-history</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.admin.VersionHistoryServlet</servlet-class>
+  </servlet>
+
   <servlet-mapping>
     <servlet-name>shibboleth-login</servlet-name>
     <url-pattern>/shibboleth-login</url-pattern>
@@ -768,6 +773,15 @@
     <url-pattern>/dspace-admin/privateitems</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>version-item</servlet-name>
+    <url-pattern>/tools/version</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>version-history</servlet-name>
+    <url-pattern>/tools/history</url-pattern>
+  </servlet-mapping>
   <!-- Icon MIME type -->
   <mime-mapping>
     <extension>ico</extension>