projects
/
Biblio-RFID.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
14ae576
)
format SID correctly and return it in read_blocks
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Thu, 29 Jul 2010 16:49:25 +0000
(18:49 +0200)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Thu, 29 Jul 2010 16:49:25 +0000
(18:49 +0200)
lib/RFID/Biblio/librfid.pm
patch
|
blob
|
history
diff --git
a/lib/RFID/Biblio/librfid.pm
b/lib/RFID/Biblio/librfid.pm
index
50e05e8
..
bd97aa4
100644
(file)
--- a/
lib/RFID/Biblio/librfid.pm
+++ b/
lib/RFID/Biblio/librfid.pm
@@
-41,19
+41,29
@@
sub _grep_tool {
while(<$s>) {
chomp;
warn "## $_\n";
while(<$s>) {
chomp;
warn "## $_\n";
- $coderef->( $_ );
+
+ my $sid;
+ if ( m/success.+:\s+(.+)/ ) {
+ $sid = $1;
+ $sid =~ s/\s*'\s*//g;
+ $sid = uc join('', reverse split(/\s+/, $sid));
+ }
+
+ $coderef->( $sid );
}
}
}
}
+sub _cleanup_sid {
+}
+
sub inventory {
my @tags;
_grep_tool '--scan' => sub {
sub inventory {
my @tags;
_grep_tool '--scan' => sub {
- if ( m/success.+:\s+(.+)/ ) {
- push @tags, $1;
- }
+ my $sid = shift;
+ push @tags, $sid if $sid;
};
warn "# invetory ",dump(@tags);
return @tags;
};
warn "# invetory ",dump(@tags);
return @tags;
@@
-61,10
+71,13
@@
sub inventory {
sub read_blocks {
sub read_blocks {
+ my $sid;
my $blocks;
_grep_tool '--read -1' => sub {
my $blocks;
_grep_tool '--read -1' => sub {
- $blocks->[$1] = hex2bytes($2)
+ $sid ||= shift;
+ $blocks->{$sid}->[$1] = hex2bytes($2)
if m/block\[\s*(\d+):.+data.+:\s*(.+)/;
if m/block\[\s*(\d+):.+data.+:\s*(.+)/;
+
};
warn "# read_blocks ",dump($blocks);
return $blocks;
};
warn "# read_blocks ",dump($blocks);
return $blocks;