Detard plus nits.

kohler · Aug 30, 2023 · 51a7440 · 51a7440
1 parent 125f214
commit 51a7440
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/batch/savepapers.php b/batch/savepapers.php
@@ -58,10 +58,10 @@ function __construct(Conf $conf) {
     function set_args($arg) {
         $this->quiet = isset($arg["q"]);
         $this->ignore_errors = isset($arg["ignore-errors"]);
-        if (isset($args["ignore-pid"])) {
+        if (isset($arg["ignore-pid"])) {
             $this->pidflags |= Paper_API::PIDFLAG_IGNORE_PID;
         }
-        if (isset($args["match-title"])) {
+        if (isset($arg["match-title"])) {
             $this->pidflags |= Paper_API::PIDFLAG_MATCH_TITLE;
         }
         $this->disable_users = isset($arg["disable-users"]);

diff --git a/src/api/api_paper.php b/src/api/api_paper.php
@@ -179,7 +179,8 @@ static function analyze_json_pid(Conf $conf, $j, $pidflags = 0) {
             }
             unset($j->pid, $j->id);
         }
-        if (!isset($j->pid) && !isset($j->id)
+        if (!isset($j->pid)
+            && !isset($j->id)
             && ($pidflags & self::PIDFLAG_MATCH_TITLE) !== 0
             && is_string($j->title ?? null)) {
             $pids = Dbl::fetch_first_columns($conf->dblink, "select paperId from Paper where title=?", simplify_whitespace($j->title));

diff --git a/src/papercolumns/pc_tag.php b/src/papercolumns/pc_tag.php
@@ -37,7 +37,7 @@ function add_decoration($decor) {
         if ($decor === "edit") {
             $this->editable = true;
             return $this->__add_decoration($decor);
-        } else if (preg_match('/\A%\d*(?:\.\d*)[bdeEfFgGoxX]\z/', $decor)) {
+        } else if (preg_match('/\A%?\d*(?:\.\d*)[bdeEfFgGoxX]\z/', $decor)) {
             $this->__add_decoration($decor, [$this->real_format]);
             $this->real_format = $decor;
             return true;