Remove "undefined value" warning

[pciids.git] / scripts / importil.pl

diff --git a/scripts/importil.pl b/scripts/importil.pl
index 7e0fe4b02e156a1ad0372a6d3d798fe721f87333..6a902fb02acfd5772a61b23c7e0b696b83e2c4ba 100755 (executable)
--- a/scripts/importil.pl
+++ b/scripts/importil.pl
@@ -1,4 +1,23 @@
 #!/usr/bin/perl
+
+#      PciIds web database
+#      Copyright (C) 2008 Michal Vaner (vorner@ucw.cz)
+#
+#      This program is free software; you can redistribute it and/or modify
+#      it under the terms of the GNU General Public License as published by
+#      he Free Software Foundation; either version 2 of the License, or
+#      (at your option) any later version.
+#
+#      This program is distributed in the hope that it will be useful,
+#      but WITHOUT ANY WARRANTY; without even the implied warranty of
+#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#
+#      GNU General Public License for more details.
+#
+#      You should have received a copy of the GNU General Public License
+#      along with this program; if not, write to the Free Software
+#      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 use strict;
 use warnings;
 BEGIN {
@@ -46,6 +65,7 @@ sub insertId( $ ) {
 
 sub getUser( $ ) {
        my( $email ) = @_;
+       $email = "" unless defined $email;
        $email =~ s/.*<([^<>]*)>.*/$1/;
        my( $mailCheck ) = emailCheck( $email, undef );
        if( defined $mailCheck ) {
@@ -64,7 +84,7 @@ sub getUser( $ ) {
 sub addComment( $$$$$ ) {
        my( $email, $time, $name, $comment, $discussion ) = @_;
        my $user = getUser( $email );
-       $name = undef if( ( defined $name ) && $name !~ /\S/ );
+       $name = undef if( ( defined $name ) && $name !~ /\S/ && $name ne '' );
        $comment = undef if( ( defined $comment ) && $comment !~ /\S/ );
        $discussion = undef if( ( defined $discussion ) && $discussion !~ /\S/ );
        $newcomment->execute( $user, $addr->get(), $time, $name, $comment, $discussion );
@@ -88,6 +108,7 @@ sub setMain( $ ) {
 print "Importing\n";
 
 while( defined( $_ = <> ) ) {
+       chomp;
        if( my( $lid ) = /^### ([0-9a-f]+) ###$/ ) {
                %ids = ();
                @toMark = ();