koha-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha/misc asmp_marc21_bib_framework.sql Install.pm [rel_3_0]

From: Antoine Farnault
Subject: [Koha-cvs] koha/misc asmp_marc21_bib_framework.sql Install.pm [rel_3_0]
Date: Mon, 04 Sep 2006 10:13:38 +0000 
CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        06/09/04 10:13:37

Modified files:
        misc           : asmp_marc21_bib_framework.sql Install.pm 

Log message:
        sync with rel_2_2.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/misc/asmp_marc21_bib_framework.sql?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/misc/Install.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.94.2.1&r2=1.94.2.2

Patches:
Index: asmp_marc21_bib_framework.sql
===================================================================
RCS file: /sources/koha/koha/misc/asmp_marc21_bib_framework.sql,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- asmp_marc21_bib_framework.sql       10 Aug 2006 01:01:23 -0000      1.3
+++ asmp_marc21_bib_framework.sql       4 Sep 2006 10:13:37 -0000       1.3.2.1
@@ -165,11 +165,9 @@
 -- ASMP KOHA MARC 21 FRAMEWORKS. 
 -- ******************************
 
-
-INSERT INTO `biblio_framework` VALUES ('ASMP_BOOKS', 'ASMP Books (including 
workbooks and activity guides)');
-INSERT INTO `biblio_framework` VALUES ('ASMP_SOUND_RECORDINGS', 'ASMP Sound 
Recordings (including audio cassettes and CDs)');
-INSERT INTO `biblio_framework` VALUES ('ASMP_VIDEORECORDINGS', 'ASMP 
Videorecordings (including VHS videocassettes and DVDs)');
-
+INSERT INTO `biblio_framework` VALUES ('ASMP_BOOKS', 'Books, Booklets, 
Workbooks');
+INSERT INTO `biblio_framework` VALUES ('ASMP_SOUND_RECORDINGS', 'Audio 
Cassettes, CDs)');
+INSERT INTO `biblio_framework` VALUES ('ASMP_VIDEORECORDINGS', 'DVDs, VHS)');
 
 -- ******************************************************
 
@@ -4258,11 +4256,11 @@
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'p', 'P&eacute;riodique', 
'P&eacute;riodique', 0, 0, '', 9, '', '', '', NULL, 5, '', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'q', 'Public vis&eacute; 
(selon l\'&acirc;ge)', 'Public vis&eacute; (selon l\'&acirc;ge)', 0, 0, '', 9, 
'', '', '', NULL, 5, '', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'r', 'Type de document et 
support mat&eacute;riel', 'Type de document et support mat&eacute;riel', 0, 0, 
'', 9, '', '', '', NULL, 5, '', '', '');
-INSERT INTO `marc_subfield_structure` VALUES ('995', 's', 'Él&eacute;ment de 
tri', 'Él&eacute;ment de tri', 0, 0, '', 9, '', '', '', NULL, 5, '', '', '');
+INSERT INTO `marc_subfield_structure` VALUES ('995', 's', '�&eacute;ment de 
tri', '�&eacute;ment de tri', 0, 0, '', 9, '', '', '', NULL, 5, '', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 't', 'Genre', 'Genre', 0, 
0, '', 9, '', '', '', NULL, 5, '', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'u', 'Note sur 
l\'exemplaire', 'Note sur l\'exemplaire', 0, 0, '', 9, '', '', '', NULL, 5, '', 
'', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'v', 'Note sur le 
num&eacute;ro de p&eacute;riodique', 'Note sur le num&eacute;ro de 
p&eacute;riodique', 0, 0, '', 9, '', '', '', NULL, 5, '', '', '');
-INSERT INTO `marc_subfield_structure` VALUES ('995', 'w', 'Établissement cible 
du document, texte libre', 'Établissement cible du document, texte libre', 0, 
0, '', 9, '', '', '', NULL, 5, '', '', '');
+INSERT INTO `marc_subfield_structure` VALUES ('995', 'w', '�ablissement 
cible du document, texte libre', '�ablissement cible du document, texte 
libre', 0, 0, '', 9, '', '', '', NULL, 5, '', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'x', 
'&Eacute;tablissement cible du document, donn&eacute;e cod&eacute;e', 
'&Eacute;tablissement cible du document, donn&eacute;e cod&eacute;e', 0, 0, '', 
9, '', '', '', NULL, 5, '', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'y', 'Ensemble cible du 
document , texte libre', 'Ensemble cible du document, texte libre', 0, 0, '', 
9, '', '', '', NULL, 5, '', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'z', 'Ensemble cible du 
document, donn&eacute;e cod&eacute;e', 'Ensemble cible du document, 
donn&eacute;e cod&eacute;e', 0, 0, '', 9, '', '', '', NULL, 5, '', '', '');
@@ -8428,11 +8426,11 @@
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'p', 'P&eacute;riodique', 
'P&eacute;riodique', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_BOOKS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'q', 'Public vis&eacute; 
(selon l\'&acirc;ge)', 'Public vis&eacute; (selon l\'&acirc;ge)', 0, 0, '', 9, 
'', '', '', NULL, 5, 'ASMP_BOOKS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'r', 'Type de document et 
support mat&eacute;riel', 'Type de document et support mat&eacute;riel', 0, 0, 
'', 9, '', '', '', NULL, 5, 'ASMP_BOOKS', '', '');
-INSERT INTO `marc_subfield_structure` VALUES ('995', 's', 'Él&eacute;ment de 
tri', 'Él&eacute;ment de tri', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_BOOKS', 
'', '');
+INSERT INTO `marc_subfield_structure` VALUES ('995', 's', '�&eacute;ment de 
tri', '�&eacute;ment de tri', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_BOOKS', 
'', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 't', 'Genre', 'Genre', 0, 
0, '', 9, '', '', '', NULL, 5, 'ASMP_BOOKS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'u', 'Note sur 
l\'exemplaire', 'Note sur l\'exemplaire', 0, 0, '', 9, '', '', '', NULL, 5, 
'ASMP_BOOKS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'v', 'Note sur le 
num&eacute;ro de p&eacute;riodique', 'Note sur le num&eacute;ro de 
p&eacute;riodique', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_BOOKS', '', '');
-INSERT INTO `marc_subfield_structure` VALUES ('995', 'w', 'Établissement cible 
du document, texte libre', 'Établissement cible du document, texte libre', 0, 
0, '', 9, '', '', '', NULL, 5, 'ASMP_BOOKS', '', '');
+INSERT INTO `marc_subfield_structure` VALUES ('995', 'w', '�ablissement 
cible du document, texte libre', '�ablissement cible du document, texte 
libre', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_BOOKS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'x', 
'&Eacute;tablissement cible du document, donn&eacute;e cod&eacute;e', 
'&Eacute;tablissement cible du document, donn&eacute;e cod&eacute;e', 0, 0, '', 
9, '', '', '', NULL, 5, 'ASMP_BOOKS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'y', 'Ensemble cible du 
document , texte libre', 'Ensemble cible du document, texte libre', 0, 0, '', 
9, '', '', '', NULL, 5, 'ASMP_BOOKS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'z', 'Ensemble cible du 
document, donn&eacute;e cod&eacute;e', 'Ensemble cible du document, 
donn&eacute;e cod&eacute;e', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_BOOKS', 
'', '');
@@ -12598,11 +12596,11 @@
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'p', 'P&eacute;riodique', 
'P&eacute;riodique', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_SOUND_RECORDINGS', 
'', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'q', 'Public vis&eacute; 
(selon l\'&acirc;ge)', 'Public vis&eacute; (selon l\'&acirc;ge)', 0, 0, '', 9, 
'', '', '', NULL, 5, 'ASMP_SOUND_RECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'r', 'Type de document et 
support mat&eacute;riel', 'Type de document et support mat&eacute;riel', 0, 0, 
'', 9, '', '', '', NULL, 5, 'ASMP_SOUND_RECORDINGS', '', '');
-INSERT INTO `marc_subfield_structure` VALUES ('995', 's', 'Él&eacute;ment de 
tri', 'Él&eacute;ment de tri', 0, 0, '', 9, '', '', '', NULL, 5, 
'ASMP_SOUND_RECORDINGS', '', '');
+INSERT INTO `marc_subfield_structure` VALUES ('995', 's', '�&eacute;ment de 
tri', '�&eacute;ment de tri', 0, 0, '', 9, '', '', '', NULL, 5, 
'ASMP_SOUND_RECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 't', 'Genre', 'Genre', 0, 
0, '', 9, '', '', '', NULL, 5, 'ASMP_SOUND_RECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'u', 'Note sur 
l\'exemplaire', 'Note sur l\'exemplaire', 0, 0, '', 9, '', '', '', NULL, 5, 
'ASMP_SOUND_RECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'v', 'Note sur le 
num&eacute;ro de p&eacute;riodique', 'Note sur le num&eacute;ro de 
p&eacute;riodique', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_SOUND_RECORDINGS', 
'', '');
-INSERT INTO `marc_subfield_structure` VALUES ('995', 'w', 'Établissement cible 
du document, texte libre', 'Établissement cible du document, texte libre', 0, 
0, '', 9, '', '', '', NULL, 5, 'ASMP_SOUND_RECORDINGS', '', '');
+INSERT INTO `marc_subfield_structure` VALUES ('995', 'w', '�ablissement 
cible du document, texte libre', '�ablissement cible du document, texte 
libre', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_SOUND_RECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'x', 
'&Eacute;tablissement cible du document, donn&eacute;e cod&eacute;e', 
'&Eacute;tablissement cible du document, donn&eacute;e cod&eacute;e', 0, 0, '', 
9, '', '', '', NULL, 5, 'ASMP_SOUND_RECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'y', 'Ensemble cible du 
document , texte libre', 'Ensemble cible du document, texte libre', 0, 0, '', 
9, '', '', '', NULL, 5, 'ASMP_SOUND_RECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'z', 'Ensemble cible du 
document, donn&eacute;e cod&eacute;e', 'Ensemble cible du document, 
donn&eacute;e cod&eacute;e', 0, 0, '', 9, '', '', '', NULL, 5, 
'ASMP_SOUND_RECORDINGS', '', '');
@@ -16767,11 +16765,11 @@
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'p', 'P&eacute;riodique', 
'P&eacute;riodique', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_VIDEORECORDINGS', 
'', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'q', 'Public vis&eacute; 
(selon l\'&acirc;ge)', 'Public vis&eacute; (selon l\'&acirc;ge)', 0, 0, '', 9, 
'', '', '', NULL, 5, 'ASMP_VIDEORECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'r', 'Type de document et 
support mat&eacute;riel', 'Type de document et support mat&eacute;riel', 0, 0, 
'', 9, '', '', '', NULL, 5, 'ASMP_VIDEORECORDINGS', '', '');
-INSERT INTO `marc_subfield_structure` VALUES ('995', 's', 'Él&eacute;ment de 
tri', 'Él&eacute;ment de tri', 0, 0, '', 9, '', '', '', NULL, 5, 
'ASMP_VIDEORECORDINGS', '', '');
+INSERT INTO `marc_subfield_structure` VALUES ('995', 's', '�&eacute;ment de 
tri', '�&eacute;ment de tri', 0, 0, '', 9, '', '', '', NULL, 5, 
'ASMP_VIDEORECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 't', 'Genre', 'Genre', 0, 
0, '', 9, '', '', '', NULL, 5, 'ASMP_VIDEORECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'u', 'Note sur 
l\'exemplaire', 'Note sur l\'exemplaire', 0, 0, '', 9, '', '', '', NULL, 5, 
'ASMP_VIDEORECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'v', 'Note sur le 
num&eacute;ro de p&eacute;riodique', 'Note sur le num&eacute;ro de 
p&eacute;riodique', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_VIDEORECORDINGS', 
'', '');
-INSERT INTO `marc_subfield_structure` VALUES ('995', 'w', 'Établissement cible 
du document, texte libre', 'Établissement cible du document, texte libre', 0, 
0, '', 9, '', '', '', NULL, 5, 'ASMP_VIDEORECORDINGS', '', '');
+INSERT INTO `marc_subfield_structure` VALUES ('995', 'w', '�ablissement 
cible du document, texte libre', '�ablissement cible du document, texte 
libre', 0, 0, '', 9, '', '', '', NULL, 5, 'ASMP_VIDEORECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'x', 
'&Eacute;tablissement cible du document, donn&eacute;e cod&eacute;e', 
'&Eacute;tablissement cible du document, donn&eacute;e cod&eacute;e', 0, 0, '', 
9, '', '', '', NULL, 5, 'ASMP_VIDEORECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'y', 'Ensemble cible du 
document , texte libre', 'Ensemble cible du document, texte libre', 0, 0, '', 
9, '', '', '', NULL, 5, 'ASMP_VIDEORECORDINGS', '', '');
 INSERT INTO `marc_subfield_structure` VALUES ('995', 'z', 'Ensemble cible du 
document, donn&eacute;e cod&eacute;e', 'Ensemble cible du document, 
donn&eacute;e cod&eacute;e', 0, 0, '', 9, '', '', '', NULL, 5, 
'ASMP_VIDEORECORDINGS', '', '');

Index: Install.pm
===================================================================
RCS file: /sources/koha/koha/misc/Install.pm,v
retrieving revision 1.94.2.1
retrieving revision 1.94.2.2
diff -u -b -r1.94.2.1 -r1.94.2.2
--- Install.pm  4 Sep 2006 08:18:35 -0000       1.94.2.1
+++ Install.pm  4 Sep 2006 10:13:37 -0000       1.94.2.2
@@ -54,7 +54,8 @@
 =cut
 
 # set the version for version checking
-$VERSION = 2.2.3;
+# set the version for version checking
+$VERSION = do { my @v = '$Revision: 1.94.2.2 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
 
 @ISA = qw(Exporter);
 @EXPORT = qw(
@@ -1753,7 +1754,7 @@
 To create the koha database, please enter your
 mysql server's root user password:
 
-Password: |;   #'
+Password: |;
 
 $messages->{'CreatingDatabase'}->{en} = heading('CREATING DATABASE') . qq|
 Creating the MySQL database for Koha...
@@ -1817,12 +1818,14 @@
        setmysqlclipass($mysqlpass);
        # Set up permissions
        startsysout();
-       print system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into user 
(Host,User,Password) values ('$hostname','$user',password('$pass'))\" mysql\;");
-       system("$mysqldir/bin/mysql '-u$mysqluser' -e \"insert into db 
(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,
 index_priv, alter_priv) values 
('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\" mysql");
-       system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
+       print system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into 
user (Host,User,Password) values ('$hostname','$user',password('$pass'))\" 
-h$hostname mysql\;");
+       system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into db 
(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,
 index_priv, alter_priv) values 
('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\" -h$hostname mysql");
+       system("$mysqldir/bin/mysqladmin -u$mysqluser -h$hostname 
reload");
+
+       my $result=system("$mysqldir/bin/mysqladmin", "-u$mysqluser", "create", 
"$database");
+       system("$mysqldir/bin/mysql '-u$mysqluser' -e \"GRANT ALL PRIVILEGES on 
".$database.".* to '$user' IDENTIFIED BY '$pass' \" mysql");
        # Change to admin user login
        setmysqlclipass($pass);
-       my $result=system("$mysqldir/bin/mysqladmin", "-u$user", "create", 
"$database");
        if ($result) {
                showmessage(getmessage('CreatingDatabaseError'),'PressEnter', 
'', 1);
        } else {
reply via email to
[Prev in Thread] Current Thread [Next in Thread]