Skip to content

Commit

Permalink
improve fastapi autodocs, remove unused routing
Browse files Browse the repository at this point in the history
  • Loading branch information
gleasonw committed Sep 21, 2023
1 parent c288645 commit d66bf5d
Show file tree
Hide file tree
Showing 5 changed files with 116 additions and 175 deletions.
66 changes: 33 additions & 33 deletions gallicaGetter/utils/date.py
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
import re


class Date:
dateFormats = [
re.compile(r"^\d{4}-\d{1,2}-\d{1,2}$"),
re.compile(r"^\d{4}-\d{1,2}$"),
re.compile(r"^\d{4}$"),
]

def __init__(self, dateText):
dateText = str(dateText)
self.date = ["", "", ""]
self.dateText = dateText
for dateFormat in Date.dateFormats:
if dateFormat.match(dateText):
for index, entry in enumerate(dateText.split("-")):
self.date[index] = entry

def __repr__(self):
return self.dateText

@property
def year(self) -> str:
return self.date[0]

@property
def month(self) -> str:
return self.date[1]

@property
def day(self) -> str:
return self.date[2]
import re


class Date:
dateFormats = [
re.compile(r"^\d{4}-\d{1,2}-\d{1,2}$"),
re.compile(r"^\d{4}-\d{1,2}$"),
re.compile(r"^\d{4}$"),
]

def __init__(self, dateText):
dateText = str(dateText)
self.date = ["", "", ""]
self.dateText = dateText
for dateFormat in Date.dateFormats:
if dateFormat.match(dateText):
for index, entry in enumerate(dateText.split("-")):
self.date[index] = entry

def __repr__(self):
return self.dateText

@property
def year(self) -> str:
return self.date[0]

@property
def month(self) -> str:
return self.date[1]

@property
def day(self) -> str:
return self.date[2]
7 changes: 3 additions & 4 deletions gallicaGetter/utils/parse_xml.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from lxml import etree
from gallicaGetter.utils.date import Date
from typing import List, Tuple
import re

Expand Down Expand Up @@ -114,12 +113,12 @@ def get_paper_title_from_record_xml(record) -> str:
return paper_title


def get_date_from_record_xml(record) -> Date:
def get_date_from_record_xml(record) -> str:
xml = get_data_from_record_root(record)
date_element = xml.find("{http://purl.org/dc/elements/1.1/}date")
if date_element is not None:
return Date(date_element.text)
return Date("")
return date_element.text
return ""


def get_author_from_record_xml(record) -> str:
Expand Down
5 changes: 3 additions & 2 deletions gallicaGetter/volumeOccurrence.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from typing import Any, Callable, Generator, List, Optional

from models import OccurrenceArgs
from datetime import datetime


@dataclass(frozen=True, slots=True)
Expand All @@ -34,10 +35,10 @@ class VolumeRecord:
paper_code: str
ocr_quality: float
author: str
publisher: Optional[str]
url: str
date: Date
date: str
terms: List[str]
publisher: Optional[str] = None

@property
def ark(self) -> str:
Expand Down
Loading

0 comments on commit d66bf5d

Please sign in to comment.