Changeset c547de5

Timestamp:

Nov 3, 2012, 4:16:53 PM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

251503b

Parents:

5f1eaa3

git-author:

Alex Dehnert <adehnert@…> (11/03/12 16:16:53)

git-committer:

Alex Dehnert <adehnert@…> (11/03/12 16:16:53)

Message:

Improve the header of the exported HTML files

Files in question are /mit/asa-db/data/db-dump/{midway,website}_groups.html, as
generated by groups/format_groups.py midway and util/export_website_groups.py.

Added information:

• Paths to /mit/asa-db/data/db-dump/*.html generated files (ASA-#134)
• Timestamp of generation (ASA-#135)
• Who can re-run the scripts (ASA-#136)
• Which groups are included

Location:

asadb

Files:

• groups/format_groups.py (modified) (3 diffs)
• util/export_website_groups.py (modified) (3 diffs)

asadb/groups/format_groups.py

@@ -2 +2 @@
 
 import csv
+import datetime
 import os
 import sys
@@ -45 +46 @@
     'midway' : {
         'prefix': """
-        <!-- Automatically generated by %(script)s %(mode)s.
-        Do not edit; instead re-run that script (or edit it as necessary). -->
+        <!--
+        Automatically generated by %(script)s %(mode)s on %(date)s.
+        Do not edit; instead ask a DB maintainer (asa-db@) to re-run that script (or edit script as necessary).
+
+        A more recent version may be in /mit/asa-db/data/db-dump/midway_groups.html.
+        Includes active, suspended, applying, and NGE's (status) who aren't Dorm/FSILG (class).
+        -->
         """,
         'format' : '<option value="%(html_name)s">%(html_name)s</option>',
@@ -74 +80 @@
     predicate = spec['predicate']
     gs = groups.models.Group.objects.filter(predicate).distinct()
-    static_args = {'script': 'groups/format_groups.py', 'mode':mode, }
+    static_args = {
+        'script': 'groups/format_groups.py',
+        'mode':mode,
+        'date':datetime.datetime.now(),
+    }
     if 'prefix' in spec:
         print spec['prefix'] % static_args

asadb/util/export_website_groups.py

@@ -5 +5 @@
 
 import codecs
+import datetime
 import os
 import sys
@@ -18 +19 @@
 
 TMPL = Template(u"""
-<!-- Automatically generated by asadb/util/export_website_groups.py.
-Do not edit; instead re-run that script (or edit it as necessary). -->
+<!--
+Automatically generated by asadb/util/export_website_groups.py on {{date}}.
+Do not edit; instead ask a DB maintainer (asa-db@) to re-run that script (or edit script as necessary).
+
+A more recent version may be in /mit/asa-db/data/db-dump/website_groups.html.
+Includes groups with status is_active=True (ie, Suspended and Active groups).
+-->
 {% for group in groups %}
 <tr><td>
@@ -32 +38 @@
 
 if __name__ == '__main__':
-    ctx = Context(
-        {'groups': groups.models.Group.objects.filter(group_status__is_active=True)}
-    )
-    out = codecs.getwriter('utf8')(sys.stdout)
+    ctx = Context({
+        'groups': groups.models.Group.objects.filter(group_status__is_active=True),
+        'date': datetime.datetime.now(),
+    })
+    out = codecs.getwriter('utf-8')(sys.stdout)
     out.write(TMPL.render(ctx))