Revert "Merge main into Zip files development (#1845)"

This reverts commit a3f2ff2.
UNC-Libraries · Dec 3, 2024 · 6691fdc · 6691fdc
1 parent a3f2ff2
commit 6691fdc
Show file tree

Hide file tree

Showing 27 changed files with 16,085 additions and 13,934 deletions.
diff --git a/indexing-solr/src/test/java/edu/unc/lib/boxc/indexing/solr/test/TestCorpus.java b/indexing-solr/src/test/java/edu/unc/lib/boxc/indexing/solr/test/TestCorpus.java
@@ -135,10 +135,9 @@ public List<SolrInputDocument> populate() {
         newDoc.addField("ancestorIds", makeAncestorIds(pid1, pid2));
         newDoc.addField("ancestorPath", makeAncestorPath(pid1, pid2));
         newDoc.addField("resourceType", ResourceType.Work.name());
-        List<String> workDatastreams = Arrays.asList(
-                ORIGINAL_FILE.getId() + "|image/png|file.png|png|766|urn:sha1:checksum|" + pid6File.getId() + "|1200x1200",
-                DatastreamType.JP2_ACCESS_COPY.getId() + "|image/jp2|bunny.jp2|jp2|||" + pid6File.getId() + "|1200x1200");
-        newDoc.addField(SearchFieldKey.DATASTREAM.getSolrField(), workDatastreams);
+        imgDatastreams.set(0, imgDatastreams.get(0) + pid6File.getId());
+        imgDatastreams.set(1, imgDatastreams.get(1) + pid6File.getId());
+        newDoc.addField(SearchFieldKey.DATASTREAM.getSolrField(), imgDatastreams);
         newDoc.addField(SearchFieldKey.FILE_FORMAT_CATEGORY.getSolrField(), ContentCategory.image.getDisplayName());
         newDoc.addField(SearchFieldKey.FILE_FORMAT_TYPE.getSolrField(), "png");
         docs.add(newDoc);
@@ -153,9 +152,6 @@ public List<SolrInputDocument> populate() {
         newDoc.addField("ancestorIds", makeAncestorIds(pid1, pid3));
         newDoc.addField("ancestorPath", makeAncestorPath(pid1));
         newDoc.addField("resourceType", "Collection");
-        List<String> collection2Datastream = List.of(
-                DatastreamType.JP2_ACCESS_COPY.getId() + "|image/jp2|bunny.jp2|jp2|||" + pid2.getId() + "|120x120");
-        newDoc.addField(SearchFieldKey.DATASTREAM.getSolrField(), collection2Datastream);
         docs.add(newDoc);
 
         return docs;

diff --git a/operations/src/main/java/edu/unc/lib/boxc/operations/api/images/ImageServerUtil.java b/operations/src/main/java/edu/unc/lib/boxc/operations/api/images/ImageServerUtil.java
@@ -30,7 +30,7 @@ public static String getImageServiceId(String id) {
      * @return
      */
     public static String getImageServerEncodedId(String id) {
-        return URLEncoder.encode(getImageServiceId(id), StandardCharsets.UTF_8);
+        return URLEncoder.encode(getImageServiceId(id));
     }
 
     /**

diff --git a/search-solr/src/main/java/edu/unc/lib/boxc/search/solr/models/DatastreamImpl.java b/search-solr/src/main/java/edu/unc/lib/boxc/search/solr/models/DatastreamImpl.java
@@ -62,7 +62,7 @@ public DatastreamImpl(String datastream) {
 
     @Override
     public String toString() {
-        //DS name|mimetype|filename|extension|filesize|checksum|owner|extent
+        //DS name|mimetype|extension|filesize|checksum|owner|extent
         StringBuilder sb = new StringBuilder();
         if (name != null) {
             sb.append(name);

diff --git a/...el-app/src/main/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessor.java b/...el-app/src/main/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessor.java
@@ -19,8 +19,7 @@ public class ImageDerivativeProcessor implements Processor {
 
     private static final Pattern MIMETYPE_PATTERN = Pattern.compile("^(image.*$|application.*?(photoshop|psd)$)");
 
-    private static final Pattern DISALLOWED_PATTERN =
-            Pattern.compile(".*(vnd\\.fpx|x-icon|x-raw-panasonic|vnd\\.microsoft\\.icon).*");
+    private static final Pattern DISALLOWED_PATTERN = Pattern.compile(".*(vnd\\.fpx|x-icon).*");
 
     /**
      * Returns true if the subject of the exchange is a binary which

diff --git a/...main/java/edu/unc/lib/boxc/services/camel/thumbnails/ImportThumbnailRequestProcessor.java b/...main/java/edu/unc/lib/boxc/services/camel/thumbnails/ImportThumbnailRequestProcessor.java
@@ -36,8 +36,6 @@ public void process(Exchange exchange) throws IOException {
         in.setHeader(CdrBinaryPath, storagePath.toString());
         in.setHeader(CdrBinaryMimeType, mimetype);
         in.setHeader(FCREPO_URI, repoPath);
-        // force access copy regeneration when importing a thumbnail
-        in.setHeader("force", "true");
     }
 
     /**

diff --git a/...pp/src/test/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessorTest.java b/...pp/src/test/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessorTest.java
diff --git a/...rc/test/java/edu/unc/lib/boxc/services/camel/thumbnails/ImportThumbnailProcessorTest.java b/...rc/test/java/edu/unc/lib/boxc/services/camel/thumbnails/ImportThumbnailProcessorTest.java
@@ -71,7 +71,6 @@ public void testImportThumbnail() throws IOException {
         verify(message).setHeader(FCREPO_URI, pid.getRepositoryPath());
         verify(message).setHeader(CdrBinaryMimeType, mimetype);
         verify(message).setHeader(CdrBinaryPath, path.toString());
-        verify(message).setHeader("force", "true");
     }
 
     @Test

diff --git a/static/css/sass/cdr_ui_styles.scss b/static/css/sass/cdr_ui_styles.scss
@@ -713,6 +713,7 @@ table.dataTable {
   .restricted-access {
     border: 1px solid;
     border-radius: 5px;
+    padding: 15px;
 
     .button {
       text-align: left;
@@ -1091,7 +1092,6 @@ a.navbar-item:hover {
     }
   }
 
-
   .relateditem {
     margin-left: 5px;
     margin-right: 5px;