projects
/
eq
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added some usage/help text for new location field.
[eq/.git]
/
bin
/
import_ward_data
diff --git
a/bin/import_ward_data
b/bin/import_ward_data
index bd707b4da75f149659a18d4c63a6acc20481d66a..4f88fd928e10e8ab58c8cfbeee39e4c66a003fe4 100755
(executable)
--- a/
bin/import_ward_data
+++ b/
bin/import_ward_data
@@
-2,13
+2,12
@@
use DBI;
use Getopt::Std;
use DBI;
use Getopt::Std;
-###################################################
-# GLOBALS
-$dbname = "phpgroupware";
-$dbhost = "192.168.0.2";
-$dbport = 3306;
-$dbuser = "phpgroupware";
-$dbpass = "phpgroupware";
+
+$mydir = `cd \$(dirname $0) 2>/dev/null; pwd`; chomp($mydir);
+unshift @INC,("$mydir/../setup");
+if( -f "$mydir/../setup/db_config.local") { require "db_config.local"; }
+else { require "db_config"; }
+
%hometeaching_data = ();
%membership_data = ();
getopts('vsn:o:');
%hometeaching_data = ();
%membership_data = ();
getopts('vsn:o:');
@@
-134,6
+133,7
@@
sub update_eq_aaronic_table
#| elder | int(16) unsigned | | PRI | NULL | auto_increment |
#| name | varchar(60) | YES | | NULL | |
#| phone | varchar(12) | YES | | NULL | |
#| elder | int(16) unsigned | | PRI | NULL | auto_increment |
#| name | varchar(60) | YES | | NULL | |
#| phone | varchar(12) | YES | | NULL | |
+#| email | varchar(120) | YES | | NULL | |
#| ppi_pri | int(10) unsigned | YES | | 1 | |
#| ppi_notes | varchar(128) | YES | | NULL | |
#| int_pri | int(10) unsigned | YES | | 1 | |
#| ppi_pri | int(10) unsigned | YES | | 1 | |
#| ppi_notes | varchar(128) | YES | | NULL | |
#| int_pri | int(10) unsigned | YES | | 1 | |
@@
-174,7
+174,7
@@
sub update_eq_elder_table
if($rows == 0) {
# No existing records found for this elder, make a new entry
print " Adding new Elder: $elder_name\n";
if($rows == 0) {
# No existing records found for this elder, make a new entry
print " Adding new Elder: $elder_name\n";
- $sth = $dbh->prepare("insert into eq_elder values (NULL,'$elder_name','$phone','1','','1','',$attending,1)");
+ $sth = $dbh->prepare("insert into eq_elder values (NULL,'$elder_name','$phone','
','
1','','1','',$attending,1)");
$sth->execute or die "-E- DB error: $DBI::errstr\n";
} elsif($rows == 1) {
# An existing record was found for this elder, update it
$sth->execute or die "-E- DB error: $DBI::errstr\n";
} elsif($rows == 1) {
# An existing record was found for this elder, update it
@@
-664,7
+664,7
@@
sub check_for_changed_ids
###################################################
# Open a connection to the database
###################################################
# Open a connection to the database
-$dbh=DBI->connect("dbi:mysql:dbname=$dbname
;host=$dbhost
port=$dbport",$dbuser,$dbpass,{
+$dbh=DBI->connect("dbi:mysql:dbname=$dbname
:host=$dbhost:
port=$dbport",$dbuser,$dbpass,{
AutoCommit=>0,
PrintError=>0}) or print "Connect Failure:".$DBI::errstr."\n" and exit 2;
AutoCommit=>0,
PrintError=>0}) or print "Connect Failure:".$DBI::errstr."\n" and exit 2;
@@
-726,6
+726,8
@@
if($opt_s) { $dbh->disconnect(); exit; }
&update_eq_parent_table();
&update_eq_child_table();
&update_eq_parent_table();
&update_eq_child_table();
+print "\n-> Import Successful! DONE...\n";
+
###################################################
# Disconnect from the database
$dbh->disconnect();
###################################################
# Disconnect from the database
$dbh->disconnect();
@@
-733,13
+735,3
@@
$dbh->disconnect();
######################################################################
######################################################################
-
-
-
-
-
-
-
-
-
-