Merge branch 'master' of /home/vorner/pciids

[pciids.git] / scripts / transfer.pl

diff --git a/scripts/transfer.pl b/scripts/transfer.pl
index 14c5a9af4674059036fda41213bb6275fa4d0bee..0ec567a1f4ddf20200976ad99882066d2aac796f 100755 (executable)
--- a/scripts/transfer.pl
+++ b/scripts/transfer.pl
@@ -1,5 +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 {
@@ -32,11 +50,11 @@ print "Submiting items from database\n";
 
 my $itemq = $olddb->prepare( "SELECT id, name, comment, author, status, type FROM ids ORDER BY LENGTH(id), id" );
 my $itemp = $newdb->prepare( "INSERT INTO locations (id, parent) VALUES (?, ?)" );
-my $comp = $newdb->prepare( "INSERT INTO history (owner, location, nodename, nodedescription, seen, time) VALUES (?, ?, ?, ?, ?, '2000-01-01 00:00:00')" );
+my $comp = $newdb->prepare( "INSERT INTO history (owner, location, nodename, nodenote, seen, time) VALUES (?, ?, ?, ?, ?, '2000-01-01 00:00:00')" );
 my $setMain = $newdb->prepare( 'UPDATE locations SET
-                               maincomment = ?,
+                               mainhistory = ?,
                                name = ( SELECT nodename FROM history WHERE id = ? ),
-                               description = ( SELECT nodedescription FROM history WHERE id = ? )
+                               note = ( SELECT nodenote FROM history WHERE id = ? )
                        WHERE
                                id = ?' );