Project

General

Profile

« Previous | Next » 

Revision bf5abe7d

Added by Andreas Kohlbecker almost 4 years ago

ref #9134 fixing bug in default transformation creation

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/media/DefaultMediaTransformations.java
8 8
*/
9 9
package eu.etaxonomy.cdm.api.service.media;
10 10

  
11
import java.awt.Point;
11 12
import java.util.ArrayList;
12 13
import java.util.List;
13 14

  
......
40 41
         * for example used in the taxon general page, max extend of the resulting images is 400px
41 42
         */
42 43
        String dataPortalPreviewImage = "digilib/Scaler/IIIF/$1!$2/full/!400,400/0/default.jpg";
44
        Point dataPortalPreviewImageSize = new Point(400,400);
43 45

  
44 46
        /*
45 47
         * universalViewerThumbnail:
......
48 50
         * question mark character which causes problems for the URI query parser see https://dev.e-taxonomy.eu/redmine/issues/9132#note-8
49 51
         */
50 52
        String universalViewerThumbnail = "digilib/Scaler/?fn=$1/$2&mo=crop&dw=200&dh=147&uvfix=1";
53
        Point universalViewerThumbnailSize = new Point(200,147);
51 54

  
52 55
        MediaUriTransformation tr1 = new MediaUriTransformation();
53 56
        tr1.setPathQueryFragment(new SearchReplace("digilib/Scaler/IIIF/([^\\!]+)\\!([^\\/]+)(.*)", dataPortalPreviewImage));
54 57
        tr1.setHost(new SearchReplace("pictures.bgbm.org", "pictures.bgbm.org")); // host part only used for matching, no replace!
55 58
        tr1.setMimeType("image/jpeg");
56
        tr1.setWidth(400);
57
        tr1.setHeight(400);
59
        tr1.setWidth(dataPortalPreviewImageSize.x);
60
        tr1.setHeight(dataPortalPreviewImageSize.y);
58 61

  
59 62
        MediaUriTransformation tr2 = new MediaUriTransformation();
60 63
        tr2.setPathQueryFragment(new SearchReplace("digilib/Scaler/IIIF/([^\\!]+)\\!([^\\/]+)(.*)", universalViewerThumbnail));
61 64
        tr2.setHost(new SearchReplace("pictures.bgbm.org", "pictures.bgbm.org")); // host part only used for matching, no replace!
62 65
        tr2.setMimeType("image/jpeg");
63
        tr2.setWidth(200);
64
        tr2.setHeight(200);
66
        tr2.setWidth(universalViewerThumbnailSize.x);
67
        tr2.setHeight(universalViewerThumbnailSize.y);
65 68

  
66 69
        MediaUriTransformation tr3 = new MediaUriTransformation();
67 70
        tr3.setPathQueryFragment(new SearchReplace("digilib/Scaler/\\?fn=([^\\\\/]+)/(\\w+)(.*)", dataPortalPreviewImage));
68 71
        tr3.setHost(new SearchReplace("pictures.bgbm.org", "pictures.bgbm.org")); // host part only used for matching, no replace!
69 72
        tr3.setMimeType("image/jpeg");
70
        tr3.setWidth(400);
71
        tr3.setHeight(400);
73
        tr3.setWidth(dataPortalPreviewImageSize.x);
74
        tr3.setHeight(dataPortalPreviewImageSize.y);
72 75

  
73 76
        MediaUriTransformation tr4 = new MediaUriTransformation();
74 77
        tr4.setPathQueryFragment(new SearchReplace("digilib/Scaler/\\?fn=([^\\\\/]+)/(\\w+)(.*)", universalViewerThumbnail));
75 78
        tr4.setHost(new SearchReplace("pictures.bgbm.org", "pictures.bgbm.org")); // host part only used for matching, no replace!
76 79
        tr4.setMimeType("image/jpeg");
77
        tr4.setWidth(200);
78
        tr4.setHeight(200);
80
        tr4.setWidth(universalViewerThumbnailSize.x);
81
        tr4.setHeight(universalViewerThumbnailSize.y);
79 82

  
80 83
        defaultTransformations.add(tr2);
81 84
        defaultTransformations.add(tr1);

Also available in: Unified diff