[open-ils-commits] r49 - in servres/trunk/conifer: doc/graphs syrup

[svn at svn.open-ils.org]

Author: gfawcett
Date: 2008-11-24 22:33:21 -0500 (Mon, 24 Nov 2008)
New Revision: 49

Added:
   servres/trunk/conifer/doc/graphs/model_to_graphviz.py
Removed:
   servres/trunk/conifer/syrup/model_to_graphviz.py
Modified:
   servres/trunk/conifer/syrup/models.py
Log:
cleanup of syrup folder; documentation stub for Course.item_tree


Copied: servres/trunk/conifer/doc/graphs/model_to_graphviz.py (from rev 48, servres/trunk/conifer/syrup/model_to_graphviz.py)
===================================================================
--- servres/trunk/conifer/doc/graphs/model_to_graphviz.py	                        (rev 0)
+++ servres/trunk/conifer/doc/graphs/model_to_graphviz.py	2008-11-25 03:33:21 UTC (rev 49)
@@ -0,0 +1,31 @@
+# Generate a graph visualization from the model. Requires Graphviz.
+# To run, from conifer directory:
+# DJANGO_SETTINGS_MODULE=conifer.settings PYTHONPATH=.. python syrup/model_to_graphviz.py  | fdp -Tpng > /tmp/syrup-model.png
+
+import django.db.models
+#import conifer.syrup.models as models
+import conifer.syrup.direct_models as models
+
+from django.db.models.fields.related import ForeignRelatedObjectsDescriptor
+
+print 'digraph a {'
+print '{ splines=true; }'
+print 'graph [ label="dotted-end is the foreign (\'many\') end", splines=true ]'
+
+all = set(); linked = set(); primary = set()
+
+for name, value in models.__dict__.items():
+    if isinstance(value, type) and issubclass(value, django.db.models.Model):
+        local = value.__name__
+        all.add(local)
+        for k, v in value.__dict__.items():
+            if isinstance(v, ForeignRelatedObjectsDescriptor):
+                foreign = v.related.model.__name__
+                print '%s -> %s [ arrowhead=dot, arrowtail=none ];' % (local, foreign)
+                primary.add(local); linked.add(local); linked.add(foreign)
+for n in (all - linked):
+    print '%s [ style=dashed ]' % n
+
+for n in primary:
+    print '%s [ color=blue ]' % n
+print '}'

Deleted: servres/trunk/conifer/syrup/model_to_graphviz.py
===================================================================
--- servres/trunk/conifer/syrup/model_to_graphviz.py	2008-11-25 03:20:02 UTC (rev 48)
+++ servres/trunk/conifer/syrup/model_to_graphviz.py	2008-11-25 03:33:21 UTC (rev 49)
@@ -1,31 +0,0 @@
-# Generate a graph visualization from the model. Requires Graphviz.
-# To run, from conifer directory:
-# DJANGO_SETTINGS_MODULE=conifer.settings PYTHONPATH=.. python syrup/model_to_graphviz.py  | fdp -Tpng > /tmp/syrup-model.png
-
-import django.db.models
-#import conifer.syrup.models as models
-import conifer.syrup.direct_models as models
-
-from django.db.models.fields.related import ForeignRelatedObjectsDescriptor
-
-print 'digraph a {'
-print '{ splines=true; }'
-print 'graph [ label="dotted-end is the foreign (\'many\') end", splines=true ]'
-
-all = set(); linked = set(); primary = set()
-
-for name, value in models.__dict__.items():
-    if isinstance(value, type) and issubclass(value, django.db.models.Model):
-        local = value.__name__
-        all.add(local)
-        for k, v in value.__dict__.items():
-            if isinstance(v, ForeignRelatedObjectsDescriptor):
-                foreign = v.related.model.__name__
-                print '%s -> %s [ arrowhead=dot, arrowtail=none ];' % (local, foreign)
-                primary.add(local); linked.add(local); linked.add(foreign)
-for n in (all - linked):
-    print '%s [ style=dashed ]' % n
-
-for n in primary:
-    print '%s [ color=blue ]' % n
-print '}'

Modified: servres/trunk/conifer/syrup/models.py
===================================================================
--- servres/trunk/conifer/syrup/models.py	2008-11-25 03:20:02 UTC (rev 48)
+++ servres/trunk/conifer/syrup/models.py	2008-11-25 03:33:21 UTC (rev 49)
@@ -117,6 +117,16 @@
     def items(self):
         return Item.objects.filter(course=self.id)
 
+    def item_tree(self):
+        """
+        Return a list, representing a tree of the course items, in
+        display order.  Every element of the list is an (Item, [Item])
+        tuple, where the second element is the (optional) list of
+        sub-elements (if a heading) or None (if an item).
+        """
+        raise NotImplementedError
+
+
 class Member(m.Model):
     course = m.ForeignKey(Course)
     user = m.ForeignKey(User)