Skip to content

2 new optional parameters on load-records #1101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

2 new optional parameters on load-records #1101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
699f85f
this introduces 2 elements up for discussion
pvgenuchten Apr 1, 2025
0a3af85
use source also to delete record sets
pvgenuchten Apr 1, 2025
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
39 changes: 29 additions & 10 deletions pycsw/core/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#
# =================================================================

import hashlib
import json
import logging
import os
Expand All @@ -49,7 +50,7 @@
LOGGER = logging.getLogger(__name__)


def load_records(context, database, table, xml_dirpath, recursive=False, force_update=False):
def load_records(context, database, table, xml_dirpath, recursive=False, hashidentifier='NEVER', source='local', force_update=False):
"""Load metadata records from directory of files to database"""

repo = repository.Repository(database, context, table=table)
Expand Down Expand Up @@ -99,9 +100,16 @@ def load_records(context, database, table, xml_dirpath, recursive=False, force_u
LOGGER.info('Inserting %s %s into database %s, table %s ....',
rec.typename, rec.identifier, database, table)

# hash identifier to prevent 404 when using it as parameter
if hashidentifier.upper() == 'ALWAYS' or (hashidentifier.upper() == 'DOUBLESLASH' and rec.identifier.contains('//')): #noqa
rec.identifier = hashlib.md5(rec.identifier.encode()).hexdigest()

# TODO: do this as CSW Harvest
try:
repo.insert(rec, 'local', util.get_today_and_now())

if source != 'local':
rec.mdsource = source
repo.insert(rec, source, util.get_today_and_now())
loaded_files.add(recfile)
LOGGER.info('Inserted %s', recfile)
except Exception as err:
Expand Down Expand Up @@ -346,14 +354,16 @@ def validate_xml(xml, xsd):
raise RuntimeError('ERROR: %s' % str(err)) from err


def delete_records(context, database, table):
def delete_records(context, source, database, table):
"""Deletes all records from repository"""

LOGGER.info('Deleting all records')

repo = repository.Repository(database, context, table=table)
repo.delete(constraint={'where': '', 'values': []})

if source == 'all':
repo.delete(constraint={'where': '', 'values': []})
else:
repo.delete(constraint={'where': f"mdsource == '{source}'", 'values': []})

def cli_option_verbosity(f):
def callback(ctx, param, value):
Expand All @@ -377,7 +387,7 @@ def callback(ctx, param, value):

CLI_OPTION_YES_PROMPT = click.option('--yes', '-y', is_flag=True,
default=False,
prompt='This will delete all records! Continue?',
prompt='This will delete all or a set of records! Continue?',
help='Bypass confirmation')


Expand Down Expand Up @@ -417,9 +427,13 @@ def cli_setup_repository(ctx, config, verbosity):
help='File or directory path to metadata records',
type=click.Path(exists=True, resolve_path=True, file_okay=True))
@click.option('--recursive', '-r', is_flag=True,
default=False, help='Bypass confirmation')
default=False, help='Recurse into subfolders')
@click.option('--hashidentifier', '-h', required=False,
default='NEVER', help='MD5 Hash of the identifier, values NEVER|ALWAYS|DOUBLESLASH') # noqa
@click.option('--source', '-s', required=False,
default='local', help='The source of the record')
@CLI_OPTION_YES
def cli_load_records(ctx, config, path, recursive, yes, verbosity):
def cli_load_records(ctx, config, path, recursive, hashidentifier, source, yes, verbosity):
"""Load metadata records from directory or file into repository"""

with open(config, encoding='utf8') as fh:
Expand All @@ -433,6 +447,8 @@ def cli_load_records(ctx, config, path, recursive, yes, verbosity):
cfg['repository']['table'],
path,
recursive,
hashidentifier,
source,
yes
)

Expand All @@ -441,9 +457,11 @@ def cli_load_records(ctx, config, path, recursive, yes, verbosity):
@cli_callbacks
@click.pass_context
@CLI_OPTION_CONFIG
@click.option('--source', '-s', required=False,
default='all', help='Remove only records from a source')
@CLI_OPTION_YES_PROMPT
def cli_delete_records(ctx, config, yes, verbosity):
"""Delete all records from repository"""
def cli_delete_records(ctx, config, source, yes, verbosity):
"""Delete records from repository"""

with open(config, encoding='utf8') as fh:
cfg = yaml_load(fh)
Expand All @@ -452,6 +470,7 @@ def cli_delete_records(ctx, config, yes, verbosity):

delete_records(
context,
source,
cfg['repository']['database'],
cfg['repository']['table']
)
Expand Down