3 files changed, 45 insertions, 5 deletions
diff --git a/rpkid/portal-gui/scripts/rpkigui-import-routes.py b/rpkid/portal-gui/scripts/rpkigui-import-routes.py
index 324700b0..3df4b83f 100644
--- a/rpkid/portal-gui/scripts/rpkigui-import-routes.py
+++ b/rpkid/portal-gui/scripts/rpkigui-import-routes.py
@@ -1,3 +1,19 @@
+# $Id$
+# Copyright (C) 2012  SPARTA, Inc. a Parsons Company
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND SPARTA DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL SPARTA BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+
 import sys, itertools, re
 import struct
 import _mysql_exceptions
@@ -5,7 +21,7 @@ import _mysql_exceptions
 from django.db import transaction, connection
 
 from rpki.resource_set import resource_range_ipv4, resource_range_ipv6
-from rpki.gui.app.models import Timestamp
+import rpki.gui.app.timestamp
 
 f = open(sys.argv[1])
 
@@ -112,7 +128,6 @@ def commit():
 commit()
 
 print 'Updating timestamp metadata...'
-ts, created = Timestamp.objects.get_or_create(name='bgp_v4_import')
-if not created: ts.save()
+rpki.gui.app.timestamp.update('bgp_v4_import')
 
 sys.exit(0)
diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
index 41557962..5cd9a765 100644
--- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py
+++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
@@ -22,10 +22,11 @@ import time, vobject
 from django.db import transaction
 import django.db.models
 
-from rpki.rcynic import rcynic_xml_iterator, label_iterator
-from rpki.sundial import datetime
 import rpki
+import rpki.gui.app.timestamp
 from rpki.gui.cacheview import models
+from rpki.rcynic import rcynic_xml_iterator, label_iterator
+from rpki.sundial import datetime
 
 debug = False
 
@@ -267,4 +268,6 @@ if __name__ == '__main__':
     process_labels(options.logfile)
     process_cache(options.root, options.logfile)
 
+    rpki.gui.app.timestamp.update('rcynic_import')
+
 # vim:sw=4 ts=8
diff --git a/rpkid/rpki/gui/app/timestamp.py b/rpkid/rpki/gui/app/timestamp.py
new file mode 100644
index 00000000..c460ff86
--- /dev/null
+++ b/rpkid/rpki/gui/app/timestamp.py
@@ -0,0 +1,22 @@
+# $Id$
+# Copyright (C) 2012  SPARTA, Inc. a Parsons Company
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND SPARTA DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL SPARTA BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+
+import models
+
+def update(name):
+    "Set the timestamp value for the given name to the current time."
+    obj, created = models.Timestamp.objects.get_or_create(name=name)
+    if not created: obj.save() # force update for existing objects