Import some attributes, aliases and relationships from the rfc_index_mirror table

 - Legacy-Id: 2737

Author: OleLaursen

ietf/idrfc/idrfc_wrapper.py

@@ -287,10 +287,10 @@ def __init__(self, rfcindex, rfc=None, idinternal=None):
                 self.draft_name = self._rfcindex.draft
 
     def _rfc_doc_list(self, name):
-        if (not self._rfcindex) or (not self._rfcindex.__dict__[name]):
+        if (not self._rfcindex) or (not getattr(self._rfcindex, name)):
             return None
         else:
-            s = self._rfcindex.__dict__[name]
+            s = getattr(self._rfcindex, name)
             s = s.replace(",", ",  ")
             s = re.sub("([A-Z])([0-9])", "\\1 \\2", s)
             return s

ietf/idrfc/models.py

@@ -96,4 +96,8 @@ def __str__(self):
         return "DraftVersions"+self.filename+self.revision+str(self.revision_date)
     class Meta:
         db_table = "draft_versions_mirror"
-    
+
+
+from django.conf import settings
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    from redesign.doc.proxy import RfcIndex

ietf/idrfc/views_doc.py

@@ -149,7 +149,8 @@ def _get_history(doc, versions):
     results = []
     if settings.USE_DB_REDESIGN_PROXY_CLASSES:
         versions = [] # clear versions
-        for e in doc._draft.event_set.all().select_related('by').order_by('-time'):
+        event_holder = doc._draft if hasattr(doc, "_draft") else doc._rfcindex
+        for e in event_holder.event_set.all().select_related('by').order_by('-time'):
             info = {}
             if e.type == "new_revision":
                 filename = u"%s-%s" % (e.doc.name, e.newrevision.rev)

redesign/doc/models.py

@@ -10,7 +10,7 @@
 
 class DocumentInfo(models.Model):
     """Any kind of document.  Draft, RFC, Charter, IPR Statement, Liaison Statement"""
-    time = models.DateTimeField() # should probably have auto_now=True
+    time = models.DateTimeField(default=datetime.datetime.now) # should probably have auto_now=True
     # Document related
     type = models.ForeignKey(DocTypeName, blank=True, null=True) # Draft, Agenda, Minutes, Charter, Discuss, Guideline, Email, Review, Issue, Wiki, External ...
     title = models.CharField(max_length=255)
@@ -103,8 +103,8 @@ def save_with_history(self, force_insert=False, force_update=False):
         super(Document, self).save(force_insert, force_update)
 
 class RelatedDocHistory(models.Model):
-    document = models.ForeignKey('DocHistory')
-    doc_alias = models.ForeignKey('DocAlias', related_name="reversely_related_document_history_set")
+    document = models.ForeignKey('DocHistory') # source
+    doc_alias = models.ForeignKey('DocAlias', related_name="reversely_related_document_history_set") # target
     relationship = models.ForeignKey(DocRelationshipName)
     def __unicode__(self):
         return u"%s %s %s" % (self.document.name, self.relationship.name.lower(), self.doc_alias.name)
@@ -127,7 +127,8 @@ def __unicode__(self):
         return "%s-->%s" % (self.name, self.document.name)
     document_link = admin_link("document")
     class Meta:
-        verbose_name_plural = "aliases"
+        verbose_name = "document alias"
+        verbose_name_plural = "document aliases"
 
 class SendQueue(models.Model):
     time = models.DateTimeField()       # Scheduled at this time
@@ -165,6 +166,7 @@ class SendQueue(models.Model):
     ("expired_document", "Expired document"),
     ("requested_resurrect", "Requested resurrect"),
     ("completed_resurrect", "Completed resurrect"),
+    ("published_rfc", "Published RFC"),
 
     # IESG events
     ("sent_ballot_announcement", "Sent ballot announcement"),

redesign/doc/proxy.py

@@ -10,7 +10,8 @@
 class InternetDraft(Document):
     objects = TranslatingManager(dict(filename="name",
                                       id_document_tag="id",
-                                      status="state"))
+                                      status="state",
+                                      rfc_number=lambda v: ("docalias__name", "rfc%s" % v)))
 
     DAYS_TO_EXPIRE=185
 
@@ -46,7 +47,7 @@ def revision_date(self):
     #file_type = models.CharField(max_length=20)
     @property
     def file_type(self):
