genre for pictures

diff --git a/apps/picture/tests/picture_import.py b/apps/picture/tests/picture_import.py
index 785aa6d..68c8753 100644 (file)
--- a/apps/picture/tests/picture_import.py
+++ b/apps/picture/tests/picture_import.py
@@ -22,3 +22,12 @@ class PictureTest(WLTestCase):
 
         picture.delete()
         
 
         picture.delete()
         

+
+    def test_import_2(self):
+        picture = Picture.from_xml_file(path.join(path.dirname(__file__), "files/pejzaz-i-miasto-krzyzanowski-chmury.xml"),
+                                        path.join(path.dirname(__file__), "files/pejzaz-i-miasto-krzyzanowski-chmury.jpg"),
+                                        overwrite=True)
+        cats = set([t.category for t in picture.tags])
+        assert 'genre' in cats
+        assert 'kind' in cats
+

diff --git a/lib/librarian b/lib/librarian
index 8f62bd3..6ab2b16 160000 (submodule)
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 8f62bd3a1a38a25e860740dc4054fd034719b477
+Subproject commit 6ab2b1634713a84c9c73905893b25abaa643c08a