ocrd 3.3.1__py3-none-any.whl → 3.3.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ocrd/mets_server.py +1 -1
- ocrd/resolver.py +4 -0
- {ocrd-3.3.1.dist-info → ocrd-3.3.2.dist-info}/METADATA +1 -1
- {ocrd-3.3.1.dist-info → ocrd-3.3.2.dist-info}/RECORD +8 -8
- {ocrd-3.3.1.dist-info → ocrd-3.3.2.dist-info}/LICENSE +0 -0
- {ocrd-3.3.1.dist-info → ocrd-3.3.2.dist-info}/WHEEL +0 -0
- {ocrd-3.3.1.dist-info → ocrd-3.3.2.dist-info}/entry_points.txt +0 -0
- {ocrd-3.3.1.dist-info → ocrd-3.3.2.dist-info}/top_level.txt +0 -0
ocrd/mets_server.py
CHANGED
|
@@ -131,7 +131,7 @@ class ClientSideOcrdMets:
|
|
|
131
131
|
def __init__(self, url, workspace_path: Optional[str] = None):
|
|
132
132
|
self.protocol = "tcp" if url.startswith("http://") else "uds"
|
|
133
133
|
self.log = getLogger(f"ocrd.models.ocrd_mets.client.{url}")
|
|
134
|
-
self.url = url if self.protocol == "tcp" else f'http+unix://{url.replace("/", "%2F")}'
|
|
134
|
+
self.url = url if self.protocol == "tcp" else f'http+unix://{url.replace("/", "%2F").replace(".", "%2E")}'
|
|
135
135
|
self.ws_dir_path = workspace_path if workspace_path else None
|
|
136
136
|
|
|
137
137
|
if self.protocol == "tcp" and "tcp_mets" in self.url:
|
ocrd/resolver.py
CHANGED
|
@@ -308,4 +308,8 @@ class Resolver():
|
|
|
308
308
|
if not is_file_in_directory(directory, mets_url):
|
|
309
309
|
raise ValueError("--mets '%s' has a directory part inconsistent with --directory '%s'" % (mets_url, directory))
|
|
310
310
|
|
|
311
|
+
if mets_server_url and not mets_server_url.startswith('http://'):
|
|
312
|
+
# UDS socket
|
|
313
|
+
mets_server_url = str(Path(mets_server_url).resolve())
|
|
314
|
+
|
|
311
315
|
return str(Path(directory).resolve()), str(mets_url), str(mets_basename), mets_server_url
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
ocrd/__init__.py,sha256=ZswMVmlqFhAEIzMR3my6IKPq9XLH21aDPC_m_8Jh4dA,1076
|
|
2
2
|
ocrd/constants.py,sha256=6dn3mG54WqHsKInmLZp4kJjNqqPtBoFoSuLUuRbOps0,740
|
|
3
3
|
ocrd/lib.bash,sha256=le6XqAOEacdjP3JNSlPkxwRH1y0oVjNQM2tX5d6QFO4,10901
|
|
4
|
-
ocrd/mets_server.py,sha256=
|
|
4
|
+
ocrd/mets_server.py,sha256=cplsjQ5OMsBRDPLLbN-6qr3VETg6xOX21tdJOxwgCWk,22471
|
|
5
5
|
ocrd/ocrd-all-tool.json,sha256=EYXmMzP68p3KzL8nUZ16TCX2chQzKkAeISvuXqI_yIw,2094
|
|
6
|
-
ocrd/resolver.py,sha256=
|
|
6
|
+
ocrd/resolver.py,sha256=A7BrZlUGrfJye-etaEuT-fdJFgvQcCxWovjufT-WmRY,15119
|
|
7
7
|
ocrd/resource_list.yml,sha256=82-PiqkZnka1kTj3MQqNn4wXWKHHtoFchsQuetWuqFs,2633
|
|
8
8
|
ocrd/resource_manager.py,sha256=kIWDoKxWH4IJE1gcoTcCRQjYjieCqiQclyuyF6Y9b8A,16813
|
|
9
9
|
ocrd/task_sequence.py,sha256=spiaUQaMM7M8WdBDoQGmLuTPm7tOugYXD6rcJ2UXzxw,6991
|
|
@@ -120,9 +120,9 @@ ocrd_validators/xlink.xsd,sha256=8fW7YAMWXN2PbB_MMvj9H5ZeFoEBDzuYBtlGC8_6ijw,318
|
|
|
120
120
|
ocrd_validators/xsd_mets_validator.py,sha256=4GWfLyqkmca0x7osDuXuExYuM0HWVrKoqn0S35sFhHU,467
|
|
121
121
|
ocrd_validators/xsd_page_validator.py,sha256=BNz_9u-Ek4UCeyZu3KxSQoolfW9lvuaSR9nIu1XXxeE,467
|
|
122
122
|
ocrd_validators/xsd_validator.py,sha256=6HrVAf6SzCvfUIuQdIzz9bOq4V-zhyii9yrUPoK2Uvo,2094
|
|
123
|
-
ocrd-3.3.
|
|
124
|
-
ocrd-3.3.
|
|
125
|
-
ocrd-3.3.
|
|
126
|
-
ocrd-3.3.
|
|
127
|
-
ocrd-3.3.
|
|
128
|
-
ocrd-3.3.
|
|
123
|
+
ocrd-3.3.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
|
124
|
+
ocrd-3.3.2.dist-info/METADATA,sha256=ovylNGJP1F1XfiV0cgYS1MXdkJr0YkTWJp9GOrvFYvk,10442
|
|
125
|
+
ocrd-3.3.2.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
|
|
126
|
+
ocrd-3.3.2.dist-info/entry_points.txt,sha256=4hcJ2LkK_OlIabHnKgFit35Ap7b5Lz1Gb4hzkxV0Kiw,152
|
|
127
|
+
ocrd-3.3.2.dist-info/top_level.txt,sha256=pUgiN42t4KXC5rvpi6V8atza31XP4SCznXpXlVlvomM,75
|
|
128
|
+
ocrd-3.3.2.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|