1 files changed, 14 insertions, 10 deletions
diff --git a/chimere/models.py b/chimere/models.py
index be84036..e7a0f8f 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -46,7 +46,8 @@ from chimere.widgets import HiddenPointChooserWidget, PointField, RouteField, \
                             DatePickerWidget
 from chimere.managers import BaseGeoManager
 from chimere.utils import KMLManager, OSMManager, ShapefileManager, \
-                      GeoRSSManager, CSVManager, HtmlXsltManager, XMLXsltManager
+    GeoRSSManager, CSVManager, HtmlXsltManager, XMLXsltManager, JsonManager
+
 
 class Page(models.Model):
     """Simple extra pages
@@ -316,13 +317,14 @@ STATUS = (('S', _(u'Submited')),
           ('I', _(u'Imported')))
 STATUS_DCT = dict(STATUS)
 
-IMPORTERS = {'KML':KMLManager,
-             'OSM':OSMManager,
-             'SHP':ShapefileManager,
-             'RSS':GeoRSSManager,
-             'CSV':CSVManager,
-             'XSLT':HtmlXsltManager,
-             'XXLT':XMLXsltManager
+IMPORTERS = {'KML': KMLManager,
+             'OSM': OSMManager,
+             'SHP': ShapefileManager,
+             'RSS': GeoRSSManager,
+             'CSV': CSVManager,
+             'JSON': JsonManager,
+             'XSLT': HtmlXsltManager,
+             'XXLT': XMLXsltManager
              }
 
 IMPORTER_CHOICES = (('KML', 'KML'),
@@ -330,20 +332,21 @@ IMPORTER_CHOICES = (('KML', 'KML'),
                     ('SHP', 'Shapefile'),
                     ('RSS', 'GeoRSS'),
                     ('CSV', 'CSV'),
+                    ('JSON', 'JSON'),
                     ('XSLT', 'HTML-XSLT'),
                     ('XXLT', 'XML-XSLT'),
                     )
 
 IMPORTER_CHOICES_DICT = dict(IMPORTER_CHOICES)
 
+
 class Importer(models.Model):
     '''
     Data importer for a specific subcategory
     '''
     importer_type = models.CharField(_(u"Importer type"), max_length=4,
                                      choices=IMPORTER_CHOICES)
-    filtr = models.CharField(_(u"Filter"), max_length=200,
-                             blank=True, null=True)
+    filtr = models.TextField(_(u"Filter"), blank=True, null=True)
     source = models.CharField(_(u"Web address"), max_length=200,
                               blank=True, null=True,
                               help_text=_(u"Don't forget the trailing slash"))
@@ -410,6 +413,7 @@ class Importer(models.Model):
             dct[key_cat.key] = key_cat.category
         return dct
 
+
 class ImporterKeyCategories(models.Model):
     """
     Association between key and categories