From 897f959bda9e55ad525c551a3ab18cb6abdfacfb Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 22 Jun 2004 15:32:43 +0000
Subject: [PATCH] adding new feature to installer : the user can select
 sql-datas to add to it's DB can be populated by any SQL french UNIMARC sample
 being added really soon - framework for monography - framework for URL -
 framework for ... - Personal UNIMARC autority ...

---
 misc/Install.pm                               | 59 ++++++++++++++++---
 misc/installer.pl                             |  2 +-
 .../french_unimarc_standard_systemprefs.sql   | 22 +++++++
 .../french_unimarc_standard_systemprefs.txt   |  1 +
 4 files changed, 75 insertions(+), 9 deletions(-)
 create mode 100644 misc/sql-datas/french_unimarc_standard_systemprefs.sql
 create mode 100644 misc/sql-datas/french_unimarc_standard_systemprefs.txt

diff --git a/misc/Install.pm b/misc/Install.pm
index 9ecf660104..477b3933f4 100644
--- a/misc/Install.pm
+++ b/misc/Install.pm
@@ -1437,10 +1437,11 @@ configuration.
 Press <ENTER> to continue: |;
 
 sub updateapacheconf {
+	my ($auto_install)=@_;
     my $logfiledir=$kohalogdir;
     my $httpdconf = $etcdir."/koha-httpd.conf";
    
-    showmessage(getmessage('StartUpdateApache'), 'none');
+    showmessage(getmessage('StartUpdateApache'), 'none') unless $auto_install->{NoPressEnter};
 	# to be polite about it: I don't think this should touch the main httpd.conf
 
 	# QUESTION: Should we warn for includes_module too?
@@ -1628,23 +1629,24 @@ $messages->{'CopyingFiles'}->{en}="Copying %s to %s.\n";
 
 sub installfiles {
 
+	my ($auto_install) = @_;
 	#MJR: preserve old files, just in case
 	sub neatcopy {
 		my $desc = shift;
 		my $src = shift;
 		my $tgt = shift;
 		if (-e $tgt) {
-    		print getmessage('CopyingFiles', ["old ".$desc,$tgt.strftime("%Y%m%d%H%M",localtime())]);
+    		print getmessage('CopyingFiles', ["old ".$desc,$tgt.strftime("%Y%m%d%H%M",localtime())]) unless ($auto_install->{NoPressEnter});
 			startsysout();
 			system("mv ".$tgt." ".$tgt.strftime("%Y%m%d%H%M",localtime()));
 		}
-		print getmessage('CopyingFiles', [$desc,$tgt]);
+		print getmessage('CopyingFiles', [$desc,$tgt]) unless ($auto_install->{NoPressEnter});
 		startsysout;
 		system("cp -R ".$src." ".$tgt);
 	}
 
 	my ($auto_install) = @_;
-	showmessage(getmessage('InstallFiles'),'none');
+	showmessage(getmessage('InstallFiles'),'none') unless ($auto_install->{NoPressEnter});
 
 	neatcopy("admin templates", 'intranet-html', "$intranetdir/htdocs");
 	neatcopy("admin interface", 'intranet-cgi', "$intranetdir/cgi-bin");
@@ -1893,6 +1895,9 @@ sample data, install them.
 
 =cut
 
+$messages->{'ConfirmFileUpload'}->{en} = qq|
+Confirm loading of this file into Koha  [Y]/N: |;
+
 sub populatedatabase {
 	my ($auto_install) = @_;
 	my $input;
@@ -1957,9 +1962,47 @@ sub populatedatabase {
 	}
 	startsysout();	
 	system("$mysqldir/bin/mysql -u$user $database -e \"update systempreferences set value='$language' where variable='opaclanguages'\"");
+	# CHECK for any other file to append...
+	my @sql;
+	push @sql,"FINISHED";
+	if (-d "scripts/misc/sql-datas") {
+	    opendir D, "scripts/misc/sql-datas";
+	    foreach my $sql (readdir D) {
+			next unless ($sql =~ /.txt$/);
+			push @sql, $sql;
+	    }
+	}
+	my $loopend=0;
+	while (not $loopend) {
+		print heading("SELECT SQL FILE");
+		print qq|
+Select a file to append to the Koha DB.
+enter a number. A detailled explanation of the file will be given
+if you confirm, the file will be added to the DB
+|;
+		for (my $i=0;$i<=$#sql;$i++) {
+			print "$i => ".$sql[$i]."\n";
+		}
+		my $response =<STDIN>;
+		if ($response==0) {
+			$loopend = 1;
+		} else {
+			# show the content of the file
+			my $FileToUpload = $sql[$response];
+			open FILE,"scripts/misc/sql-datas/$FileToUpload";
+			my $content = <FILE>;
+			print heading("INSERT $FileToUpload ?")."$content\n";
+			# ask confirmation
+			$response=showmessage(getmessage('ConfirmFileUpload'), 'yn', 'y');
+			# if confirmed, upload the file in the DB
+			unless ($response =~/^n/i) {
+				$FileToUpload =~ s/\.txt/\.sql/;
+				system("$mysqldir/bin/mysql -u$user $database <scripts/misc/sql-datas/$FileToUpload");
+			}
+		}
+	}
 }
 
-
 =item restartapache
 
     restartapache;
@@ -1985,11 +2028,11 @@ sub restartapache {
 		startsysout();
 		# Need to support other init structures here?
 		if (-e "/etc/rc.d/init.d/httpd") {
-			system('su root -c /etc/rc.d/init.d/httpd restart');
+			system('su root -c "/etc/rc.d/init.d/httpd restart"');
 		} elsif (-e "/etc/init.d/apache") {
-			system('su root -c /etc/init.d/apache restart');
+			system('su root -c "/etc/init.d/apache restart"');
 		} elsif (-e "/etc/init.d/apache-ssl") {
-			system('su root -c /etc/init.d/apache-ssl restart');
+			system('su root -c "/etc/init.d/apache-ssl restart"');
 		}
 	}
 }
diff --git a/misc/installer.pl b/misc/installer.pl
index 2f6642420e..da13538539 100644
--- a/misc/installer.pl
+++ b/misc/installer.pl
@@ -109,7 +109,7 @@ getdatabaseinfo($auto_install);
 
 getapachevhostinfo($auto_install);
 
-updateapacheconf();
+updateapacheconf($auto_install);
 
 # basicauthentication();
 
diff --git a/misc/sql-datas/french_unimarc_standard_systemprefs.sql b/misc/sql-datas/french_unimarc_standard_systemprefs.sql
new file mode 100644
index 0000000000..4b56b55e6b
--- /dev/null
+++ b/misc/sql-datas/french_unimarc_standard_systemprefs.sql
@@ -0,0 +1,22 @@
+TRUNCATE systempreferences;
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('template', 'default', 'Preference order for intranet interface templates', NULL, 'Themes');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('autoBarcode', '0', 'Barcode is auto-calculated', NULL, 'YesNo');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('acquisitions', 'normal', 'Normal, budget-based acquisitions, or Simple bibliographic-data acquisitions', 'simple|normal', 'Choice');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('autoMemberNum', '0', 'Member number is auto-calculated', NULL, 'YesNo');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('authoritysep', '--', 'the separator used in authority/thesaurus. Usually --', '10', 'free');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('opaclanguages', 'fr', 'Set the preferred order for translations.  The top language will be tried first.', NULL, 'Languages');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('opacthemes', 'css', 'Set the preferred order for themes.  The top theme will be tried first.', NULL, 'Themes');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('timeout', '120000000', 'Inactivity timeout for cookies authentication (in seconds)', NULL, 'Integer');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('marc', 'ON', 'Turn on MARC support', NULL, 'YesNo');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('marcflavour', 'UNIMARC', 'your MARC flavor (MARC21 or UNIMARC) used for character encoding', 'MARC21|UNIMARC', 'Choice');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('checkdigit', 'none', 'Validity checks on membership number: none or "Katipo" style checks', 'none|katipo', 'Choice');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('dateformat', 'metric', 'date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy/mm/dd)', 'metric|us|iso', 'Choice');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('insecure', 'no', 'If YES, no auth at all is needed. Be careful if you set this to yes!', NULL, 'YesNo');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('maxoutstanding', '5', 'maximum amount withstanding to be able make reserves', NULL, 'Integer');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('maxreserves', '5', 'maximum number of reserves a member can make', NULL, 'Integer');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('noissuescharge', '5', 'maximum amount withstanding to be able to check out an item', NULL, 'Integer');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('KohaAdminEmailAddress', 'your.mail@here', 'the email address where borrowers modifs are sent', NULL, 'free');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('gist', '0.196', 'the gist rate. NOT in %, but in numeric form (0.12 for 12%)', NULL, 'free');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('LibraryName', '<b>Bienvenue dans Koha</b>', 'Library name as shown on main opac page', NULL, '');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('ldapserver', '', 'your ldap server', NULL, 'free');
+INSERT INTO systempreferences (variable, value, explanation, options, type) VALUES ('ldapinfos', '', 'ldap info. The ldap will be used in dn : uid=xxx, <ldapinfos>', NULL, 'free');
\ No newline at end of file
diff --git a/misc/sql-datas/french_unimarc_standard_systemprefs.txt b/misc/sql-datas/french_unimarc_standard_systemprefs.txt
new file mode 100644
index 0000000000..853a4f24b1
--- /dev/null
+++ b/misc/sql-datas/french_unimarc_standard_systemprefs.txt
@@ -0,0 +1 @@
+This file contains systemprefs for french UNIMARC standard setup
\ No newline at end of file
-- 
2.39.5