in xml2text, change & < to entities

[redakcja.git] / apps / catalogue / management / commands / fixdc.py

diff --git a/apps/catalogue/management/commands/fixdc.py b/apps/catalogue/management/commands/fixdc.py
index 80b341c..3f997d0 100644 (file)
--- a/apps/catalogue/management/commands/fixdc.py
+++ b/apps/catalogue/management/commands/fixdc.py
@@ -18,7 +18,13 @@ class FixDC(XmlUpdater):
         try:
             WLURI.strict(elem.text)
         except ValidationError:
         try:
             WLURI.strict(elem.text)
         except ValidationError:

-            correct_field = unicode(WLURI.from_slug(WLURI(elem.text).slug))
+            correct_field = unicode(WLURI.from_slug(
+                                WLURI(elem.text.strip()).slug))
+            try:
+                WLURI.strict(correct_field)
+            except ValidationError:
+                # Can't make a valid WLURI out of it, leave as is.
+                return False

             if verbose:
                 print "Changing %s from %s to %s" % (
                         elem.tag, elem.text, correct_field
             if verbose:
                 print "Changing %s from %s to %s" % (
                         elem.tag, elem.text, correct_field