Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/issues fixer #331

Merged
merged 31 commits into from
Sep 29, 2020
Merged

Fix/issues fixer #331

merged 31 commits into from
Sep 29, 2020

Conversation

lrosenth
Copy link
Collaborator

Latest version... Should fix knora.json problem

lrosenth and others added 28 commits July 1, 2020 12:37
@lrosenth
Squashed commit of the following:
aa882e1 
commit 4efa7410676e25e36e52cdae9e5d1a5944641776
Author: Lukas Rosenthaler <[email protected]>
Date:   Wed Jul 1 11:43:27 2020 +0200

    delete large file

commit 8693fbe66ccce0b1a679aecb05eca9a56ab16151
Author: Lukas Rosenthaler <[email protected]>
Date:   Wed Jul 1 10:52:56 2020 +0200

    Handling of non-image files in knora.json

commit 641efa3c62499df1f949b29fe93652e9f4d78c71
Author: Lukas Rosenthaler <[email protected]>
Date:   Mon Jun 29 18:09:08 2020 +0200

    …

commit 394d96c5b52e00d3f037bba2551ec0a330c20946
Author: Lukas Rosenthaler <[email protected]>
Date:   Mon Jun 29 18:08:58 2020 +0200

    Added support for non-imagefiles

commit eb792e1
Author: Lukas Rosenthaler <[email protected]>
Date:   Wed Jun 24 11:12:17 2020 +0200

    Small fixes

commit 547d83d
Author: Lukas Rosenthaler <[email protected]>
Date:   Tue Jun 23 01:27:33 2020 +0200

    ...

commit e0e6f3a
Author: Lukas Rosenthaler <[email protected]>
Date:   Tue Jun 23 01:27:19 2020 +0200

    Frist commit of new branch
