From: Diane Trout <diane@ghic.org>
Date: Tue, 10 Jun 2014 22:48:46 +0000 (-0700)
Subject: Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=1ce0dd6915b2a183be02eaf84de334acc4b4c392;hp=3fede36522514b41753f0cb9d034110ec259c905

Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
---

diff --git a/htsworkflow/frontend/experiments/models.py b/htsworkflow/frontend/experiments/models.py
index ce2f6b7..6c952db 100644
--- a/htsworkflow/frontend/experiments/models.py
+++ b/htsworkflow/frontend/experiments/models.py
@@ -395,7 +395,7 @@ class FileType(models.Model):
     name = models.CharField(max_length=50)
     mimetype = models.CharField(max_length=50, null=True, blank=True)
     # regular expression from glob.fnmatch.translate
-    regex = models.CharField(max_length=50, null=True, blank=True)
+    regex = models.TextField(null=True, blank=True)
 
     def parse_filename(self, pathname):
         """Does filename match our pattern?