blindly commit working version, this may need tweaks <holds breath>

forestofthings · Dec 4, 2018 · 2b7dabd · 2b7dabd
1 parent b065e50
commit 2b7dabd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/irsdb/metadata/management/commands/generate_schemas_from_metadata.py b/irsdb/metadata/management/commands/generate_schemas_from_metadata.py
@@ -116,7 +116,7 @@ def write_sked(self, schedule):
 
             variables_in_this_part = Variable.objects.filter(
                 parent_sked_part=form_part.parent_sked_part,
-                versions__contains=CANONICAL_VERSION,
+                version_end='',
             ).exclude(in_a_group=True).order_by('ordering',)
             if variables_in_this_part:
                 # only write it if it contains anything
@@ -132,7 +132,7 @@ def write_sked(self, schedule):
 
         groups_in_this_sked = Group.objects.filter(
             parent_sked=schedule,
-            versions__contains=CANONICAL_VERSION,
+            version_end='',
         ).order_by('ordering',)
 
         for group in groups_in_this_sked:
@@ -148,7 +148,7 @@ def write_sked(self, schedule):
 
             variables_in_this_group = Variable.objects.filter(
                     db_table=group.db_name,
-                    versions__contains=CANONICAL_VERSION,
+                    version_end='',
                 ).order_by('ordering',)
 
             if variables_in_this_group:

diff --git a/irsdb/metadata/management/commands/load_metadata.py b/irsdb/metadata/management/commands/load_metadata.py
@@ -24,11 +24,11 @@ def reload_variables(self, *args, **options):
             if i%REPORT_COUNT == 0:
                 print("Created %s rows" % i)
 
-            if CANONICAL_VERSION in row['versions']:
-                row['is_canonical'] = True
-                row['canonical_version'] = CANONICAL_VERSION
-            else:
-                row['is_canonical'] = False
+            #if CANONICAL_VERSION in row['versions']:
+            #    row['is_canonical'] = True
+            #    row['canonical_version'] = CANONICAL_VERSION
+            #else:
+            #    row['is_canonical'] = False
             Variable.objects.create(**row)
         print("Total Variables %s" % i)
 

diff --git a/irsdb/metadata/models.py b/irsdb/metadata/models.py
@@ -18,7 +18,8 @@ class Variable(IRSxBase):
     db_type = models.CharField(max_length=63, blank=True, null=True, help_text="db type", editable=False)
     line_number = models.CharField(max_length=255, blank=True, null=True, help_text="IRS line number. Missing in returnheader", editable=False)
     description = models.TextField(help_text="IRS-supplied description, from .xsd. ") 
-    versions = models.TextField(help_text="semicolon-delimited  ") 
+    version_start = models.TextField(help_text="Start year", null=True) 
+    version_end = models.TextField(help_text="End year", null=True) 
     is_canonical = models.NullBooleanField(help_text="", default=False) 
     canonical_version = models.CharField(max_length=16, blank=True, null=True, help_text="canonical_version", editable=False)
 
@@ -30,7 +31,8 @@ class Group(IRSxBase):
     line_number = models.CharField(max_length=255, blank=True, null=True, help_text="IRS-supplied line numbers. Missing for returnheaders", editable=False) 
     description = models.TextField(help_text="IRS-supplied description, from .xsd. ") 
     headless = models.NullBooleanField(help_text="", default=False) 
-    versions = models.TextField(help_text="IRS-supplied description, from .xsd. ")
+    version_start = models.TextField(help_text="Start year", null=True) 
+    version_end = models.TextField(help_text="End year", null=True) 
 
     def get_absolute_url(self):
         return ("/metadata/groups/%s.html" % self.db_name)
@@ -48,10 +50,12 @@ def get_absolute_url(self):
 
 class LineNumber(models.Model):
     xpath = models.CharField(max_length=255, blank=True, null=True, help_text="xpath", editable=False) #is this not equivalent to xpath? 
-    versions = models.TextField(help_text="versions") 
+    version_start = models.TextField(help_text="Start year", null=True) 
+    version_end = models.TextField(help_text="End year", null=True) 
     line_number = models.CharField(max_length=255, blank=True, null=True, help_text="IRS-supplied line numbers. Missing for returnheaders", editable=False) 
 
 class Description(models.Model):
     xpath = models.CharField(max_length=255, blank=True, null=True, help_text="xpath", editable=False) #is this not equivalent to xpath? 
-    versions = models.TextField(help_text="versions") 
+    version_start = models.TextField(help_text="Start year", null=True) 
+    version_end = models.TextField(help_text="End year", null=True) 
     description = models.TextField(help_text="description") 
diff --git a/irsdb/return/management/commands/load_filings.py b/irsdb/return/management/commands/load_filings.py
@@ -52,8 +52,8 @@ def process_sked(self, sked):
 
 
     def run_filing(self, filing):
-
         object_id = filing.object_id
+        print("run_filing %s" % object_id)
 
         parsed_filing = self.xml_runner.run_filing(object_id)
         if not parsed_filing: