Fixed serial number generation error message when series is undefined.

tendril/entityhub/db/controller.py

@@ -34,9 +34,20 @@
 logger = log.get_logger(__name__, log.DEFAULT)
 
 
+class SeriesNotFound(Exception):
+    pass
+
+
+class SerialNoNotFound(Exception):
+    pass
+
+
 @with_db
 def get_series_obj(series=None, session=None):
-    return session.query(SerialNumberSeries).filter_by(series=series).one()
+    try:
+        return session.query(SerialNumberSeries).filter_by(series=series).one()
+    except NoResultFound:
+        raise SeriesNotFound('Series {0} is not defined.'.format(series))
 
 
 @with_db
@@ -75,7 +86,10 @@ def get_serialnos_by_series(series=None, session=None):
 def get_serialno_object(sno=None, session=None):
     if sno is None:
         raise AttributeError("sno cannot be None")
-    return session.query(SerialNumber).filter_by(sno=sno).one()
+    try:
+        return session.query(SerialNumber).filter_by(sno=sno).one()
+    except NoResultFound:
+        raise SerialNoNotFound("Serial No {0} not defined.".format(sno))
 
 
 @with_db

tendril/entityhub/serialnos.py

@@ -107,9 +107,14 @@ def delete_serialno(sno, recurse=False, session=None):
 
 @with_db
 def get_serialno(series=None, efield=None, register=True,
-                 start_seed='100A', session=None):
+                 start_seed='100A', create_series=False, session=None):
     series = series.upper()
-    series_obj = controller.get_series_obj(series=series, session=session)
+    try:
+        series_obj = controller.get_series_obj(series=series, session=session)
+    except controller.SeriesNotFound:
+        if not create_series:
+            raise
+        series_obj = None
     if series_obj is not None:
         last_seed = series_obj.last_seed
         logger.debug("Found last seed for series " + str(series) +