#1913: tags in section titles break table of contents

[librarian.git] / librarian / dcparser.py

diff --git a/librarian/dcparser.py b/librarian/dcparser.py
index cf4a7b9..a0eaa04 100644 (file)
--- a/librarian/dcparser.py
+++ b/librarian/dcparser.py
@@ -79,35 +79,43 @@ def as_unicode(text):
     else:
         return text.decode('utf-8')
 
     else:
         return text.decode('utf-8')
 

+def as_wluri_strict(text):
+    return WLURI.strict(text)
+

 class Field(object):
 class Field(object):

-    def __init__(self, uri, attr_name, type=as_unicode, multiple=False, salias=None, **kwargs):
+    def __init__(self, uri, attr_name, validator=as_unicode, strict=None, multiple=False, salias=None, **kwargs):

         self.uri = uri
         self.name = attr_name
         self.uri = uri
         self.name = attr_name

-        self.validator = type
+        self.validator = validator
+        self.strict = strict

         self.multiple = multiple
         self.salias = salias
 
         self.required = kwargs.get('required', True) and not kwargs.has_key('default')
         self.default = kwargs.get('default', [] if multiple else [None])
 
         self.multiple = multiple
         self.salias = salias
 
         self.required = kwargs.get('required', True) and not kwargs.has_key('default')
         self.default = kwargs.get('default', [] if multiple else [None])
 

-    def validate_value(self, val):
+    def validate_value(self, val, strict=False):
+        if strict and self.strict is not None:
+            validator = self.strict
+        else:
+            validator = self.validator

         try:
             if self.multiple:
         try:
             if self.multiple:

-                if self.validator is None:
+                if validator is None:

                     return val
                     return val

-                return [ self.validator(v) if v is not None else v for v in val ]
+                return [ validator(v) if v is not None else v for v in val ]

             elif len(val) > 1:
                 raise ValidationError("Multiple values not allowed for field '%s'" % self.uri)
             elif len(val) == 0:
                 raise ValidationError("Field %s has no value to assign. Check your defaults." % self.uri)
             else:
             elif len(val) > 1:
                 raise ValidationError("Multiple values not allowed for field '%s'" % self.uri)
             elif len(val) == 0:
                 raise ValidationError("Field %s has no value to assign. Check your defaults." % self.uri)
             else:

-                if self.validator is None or val[0] is None:
+                if validator is None or val[0] is None:

                     return val[0]
                     return val[0]

-                return self.validator(val[0])
+                return validator(val[0])

         except ValueError, e:
             raise ValidationError("Field '%s' - invald value: %s" % (self.uri, e.message))
 
         except ValueError, e:
             raise ValidationError("Field '%s' - invald value: %s" % (self.uri, e.message))
 

-    def validate(self, fdict):
+    def validate(self, fdict, strict=False):

         if not fdict.has_key(self.uri):
             if not self.required:
                 f = self.default
         if not fdict.has_key(self.uri):
             if not self.required:
                 f = self.default


@@ -116,7 +124,7 @@ class Field(object):
         else:
             f = fdict[self.uri]
 
         else:
             f = fdict[self.uri]
 

-        return self.validate_value(f)
+        return self.validate_value(f, strict=strict)

 
     def __eq__(self, other):
         if isinstance(other, Field) and other.name == self.name:
 
     def __eq__(self, other):
         if isinstance(other, Field) and other.name == self.name:


@@ -134,7 +142,7 @@ class DCInfo(type):
                     try:
                         fields.index(field)
                     except ValueError:
                     try:
                         fields.index(field)
                     except ValueError:

-                        fields = (field,) + fields
+                        fields.insert(0, field)

 
         class_dict['FIELDS'] = tuple(fields)
         return super(DCInfo, meta).__new__(meta, classname, bases, class_dict)
 
         class_dict['FIELDS'] = tuple(fields)
         return super(DCInfo, meta).__new__(meta, classname, bases, class_dict)


@@ -162,18 +170,18 @@ class WorkInfo(object):
 
         Field( DCNS('source'), 'source_name', required=False),
         Field( DCNS('source.URL'), 'source_url', required=False),
 
         Field( DCNS('source'), 'source_name', required=False),
         Field( DCNS('source.URL'), 'source_url', required=False),

-        Field( DCNS('identifier.url'), 'url', WLURI),
+        Field( DCNS('identifier.url'), 'url', WLURI, strict=as_wluri_strict),

         Field( DCNS('rights.license'), 'license', required=False),
         Field( DCNS('rights'), 'license_description'),
     )
 
     @classmethod
         Field( DCNS('rights.license'), 'license', required=False),
         Field( DCNS('rights'), 'license_description'),
     )
 
     @classmethod

