Skip to content

Commit ab87fe3

Browse files
m-r-cm-r-c
committed
Merge remote-tracking branch 'remotes/origin/dev'
Conflicts: application.properties
2 parents fbb1a0c + 32ef086 commit ab87fe3

File tree

130 files changed

+3970
-1402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+3970
-1402
lines changed

Diff for: ‎README.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,13 @@ See the [project setup page](https://github.com/AtlasOfLivingAustralia/profile-h
1313

1414
# Name Matching
1515

16-
This content has been moved to the [project wiki](https://github.com/AtlasOfLivingAustralia/profile-hub/wiki/Name-Matching).
16+
This content has been moved to the [project wiki](https://github.com/AtlasOfLivingAustralia/profile-hub/wiki/Name-Matching).
17+
18+
# Image Storage
19+
20+
Profiles supports images from remote sources, private images and staged images. A private image is stored relative to
21+
the collection and associated profile /data/profile-hub/private_images/collectionId/profileUUID/imageID/imageID.jpg.
22+
The image directory also contains tile and thumbnail directories.
23+
A staged image is an image added while the profile is locked for major revisionand is treated similarly to a private
24+
image until the profile is unlocked. Staged images are stored at /data/profile-hub/staged_images/collectionId/
25+
profileUUID/imageID/imageID.jpg.

Diff for: ‎application.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
#Thu Nov 13 14:32:43 EST 2014
33
app.grails.version=2.5.2
44
app.name=profile-hub
5-
app.version=1.1
5+
app.version=1.2-SNAPSHOT

Diff for: ‎grails-app/conf/ApplicationResources.groovy

+11
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,29 @@ modules = {
3737
resource url:"js/angular/directives/nomenclature.js"
3838
resource url:"js/angular/directives/publication.js"
3939
resource url:"js/angular/directives/link.js"
40+
resource url:"js/angular/directives/saveButton.js"
41+
resource url:"js/angular/directives/saveAll.js"
4042
resource url:"js/angular/directives/taxonomy.js"
4143
resource url:"js/angular/directives/profileSideBar.js"
4244
resource url:"js/angular/directives/fallbackDatePicker.js"
4345
resource url:"js/angular/directives/delegatedSearch.js"
46+
resource url:"js/angular/directives/missingImage.js"
47+
resource url:"js/angular/directives/markupText.js"
48+
resource url:"js/angular/directives/imageUpload.js"
49+
resource url:"js/angular/directives/closeModal.js"
4450
resource url:"js/angular/services/ProfileService.js"
4551
resource url:"js/angular/services/MessageService.js"
4652
resource url:"js/angular/services/NavService.js"
53+
resource url:"js/angular/services/ProfileComparisonService.js"
54+
resource url:"js/angular/controllers/ImageUploadController.js"
4755
resource url:"js/angular/controllers/CreateProfileController.js"
4856
resource url:"js/angular/controllers/AttachmentController.js"
4957
resource url:"js/angular/controllers/OpusController.js"
5058
resource url:"js/angular/controllers/ProfileController.js"
5159
resource url:"js/angular/controllers/UserAccessController.js"
5260
resource url:"js/angular/controllers/BrowseController.js"
5361
resource url:"js/angular/controllers/SearchController.js"
62+
resource url:"js/angular/controllers/AttributeImageController.js"
5463
resource url:"js/angular/controllers/AttributesController.js"
5564
resource url:"js/angular/controllers/BhlLinksController.js"
5665
resource url:"js/angular/controllers/LinksController.js"
@@ -69,10 +78,12 @@ modules = {
6978
resource url:"js/angular/controllers/DoiController.js"
7079
resource url:"js/angular/controllers/ShareRequestController.js"
7180
resource url:"js/angular/controllers/UserDetailsController.js"
81+
resource url:"js/angular/controllers/AdminController.js"
7282
}
7383

7484
angular {
7585
resource url:"thirdparty/angular/angular-1.3.13.min.js"
86+
resource url:"thirdparty/angular/angular-sanitize-1.3.13.min.js"
7687
resource url:"thirdparty/angular/ui-bootstrap-tpls-0.12.0.js"
7788
dependsOn 'bootstrap3'
7889
}

Diff for: ‎grails-app/conf/BuildConfig.groovy

+5-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import grails.util.Environment
2+
13
grails.servlet.version = "3.0" // Change depending on target container compliance (2.5 or 3.0)
24
grails.project.class.dir = "target/classes"
35
grails.project.test.class.dir = "target/test-classes"
@@ -51,15 +53,9 @@ grails.project.dependency.resolution = {
5153
runtime "org.springframework:spring-test:4.1.2.RELEASE" // required by the rendering plugin
5254
runtime 'au.org.ala:image-utils:1.8.2'
5355

54-
compile('net.sf.jasperreports:jasperreports:6.1.0') {
55-
excludes 'antlr', 'commons-logging',
56-
'ant', 'mondrian', 'commons-javaflow', 'barbecue', 'xml-apis-ext', 'xml-apis', 'xalan', 'groovy-all', 'hibernate', 'saaj-api', 'servlet-api',
57-
'xercesImpl', 'xmlParserAPIs', 'spring-core', 'bsh', 'spring-beans', 'jaxen', 'barcode4j', 'batik-svg-dom', 'batik-xml', 'batik-awt-util', 'batik-dom',
58-
'batik-css', 'batik-gvt', 'batik-script', 'batik-svggen', 'batik-util', 'batik-bridge', 'persistence-api', 'jdtcore', 'bcmail-jdk16', 'bcprov-jdk16', 'bctsp-jdk16',
59-
'bcmail-jdk14', 'bcprov-jdk14', 'bctsp-jdk14', 'xmlbeans', 'olap4j'
60-
}
61-
compile 'net.sf.jasperreports:jasperreports-functions:6.1.0'
62-
compile 'net.sf.jasperreports:jasperreports-fonts:6.1.0'
56+
compile 'net.sf.jasperreports:jasperreports:6.2.0'
57+
compile 'net.sf.jasperreports:jasperreports-functions:6.2.0'
58+
compile 'au.org.ala:jasper-liberation-fonts-2.00.1:1.1'
6359
compile 'net.glxn:qrgen:1.4'
6460
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20160203.1-ALA'
6561
compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4'
@@ -77,9 +73,6 @@ grails.project.dependency.resolution = {
7773
compile ":uploadr:0.8.2"
7874
compile ":cors:1.1.6"
7975
compile ":csv:0.3.1"
80-
compile(":jasper:1.11.0") {
81-
excludes 'jasperreports'
82-
}
8376
compile ":ala-map:1.2"
8477
runtime(":images-client-plugin:0.6.1") {
8578
excludes "ala-bootstrap3"

Diff for: ‎grails-app/conf/UrlMappings.groovy

+5
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ class UrlMappings {
3434
"/opus/$opusId/profile/$profileId/images" controller: "profile", action: [GET: "retrieveImages"]
3535
"/opus/$opusId/profile/$profileId/primaryImage" controller: "profile", action: [GET: "getPrimaryImage"]
3636
"/opus/$opusId/profile/$profileId/image/$imageId" controller: "profile", action: [GET: "getLocalImage"]
37+
"/opus/$opusId/profile/$profileId/image/thumbnail/$imageId" controller: "profile", action: [GET: "retrieveLocalThumbnailImage"]
3738
"/opus/$opusId/profile/$profileId/image/$imageId/delete" controller: "profile", action: [DELETE: "deleteLocalImage"]
3839
"/opus/$opusId/profile/$profileId/image/$imageId/publish" controller: "profile", action: [POST: "publishPrivateImage"]
3940
"/opus/$opusId/profile/$profileId/file/$fileId" controller: "profile", action: [GET: "downloadTempFile"]
4041
"/opus/$opusId/profile/$profileId/image/upload" controller: "profile", action: [POST: "uploadImage"]
4142
"/opus/$opusId/profile/$profileId/lists" controller: "speciesList", action: [GET: "retrieveLists"]
4243
"/opus/$opusId/profile/$profileId/publication" controller: "profile", action: [GET: "retrievePublication"]
4344
"/opus/$opusId/profile/$profileId/publication/create" controller: "profile", action: [PUT: "savePublication"]
45+
"/opus/$opusId/profile/$profileId/publication/$publicationId/file" controller: "profile", action: [GET: "proxyPublicationDownload"]
4446
"/opus/$opusId/profile/$profileId/publication/$publicationId/update" controller: "profile", action: [POST: "savePublication"]
4547
"/opus/$opusId/profile/$profileId/speciesProfile" controller: "profile", action: [GET: "retrieveSpeciesProfile"]
4648
"/opus/$opusId/profile/$profileId/featureList" controller: "profile", action: [GET: "getFeatureLists"]
@@ -88,6 +90,8 @@ class UrlMappings {
8890
"/opus/$opusId/report/$reportId" controller: "report", action: [GET: "loadReport"]
8991

9092
"/opus/$opusId/statistics" controller: "statistics", action: [GET: "index"]
93+
"/opus/$opusId/image/$filename" controller: "opus", action: [GET: "downloadImage", DELETE: "deleteImage"]
94+
"/opus/$opusId/image" controller: "opus", action: [POST: "uploadImage", PUT: "uploadImage"]
9195

9296
"/opus/$opusId/update" controller: "opus", action: [GET: "edit", POST: "updateOpus"]
9397
"/opus/$opusId/json" controller: "opus", action: [GET: "getJson"]
@@ -140,5 +144,6 @@ class UrlMappings {
140144
"/ws/getImageInfo/$imageId" controller: "image", action: [GET: "getImageInfo"]
141145
"/image/proxyImage/$imageId" controller: "image", action: [GET: "downloadImage"]
142146
"/profile/$profileId/image/$imageId/tile/$zoom/$x/$y" controller: "image", action: [GET: "getTile"]
147+
"/opus/$opusId/profile/$profileId/image/$imageId/tile/$zoom/$x/$y" controller: "image", action: [GET: "getTile"]
143148
}
144149
}

Diff for: ‎grails-app/conf/jasperreports.properties

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#net.sf.jasperreports.default.font.name=DejaVu Sans
2+
#net.sf.jasperreports.default.pdf.font.name=Helvetica
3+
net.sf.jasperreports.default.font.name=Liberation Sans

Diff for: ‎grails-app/conf/reports/profiles/Acacia-paradoxa-DC.json

+67-1
Original file line numberDiff line numberDiff line change
@@ -5754,7 +5754,73 @@
57545754
{
57555755
"creators": "P.G. Kodela",
57565756
"title": "Description",
5757-
"text": "Erect or spreading shrub 1–4 m high; bark finely fissured, brownish grey; branchlets ± terete with low ridges, ± hairy. Stipules spinescent, slender, mostly 5–15 mm long.",
5757+
"images": [
5758+
{
5759+
"rightImage": {
5760+
"imageDetailsUrl": "http://images.ala.org.au/image/details?imageId=a4d2b5bb-4798-42ce-aa31-a24ef5c322f1",
5761+
"dataResourceName": "Australian Plant Image Index",
5762+
"scientificName": "Acacia paradoxa",
5763+
"imageId": "a4d2b5bb-4798-42ce-aa31-a24ef5c322f1",
5764+
"excluded": false,
5765+
"primary": false,
5766+
"thumbnailUrl": "http://images.ala.org.au/image/proxyImageThumbnail?imageId=a4d2b5bb-4798-42ce-aa31-a24ef5c322f1",
5767+
"largeImageUrl": "http://images.ala.org.au/image/proxyImageThumbnailLarge?imageId=a4d2b5bb-4798-42ce-aa31-a24ef5c322f1",
5768+
"occurrenceId": "d8209b4a-bc82-40cc-8814-bd7d43fc892c",
5769+
"imageNumber": 2,
5770+
"staged": false,
5771+
"metadata": null,
5772+
"licenceIcon": "https://licensebuttons.net/l/by-nc/3.0/80x15.png"
5773+
},
5774+
"leftImage": {
5775+
"imageDetailsUrl": "http://images.ala.org.au/image/details?imageId=dfc0883d-1fab-4689-a922-b6f30ab93236",
5776+
"dataResourceName": "Australian Plant Image Index",
5777+
"scientificName": "Acacia paradoxa",
5778+
"imageId": "dfc0883d-1fab-4689-a922-b6f30ab93236",
5779+
"excluded": false,
5780+
"primary": false,
5781+
"thumbnailUrl": "http://images.ala.org.au/image/proxyImageThumbnail?imageId=dfc0883d-1fab-4689-a922-b6f30ab93236",
5782+
"largeImageUrl": "http://images.ala.org.au/image/proxyImageThumbnailLarge?imageId=dfc0883d-1fab-4689-a922-b6f30ab93236",
5783+
"occurrenceId": "50786efe-acdc-4b12-b80d-7cfc28247e12",
5784+
"imageNumber": 1,
5785+
"staged": false,
5786+
"metadata": {
5787+
"title": "image title"
5788+
},
5789+
"licenceIcon": "https://licensebuttons.net/l/by-nc/3.0/80x15.png"
5790+
}
5791+
},
5792+
{
5793+
"rightImage": {
5794+
"imageDetailsUrl": "http://images.ala.org.au/image/details?imageId=f87468e0-7157-4cee-a18c-4f5735d9935d",
5795+
"dataResourceName": "Australian Plant Image Index",
5796+
"scientificName": "Acacia paradoxa",
5797+
"imageId": "f87468e0-7157-4cee-a18c-4f5735d9935d",
5798+
"excluded": false,
5799+
"primary": false,
5800+
"thumbnailUrl": "http://images.ala.org.au/image/proxyImageThumbnail?imageId=f87468e0-7157-4cee-a18c-4f5735d9935d",
5801+
"largeImageUrl": "http://images.ala.org.au/image/proxyImageThumbnailLarge?imageId=f87468e0-7157-4cee-a18c-4f5735d9935d",
5802+
"occurrenceId": "ca8cbe7a-a05c-45d8-ae09-fe3e8caffc07",
5803+
"imageNumber": 4,
5804+
"staged": false,
5805+
"metadata": null
5806+
},
5807+
"leftImage": {
5808+
"imageDetailsUrl": "http://images.ala.org.au/image/details?imageId=79895e9f-3ed8-4ce8-bff3-9a7036945e64",
5809+
"dataResourceName": "Australian Plant Image Index",
5810+
"scientificName": "Acacia paradoxa",
5811+
"imageId": "79895e9f-3ed8-4ce8-bff3-9a7036945e64",
5812+
"excluded": false,
5813+
"primary": false,
5814+
"thumbnailUrl": "http://images.ala.org.au/image/proxyImageThumbnail?imageId=79895e9f-3ed8-4ce8-bff3-9a7036945e64",
5815+
"largeImageUrl": "http://images.ala.org.au/image/proxyImageThumbnailLarge?imageId=79895e9f-3ed8-4ce8-bff3-9a7036945e64",
5816+
"occurrenceId": "4d813920-15cb-488c-93d1-bec269e110db",
5817+
"imageNumber": 3,
5818+
"staged": false,
5819+
"metadata": null
5820+
}
5821+
}
5822+
],
5823+
"text": "Erect or spreading shrub 1–4 m high; bark finely fissured, brownish grey; branchlets ± terete with low ridges, ± hairy. Stipules spinescent, slender, mostly 5–15 mm longErect or spreading shrub 1–4 m high; bark finely fissured, brownish grey; branchlets ± terete with low ridges, ± hairy. Stipules spinescent, slender, mostly 5–15 mm longErect or spreading shrub 1–4 m high; bark finely fissured, brownish grey; branchlets ± terete with low ridges, ± hairy. Stipules spinescent, slender, mostly 5–15 mm longErect or spreading shrub 1–4 m high; bark finely fissured, brownish grey; branchlets ± terete with low ridges, ± hairy. Stipules spinescent, slender, mostly 5–15 mm longErect or spreading shrub 1–4 m high; bark finely fissured, brownish grey; branchlets ± terete with low ridges, ± hairy. Stipules spinescent, slender, mostly 5–15 mm longErect or spreading shrub 1–4 m high; bark finely fissured, brownish grey; branchlets ± terete with low ridges, ± hairy. Stipules spinescent, slender, mostly 5–15 mm longErect or spreading shrub 1–4 m high; bark finely fissured, brownish grey; branchlets ± terete with low ridges, ± hairy. Stipules spinescent, slender, mostly 5–15 mm longErect or spreading shrub 1–4 m high; bark finely fissured, brownish grey; branchlets ± terete with low ridges, ± hairy. Stipules spinescent, slender, mostly 5–15 mm longErect or spreading shrub 1–4 m high; bark finely fissured, brownish grey; branchlets ± terete with low ridges, ± hairy. Stipules spinescent, slender, mostly 5–15 mm long",
57585824
"order": -1,
57595825
"source": null,
57605826
"original": null,

Diff for: ‎grails-app/conf/reports/profiles/PROFILES_detail.jrxml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- Created with Jaspersoft Studio version 6.1.0.final using JasperReports Library version 6.1.0 -->
3-
<!-- 2016-02-18T16:17:31 -->
3+
<!-- 2016-03-16T15:04:48 -->
44
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PROFILES_detail" language="groovy" pageWidth="595" pageHeight="842" columnWidth="515" leftMargin="40" rightMargin="40" topMargin="40" bottomMargin="30" uuid="eb6cf9a1-0a5c-4453-8b43-458e6c8b58f3">
55
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="JSON Sample Data Source"/>
66
<property name="net.sf.jasperreports.print.create.bookmarks" value="true"/>

Diff for: ‎grails-app/conf/reports/profiles/PROFILES_detail_attributes.jrxml

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- Created with Jaspersoft Studio version 6.1.0.final using JasperReports Library version 6.1.0 -->
3-
<!-- 2015-07-23T10:40:37 -->
3+
<!-- 2016-03-16T14:55:08 -->
44
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PROFILES_detail_attributes" pageWidth="595" pageHeight="842" columnWidth="595" leftMargin="0" rightMargin="0" topMargin="10" bottomMargin="5" uuid="052ebf40-2ed2-4f4f-b9ab-676a9ef84df6">
55
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
66
<parameter name="allowFineGrainedAttribution" class="java.lang.Boolean">
@@ -32,11 +32,12 @@
3232
</band>
3333
</columnHeader>
3434
<detail>
35-
<band height="48" splitType="Stretch">
35+
<band height="55" splitType="Stretch">
3636
<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
3737
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
38-
<reportElement x="0" y="5" width="515" height="13" isRemoveLineWhenBlank="true" uuid="9304f71c-bcb9-450d-adfc-0d6e2d59005e">
38+
<reportElement positionType="Float" x="0" y="5" width="515" height="13" isRemoveLineWhenBlank="true" uuid="9304f71c-bcb9-450d-adfc-0d6e2d59005e">
3939
<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
40+
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
4041
</reportElement>
4142
<textElement markup="html">
4243
<font size="10" isBold="false"/>
@@ -65,6 +66,18 @@
6566
</textElement>
6667
<textFieldExpression><![CDATA["- Edited by " + $F{editors}]]></textFieldExpression>
6768
</textField>
69+
<subreport>
70+
<reportElement positionType="Float" x="2" y="47" width="515" height="2" isRemoveLineWhenBlank="true" uuid="9d38626c-0a49-4f45-8c69-96b550081da7">
71+
<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
72+
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
73+
<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
74+
</reportElement>
75+
<subreportParameter name="showTitle">
76+
<subreportParameterExpression><![CDATA[false]]></subreportParameterExpression>
77+
</subreportParameter>
78+
<dataSourceExpression><![CDATA[((net.sf.jasperreports.engine.data.JsonDataSource)$P{REPORT_DATA_SOURCE}).subDataSource("images")]]></dataSourceExpression>
79+
<subreportExpression><![CDATA["PROFILES_detail_images.jasper"]]></subreportExpression>
80+
</subreport>
6881
</band>
6982
</detail>
7083
<columnFooter>

0 commit comments

Comments
 (0)