Skip to content

Commit 9a5fb77

Browse files
author
André Kilchenmann
authored
feat!: New features and refactoring (#1779)
* fix: Typo in PR template * docs: Refactor README
1 parent 593ffab commit 9a5fb77

2 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎.github/pull_request_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
===REMOVE===
2-
Important! Please follow the new quideline for setting the Pull Request title: https://docs.dasch.swiss/developers/dsp/contribution/#pull-request-guidelines
2+
Important! Please follow the new guideline for setting the Pull Request title: https://docs.dasch.swiss/developers/dsp/contribution/#pull-request-guidelines
33
===REMOVE===
44

55
resolves DSP-

‎README.md‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
[![Build Status](https://github.com/dasch-swiss/knora-api/workflows/CI/badge.svg?branch=main)](https://github.com/dasch-swiss/knora-api/actions)
2-
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7e7c734a37ef403a964345e29106b267)](https://app.codacy.com/app/dhlab-basel/Knora?utm_source=github.com&utm_medium=referral&utm_content=dhlab-basel/Knora&utm_campaign=Badge_Grade_Dashboard)
3-
# Knora
1+
# Knora — Knowledge Organization, Representation, and Annotation
42

5-
[Knora](https://www.knora.org/) (Knowledge Organization, Representation, and
6-
Annotation) is a server application for storing, sharing, and working with
7-
primary sources and data in the humanities.
3+
[![Github](https://img.shields.io/github/v/tag/dasch-swiss/dsp-api?include_prereleases&label=Github%20tag)](https://github.com/dasch-swiss/dsp-api)
4+
[![Docker](https://img.shields.io/docker/v/daschswiss/knora-api?label=Docker%20image)](https://hub.docker.com/r/daschswiss/knora-api)
5+
[![CI](https://github.com/dasch-swiss/dsp-app/workflows/CI/badge.svg)](https://github.com/dasch-swiss/dsp-api/actions?query=workflow%3ACI)
6+
7+
[Knora](https://www.knora.org/) is a server application for storing, sharing, and working with primary sources and data in the humanities.
88

99
It is developed by the [Data and Service Center for the Humanities](https://dasch.swiss)
1010
at the [University of Basel](https://www.unibas.ch), and is supported by the
@@ -17,11 +17,11 @@ released under the [GNU Affero General Public License](http://www.gnu.org/licens
1717
## Features
1818

1919
* Stores humanities data as industry-standard [RDF](http://www.w3.org/TR/2014/NOTE-rdf11-primer-20140624/) graphs, plus files for binary data such as digitized primary sources.
20-
* Designed to work with any standards-compliant RDF triplestore. Tested with [Jena Fuseki](https://jena.apache.org/).
20+
* Designed to work with any standards-compliant RDF triplestore. Tested with [Jena Fuseki](https://jena.apache.org/).
2121
* Based on [OWL](http://www.w3.org/TR/2012/REC-owl2-primer-20121211/) ontologies that express abstract, cross-disciplinary commonalities in the structure and semantics of research data.
2222
* Offers a generic HTTP-based API, implemented in [Scala](https://www.scala-lang.org/), for querying, annotating, and linking together heterogeneous data in a unified way.
23-
* Handles authentication and authorization.
24-
* Provides automatic versioning of data.
23+
* Handles authentication and authorization.
24+
* Provides automatic versioning of data.
2525
* Uses [Sipi](https://www.sipi.io), a high-performance media server implemented in C++.
2626
* Designed to be be used with [DSP-APP](https://docs.dasch.swiss/user-guide/), a general-purpose, browser-based virtual research environment,
2727
as well as with custom user interfaces.
@@ -59,23 +59,23 @@ Each developer machine should have the following prerequisites installed:
5959

6060
To install, follow these steps:
6161

62-
```bash
63-
$ brew tap AdoptOpenJDK/openjdk
64-
$ brew cask install AdoptOpenJDK/openjdk/adoptopenjdk11
62+
```shell
63+
brew tap AdoptOpenJDK/openjdk
64+
brew cask install AdoptOpenJDK/openjdk/adoptopenjdk11
6565
```
6666

6767
To pin the version of Java, please add this environment variable to you startup script (bashrc, etc.):
6868

69-
```
69+
```shell
7070
export JAVA_HOME=`/usr/libexec/java_home -v 11`
7171
```
7272

7373
#### Bazel build tools
7474

7575
To install, follow these steps:
7676

77-
```
78-
$ npm install -g @bazel/bazelisk
77+
```shell
78+
npm install -g @bazel/bazelisk
7979
```
8080

8181
This will install [bazelisk](https://github.com/bazelbuild/bazelisk) which is
@@ -95,40 +95,40 @@ With [Bazel](https://docs.bazel.build/versions/3.3.0/install-os-x.html) and
9595
[Docker](https://www.docker.com) installed, run the following to create a test
9696
repository and load some test data into the triplestore:
9797

98-
```
99-
$ make init-db-test
98+
```shell
99+
make init-db-test
100100
```
101101

102102
Then we need to start knora-api after loading the data:
103103

104-
```
105-
$ make stack-up
104+
```shell
105+
make stack-up
106106
```
107107

108108
Then try opening [http://localhost:3333/v2/resources/http%3A%2F%2Frdfh.ch%2F0803%2Fc5058f3a](http://localhost:3333/v2/resources/http%3A%2F%2Frdfh.ch%2F0803%2Fc5058f3a) in a web browser. You should see a response in JSON-LD describing a book.
109109

110110
To shut down the Knora-Stack:
111111

112-
```
113-
$ make stack-down
112+
```shell
113+
make stack-down
114114
```
115115

116116
### Run the automated tests
117117

118118
Run :
119119

120-
```
121-
$ make test
120+
```shell
121+
make test
122122
```
123123

124124
### Running with Custom Folders
125125

126126
The `$ make stack-up` target can be additionally configured thorough the
127127
following environment variables:
128128

129-
- `KNORA_DB_HOME`: sets the path to the folder where the triplestore will store
129+
* `KNORA_DB_HOME`: sets the path to the folder where the triplestore will store
130130
the database files
131-
- `KNORA_DB_IMPORT`: sets the path to the import directory accessible from
131+
* `KNORA_DB_IMPORT`: sets the path to the import directory accessible from
132132
inside the docker image
133133

134134
If the import and/or data directory are not set, then Docker volumes will be
@@ -210,11 +210,11 @@ A pull request usually resolves one issue or user story defined on [Youtrack](ht
210210

211211
## Acknowledgments
212212

213-
![](https://www.yourkit.com/images/yklogo.png)
213+
![YourKit](https://www.yourkit.com/images/yklogo.png)
214214

215215
The Knora project is using YourKit for profiling.
216216

217217
YourKit supports open source projects with its full-featured Java Profiler.
218-
YourKit, LLC is the creator of <a href="https://www.yourkit.com/java/profiler/">YourKit Java Profiler</a>
219-
and <a href="https://www.yourkit.com/.net/profiler/">YourKit .NET Profiler</a>,
218+
YourKit, LLC is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler/)
219+
and [YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/),
220220
innovative and intelligent tools for profiling Java and .NET applications.

0 commit comments

Comments
 (0)