standardize db col names and some preliminary work for public corpora

This commit is contained in:
Patrick Jentsch 2022-11-29 15:27:50 +01:00
parent f8d4b601f7
commit 5864aa653e

View File

@ -532,7 +532,7 @@ class TesseractOCRPipelineModel(FileMixin, HashidMixin, db.Model):
publisher_url = db.Column(db.String(512)) publisher_url = db.Column(db.String(512))
publishing_url = db.Column(db.String(512)) publishing_url = db.Column(db.String(512))
publishing_year = db.Column(db.Integer) publishing_year = db.Column(db.Integer)
shared = db.Column(db.Boolean, default=False) is_public = db.Column(db.Boolean, default=False)
# Backrefs: user: User # Backrefs: user: User
@property @property
@ -576,7 +576,7 @@ class TesseractOCRPipelineModel(FileMixin, HashidMixin, db.Model):
model.publisher_url = m['publisher_url'] model.publisher_url = m['publisher_url']
model.publishing_url = m['publishing_url'] model.publishing_url = m['publishing_url']
model.publishing_year = m['publishing_year'] model.publishing_year = m['publishing_year']
model.shared = True model.is_public = True
model.title = m['title'] model.title = m['title']
model.version = m['version'] model.version = m['version']
continue continue
@ -587,7 +587,7 @@ class TesseractOCRPipelineModel(FileMixin, HashidMixin, db.Model):
publisher_url=m['publisher_url'], publisher_url=m['publisher_url'],
publishing_url=m['publishing_url'], publishing_url=m['publishing_url'],
publishing_year=m['publishing_year'], publishing_year=m['publishing_year'],
shared=True, is_public=True,
title=m['title'], title=m['title'],
user=nopaque_user, user=nopaque_user,
version=m['version'] version=m['version']
@ -629,7 +629,7 @@ class TesseractOCRPipelineModel(FileMixin, HashidMixin, db.Model):
'publisher_url': self.publisher_url, 'publisher_url': self.publisher_url,
'publishing_url': self.publishing_url, 'publishing_url': self.publishing_url,
'publishing_year': self.publishing_year, 'publishing_year': self.publishing_year,
'shared': self.shared, 'is_public': self.is_public,
'title': self.title, 'title': self.title,
'version': self.version, 'version': self.version,
**self.file_mixin_to_json_serializeable() **self.file_mixin_to_json_serializeable()
@ -656,7 +656,7 @@ class SpaCyNLPPipelineModel(FileMixin, HashidMixin, db.Model):
publishing_url = db.Column(db.String(512)) publishing_url = db.Column(db.String(512))
publishing_year = db.Column(db.Integer) publishing_year = db.Column(db.Integer)
pipeline_name = db.Column(db.String(64)) pipeline_name = db.Column(db.String(64))
shared = db.Column(db.Boolean, default=False) is_public = db.Column(db.Boolean, default=False)
# Backrefs: user: User # Backrefs: user: User
@property @property
@ -700,7 +700,7 @@ class SpaCyNLPPipelineModel(FileMixin, HashidMixin, db.Model):
model.publisher_url = m['publisher_url'] model.publisher_url = m['publisher_url']
model.publishing_url = m['publishing_url'] model.publishing_url = m['publishing_url']
model.publishing_year = m['publishing_year'] model.publishing_year = m['publishing_year']
model.shared = True model.is_public = True
model.title = m['title'] model.title = m['title']
model.version = m['version'] model.version = m['version']
model.pipeline_name = m['pipeline_name'] model.pipeline_name = m['pipeline_name']
@ -712,7 +712,7 @@ class SpaCyNLPPipelineModel(FileMixin, HashidMixin, db.Model):
publisher_url=m['publisher_url'], publisher_url=m['publisher_url'],
publishing_url=m['publishing_url'], publishing_url=m['publishing_url'],
publishing_year=m['publishing_year'], publishing_year=m['publishing_year'],
shared=True, is_public=True,
title=m['title'], title=m['title'],
user=nopaque_user, user=nopaque_user,
version=m['version'], version=m['version'],
@ -756,7 +756,7 @@ class SpaCyNLPPipelineModel(FileMixin, HashidMixin, db.Model):
'publishing_url': self.publishing_url, 'publishing_url': self.publishing_url,
'publishing_year': self.publishing_year, 'publishing_year': self.publishing_year,
'pipeline_name': self.pipeline_name, 'pipeline_name': self.pipeline_name,
'shared': self.shared, 'is_public': self.is_public,
'title': self.title, 'title': self.title,
'version': self.version, 'version': self.version,
**self.file_mixin_to_json_serializeable() **self.file_mixin_to_json_serializeable()
@ -1024,6 +1024,7 @@ class CorpusFile(FileMixin, HashidMixin, db.Model):
corpus_id = db.Column(db.Integer, db.ForeignKey('corpora.id')) corpus_id = db.Column(db.Integer, db.ForeignKey('corpora.id'))
# Fields # Fields
author = db.Column(db.String(255)) author = db.Column(db.String(255))
description = db.Column(db.String(255))
publishing_year = db.Column(db.Integer) publishing_year = db.Column(db.Integer)
title = db.Column(db.String(255)) title = db.Column(db.String(255))
address = db.Column(db.String(255)) address = db.Column(db.String(255))