Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions journal/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,7 @@ def _add_institution_history(
initial_date=None,
final_date=None,
location=None,
raw_text=None,
):
"""Adiciona instituição usando InstitutionHistory genérico."""
if not original_data and not organization:
Expand Down Expand Up @@ -1106,6 +1107,8 @@ def _add_institution_history(
)
institution_history.journal = self
institution_history.organization = organization
# Populate raw_text from raw_text parameter or original_data
institution_history.raw_text = raw_text if raw_text is not None else original_data
institution_history.save()
return institution_history

Expand All @@ -1117,6 +1120,7 @@ def add_publisher(
initial_date=None,
final_date=None,
location=None,
raw_text=None,
):
"""Adiciona publisher usando PublisherHistory."""
return self._add_institution_history(
Expand All @@ -1128,6 +1132,7 @@ def add_publisher(
initial_date=initial_date,
final_date=final_date,
location=location,
raw_text=raw_text,
)

def add_owner(
Expand All @@ -1138,6 +1143,7 @@ def add_owner(
initial_date=None,
final_date=None,
location=None,
raw_text=None,
):
"""Adiciona owner usando OwnerHistory."""
return self._add_institution_history(
Expand All @@ -1149,6 +1155,7 @@ def add_owner(
initial_date=initial_date,
final_date=final_date,
location=location,
raw_text=raw_text,
)

def add_sponsor(
Expand All @@ -1159,6 +1166,7 @@ def add_sponsor(
initial_date=None,
final_date=None,
location=None,
raw_text=None,
):
"""Adiciona sponsor usando SponsorHistory."""
return self._add_institution_history(
Expand All @@ -1170,6 +1178,7 @@ def add_sponsor(
initial_date=initial_date,
final_date=final_date,
location=location,
raw_text=raw_text,
)

def add_copyright_holder(
Expand All @@ -1180,6 +1189,7 @@ def add_copyright_holder(
initial_date=None,
final_date=None,
location=None,
raw_text=None,
):
"""Adiciona copyright_holder usando CopyrightHolderHistory."""
return self._add_institution_history(
Expand All @@ -1191,6 +1201,7 @@ def add_copyright_holder(
initial_date=initial_date,
final_date=final_date,
location=location,
raw_text=raw_text,
)


Expand Down
6 changes: 6 additions & 0 deletions journal/sources/am_to_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,14 @@ def update_panel_institution(
user=user,
original_data=p,
location=location,
raw_text=p,
)
# Usa novo método add_owner ao invés de OwnerHistory
journal.add_owner(
user=user,
original_data=p,
location=location,
raw_text=p,
)
journal.contact_name = p

Expand Down Expand Up @@ -541,6 +543,7 @@ def get_or_create_sponsor(sponsor, journal, user, location=None):
user=user,
original_data=s,
location=location,
raw_text=s,
)


Expand Down Expand Up @@ -822,6 +825,7 @@ def get_or_create_copyright_holder(journal, copyright_holder_name, user, locatio
user=user,
original_data=cp,
location=location,
raw_text=cp,
)
except Exception as e:
exc_type, exc_value, exc_traceback = sys.exc_info()
Expand Down Expand Up @@ -936,12 +940,14 @@ def create_location_and_add_institutions(
user=user,
original_data=p,
location=location,
raw_text=p,
)
# Adiciona owner (mesmo dado do publisher por padrão)
journal.add_owner(
user=user,
original_data=p,
location=location,
raw_text=p,
)

# Adiciona sponsor(s) se fornecido
Expand Down