fnp / librarian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 262c708 808e7c2)
merged a conflict in dcparser fields
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Tue, 20 Dec 2011 10:16:31 +0000 (11:16 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Tue, 20 Dec 2011 10:16:31 +0000 (11:16 +0100)
1  2 
librarian/dcparser.py patch | diff1 | diff2 | blob | history

diff --cc librarian/dcparser.py
index aacbdbe,4fd0f66..245cf92
--- 1/librarian/dcparser.py
--- 2/librarian/dcparser.py
+++ b/librarian/dcparser.py
@@@ -163,10 -159,7 +163,9 @@@ class WorkInfo(object)
          Field( DCNS('source'), 'source_name', required=False),
          Field( DCNS('source.URL'), 'source_url', required=False),
          Field( DCNS('identifier.url'), 'url', WLURI),
- 
 -        )
 +        Field( DCNS('rights.license'), 'license', required=False),
 +        Field( DCNS('rights'), 'license_description'),
 +    )
  
      @classmethod
      def from_string(cls, xml):