diff --git a/files/export/.gitignore b/files/export/.gitignore old mode 100755 new mode 100644 diff --git a/files/processed_images/resized/.gitignore b/files/processed_images/resized/.gitignore old mode 100755 new mode 100644 diff --git a/files/uploads/.gitignore b/files/uploads/.gitignore old mode 100755 new mode 100644 diff --git a/openatlas/database/link.py b/openatlas/database/link.py index fad43fd51..4e3bb4bf7 100644 --- a/openatlas/database/link.py +++ b/openatlas/database/link.py @@ -174,11 +174,10 @@ def get_all_links_for_network( FROM model.link l JOIN model.entity de ON l.domain_id = de.id JOIN model.entity re ON l.range_id = re.id - WHERE de.openatlas_class_name IN %(system_classes)s - AND re.openatlas_class_name IN %(system_classes)s; + WHERE de.openatlas_class_name IN %(system_classes)s + AND re.openatlas_class_name IN %(system_classes)s; """, {'system_classes': tuple(system_classes)}) - # Todo: return list(g.cursor) would be better but triggers an API error return [dict(row) for row in g.cursor.fetchall()] @@ -202,5 +201,4 @@ def get_links_by_id_network(ids: list[int]) -> list[dict[str, Any]]: WHERE l.range_id IN %(ids)s OR l.domain_id IN %(ids)s; """, {'ids': tuple(ids)}) - # Todo: return list(g.cursor) would be better but triggers an API error return [dict(row) for row in g.cursor.fetchall()] diff --git a/openatlas/static/manual/.doctrees/environment.pickle b/openatlas/static/manual/.doctrees/environment.pickle index b97a95654..a8b1b97a3 100644 Binary files a/openatlas/static/manual/.doctrees/environment.pickle and b/openatlas/static/manual/.doctrees/environment.pickle differ diff --git a/openatlas/static/manual/.doctrees/faq.doctree b/openatlas/static/manual/.doctrees/faq.doctree index 23550c85c..c8225a152 100644 Binary files a/openatlas/static/manual/.doctrees/faq.doctree and b/openatlas/static/manual/.doctrees/faq.doctree differ diff --git a/openatlas/static/manual/.doctrees/features.doctree b/openatlas/static/manual/.doctrees/features.doctree index 2eba24f24..fe3cec8d2 100644 Binary files a/openatlas/static/manual/.doctrees/features.doctree and b/openatlas/static/manual/.doctrees/features.doctree differ diff --git a/openatlas/static/manual/.doctrees/overview.doctree b/openatlas/static/manual/.doctrees/overview.doctree index 9b940dcaa..d22dbbf47 100644 Binary files a/openatlas/static/manual/.doctrees/overview.doctree and b/openatlas/static/manual/.doctrees/overview.doctree differ diff --git a/openatlas/static/manual/.doctrees/tools/anthropological_analyses.doctree b/openatlas/static/manual/.doctrees/tools/anthropological_analyses.doctree index 6ef14ed62..b6ed5c7b2 100644 Binary files a/openatlas/static/manual/.doctrees/tools/anthropological_analyses.doctree and b/openatlas/static/manual/.doctrees/tools/anthropological_analyses.doctree differ diff --git a/openatlas/static/manual/.doctrees/tools/image_annotation.doctree b/openatlas/static/manual/.doctrees/tools/image_annotation.doctree index 59cedfd8b..ef2f364c0 100644 Binary files a/openatlas/static/manual/.doctrees/tools/image_annotation.doctree and b/openatlas/static/manual/.doctrees/tools/image_annotation.doctree differ diff --git a/openatlas/static/manual/.doctrees/tools/map.doctree b/openatlas/static/manual/.doctrees/tools/map.doctree index 804c0d296..408369e50 100644 Binary files a/openatlas/static/manual/.doctrees/tools/map.doctree and b/openatlas/static/manual/.doctrees/tools/map.doctree differ diff --git a/openatlas/static/manual/.doctrees/tools/network.doctree b/openatlas/static/manual/.doctrees/tools/network.doctree index 1df0f8e45..acbcf600f 100644 Binary files a/openatlas/static/manual/.doctrees/tools/network.doctree and b/openatlas/static/manual/.doctrees/tools/network.doctree differ diff --git a/openatlas/static/manual/.doctrees/tools/notes.doctree b/openatlas/static/manual/.doctrees/tools/notes.doctree index a3954d444..201a23e65 100644 Binary files a/openatlas/static/manual/.doctrees/tools/notes.doctree and b/openatlas/static/manual/.doctrees/tools/notes.doctree differ diff --git a/openatlas/static/manual/.doctrees/tools/profile.doctree b/openatlas/static/manual/.doctrees/tools/profile.doctree index 58ccbbf1f..f644e6d25 100644 Binary files a/openatlas/static/manual/.doctrees/tools/profile.doctree and b/openatlas/static/manual/.doctrees/tools/profile.doctree differ diff --git a/openatlas/static/manual/.doctrees/tools/radiocarbon_dating.doctree b/openatlas/static/manual/.doctrees/tools/radiocarbon_dating.doctree index b1d3ea2b3..d42d11c20 100644 Binary files a/openatlas/static/manual/.doctrees/tools/radiocarbon_dating.doctree and b/openatlas/static/manual/.doctrees/tools/radiocarbon_dating.doctree differ diff --git a/openatlas/static/manual/.doctrees/tools/search.doctree b/openatlas/static/manual/.doctrees/tools/search.doctree index 202997f28..9f7ba4c58 100644 Binary files a/openatlas/static/manual/.doctrees/tools/search.doctree and b/openatlas/static/manual/.doctrees/tools/search.doctree differ diff --git a/openatlas/static/manual/.doctrees/troubleshooting/display.doctree b/openatlas/static/manual/.doctrees/troubleshooting/display.doctree index fcc88c572..291b76c07 100644 Binary files a/openatlas/static/manual/.doctrees/troubleshooting/display.doctree and b/openatlas/static/manual/.doctrees/troubleshooting/display.doctree differ diff --git a/openatlas/static/manual/.doctrees/troubleshooting/error_codes.doctree b/openatlas/static/manual/.doctrees/troubleshooting/error_codes.doctree index ed3f83d13..be03bbebe 100644 Binary files a/openatlas/static/manual/.doctrees/troubleshooting/error_codes.doctree and b/openatlas/static/manual/.doctrees/troubleshooting/error_codes.doctree differ diff --git a/openatlas/static/manual/.doctrees/troubleshooting/index.doctree b/openatlas/static/manual/.doctrees/troubleshooting/index.doctree index 4f7336a7e..31b1a69f0 100644 Binary files a/openatlas/static/manual/.doctrees/troubleshooting/index.doctree and b/openatlas/static/manual/.doctrees/troubleshooting/index.doctree differ diff --git a/openatlas/static/manual/.doctrees/troubleshooting/login.doctree b/openatlas/static/manual/.doctrees/troubleshooting/login.doctree index c60f864ba..7e43a8fc4 100644 Binary files a/openatlas/static/manual/.doctrees/troubleshooting/login.doctree and b/openatlas/static/manual/.doctrees/troubleshooting/login.doctree differ diff --git a/openatlas/static/manual/.doctrees/ui/date.doctree b/openatlas/static/manual/.doctrees/ui/date.doctree index 22b2227f5..5f0397db5 100644 Binary files a/openatlas/static/manual/.doctrees/ui/date.doctree and b/openatlas/static/manual/.doctrees/ui/date.doctree differ diff --git a/openatlas/static/manual/.doctrees/ui/description.doctree b/openatlas/static/manual/.doctrees/ui/description.doctree index 9a328931b..ae3cf31ce 100644 Binary files a/openatlas/static/manual/.doctrees/ui/description.doctree and b/openatlas/static/manual/.doctrees/ui/description.doctree differ diff --git a/openatlas/static/manual/.doctrees/ui/form.doctree b/openatlas/static/manual/.doctrees/ui/form.doctree index 456764275..e4530e9d6 100644 Binary files a/openatlas/static/manual/.doctrees/ui/form.doctree and b/openatlas/static/manual/.doctrees/ui/form.doctree differ diff --git a/openatlas/static/manual/.doctrees/ui/menu.doctree b/openatlas/static/manual/.doctrees/ui/menu.doctree index 7f4fdd5f6..e19654f31 100644 Binary files a/openatlas/static/manual/.doctrees/ui/menu.doctree and b/openatlas/static/manual/.doctrees/ui/menu.doctree differ diff --git a/openatlas/static/manual/.doctrees/ui/name.doctree b/openatlas/static/manual/.doctrees/ui/name.doctree index 81e272298..373f441a0 100644 Binary files a/openatlas/static/manual/.doctrees/ui/name.doctree and b/openatlas/static/manual/.doctrees/ui/name.doctree differ diff --git a/openatlas/static/manual/.doctrees/ui/table.doctree b/openatlas/static/manual/.doctrees/ui/table.doctree index 594ba5207..af16469ed 100644 Binary files a/openatlas/static/manual/.doctrees/ui/table.doctree and b/openatlas/static/manual/.doctrees/ui/table.doctree differ diff --git a/openatlas/static/manual/faq.html b/openatlas/static/manual/faq.html index 4cfb486a6..02aa38f59 100644 --- a/openatlas/static/manual/faq.html +++ b/openatlas/static/manual/faq.html @@ -105,48 +105,48 @@

