From 52cad99cb925a54af00e3c578a1dff39a17381dc Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Wed, 24 Nov 2004 16:05:33 +0000
Subject: [PATCH] moving stopwords into sql-datas. Now, they can be accessed
 during install

---
 misc/Install.pm                                         | 2 --
 misc/{lang-datas/en => sql-datas/english}/stopwords.sql | 0
 misc/sql-datas/english/stopwords.txt                    | 2 ++
 misc/{lang-datas/fr => sql-datas/french}/stopwords.sql  | 1 +
 misc/sql-datas/french/stopwords.txt                     | 2 ++
 5 files changed, 5 insertions(+), 2 deletions(-)
 rename misc/{lang-datas/en => sql-datas/english}/stopwords.sql (100%)
 create mode 100644 misc/sql-datas/english/stopwords.txt
 rename misc/{lang-datas/fr => sql-datas/french}/stopwords.sql (98%)
 create mode 100644 misc/sql-datas/french/stopwords.txt

diff --git a/misc/Install.pm b/misc/Install.pm
index 738a261ae6..18f1bb5174 100644
--- a/misc/Install.pm
+++ b/misc/Install.pm
@@ -1859,11 +1859,9 @@ sub updatedatabase {
 	startsysout();
 	if ($response eq '1') {
 		system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $database");
-		system("cat scripts/misc/lang-datas/en/stopwords.sql | $mysqldir/bin/mysql -u$user $database");
 	}
 	if ($response eq '2') {
 		system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $database");
-		system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $database");
 	}
 	delete($ENV{"KOHA_CONF"});
 
diff --git a/misc/lang-datas/en/stopwords.sql b/misc/sql-datas/english/stopwords.sql
similarity index 100%
rename from misc/lang-datas/en/stopwords.sql
rename to misc/sql-datas/english/stopwords.sql
diff --git a/misc/sql-datas/english/stopwords.txt b/misc/sql-datas/english/stopwords.txt
new file mode 100644
index 0000000000..74cdb77c43
--- /dev/null
+++ b/misc/sql-datas/english/stopwords.txt
@@ -0,0 +1,2 @@
+English stop words
+(contains only THE, please suggest a more complete file)
diff --git a/misc/lang-datas/fr/stopwords.sql b/misc/sql-datas/french/stopwords.sql
similarity index 98%
rename from misc/lang-datas/fr/stopwords.sql
rename to misc/sql-datas/french/stopwords.sql
index 2c5c4c43f6..53c41905a7 100644
--- a/misc/lang-datas/fr/stopwords.sql
+++ b/misc/sql-datas/french/stopwords.sql
@@ -22,6 +22,7 @@ INSERT INTO stopwords VALUES ('CES');
 INSERT INTO stopwords VALUES ('CEUX');
 INSERT INTO stopwords VALUES ('CI');
 INSERT INTO stopwords VALUES ('DANS');
+INSERT INTO stopwords VALUES ('DE');
 INSERT INTO stopwords VALUES ('DES');
 INSERT INTO stopwords VALUES ('DU');
 INSERT INTO stopwords VALUES ('ELLE');
diff --git a/misc/sql-datas/french/stopwords.txt b/misc/sql-datas/french/stopwords.txt
new file mode 100644
index 0000000000..9ccf0799a6
--- /dev/null
+++ b/misc/sql-datas/french/stopwords.txt
@@ -0,0 +1,2 @@
+French stop words
+Mots vides de la langue française.
\ No newline at end of file
-- 
2.39.2