From 5b824432e6a01335d0db784e1c9c454ec06a0eed Mon Sep 17 00:00:00 2001
From: "Matthew Dillon (diogenes)" <mrdillon@alaska.edu>
Date: Mon, 16 Sep 2013 05:28:01 -0800
Subject: [PATCH] Added resolution column to dataset db table

---
 snapindices/database.py |  7 ++++---
 snapindices/forms.py    | 10 ++++++----
 snapindices/models.py   |  7 +++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/snapindices/database.py b/snapindices/database.py
index a8d35e8..e1fe920 100644
--- a/snapindices/database.py
+++ b/snapindices/database.py
@@ -60,7 +60,7 @@ def init_db():
             endyr = 2099
         starttime = datetime.datetime.now()
         print datetime.datetime.now().strftime('%m-%d-%Y %I:%M%p')
-        print filename, startyr, endyr, dataset.model, dataset.scenario
+        print filename, startyr, endyr, dataset.model, dataset.scenario, dataset.resolution
 
         extracted_temps = dataset.extract_points(northings, eastings,
                                                  startyr, endyr)
@@ -75,11 +75,12 @@ def init_db():
                                               models.Dataset.scenario == dataset.scenario).first()
 
         if dataset_sql is None:
-            print "not in dataset...", (dataset.model, dataset.scenario)
+            print "not in dataset table...", (dataset.model, dataset.scenario)
             dataset_sql = models.Dataset(datasetType,
                              dataset.model,
                              modelnames[dataset.model],
-                             dataset.scenario)
+                             dataset.scenario,
+                             dataset.resolution)
             db_session.add(dataset_sql)
             datasets.append((dataset.model, dataset.scenario))
             db_session.commit()
diff --git a/snapindices/forms.py b/snapindices/forms.py
index e320895..7c59768 100644
--- a/snapindices/forms.py
+++ b/snapindices/forms.py
@@ -17,6 +17,7 @@ class SNAPYearField(IntegerField):
             self.validators = [validators.NumberRange(min=ymin, max=ymax),
                                validators.Required()]
 
+
 def communities():
     return Community.query.order_by('name')
 
@@ -24,10 +25,11 @@ def datasets():
     return Dataset.query.order_by('datatype', 'model', 'scenario')
 
 def dataset_names(ds):
-    return "{type} - {modelname} {scenario}".format(modelname=ds.modelname,
-                                                      scenario=ds.scenario,
-                                                      type=ds.datatype.lower()\
-                                                           .capitalize())
+    return "{type} ({resolution}) - {modelname} {scenario}".format(modelname=ds.modelname,
+                                                                   scenario=ds.scenario,
+                                                                   type=ds.datatype.lower()\
+                                                                        .capitalize(),
+                                                                   resolution=ds.resolution)
 
 class SNAPForm(Form):
     community = QuerySelectField(query_factory=communities,
diff --git a/snapindices/models.py b/snapindices/models.py
index e552ac0..d15b7b5 100644
--- a/snapindices/models.py
+++ b/snapindices/models.py
@@ -90,18 +90,21 @@ class Dataset(Base):
     model = Column(String(15), nullable=False)
     modelname = Column(String(50), nullable=True)
     scenario = Column(String(15), nullable=False)
+    resolution = Column(String(15), nullable=False)
 
     temperatures = relationship("Temperature", backref='datasets')
 
-    def __init__(self, datatype, model, modelname, scenario):
+    def __init__(self, datatype, model, modelname, scenario, resolution):
         self.datatype = datatype
         self.model = model
         self.modelname = modelname
         self.scenario = scenario
+        self.resolution = resolution
 
     def __repr__(self):
         return "Dataset{data}".format(data=(self.datatype, self.model,
-                                            self.modelname, self.scenario))
+                                            self.modelname, self.scenario,
+                                            self.resolution))
 
 
 class Temperature(Base):