@lrosenth
fixing issue #287
af6990d
@lrosenth
Bugfix in lua: binding of values in prepared SQL
6193427
@lrosenth
Bug fixes of issues
faf7103
@lrosenth
more fixes
a18987a
@lrosenth
Squashed commit of the following:
336a2a9 
commit 2e4253b
Author: André Kilchenmann <[email protected]>
Date:   Thu Jun 25 15:38:46 2020 +0200

    chore(ci): Update release notes on each release (#327)

commit 0306c33
Author: Ivan Subotic <[email protected]>
Date:   Wed Jun 24 21:07:58 2020 +0200

    build: fix publish (#326)

commit 7cfc5c6
Author: Ivan Subotic <[email protected]>
Date:   Wed Jun 24 19:38:39 2020 +0200

    build: fix publish (#325)

commit d04725a
Author: Ivan Subotic <[email protected]>
Date:   Wed Jun 24 17:46:12 2020 +0200

    feature: add IIIF 3.0 support (#324)
@subotic
Merge branch 'develop' into fix/issues-fixer
b025ab0
@lrosenth
Missing files added
4ed55e8
@lrosenth
Merge branch 'fix/issues-fixer' of github.com:dasch-swiss/sipi into i…
9a18b82 
…ssues-fixer
@lrosenth
Missing filew…
30f91c3
@subotic
test: add missing file
7aba93c
@subotic
test: trying to fix
55081d7
@subotic
test: reverting wrong fix
385bf22
@lrosenth
Added XML content to XMP file
2613226
@lrosenth
Testing now removes all files created at the end of testing
334ebda
@lrosenth
Bugfix in SipiSize and Cache
1055545
@lrosenth
removed debugging output (commented out)
3d618ac
@lrosenth
refactoring of core
df6fd0d
@lrosenth
Merge branch 'develop' into fix/issues-fixer
df5066e 
# Conflicts:
#	test/e2e/conftest.py
@lrosenth
Further reorganization
f028306
@lrosenth
More IIIF conformance
7063a19
@lrosenth
...
6628256
@lrosenth
A lot of documentation and some small fixes
959bfab
@lrosenth
Documentation
b2fe025
@lrosenth
Docu and small fixes for stability
41af71e
@lrosenth
Some fixes for cache information in lua
b4ef618
@lrosenth
Docu update and fixes
caea0bb
@lrosenth
better error messages
7d786c1
benjamingeer
benjamingeer previously approved these changes Sep 23, 2020
View reviewed changes
Copy link
Contributor

@benjamingeer benjamingeer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't review this properly without a user story and explanation for each change, and it would be easier to review if each user story was implemented in a separate, smaller pull request. But let's try it. :)

@benjamingeer benjamingeer dismissed their stale review September 23, 2020 12:24

forgot something

benjamingeer
benjamingeer suggested changes Sep 23, 2020
View reviewed changes
Copy link
Contributor

@benjamingeer benjamingeer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I forgot something: does this PR fix the version number and commit ID printed on startup?

@lrosenth
Merge branch 'develop' into fix/issues-fixer
9a2d950 
# Conflicts:
#	config/sipi.config.lua
benjamingeer
benjamingeer reviewed Sep 28, 2020
View reviewed changes
shttps/Parsing.cpp Outdated
{"ics", {"text/calendar"}},
{"csv", {"text/comma-separated-values", "text/plain"}},
{"tsv", {"text/tab-separated-values", "text/plain"}},
{"csv", {"text/comma-separated-values", "text/plain", "application/vnd.ms-excel",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently the /knora.json route returns text/comma-separated-values for a CSV file, but this MIME type is unregistered. The registered MIME type for CSV is text/csv: https://www.rfc-editor.org/rfc/rfc4180.html

@lrosenth
Copy link
Collaborator Author

@benjamingeer The csv-mimetype is returned as "text/csv" in the JSON variable "internalMimeType"...
Should now be ready for merge and deployement...

@benjamingeer
Copy link
Contributor

Does this PR fix the version number and commit ID printed on startup (https://dasch.myjetbrains.com/youtrack/issue/DSP-687)?

It would be great to have this automatically updated. CMake can generate a source file with the current Git commit hash: https://stackoverflow.com/questions/1435953/how-can-i-pass-git-sha1-to-compiler-as-definition-using-cmake/4318642#4318642

@subotic
Copy link
Contributor

subotic commented Sep 29, 2020

@benjamingeer I don't think so

Does this PR fix the version number and commit ID printed on startup (https://dasch.myjetbrains.com/youtrack/issue/DSP-687)?

I don't think so. There is another PR open to solve this. The checksum printed at startup comes already from git and cmake. The only thing missing is the tag. It is next on my list.

benjamingeer
benjamingeer approved these changes Sep 29, 2020
View reviewed changes
Copy link
Contributor

@benjamingeer benjamingeer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is another PR open to solve this. The checksum printed at startup comes already from git and cmake. The only thing missing is the tag. It is next on my list.

OK then let's merge this now and make a new Sipi release from it.

@subotic subotic merged commit 9647328 into develop Sep 29, 2020
@subotic subotic deleted the fix/issues-fixer branch September 29, 2020 09:22
lrosenth added a commit that referenced this pull request Oct 25, 2020
@lrosenth
Squashed commit of the following:
1c9dd59 
commit 9778b19
Author: Ivan Subotic <[email protected]>
Date:   Tue Sep 29 16:23:14 2020 +0200

    fix: printed version strings (DSP-687) (#332)

    * fix init DSP-687 SIPI version strings hardcoded somewhere

    * fix: printed version strings

    Co-authored-by: Ralf Barkow <[email protected]>

commit 9647328
Author: Lukas Rosenthaler <[email protected]>
Date:   Tue Sep 29 11:22:27 2020 +0200

    Fix/issues fixer (#331)

    * Squashed commit of the following:

    commit 4efa7410676e25e36e52cdae9e5d1a5944641776
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Wed Jul 1 11:43:27 2020 +0200

        delete large file

    commit 8693fbe66ccce0b1a679aecb05eca9a56ab16151
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Wed Jul 1 10:52:56 2020 +0200

        Handling of non-image files in knora.json

    commit 641efa3c62499df1f949b29fe93652e9f4d78c71
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Mon Jun 29 18:09:08 2020 +0200

        …

    commit 394d96c5b52e00d3f037bba2551ec0a330c20946
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Mon Jun 29 18:08:58 2020 +0200

        Added support for non-imagefiles

    commit eb792e1
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Wed Jun 24 11:12:17 2020 +0200

        Small fixes

    commit 547d83d
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Tue Jun 23 01:27:33 2020 +0200

        ...

    commit e0e6f3a
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Tue Jun 23 01:27:19 2020 +0200

        Frist commit of new branch

    * fixing issue #287

    * Bugfix in lua: binding of values in prepared SQL

    * Bug fixes of issues

    * more fixes

    * Squashed commit of the following:

    commit 2e4253b
    Author: André Kilchenmann <[email protected]>
    Date:   Thu Jun 25 15:38:46 2020 +0200

        chore(ci): Update release notes on each release (#327)

    commit 0306c33
    Author: Ivan Subotic <[email protected]>
    Date:   Wed Jun 24 21:07:58 2020 +0200

        build: fix publish (#326)

    commit 7cfc5c6
    Author: Ivan Subotic <[email protected]>
    Date:   Wed Jun 24 19:38:39 2020 +0200

        build: fix publish (#325)

    commit d04725a
    Author: Ivan Subotic <[email protected]>
    Date:   Wed Jun 24 17:46:12 2020 +0200

        feature: add IIIF 3.0 support (#324)

    * Missing files added

    * Missing filew…

    * test: add missing file

    * test: trying to fix

    * test: reverting wrong fix

    * Added XML content to XMP file

    * Testing now removes all files created at  the end of testing

    * Bugfix in SipiSize and Cache

    * removed debugging output (commented out)

    * refactoring of core

    * Further reorganization

    * More IIIF conformance

    * ...

    * A lot of documentation and some small fixes

    * Documentation

    * Docu and small fixes for stability

    * Some fixes for cache information in lua

    * Docu update and fixes

    * better error messages

    * CSV mimteype fix

    * Update of e2e tests to reflect mimetype change for csv

    Co-authored-by: Ivan Subotic <[email protected]>
lrosenth added a commit that referenced this pull request Oct 26, 2020
@lrosenth @subotic
fix for upscaling IIIF V3 (#334)
0aa1029 
* Squashed commit of the following:

commit 4efa7410676e25e36e52cdae9e5d1a5944641776
Author: Lukas Rosenthaler <[email protected]>
Date:   Wed Jul 1 11:43:27 2020 +0200

    delete large file

commit 8693fbe66ccce0b1a679aecb05eca9a56ab16151
Author: Lukas Rosenthaler <[email protected]>
Date:   Wed Jul 1 10:52:56 2020 +0200

    Handling of non-image files in knora.json

commit 641efa3c62499df1f949b29fe93652e9f4d78c71
Author: Lukas Rosenthaler <[email protected]>
Date:   Mon Jun 29 18:09:08 2020 +0200

    …

commit 394d96c5b52e00d3f037bba2551ec0a330c20946
Author: Lukas Rosenthaler <[email protected]>
Date:   Mon Jun 29 18:08:58 2020 +0200

    Added support for non-imagefiles

commit eb792e1
Author: Lukas Rosenthaler <[email protected]>
Date:   Wed Jun 24 11:12:17 2020 +0200

    Small fixes

commit 547d83d
Author: Lukas Rosenthaler <[email protected]>
Date:   Tue Jun 23 01:27:33 2020 +0200

    ...

commit e0e6f3a
Author: Lukas Rosenthaler <[email protected]>
Date:   Tue Jun 23 01:27:19 2020 +0200

    Frist commit of new branch

* fixing issue #287

* Bugfix in lua: binding of values in prepared SQL

* Bug fixes of issues

* more fixes

* Squashed commit of the following:

commit 2e4253b
Author: André Kilchenmann <[email protected]>
Date:   Thu Jun 25 15:38:46 2020 +0200

    chore(ci): Update release notes on each release (#327)

commit 0306c33
Author: Ivan Subotic <[email protected]>
Date:   Wed Jun 24 21:07:58 2020 +0200

    build: fix publish (#326)

commit 7cfc5c6
Author: Ivan Subotic <[email protected]>
Date:   Wed Jun 24 19:38:39 2020 +0200

    build: fix publish (#325)

commit d04725a
Author: Ivan Subotic <[email protected]>
Date:   Wed Jun 24 17:46:12 2020 +0200

    feature: add IIIF 3.0 support (#324)

* Missing files added

* Missing filew…

* test: add missing file

* test: trying to fix

* test: reverting wrong fix

* Added XML content to XMP file

* Testing now removes all files created at  the end of testing

* Bugfix in SipiSize and Cache

* removed debugging output (commented out)

* refactoring of core

* Further reorganization

* More IIIF conformance

* ...

* A lot of documentation and some small fixes

* Documentation

* Docu and small fixes for stability

* Some fixes for cache information in lua

* Docu update and fixes

* better error messages

* CSV mimteype fix

* Update of e2e tests to reflect mimetype change for csv

* Bugfix which made SIPI crash if upscaling an image

* Squashed commit of the following:

commit 9778b19
Author: Ivan Subotic <[email protected]>
Date:   Tue Sep 29 16:23:14 2020 +0200

    fix: printed version strings (DSP-687) (#332)

    * fix init DSP-687 SIPI version strings hardcoded somewhere

    * fix: printed version strings

    Co-authored-by: Ralf Barkow <[email protected]>

commit 9647328
Author: Lukas Rosenthaler <[email protected]>
Date:   Tue Sep 29 11:22:27 2020 +0200

    Fix/issues fixer (#331)

    * Squashed commit of the following:

    commit 4efa7410676e25e36e52cdae9e5d1a5944641776
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Wed Jul 1 11:43:27 2020 +0200

        delete large file

    commit 8693fbe66ccce0b1a679aecb05eca9a56ab16151
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Wed Jul 1 10:52:56 2020 +0200

        Handling of non-image files in knora.json

    commit 641efa3c62499df1f949b29fe93652e9f4d78c71
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Mon Jun 29 18:09:08 2020 +0200

        …

    commit 394d96c5b52e00d3f037bba2551ec0a330c20946
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Mon Jun 29 18:08:58 2020 +0200

        Added support for non-imagefiles

    commit eb792e1
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Wed Jun 24 11:12:17 2020 +0200

        Small fixes

    commit 547d83d
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Tue Jun 23 01:27:33 2020 +0200

        ...

    commit e0e6f3a
    Author: Lukas Rosenthaler <[email protected]>
    Date:   Tue Jun 23 01:27:19 2020 +0200

        Frist commit of new branch

    * fixing issue #287

    * Bugfix in lua: binding of values in prepared SQL

    * Bug fixes of issues

    * more fixes

    * Squashed commit of the following:

    commit 2e4253b
    Author: André Kilchenmann <[email protected]>
    Date:   Thu Jun 25 15:38:46 2020 +0200

        chore(ci): Update release notes on each release (#327)

    commit 0306c33
    Author: Ivan Subotic <[email protected]>
    Date:   Wed Jun 24 21:07:58 2020 +0200

        build: fix publish (#326)

    commit 7cfc5c6
    Author: Ivan Subotic <[email protected]>
    Date:   Wed Jun 24 19:38:39 2020 +0200

        build: fix publish (#325)

    commit d04725a
    Author: Ivan Subotic <[email protected]>
    Date:   Wed Jun 24 17:46:12 2020 +0200

        feature: add IIIF 3.0 support (#324)

    * Missing files added

    * Missing filew…

    * test: add missing file

    * test: trying to fix

    * test: reverting wrong fix

    * Added XML content to XMP file

    * Testing now removes all files created at  the end of testing

    * Bugfix in SipiSize and Cache

    * removed debugging output (commented out)

    * refactoring of core

    * Further reorganization

    * More IIIF conformance

    * ...

    * A lot of documentation and some small fixes

    * Documentation

    * Docu and small fixes for stability

    * Some fixes for cache information in lua

    * Docu update and fixes

    * better error messages

    * CSV mimteype fix

    * Update of e2e tests to reflect mimetype change for csv

    Co-authored-by: Ivan Subotic <[email protected]>

* Added tests for upscaling

Co-authored-by: Ivan Subotic <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benjamingeer benjamingeer benjamingeer approved these changes

@subotic subotic Awaiting requested review from subotic

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lrosenth @benjamingeer @subotic