-    def from_string(cls, xml):
+    def from_string(cls, xml, *args, **kwargs):

         from StringIO import StringIO
         from StringIO import StringIO

-        return cls.from_file(StringIO(xml))
+        return cls.from_file(StringIO(xml), *args, **kwargs)

 
     @classmethod
 
     @classmethod

-    def from_file(cls, xmlfile):
+    def from_file(cls, xmlfile, *args, **kwargs):

         desc_tag = None
         try:
             iter = etree.iterparse(xmlfile, ['start', 'end'])
         desc_tag = None
         try:
             iter = etree.iterparse(xmlfile, ['start', 'end'])


@@ -194,14 +202,14 @@ class WorkInfo(object):
             # if there is no end, Expat should yell at us with an ExpatError
 
             # extract data from the element and make the info
             # if there is no end, Expat should yell at us with an ExpatError
 
             # extract data from the element and make the info

-            return cls.from_element(desc_tag)
+            return cls.from_element(desc_tag, *args, **kwargs)

         except XMLSyntaxError, e:
             raise ParseError(e)
         except ExpatError, e:
             raise ParseError(e)
 
     @classmethod
         except XMLSyntaxError, e:
             raise ParseError(e)
         except ExpatError, e:
             raise ParseError(e)
 
     @classmethod

-    def from_element(cls, rdf_tag):
+    def from_element(cls, rdf_tag, *args, **kwargs):

         # the tree is already parsed, so we don't need to worry about Expat errors
         field_dict = {}
         desc = rdf_tag.find(".//" + RDFNS('Description'))
         # the tree is already parsed, so we don't need to worry about Expat errors
         field_dict = {}
         desc = rdf_tag.find(".//" + RDFNS('Description'))


@@ -214,10 +222,9 @@ class WorkInfo(object):
             fv.append(e.text)
             field_dict[e.tag] = fv
 
             fv.append(e.text)
             field_dict[e.tag] = fv
 

-        print field_dict
-        return cls(desc.attrib, field_dict)
+        return cls(desc.attrib, field_dict, *args, **kwargs)

 
 

-    def __init__(self, rdf_attrs, dc_fields):
+    def __init__(self, rdf_attrs, dc_fields, strict=False):

         """rdf_attrs should be a dictionary-like object with any attributes of the RDF:Description.
         dc_fields - dictionary mapping DC fields (with namespace) to list of text values for the
         given field. """
         """rdf_attrs should be a dictionary-like object with any attributes of the RDF:Description.
         dc_fields - dictionary mapping DC fields (with namespace) to list of text values for the
         given field. """


@@ -226,16 +233,11 @@ class WorkInfo(object):
         self.fmap = {}
 
         for field in self.FIELDS:
         self.fmap = {}
 
         for field in self.FIELDS:

-            value = field.validate( dc_fields )
+            value = field.validate(dc_fields, strict=strict)

             setattr(self, 'prop_' + field.name, value)
             self.fmap[field.name] = field
             if field.salias: self.fmap[field.salias] = field
 
             setattr(self, 'prop_' + field.name, value)
             self.fmap[field.name] = field
             if field.salias: self.fmap[field.salias] = field
 

-        self.validate()
-
-    def validate(self):
-        self.url.validate_language(self.language)
-

     def __getattribute__(self, name):
         try:
             field = object.__getattribute__(self, 'fmap')[name]
     def __getattribute__(self, name):
         try:
             field = object.__getattribute__(self, 'fmap')[name]


@@ -351,7 +353,10 @@ class BookInfo(WorkInfo):
                 
         Field( DCNS('contributor.translator'), 'translators', \
             as_person,  salias='translator', multiple=True, default=[]),
                 
         Field( DCNS('contributor.translator'), 'translators', \
             as_person,  salias='translator', multiple=True, default=[]),

-        Field( DCNS('relation.hasPart'), 'parts', WLURI, multiple=True, required=False),
+        Field( DCNS('relation.hasPart'), 'parts', 
+            WLURI, strict=as_wluri_strict, multiple=True, required=False),
+        Field( DCNS('relation.isVariantOf'), 'variant_of', 
+            WLURI, strict=as_wluri_strict, required=False),

 
         Field( DCNS('relation.cover_image.url'), 'cover_url', required=False),
         Field( DCNS('relation.cover_image.attribution'), 'cover_by', required=False),
 
         Field( DCNS('relation.cover_image.url'), 'cover_url', required=False),
         Field( DCNS('relation.cover_image.attribution'), 'cover_by', required=False),