0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

cleanup ids

Browse source
This commit is contained in:
j 2014-05-24 12:50:27 +02:00
parent bea8efe6c4
commit a1833cc937
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
oml/item/api.py
View file

@ -20,6 +20,7 @@ from websocket import trigger_event
import metaremote as meta import metaremote as meta
import utils import utils
from utils import cleanup_id
import logging import logging
logger = logging.getLogger('oml.item.api') logger = logging.getLogger('oml.item.api')
@ -120,8 +121,7 @@ def edit(data):
if data['primaryid']: if data['primaryid']:
key, value = data['primaryid'] key, value = data['primaryid']
logger.debug('update primaryid %s %s', key, value) logger.debug('update primaryid %s %s', key, value)
if key == 'isbn': value = cleanup_id(key, value)
value = utils.normalize_isbn(value)
item.update_primaryid(key, value) item.update_primaryid(key, value)
else: else:
item.update_primaryid() item.update_primaryid()
@ -181,8 +181,7 @@ def getMetadata(data):
else: else:
include_edits = False include_edits = False
key, value = data.iteritems().next() key, value = data.iteritems().next()
if key == 'isbn': value = cleanup_id(key, value)
value = utils.normalize_isbn(value)
response = meta.lookup(key, value) response = meta.lookup(key, value)
if include_edits: if include_edits:
response.update(models.Metadata.load(key, value)) response.update(models.Metadata.load(key, value))

7
oml/utils.py
View file

@ -25,6 +25,13 @@ logger = logging.getLogger('oml.utils')
ENCODING='base64' ENCODING='base64'
def cleanup_id(key, value):
if key == 'isbn':
value = normalize_isbn(value)
if key in ('lccn', 'olid', 'oclc'):
value = ''.join([v for v in value if v!='-'])
return value
def valid_olid(id): def valid_olid(id):
return id.startswith('OL') and id.endswith('M') return id.startswith('OL') and id.endswith('M')