Revert "Handle choice tag with abbr and expan"

This reverts commit bea9dd89.

src/Controller/Tei2SolrController.php

@@ -944,7 +944,6 @@ class Tei2SolrController extends AbstractController
                         $element->nodeName === 'address' ||
                         $element->nodeName === 'closer' ||
                         $element->nodeName === 'list' ||
-                        $element->nodeName === 'choice' ||
                         ($element->nodeName === 'signed' && 'closer' !== $element->parentNode->nodeName)
                     )) {
 
@@ -960,7 +959,6 @@ class Tei2SolrController extends AbstractController
                             && ($childElement->parentNode->nodeName !== 'abbr' && ($childElement->nodeName !== 'del' || $childElement->parentNode->nodeName !== 'add'))
                             && $childElement->parentNode->nodeName !== 'note' && $childElement->parentNode->nodeName !== 'seg'
                             && $childElement->parentNode->nodeName !== 'ref'
-                            && $childElement->parentNode->nodeName !== 'expan'
                         ) {
                             if (isset($add) && !empty($add)) {
                                 $tText .= ' ⟨' . $childElement->data . ' ' . $add;
@@ -1168,14 +1166,6 @@ class Tei2SolrController extends AbstractController
                                     }
                                 }
                             }
-                        } elseif ('abbr' === $childElement->nodeName && 'choice' === $childElement->parentNode->nodeName) {
-                            if (isset($childElement->firstChild) && $childElement->firstChild->nodeName === '#text') {
-                                $tText .= $childElement->firstChild->data;
-                            }
-                        } elseif ('expan' === $childElement->nodeName && 'choice' === $childElement->parentNode->nodeName) {
-                            if (isset($childElement->firstChild) && $childElement->firstChild->nodeName === '#text') {
-                                $eText .= $childElement->firstChild->data;
-                            }
                         } elseif ('name' === $childElement->nodeName && (isset($childElement->attributes[1]->value) && !empty($childElement->attributes[1]->value)) && (isset($childElement->attributes[0]->value) && !empty($childElement->attributes[0]->value))) {
                             $entityName = $this->getEntityName($childElement);
                             $uuid = $this->getUuid();