Merge pull request #481 from NetrunnerDB/nb/stripped-text-title

Add strippedTitle
NetrunnerDB · Mar 13, 2021 · d7182a9 · d7182a9
2 parents dd1efd7 + 4eebe6e
commit d7182a9
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 39 deletions.
diff --git a/src/AppBundle/Command/ImportStdCommand.php b/src/AppBundle/Command/ImportStdCommand.php
@@ -33,39 +33,6 @@ public function __construct(EntityManagerInterface $entityManager)
 
     private $collections = [];
 
-    private $xmlToStrip = [
-        "/<strong>/",
-        "/<\/strong>/",
-        "/<trace>/",
-        "/<\/trace>/",
-        "/<errata>/",
-        "/<\/errata>/",
-        "/<em>/",
-        "/<\/em>/",
-        "/<i>/",
-        "/<\/i>/",
-    ];
-
-    private $iconsToStrip = [
-        "/\[click]/",
-        "/\[credit]/",
-        "/\+(\d)\[mu]/",
-        "/\[link]/",
-        "/\[trash]/",
-        "/\[interrupt]/",
-        "/\[recurring-credit]/",
-    ];
-
-    private $replacementIcons = [
-        "click",
-        "credit",
-        '+$1 mu',
-        "link",
-        "trash",
-        "interrupt",
-        "recurring credit",
-    ];
-
     protected function configure()
     {
         $this
@@ -349,6 +316,7 @@ protected function importCardsJsonFile(\SplFileInfo $fileinfo)
                 'deck_limit',
                 'position',
                 'quantity',
+                'stripped_title',
                 'title',
                 'uniqueness',
             ], [
@@ -491,12 +459,6 @@ protected function copyFieldValueToEntity($entity, string $entityName, string $f
                         }
                 }
             }
-        } elseif ($fieldName == "strippedText") {
-            $strippedText = ($entity->getText() ?: "");
-            $strippedText = preg_replace($this->xmlToStrip, "", $strippedText);
-            $strippedText = preg_replace($this->iconsToStrip, $this->replacementIcons, $strippedText);
-            $newTypedValue = $strippedText;
-            $newJsonValue = $strippedText;
         }
 
         $different = ($currentJsonValue !== $newJsonValue);

diff --git a/src/AppBundle/Entity/Card.php b/src/AppBundle/Entity/Card.php
@@ -32,6 +32,11 @@ class Card implements NormalizableInterface, TimestampableInterface
      */
     private $title;
 
+    /**
+     * @var string
+     */
+    private $strippedTitle;
+
     /**
      * @var string|null
      */
@@ -384,6 +389,25 @@ public function setTitle(string $title)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getStrippedTitle()
+    {
+        return $this->strippedTitle;
+    }
+
+    /**
+     * @param string $title
+     * @return $this
+     */
+    public function setStrippedTitle(string $title)
+    {
+        $this->strippedTitle = $title;
+
+        return $this;
+    }
+
     /**
      * @return string|null
      */

diff --git a/src/AppBundle/Resources/config/doctrine/Card.orm.yml b/src/AppBundle/Resources/config/doctrine/Card.orm.yml
@@ -80,6 +80,10 @@ AppBundle\Entity\Card:
         title:
             type: string
             length: 255
+        strippedTitle:
+            type: string
+            length: '1024'
+            nullable: true
         keywords:
             type: string
             length: 255

diff --git a/src/AppBundle/Service/CardsData.php b/src/AppBundle/Service/CardsData.php
@@ -189,6 +189,8 @@ public function get_search_rows(array $conditions, string $sortorder, string $lo
                             $like = implode('% ', str_split($arg));
                             $or[] = "(REPLACE(c.title, '-', ' ') like ?$i)";
                             $parameters[$i++] = "$like%";
+                            $or[] = "(c.strippedTitle like ?$i)";
+                            $parameters[$i++] = "$like%";
                         } else {
                             if ($arg == 'Franklin') {
                                 $arg = 'Crick';