Fixes/added functionalities:

Diacritics are now working when using the search Added SHA256 for checksums Added option to delete the entire archive and start from scratch Added functionality for listing and deleting sidecar files Added functionality to manually add PREMIS events Added functionality to switch between the language of the user interface Premis data is now exported in JSON format in addition to XML format
ePADD · Jan 11, 2023 · 79e1620 · 79e1620
1 parent dac9273
commit 79e1620
Show file tree

Hide file tree

Showing 37 changed files with 1,716 additions and 270 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/WebContent/WEB-INF/classes/messages.properties b/WebContent/WEB-INF/classes/messages.properties
@@ -39,7 +39,8 @@ sidecar-top.upload-sidecar-no-archive = Please import any number of emails first
 sidecar.upload.sidecar-file = Upload a sidecar file
 sidecar.upload.upload-button = Upload
 
-
+sidecar.management-title = Sidecar file listing
+sidecar.management-no-file = No Uploaded Sidecar File
 
 #Advnanced-search.jsp file
 advanced-search.head-advanced-search = Advanced Search
@@ -597,6 +598,7 @@ export.export-mbox-message = Export Messages in MBOX Format
 export.mess-all = All Messages
 export.mess-non-restricted = Non-Restricted Messages
 export.mess-restricted = Restricted Messages
+export.export-archive = Exported Archive Name
 
 #This section corresponds to Correspondents
 correspondents.head-correspondents = Correspondents
@@ -626,7 +628,7 @@ browse.loading = Loading
 browse.messages = Messages
 
 browse.label-all-messages = Label all these Messages
-browse.export-message = Download Messages
+export.export-message = Download Messages
 browse.previous-message = Previous Message
 browse.next-message = Next Message
 

diff --git a/WebContent/WEB-INF/classes/messages_de.properties b/WebContent/WEB-INF/classes/messages_de.properties
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
@@ -662,6 +662,15 @@
 		<url-pattern>/report</url-pattern>
 	</servlet-mapping>
 
+	<servlet>
+		<servlet-name>sidecarFiles</servlet-name>
+		<jsp-file>/sidecarFiles.jsp</jsp-file>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>sidecarFiles</servlet-name>
+		<url-pattern>/sidecarFiles</url-pattern>
+	</servlet-mapping>
+
     <!-- 404 page -->
     <servlet>
         <servlet-name>error-404</servlet-name>

diff --git a/WebContent/ajax/async/export-from-appraisal.jsp b/WebContent/ajax/async/export-from-appraisal.jsp
@@ -1,3 +1,8 @@
+<%
+/*    
+    2022-10-28      Allow custom naming in Export to next ePADD module
+*/
+%>
 <%@page language="java" contentType="application/json;charset=UTF-8"%>
 <%@page trimDirectiveWhitespaces="true"%>
 <%@page language="java" import="java.io.*"%>
@@ -67,6 +72,8 @@
 	//writeProfileBlock(out, archive, "Export archive");
 	String rawDir = JSPHelper.getParam(params,"dir");
 	 String error="";
+// 2022-10-28
+        String dir_name = JSPHelper.getParam(params,"dir_name");
 
 	/*
 	List<String> pathTokens = Util.tokenize(dir, "\\/");
@@ -78,8 +85,11 @@
 	if (!file.isDirectory() || !file.canWrite()) {
 		error = "Sorry, the directory " + dir + " is not writable. Please select a different directory.";
 	}else{
-
-		String folder = dir + File.separator + "ePADD archive of " + bestName;
+// 2022-10-28
+//		String folder = dir + File.separator + "ePADD archive of " + bestName;
+        String folder;
+        if (dir_name != null && dir_name != "")  folder = dir + File.separator + dir_name;
+        else folder = dir + File.separator + "ePADD archive of " + bestName;
 		List<Document> docsToExport = new ArrayList<>();
 		docsToExport = archive.getDocsForExport(Archive.ExportMode.EXPORT_APPRAISAL_TO_PROCESSING);
 

diff --git a/WebContent/css/bootstrap-datetimepicker.min.css b/WebContent/css/bootstrap-datetimepicker.min.css
diff --git a/WebContent/email-sources.jsp b/WebContent/email-sources.jsp
@@ -1,15 +1,19 @@
 <%@page contentType="text/html; charset=UTF-8"%>
 <%@page trimDirectiveWhitespaces="true"%>
-<%@page language="java" import="edu.stanford.muse.AddressBookManager.AddressBook"%>
-<%@page language="java" import="edu.stanford.muse.index.Archive"%>
-<%@page language="java" import="java.util.Set"%>
-<%@ page import="edu.stanford.muse.webapp.ModeConfig" %>
+<%@page language="java" import="edu.stanford.epadd.util.EmailConvert"%>
+<%@page language="java" %>
+<%@page language="java" %>
 <%@page language="java" %>
 
 <%--
 	<%@ page import="Internationalisation.ReadFromProp"%>
 --%>
-
+<%
+	EmailConvert.activateLicense();
+/*
+    2022-11-09  Added Sidecar file listing
+*/    
+%>
 
 <!DOCTYPE HTML>
 <html>
@@ -279,7 +283,7 @@ if (archive != null) {
 							<option value="cserv4">CompuServe for Windows 3.0+</option>
 							<option value="cserv2k">CompuServe 2000 (5.0 or higher) for Windows</option>
 							<option value="emailer1">Claris Emailer 1 (Filing Cabinet)</option>
-							<option value="emailer1fr">Claris Emailer 1 français</option>
+							<option value="emailer1fr">Claris Emailer 1 français</option>
 							<option value="emailer2">Claris Emailer 2 (Mail Database)</option>
 							<option value="eml">EML file (RFC-2822 Message)</option>
 							<option value="entourage">Entourage (Database)</option>
@@ -353,6 +357,12 @@ if (archive != null) {
 				<br/>
 			</div>
 			<p></p>
+
+            <% if (archiveID != null) { %>
+                <button id="manage-sidecar-btn" class="btn-default" onclick="return goSidecarFiles();"><i class="fa fa-files-o fa-2x" aria-hidden="true"></i>&nbsp; 
+                <%=edu.stanford.muse.util.Messages.getMessage(archiveID, "messages", "sidecar.management-title")%>
+                </button>
+            <% } %>                            
 		</div>
 <div>
 </form>
@@ -408,6 +418,13 @@ if (archive != null) {
 <jsp:include page="footer.jsp"/>
 
 	<script>
+	// 2022-11-09            
+        function goSidecarFiles() {
+            url = "sidecarFiles?archiveID=<%=archiveID%>";
+            window.location.href = url;
+            return false;
+        }
+        
 		function fetchLicenseStatus() {
 			$.ajax({
 						type: "POST",

diff --git a/WebContent/export.jsp b/WebContent/export.jsp
@@ -1,16 +1,19 @@
+<%
+/*    
+    2022-10-28      Allow custom naming in Export to next ePADD module
+*/
+%>
 <%@page contentType="text/html; charset=UTF-8"%>
 <%@page trimDirectiveWhitespaces="true"%>
-<%@page language="java" %>
-<%@ page import="edu.stanford.muse.webapp.ModeConfig" %>
-<%@ page import="java.util.Set" %>
-<%@ page import="edu.stanford.muse.Config" %>
-<%@ page import="java.util.Map" %>
-<%@ page import="edu.stanford.muse.AddressBookManager.AddressBook" %>
-<%@ page import="java.util.LinkedHashMap" %>
+<%@page language="java" import="edu.stanford.epadd.util.EmailConvert"%>
+<%@ page import="edu.stanford.muse.index.EmailExporter" %>
 <%@ page import="edu.stanford.muse.ner.model.NEType" %>
-<%@ page import="edu.stanford.muse.index.*" %>
+<%@ page import="java.util.LinkedHashMap" %>
+<%@ page import="java.util.Map" %>
 <%@page language="java" %>
-<!DOCTYPE HTML>
+<%	EmailConvert.activateLicense();%>
+
+    <!DOCTYPE HTML>
 <html>
 <head>
 
@@ -118,6 +121,8 @@
     String bestEmail = "";
     if (archive != null) {
         AddressBook ab = archive.addressBook;
+// 2022-10-28        
+        bestName = ab.getBestNameForSelf();
         Set<String> addrs = ab.getOwnAddrs();
         if (addrs.size() > 0)
             bestEmail = addrs.iterator().next();
@@ -235,6 +240,12 @@ Error: Export is only available in processing or appraisal modes!
                 </div>
                 <div class="form-group col-sm-4 picker-buttons">
                     <button id="export-next-browse" class="btn-default browse-button"><%=edu.stanford.muse.util.Messages.getMessage(archiveID, "messages", "export.browse-button")%></button>
+                </div>
+                <div class="form-group col-sm-8">
+                    <label><%=edu.stanford.muse.util.Messages.getMessage(archiveID, "messages", "export.export-archive")%></label>
+                    <input id="export-next-dir" class="form-control" type="text" name="name_dir" value="ePADD archive of <%=bestName%>" />
+                </div>    
+                <div class="form-group col-sm-4 picker-buttons">    
                     <button id="export-next-do" style="margin-left: 10px;" class="go-button faded btn-default"><%=edu.stanford.muse.util.Messages.getMessage(archiveID, "messages", "export.export-button")%></button>
                 </div>
             </div>
@@ -720,7 +731,9 @@ Error: Export is only available in processing or appraisal modes!
                     }(dir);
                 }
                 //window.location = baseUrl + '?archiveID=<%=archiveID%>&dir=' + dir;
-                var post_params = {archiveID: archiveID, dir: dir};
+// 2022-10-28
+//                var post_params = {archiveID: archiveID, dir: dir};
+                var post_params = {archiveID: archiveID, dir: dir, dir_name: dir_name};				
                 var params = epadd.convertParamsToAmpersandSep(post_params);
                 var premisData = {eventType: "transfer to processing", eventDetailInformation: "Exported to " + post_params.dir};
                 fetch_page_with_progress(baseUrl, "status", document.getElementById('status'), document.getElementById('status_text'), params,promptmethod, null, premisData);

diff --git a/WebContent/getArchive.jspf b/WebContent/getArchive.jspf
@@ -1,7 +1,10 @@
 <%@page import="edu.stanford.epadd.util.EmailConvert"%>
 <%@page import="edu.stanford.muse.index.Archive"%>
 <%@page import="edu.stanford.muse.index.ArchiveReaderWriter"%>
+<%@page import="edu.stanford.muse.webapp.ModeConfig"%>
 <%@page import="edu.stanford.muse.webapp.JSPHelper" %>
+<%@page import="edu.stanford.muse.index.Archive" %>
+<%@page import="edu.stanford.muse.index.ArchiveReaderWriter"%>
 <%@page import="edu.stanford.muse.webapp.ModeConfig" %>
 <%@page import="java.util.concurrent.TimeUnit"%>
 <%