counters

indigo/xmlutils.py

@@ -79,3 +79,4 @@ def rewrite_all_attachment_work_components(xml_doc):
                     'a:FRBRExpression': lambda: frbr_uri.expression_uri(),
                     'a:FRBRManifestation': lambda: frbr_uri.manifestation_uri(),
                 }[part]()
+    return counter

indigo_app/static/javascript/indigo/models.js

@@ -131,13 +131,21 @@
     rewriteIds: function() {
       // rewrite all eIds before setting the content
       // in provision mode, retain the eId of the parent element as the prefix
-      let eidPrefix;
+      // and use the counters of all preceding provisions for context
+      let eidPrefix,
+          eidRewriter = new indigoAkn.EidRewriter(),
+          workComponentRewriter = new indigoAkn.WorkComponentRewriter();
       if (Indigo.Preloads.provisionEid && Indigo.Preloads.provisionEid.lastIndexOf('__') > -1) {
         eidPrefix = Indigo.Preloads.provisionEid.substring(0, Indigo.Preloads.provisionEid.lastIndexOf('__'));
       }
-      new indigoAkn.EidRewriter().rewriteAllEids(this.xmlDocument.documentElement, eidPrefix);
+      if (Indigo.Preloads.provisionEid) {
+        eidRewriter.counters = JSON.parse(JSON.stringify(Indigo.Preloads.provisionCounters));
+        eidRewriter.eidCounter = JSON.parse(JSON.stringify(Indigo.Preloads.eidCounter));
+        workComponentRewriter.counters = JSON.parse(JSON.stringify(Indigo.Preloads.attachmentCounters));
+      }
+      eidRewriter.rewriteEid(this.xmlDocument.documentElement, eidPrefix);
       // rewrite all attachment FRBR URI work components too
-      new indigoAkn.WorkComponentRewriter().rewriteAllAttachmentWorkComponents(this.xmlDocument.documentElement);
+      workComponentRewriter.rewriteAttachmentWorkComponent(this.xmlDocument.documentElement);
     },
 
     // serialise an XML node, or the entire document if node is not given, to a string

indigo_app/templates/indigo_api/document/show.html

@@ -134,6 +134,9 @@ <h5 class="main-header-title">
   window.Indigo.Preloads.document = {{ document_json|safe }};
   window.Indigo.Preloads.documentContent = {{ document_content_json|safe }};
   window.Indigo.Preloads.provisionEid = "{{ provision_eid }}";
+  window.Indigo.Preloads.provisionCounters = {% if provision_counters %}{{ provision_counters|safe }}{% else %}null{% endif %};
+  window.Indigo.Preloads.eidCounter = {% if eid_counter %}{{ eid_counter|safe }}{% else %}null{% endif %};
+  window.Indigo.Preloads.attachmentCounters = {% if attachment_counters %}{{ attachment_counters|safe }}{% else %}null{% endif %};
   window.Indigo.Preloads.amendments = {{ amendments_json|safe }};
   window.Indigo.Preloads.expressions = {{ expressions_json|safe }};
   {% if pyodide_packages_json %}

indigo_app/views/documents.py

@@ -1,5 +1,4 @@
 import json
-
 from django.conf import settings
 from django.contrib import messages
 from django.http import Http404
@@ -11,8 +10,9 @@
 
 import bluebell
 import cobalt
-from cobalt import Portion
+from bluebell.xml import XmlGenerator
 from indigo.plugins import plugins
+from indigo.xmlutils import rewrite_all_attachment_work_components
 from indigo_api.models import Document, Country, Subtype, Work
 from indigo_api.serializers import DocumentSerializer, WorkSerializer, WorkAmendmentSerializer
 from indigo_api.views.documents import DocumentViewSet
@@ -139,11 +139,38 @@ def get(self, request, *args, **kwargs):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['provision_eid'] = self.eid
+        context['provision_counters'], context['eid_counter'], context['attachment_counters'] = self.get_counters()
         return context
 
     def get_document_content_json(self, document):
         return json.dumps(etree.tostring(self.provision_xml, encoding='unicode'))
 
+    def get_counters(self):
+        """ Generate provision and eid counters based on the content preceding our element.
+            This way we don't end up 'correcting' e.g. part_II_2 to part_II,
+             because the context will now be aware of the preceding part_II that isn't being edited.
+        """
+        root = etree.fromstring(self.object.document_xml)
+        element = root.xpath(f'.//a:*[@eId="{self.eid}"]', namespaces={'a': self.object.doc.namespace})[0]
+        parent = element.getparent()
+        # remove everything from our element onwards (inclusive) from the tree
+        for sibling in element.itersiblings():
+            # this will remove e.g. parts III, IV, etc -- or if we're lower down, e.g. part_II__sec_3__subsec_2 etc
+            parent.remove(sibling)
+        parent.remove(element)
+        # now remove all the ancestors' following siblings too, e.g. attachments,
+        # or e.g. part_II__sec_4, part_III, up to attachments
+        while parent is not None:
+            for aunt in parent.itersiblings():
+                aunt.getparent().remove(aunt)
+            parent = parent.getparent()
+
+        generator = XmlGenerator(self.object.frbr_uri)
+        generator.generate_eids(root)
+        doc = cobalt.StructuredDocument.for_document_type(self.object.work.work_uri.doctype)(etree.tostring(root, encoding='unicode'))
+        attachment_counters = {'__attachments': rewrite_all_attachment_work_components(doc)}
+        return json.dumps(generator.ids.counters), json.dumps(generator.ids.eid_counter), json.dumps(attachment_counters)
+
 
 class DocumentPopupView(AbstractAuthedIndigoView, DetailView):
     model = Document