Revize baf6fc22

More changes in export and download

Backend/Backend/Controllers/DocumentController.cs

@@ -8 +8 @@
 using RestAPI.Authentication;
 using Models.Annotations;
 using Core.Services.AnnotationService;
+using System.Net.Http.Headers;
+using Microsoft.Net.Http.Headers;
+using System.Net.Mime;
 
 namespace RestAPI.Controllers;
 
@@ -272 +275 @@
         {
             var outputStream = annotationService.Export(request);
 
-            var cd = new System.Net.Mime.ContentDisposition()
+            var cd = new System.Net.Http.Headers.ContentDispositionHeaderValue("attachment")
             {
-                FileName = "export.zip",
-                Inline = false,
             };
 
-            Response.Headers.Add("Content-Disposition", cd.ToString());
-            return File(outputStream, "application/zip");
+            Response.Headers.Add(HeaderNames.ContentDisposition, cd.ToString());
+            return File(outputStream, MediaTypeNames.Application.Zip, "export.zip");
         }
         catch (InvalidOperationException e)
         {

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -858 +858 @@
             foreach (var document in finalAnnotationsToExport.Keys)
             {
                 var finalAnnotation = finalAnnotationsToExport[document];
+                if (finalAnnotation == null)
+                {
+                    continue;
+                }
+
                 finalTagsToExport[finalAnnotation] = context.FinalAnnotationTags
                     .Include(at => at.Annotation)
                     .Include(at => at.Tag).ThenInclude(t => t.Category)

Backend/Core/ZipUtils/Export.cs

@@ -38 +38 @@
                 }
 
                 var finalAnnotation = documentFinalAnnotations[document];
+                if (finalAnnotation == null)
+                {
+                    continue;
+                }
+
                 var finalTags = finalAnnotationTags[finalAnnotation].Select(ft => ft as AnnotationTagGeneric).ToList();
                 string finalAnnotationInfoJson = DumpAnnotation(finalAnnotation, finalTags, document.Id);
                 CreateFile(documentDir + "/final.json", finalAnnotationInfoJson, archive);