-        matches = glob.glob(os.path.join(settings.INTERNET_DRAFT_PATH, self.filename + "*.*"))
+        matches = glob.glob(os.path.join(settings.INTERNET_DRAFT_PATH, self.name + "*.*"))
         possible_types = [".txt", ".pdf", ".xml", ".ps"]
         res = set()
         for m in matches:
@@ -133,7 +134,7 @@ def last_modified_date(self):
     #replaced_by = models.ForeignKey('self', db_column='replaced_by', blank=True, null=True, related_name='replaces_set')
     @property
     def replaced_by(self):
-        r = InternetDraft.objects.filter(related__document=self, related__relateddocument__relationship="replaces")
+        r = InternetDraft.objects.filter(relateddocument__doc_alias__document=self, relateddocument__relationship="replaces")
         return r[0] if r else None
 
     #replaces = FKAsOneToOne('replaces', reverse=True)
@@ -144,7 +145,7 @@ def replaces(self):
 
     @property
     def replaces_set(self):
-        return InternetDraft.objects.filter(docalias__relateddocument__relationship="replaces", docalias__relateddocument__document=self)
+        return InternetDraft.objects.filter(docalias__relateddocument__document=self, docalias__relateddocument__relationship="replaces")
 
     #review_by_rfc_editor = models.BooleanField()
     @property
@@ -548,6 +549,71 @@ def needed(self, standardsTrack=True):
 
 	return answer.rstrip()
 
+
+    # things from RfcIndex
+    
+    #rfc_number = models.IntegerField(primary_key=True) # already taken care of
+    #title = models.CharField(max_length=250) # same name
+    #authors = models.CharField(max_length=250) FIXME
+    #rfc_published_date = models.DateField()
+    @property
+    def rfc_published_date(self):
+        e = self.latest_event(type="published_rfc")
+        return e.time.date() if e else None
 
+    #current_status = models.CharField(max_length=50,null=True)
+    @property
+    def current_status(self):
+        return self.std_level
+
+    #updates = models.CharField(max_length=200,blank=True,null=True)
+    @property
+    def updates(self):
+        return ",".join(sorted("RFC%s" % d.rfc_number for d in InternetDraft.objects.filter(docalias__relateddocument__document=self, docalias__relateddocument__relationship="updates")))
+
+    #updated_by = models.CharField(max_length=200,blank=True,null=True)
+    @property
+    def updated_by(self):
+        return ",".join(sorted("RFC%s" % d.rfc_number for d in InternetDraft.objects.filter(relateddocument__doc_alias__document=self, relateddocument__relationship="updates")))
+
+    #obsoletes = models.CharField(max_length=200,blank=True,null=True)
+    @property
+    def obsoletes(self):
+        return ",".join(sorted("RFC%s" % d.rfc_number for d in InternetDraft.objects.filter(docalias__relateddocument__document=self, docalias__relateddocument__relationship="obs")))
+
+    #obsoleted_by = models.CharField(max_length=200,blank=True,null=True)
+    @property
+    def obsoleted_by(self):
+        return ",".join(sorted("RFC%s" % d.rfc_number for d in InternetDraft.objects.filter(relateddocument__doc_alias__document=self, relateddocument__relationship="obs")))
+
+    #also = models.CharField(max_length=50,blank=True,null=True)
+    @property
+    def also(self):
+        aliases = self.docalias_set.filter(models.Q(name__startswith="bcp") |
+                                           models.Q(name__startswith="std") |
+                                           models.Q(name__startswith="bcp"))
+        return aliases[0].name.upper() if aliases else None
+    
+    #draft = models.CharField(max_length=200,null=True)
+    @property
+    def draft(self):
+        if not self.name.startswith("rfc"):
+            return self.name
+        else:
+            return None
+        
+    #has_errata = models.BooleanField() FIXME
+    #stream = models.CharField(max_length=15,blank=True,null=True)
+    @property
+    def stream(self):
+        return super(InternetDraft, self).stream.name
+    #wg = models.CharField(max_length=15,blank=True,null=True) FIXME
+    #file_formats = models.CharField(max_length=20,blank=True,null=True)
+    @property
+    def file_formats(self):
+        return self.file_type.replace(".", "").replace("txt", "ascii")
+
     class Meta:
         proxy = True
+
+RfcIndex = InternetDraft