FAQ

How to manage multiple projects or case studies

Tag: technical

-

There are two main approaches how to deal with multiple projects or case -studies.

+

There are two main approaches on how to deal with multiple projects or case +studies:

Multiple instances

-

If every project has their own instance (installation) of OpenAtlas than you +

If every project has their own instance (installation) of OpenAtlas then you don’t have to worry about separating the data later. But it would also mean that data can’t be used together, at least not directly.

Shared instance

-

Projects (or case studies) can use the same instance which can be especially -useful if they share data, e.g. information about places or persons.

+

Projects (or case studies) can use the same instance which can be useful if +they share data, such as information about places or persons.

For data separation a custom Type can be created, usually called Case study, which can be:

Later on, e.g. when running analyses or developing a presentation site for one -case study, this type can be used to separate the data via the -API.

+case study, data can be filtered by case studies to separate the data sets +via the API.

How does data access work

Tag: design decision

-

In OpenAtlas it can be chosen if and when to make data public but:

+

If and when data saved in OpenAtlas is shared can be chosen at any point, but:

There is no option (or plans to add one) to hide parts of the data for -specific users. Reasons for this is that it would conflict with one of our core -values (open) but there are also practical reasons, e.g. to avoid duplicates. -If a strict separation is needed, using multiple OpenAtlas instances would -likely be a better alternative.

+specific users as that conflicts with one of our core value - to be open. +Furthermore, there are practical reasons, e.g. to avoid duplicates. +If a strict separation is needed, using multiple OpenAtlas instances might +be a better solution.

How to enter professions

@@ -157,36 +157,36 @@

How to enter professionshere.

How to make files available for the public

-

In case it is planned to share files with the public, e.g. at a presentation -site or a public archive, several criteria have to be met.

+

If you plan on sharing files with the public, e.g. on a presentation +site or a public archive, several criteria have to be met:

Criteria checked by the software

  • The file must exist

  • A license has to be specified

  • -
  • It has to be marked with public sharing allowed

  • +
  • The file has to be marked with public sharing allowed

-

In case these criteria aren’t met, a file won’t be:

+

In case these criteria aren’t met, a file:

    -
  • Shared via the API

  • -
  • Won’t show up on presentation sites developed by the OpenAtlas team

  • -
  • Won’t be included in case the long time archiving -system ARCHE is used

  • +
  • Will not be shared via the API

  • +
  • Will not show up on presentation sites developed by the OpenAtlas team

  • +
  • Will not be included in long-term archiving via +ARCHE

-

But be aware that although the file itself won’t be shared, the file -information (e.g. filename) will still be available (e.g. shown on a +

Be aware that although the file itself won’t be shared, the file +information (such as filenames, etc.) will still be available (e.g. shown on a presentation site).

-

At file -> list at the top you find counts for:

+

At file -> list you find counts for:

    -
  • public files

  • -
  • public files with a missing license

  • -
  • public files with a license but without creator (which many licenses require)

  • +
  • Public files

  • +
  • Public files with a missing license

  • +
  • Public files with a license but without creator (which many licenses require)

@@ -209,15 +209,15 @@

Why can’t a free text field be added via custom typesTag: design decision

A free text entry field would lead to lots of unstructured data. Unstructured data can not be processed automatically and would result in it -not being presented nor searchable in the OpenAtlas system as well as in a -presentation site that presents your data. Therefore, we made the decision, not -to include free text types into the OpenAtlas system. Solutions to this problem -are very case specific, but you could:

+neither being presented nor searchable in the OpenAtlas system as well as in a +presentation site. Therefore, we made the decision, not to include free text +types into the OpenAtlas system. Solutions to this problem are very case +specific, but you could:

@@ -234,11 +234,10 @@

Why can’t longer texts be formattedAPI, and these systems are not necessarily able to handle these formats.

Another reason is that these formats might change over time. All in all it is -more important for us that acquired data is as interoperable, as long as +more important that acquired data is as interoperable for as long as possible.

-

Of course the situation is different for e.g. presentation sites for OpenAtlas -data. There it would be possible to e.g. add manual formatted texts where -needed.

+

For presentation sites and the alike it is possible to add e.g. manually +formatted texts, etc. where needed.

diff --git a/openatlas/static/manual/features.html b/openatlas/static/manual/features.html index 88981252e..e4e76bf6f 100644 --- a/openatlas/static/manual/features.html +++ b/openatlas/static/manual/features.html @@ -110,7 +110,7 @@

Features

Model

The data model specifies the structure in which the information is stored -within the database. The use of an ontology, for example, allows the data to be +within the database. The use of an ontology allows the data to be combined more easily with information from other projects and is consistent with the FAIR principles.

The OpenAtlas Model is based on the international standard of @@ -118,8 +118,8 @@

Model field of humanities.