Replacing \d with explicit ascii [0-9]

LibreCat · Jul 10, 2017 · 30aaa4a · 30aaa4a
1 parent 0f21801
commit 30aaa4a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/Build.PL b/Build.PL
@@ -1,5 +1,5 @@
 
-# This file was automatically generated by Dist::Zilla::Plugin::ModuleBuild v6.008.
+# This file was automatically generated by Dist::Zilla::Plugin::ModuleBuild v6.005.
 use strict;
 use warnings;
 

diff --git a/lib/Catmandu/Fix/Condition/marc_has_many.pm b/lib/Catmandu/Fix/Condition/marc_has_many.pm
@@ -28,7 +28,7 @@ sub emit {
     $perl .= $marc_map->emit($fixer,$label);
 
     my $all_match    =
-        $self->marc_path =~ m{^...(\/\d+-\d+)?$} ?
+        $self->marc_path =~ m{^...(\/[0-9]+-[0-9]+)?$} ?
             Catmandu::Fix::Condition::exists->new("$tmp_var.1") :
             Catmandu::Fix::Condition::exists->new("$tmp_var.0.1");
 

diff --git a/lib/Catmandu/Fix/marc_map.pm b/lib/Catmandu/Fix/marc_map.pm
@@ -33,7 +33,7 @@ sub emit {
                             '-pluck'         => $self->pluck  // 0 ,
                             '-nested_arrays' => $self->nested_arrays // 0 ,
                             '-value'         => $self->value ,
-                            '-force_array'   => ($key =~ /^(\$.*|\d+)$/) ? 1 : 0
+                            '-force_array'   => ($key =~ /^(\$.*|[0-9]+)$/) ? 1 : 0
                         });
 
     my $var           = $fixer->var;

diff --git a/lib/Catmandu/Fix/marc_spec.pm b/lib/Catmandu/Fix/marc_spec.pm
@@ -35,7 +35,7 @@ sub emit {
                             '-nested_arrays' => $self->nested_arrays // 0 ,
                             '-invert'      => $self->invert // 0 ,
                             '-value'       => $self->value ,
-                            '-force_array' => ($key =~ /^(\$.*|\d+)$/) ? 1 : 0
+                            '-force_array' => ($key =~ /^(\$.*|[0-9]+)$/) ? 1 : 0
                         });
 
     my $var          = $fixer->var;

diff --git a/lib/Catmandu/Importer/MARC/Decoder.pm b/lib/Catmandu/Importer/MARC/Decoder.pm
@@ -48,7 +48,7 @@ sub decode {
     if ($id =~ /^00/ && $record->field($id)) {
         $sysid = $record->field($id)->data();
     }
-    elsif ($id =~ /^(\d{3})([\da-zA-Z])$/) {
+    elsif ($id =~ /^([0-9]{3})([[0-9a-zA-Z])$/) {
         my $field = $record->field($1);
         $sysid = $field->subfield($2) if ($field);
     }

diff --git a/lib/Catmandu/Importer/MARC/ISO.pm b/lib/Catmandu/Importer/MARC/ISO.pm
@@ -125,7 +125,7 @@ sub decode_marc {
     if ($id =~ /^00/ && $record->field($id)) {
         $sysid = $record->field($id)->data();
     }
-    elsif ($id =~ /^(\d{3})([\da-zA-Z])$/) {
+    elsif ($id =~ /^([0-9]{3})([0-9a-zA-Z])$/) {
         my $field = $record->field($1);
         $sysid = $field->subfield($2) if ($field);
     }

diff --git a/lib/Catmandu/MARC.pm b/lib/Catmandu/MARC.pm
@@ -983,7 +983,7 @@ sub compile_marc_path {
     my ($field,$field_regex,$ind1,$ind2,
         $subfield,$subfield_regex,$from,$to,$len,$is_regex_field);
 
-    my $MARC_PATH_REGEX = qr/(\S{1,3})(\[([^,])?,?([^,])?\])?([\$_a-z0-9^]+)?(\/(\d+)(-(\d+))?)?/;
+    my $MARC_PATH_REGEX = qr/(\S{1,3})(\[([^,])?,?([^,])?\])?([\$_a-z0-9^]+)?(\/([0-9]+)(-([0-9]+))?)?/;
     if ($marc_path =~ $MARC_PATH_REGEX) {
         $field          = $1;
         $ind1           = $3;