Skip to content

Commit 09f055b

Browse files
dtheilerdtheiler
committed
SSS-218
1 parent 46d59ec commit 09f055b

File tree

10 files changed

+1283
-1269
lines changed

10 files changed

+1283
-1269
lines changed

‎serv/jobs/ss-dataimport/ss-dataimport-impl/src/main/java/at/kc/tugraz/ss/serv/dataimport/impl/evernote/SSDataImportEvernoteNoteContentHandler.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,12 @@ private String downnloadNoteResourcesAndFillXHTMLWithLocalImageLinks(
416416
mimeType = SSMimeTypeU.imageGif;
417417
}
418418

419+
if(
420+
tmpLine.contains("type=\"" + SSMimeTypeU.imageTiff + "\"") &&
421+
endIndex > tmpLine.indexOf("type=\"" + SSMimeTypeU.imageTiff + "\"")){
422+
mimeType = SSMimeTypeU.imageTiff;
423+
}
424+
419425
if(
420426
tmpLine.contains("type=\"" + SSMimeTypeU.applicationPdf + "\"") &&
421427
endIndex > tmpLine.indexOf("type=\"" + SSMimeTypeU.applicationPdf + "\"")){
@@ -499,6 +505,7 @@ private String downnloadNoteResourcesAndFillXHTMLWithLocalImageLinks(
499505
SSStrU.equals(mimeType, SSMimeTypeU.imageJpeg) ||
500506
SSStrU.equals(mimeType, SSMimeTypeU.imagePng) ||
501507
SSStrU.equals(mimeType, SSMimeTypeU.imageGif) ||
508+
SSStrU.equals(mimeType, SSMimeTypeU.imageTiff) ||
502509
SSStrU.equals(mimeType, SSMimeTypeU.applicationPdf)){
503510

504511
hashEndIndex = tmpLine.indexOf("\"", hashIndex + 6);

‎serv/ss-datatypes/ss-tag/ss-tag-impl/src/main/java/at/kc/tugraz/ss/service/tag/impl/SSTagImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ public Boolean tagsUserRemove(final SSServPar parA) throws Exception {
559559

560560

561561
if(
562-
par.space == null &&
562+
par.space == null &&
563563
par.entity == null){
564564

565565
dbSQL.startTrans(par.shouldCommit);
@@ -572,7 +572,7 @@ public Boolean tagsUserRemove(final SSServPar parA) throws Exception {
572572
}
573573

574574
if(
575-
par.space != null &&
575+
par.space != null &&
576576
par.entity == null){
577577

578578
dbSQL.startTrans(par.shouldCommit);
@@ -584,7 +584,7 @@ public Boolean tagsUserRemove(final SSServPar parA) throws Exception {
584584
}
585585

586586
if(
587-
par.space == null &&
587+
par.space == null &&
588588
par.entity != null){
589589

590590
dbSQL.startTrans(par.shouldCommit);
@@ -597,7 +597,7 @@ public Boolean tagsUserRemove(final SSServPar parA) throws Exception {
597597
}
598598

599599
if(
600-
par.space != null &&
600+
par.space != null &&
601601
par.entity != null){
602602

603603
dbSQL.startTrans(par.shouldCommit);

‎ss-adapter/ss-adapter-rest-v1/src/main/webapp/api-docs/SSAdapterRESTFile.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,73 +4,73 @@
44
"basePath" : "http://localhost:8080/ss-adapter-rest",
55
"resourcePath" : "/SSAdapterRESTFile",
66
"apis" : [ {
7-
"path" : "/fileCanWrite",
7+
"path" : "/fileUserFileWrites",
88
"operations" : [ {
99
"method" : "POST",
10-
"summary" : "query whether given file can be downloaded with write access",
10+
"summary" : "retrieve files user currently could replace when uploading respective file again as he is writer",
1111
"notes" : "",
12-
"type" : "SSFileCanWriteRet",
13-
"nickname" : "fileCanWrite",
12+
"type" : "SSFileGetEditingFilesRet",
13+
"nickname" : "fileUserFileWrites",
1414
"produces" : [ "application/json" ],
1515
"consumes" : [ "application/json" ],
1616
"parameters" : [ {
1717
"name" : "body",
1818
"required" : false,
19-
"type" : "SSFileCanWritePar",
19+
"type" : "SSFileUserFileWritesPar",
2020
"paramType" : "body",
2121
"allowMultiple" : false
2222
} ]
2323
} ]
2424
}, {
25-
"path" : "/fileExtGet",
25+
"path" : "/fileSetReaderOrWriter",
2626
"operations" : [ {
2727
"method" : "POST",
28-
"summary" : "retrieve a file's extension",
28+
"summary" : "set user being writer or reaader for given file",
2929
"notes" : "",
30-
"type" : "SSFileExtGetRet",
31-
"nickname" : "fileExtGet",
30+
"type" : "SSFileSetReaderOrWriterRet",
31+
"nickname" : "fileSetReaderOrWriter",
3232
"produces" : [ "application/json" ],
3333
"consumes" : [ "application/json" ],
3434
"parameters" : [ {
3535
"name" : "body",
3636
"required" : false,
37-
"type" : "SSFileExtGetPar",
37+
"type" : "SSFileSetReaderOrWriterPar",
3838
"paramType" : "body",
3939
"allowMultiple" : false
4040
} ]
4141
} ]
4242
}, {
43-
"path" : "/fileUserFileWrites",
43+
"path" : "/fileCanWrite",
4444
"operations" : [ {
4545
"method" : "POST",
46-
"summary" : "retrieve files user currently could replace when uploading respective file again as he is writer",
46+
"summary" : "query whether given file can be downloaded with write access",
4747
"notes" : "",
48-
"type" : "SSFileGetEditingFilesRet",
49-
"nickname" : "fileUserFileWrites",
48+
"type" : "SSFileCanWriteRet",
49+
"nickname" : "fileCanWrite",
5050
"produces" : [ "application/json" ],
5151
"consumes" : [ "application/json" ],
5252
"parameters" : [ {
5353
"name" : "body",
5454
"required" : false,
55-
"type" : "SSFileUserFileWritesPar",
55+
"type" : "SSFileCanWritePar",
5656
"paramType" : "body",
5757
"allowMultiple" : false
5858
} ]
5959
} ]
6060
}, {
61-
"path" : "/fileSetReaderOrWriter",
61+
"path" : "/fileExtGet",
6262
"operations" : [ {
6363
"method" : "POST",
64-
"summary" : "set user being writer or reaader for given file",
64+
"summary" : "retrieve a file's extension",
6565
"notes" : "",
66-
"type" : "SSFileSetReaderOrWriterRet",
67-
"nickname" : "fileSetReaderOrWriter",
66+
"type" : "SSFileExtGetRet",
67+
"nickname" : "fileExtGet",
6868
"produces" : [ "application/json" ],
6969
"consumes" : [ "application/json" ],
7070
"parameters" : [ {
7171
"name" : "body",
7272
"required" : false,
73-
"type" : "SSFileSetReaderOrWriterPar",
73+
"type" : "SSFileExtGetPar",
7474
"paramType" : "body",
7575
"allowMultiple" : false
7676
} ]
@@ -115,13 +115,13 @@
115115
"id" : "SSFileGetEditingFilesRet",
116116
"required" : [ "op" ],
117117
"properties" : {
118-
"labels" : {
118+
"files" : {
119119
"type" : "array",
120120
"items" : {
121121
"type" : "string"
122122
}
123123
},
124-
"files" : {
124+
"labels" : {
125125
"type" : "array",
126126
"items" : {
127127
"type" : "string"

‎ss-adapter/ss-adapter-rest-v1/src/main/webapp/api-docs/SSAdapterRESTFileDownload.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,25 @@
44
"basePath" : "http://localhost:8080/ss-adapter-rest",
55
"resourcePath" : "/SSAdapterRESTFileDownload",
66
"apis" : [ {
7+
"path" : "/fileDownload",
8+
"operations" : [ {
9+
"method" : "POST",
10+
"summary" : "download a file via POST request",
11+
"notes" : "",
12+
"type" : "string",
13+
"format" : "byte",
14+
"nickname" : "fileDownload",
15+
"produces" : [ "application/octet-stream" ],
16+
"consumes" : [ "application/json" ],
17+
"parameters" : [ {
18+
"name" : "body",
19+
"required" : false,
20+
"type" : "SSFileDownloadPar",
21+
"paramType" : "body",
22+
"allowMultiple" : false
23+
} ]
24+
} ]
25+
}, {
726
"path" : "/fileDownloadGET",
827
"operations" : [ {
928
"method" : "GET",
@@ -34,25 +53,6 @@
3453
"allowMultiple" : false
3554
} ]
3655
} ]
37-
}, {
38-
"path" : "/fileDownload",
39-
"operations" : [ {
40-
"method" : "POST",
41-
"summary" : "download a file via POST request",
42-
"notes" : "",
43-
"type" : "string",
44-
"format" : "byte",
45-
"nickname" : "fileDownload",
46-
"produces" : [ "application/octet-stream" ],
47-
"consumes" : [ "application/json" ],
48-
"parameters" : [ {
49-
"name" : "body",
50-
"required" : false,
51-
"type" : "SSFileDownloadPar",
52-
"paramType" : "body",
53-
"allowMultiple" : false
54-
} ]
55-
} ]
5656
} ],
5757
"models" : {
5858
"SSFileDownloadPar" : {

0 commit comments

Comments
 (0)