Bug fixes involving field names.

[plstackapi.git] / planetstack / apigen / modelgen

diff --git a/planetstack/apigen/modelgen b/planetstack/apigen/modelgen
index 4c8a0f1..e75467e 100755 (executable)
--- a/planetstack/apigen/modelgen
+++ b/planetstack/apigen/modelgen
@@ -2,24 +2,35 @@
 
 import os
 import pdb
+import copy
 import sys
 import json
 import re
 from django.template import Context, Template
 
+blacklist = ['SingletonModel','PlCoreBase']
+
 # Django set up
 
 sys.path.append('.')
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
-from django.db.models.fields.related import ForeignKey
+from django.db.models.fields.related import ForeignKey, ManyToManyField
 from core.models import *
 
+def singular(foo, keys):
+       for k in keys:
+               if (foo==k+'es'):
+                       return k
+               elif (foo==k+'s'):
+                       return k
+       raise Exception('Plural to singular error for %s'%foo)
+
 g = globals()
 
 def enum_classes():
        model_classes = []
        for c in g.values():
-               if type(c)==type(PlCoreBase):
+               if type(c)==type(PlCoreBase) and c.__name__ not in blacklist:
                        model_classes.append(c)
        return model_classes
 
@@ -32,17 +43,21 @@ class GenObj(object):
                self.model = m
                self.props = []
                self.refs = []
+               self.plural_name = None
 
        def plural(self):
-               name = str(self)
-               if (name.endswith('s')):
-                       return name+'es'
+               if (self.plural_name):
+                       return self.plural_name
                else:
-                       return name+'s'
+                       name = str(self)
+                       if (name.endswith('s')):
+                               return name+'es'
+                       else:
+                               return name+'s'
 
        def camel(self):
                name = str(self.model.__name__)
-               return name.title()
+               return name
                
 class Generator(dict):
        def all(self):
@@ -59,13 +74,43 @@ class Generator(dict):
 
        def compute_links(self):
                for obj in self.values():
+                       #if (str(obj)=='siteprivilege'):
+                       #       pdb.set_trace()
                        fields = obj.model._meta.fields
                        for f in fields:
                                if type(f)==ForeignKey and f.name in self.keys():
                                        refobj = self[f.name]
                                        obj.refs.append(refobj)
+                                       related_name = f.related_query_name()
+                                       if (related_name.lower()!=str(obj).lower()):
+                                               cobj = copy.deepcopy(obj)
+                                               cobj.multi = True
+                                               cobj.plural_name = related_name
+                                               refobj.refs.append(cobj)
                                else:
                                        obj.props.append(f.name)
+                       m2m = obj.model._meta.many_to_many
+                       for f in m2m:
+                               try:
+                                       related_model_name = f.m2m_reverse_field_name()
+                               except:
+                                       related_model_name = f.m2m_db_table().rsplit('_',1)[-1]
+
+                               if related_model_name in self.keys():
+                       #               pdb.set_trace()
+                                       refobj = self[related_model_name]
+                                       cobj = copy.deepcopy(obj)
+                                       cobj.multi=True
+                                       refobj.refs.append(cobj)
+                               
+                               if (related_name.lower()!=str(obj).lower()):
+                                       cobj = copy.deepcopy(obj)
+                                       cobj.multi = True
+                                       cobj.plural_name = related_name
+                                       refobj.refs.append(obj)
+
+
+
                        
 def main():
        try: