From 87a2bce93c11d43cc11583a80cc356231e3ddfe2 Mon Sep 17 00:00:00 2001
From: "Gerber, Mike" <mike.gerber@sbb.spk-berlin.de>
Date: Thu, 16 Jan 2020 15:44:26 +0100
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=20Update=20calamari-models=20URL=20+?=
 =?UTF-8?q?=20path?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build            | 4 ++--
 data             | 2 +-
 my_ocrd_workflow | 2 +-
 requirements.txt | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/build b/build
index f7ab567..a425d8a 100755
--- a/build
+++ b/build
@@ -5,13 +5,13 @@
 DATA_SUBDIR=data
 
 get_from_annex() {
-  annex_get 'calamari-models/GT4HistOCR/*.ckpt*'
+  annex_get 'calamari-models/GT4HistOCR/2019-07-22T15:49+0200/*.ckpt*'
   annex_get 'tesseract-models/GT4HistOCR/*.traineddata'
   annex_get 'textline_detection/*.h5'
 }
 
 get_from_web() {
-  download_to 'https://qurator-data.de/calamari-models/GT4HistOCR/model.tar.xz'  'calamari-models/GT4HistOCR'
+  download_to 'https://qurator-data.de/calamari-models/GT4HistOCR/model.tar.xz' 'calamari-models/GT4HistOCR/2019-07-22T15:49+0200'
   download_to 'https://qurator-data.de/tesseract-models/GT4HistOCR/models.tar'   'tesseract-models/GT4HistOCR'
   # FIXME needs update download_to 'https://file.spk-berlin.de:8443/textline_detection/models.tar.gz'         'textline_detection'
 }
diff --git a/data b/data
index f6f7dd4..dcd3643 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit f6f7dd40cf309dbc7ce31f2df6b4ae52949d1c78
+Subproject commit dcd364391768317ce6cb14f0a3300a191d0a63a9
diff --git a/my_ocrd_workflow b/my_ocrd_workflow
index cec0b84..4783cdd 100755
--- a/my_ocrd_workflow
+++ b/my_ocrd_workflow
@@ -100,7 +100,7 @@ do_ocr() {
 }
 
 do_ocr_calamari() {
-  ocrd_calamari_recognize_parameters='{ "checkpoint": "/var/lib/calamari-models/GT4HistOCR/*.ckpt.json" }'
+  ocrd_calamari_recognize_parameters='{ "checkpoint": "/var/lib/calamari-models/GT4HistOCR/2019-07-22T15:49+0200/*.ckpt.json" }'
   remove_filegrp OCR-D-OCR-CALAMARI mets.xml
   ocrd-calamari-recognize -l $LOG_LEVEL \
     -m mets.xml -I OCR-D-SEG-LINE -O OCR-D-OCR-CALAMARI \
diff --git a/requirements.txt b/requirements.txt
index f9ff51c..90907ef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,6 @@ ocrd_tesserocr
 
 https://github.com/mikegerber/ocrd_calamari/archive/6949876.tar.gz
 
-
-vendor/sbb_textline_detector-5757025.tar
+https://github.com/qurator-spk/sbb_textline_detector/archive/1446d7c6.tar.gz
 
 https://github.com/qurator-spk/dinglehopper/archive/c305539.tar.gz