order of precedence on serial no. entry

This commit is contained in:
Max Baker
2004-02-13 06:18:57 +00:00
parent 800aa0b4f0
commit b46aa416a0
2 changed files with 2 additions and 2 deletions

View File

@@ -134,8 +134,8 @@ sub serial {
# precedence # precedence
# serial2,chassis parse,serial1 # serial2,chassis parse,serial1
return $1 if (defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i);
return $serial2 if (defined $serial2 and $serial2 !~ /^\s*$/); return $serial2 if (defined $serial2 and $serial2 !~ /^\s*$/);
return $1 if (defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i);
return $serial1 if (defined $serial1 and $serial1 !~ /^\s*$/); return $serial1 if (defined $serial1 and $serial1 !~ /^\s*$/);
return undef; return undef;

View File

@@ -151,8 +151,8 @@ sub serial {
# precedence # precedence
# serial2,chassis parse,serial1 # serial2,chassis parse,serial1
return $1 if (defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i);
return $serial2 if (defined $serial2 and $serial2 !~ /^\s*$/); return $serial2 if (defined $serial2 and $serial2 !~ /^\s*$/);
return $1 if (defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i);
return $serial1 if (defined $serial1 and $serial1 !~ /^\s*$/); return $serial1 if (defined $serial1 and $serial1 !~ /^\s*$/);
return undef; return undef;