You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/11/07 01:03:49 UTC

git commit: bug fixes

Updated Branches:
  refs/heads/develop 1d99989c9 -> da75a3e75


bug fixes


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/da75a3e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/da75a3e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/da75a3e7

Branch: refs/heads/develop
Commit: da75a3e754ea45ef808179ec0ef40829fb38f04b
Parents: 1d99989
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Thu Nov 7 01:03:44 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Thu Nov 7 01:03:44 2013 +0100

----------------------------------------------------------------------
 .../kiwi/sparql/sail/KiWiSparqlSail.java        | 33 +++++++++++++++++---
 .../persistence/pgsql/create_fulltext_index.sql |  2 +-
 .../pgsql/create_fulltext_index_generic.sql     |  2 +-
 .../pgsql/create_fulltext_langlookup.sql        |  2 +-
 4 files changed, 32 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/da75a3e7/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSail.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSail.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSail.java
index df87cad..f6488dd 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSail.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSail.java
@@ -40,6 +40,8 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.io.StringReader;
 import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Add file description here!
@@ -118,10 +120,13 @@ public class KiWiSparqlSail extends NotifyingSailWrapper {
                             }
                             for(String lang : configuration.getFulltextLanguages()) {
                                 if(connection.getMetadata("ft.idx."+lang) == null) {
-                                    log.info("PostgreSQL: creating fulltext index for language {}", lang);
-                                    String script_lang = script.toString().replaceAll("@LANGUAGE@", lang);
-                                    log.debug("PostgreSQL: running SQL script '{}'", script_lang);
-                                    runner.runScript(new StringReader(script_lang));
+                                    String pg_configuration = POSTGRES_LANG_MAPPINGS.get(lang);
+                                    if(pg_configuration != null) {
+                                        log.info("PostgreSQL: creating fulltext index for language {}", lang);
+                                        String script_lang = script.toString().replaceAll("@LANGUAGE@", lang).replaceAll("@CONFIGURATION@",pg_configuration);
+                                        log.debug("PostgreSQL: running SQL script '{}'", script_lang);
+                                        runner.runScript(new StringReader(script_lang));
+                                    }
                                 }
                             }
                         }
@@ -198,4 +203,24 @@ public class KiWiSparqlSail extends NotifyingSailWrapper {
             throw new SailException(e);
         }
     }
+
+
+    private static Map<String,String> POSTGRES_LANG_MAPPINGS = new HashMap<>();
+    static {
+        POSTGRES_LANG_MAPPINGS.put("en","english");
+        POSTGRES_LANG_MAPPINGS.put("de","german");
+        POSTGRES_LANG_MAPPINGS.put("fr","french");
+        POSTGRES_LANG_MAPPINGS.put("it","italian");
+        POSTGRES_LANG_MAPPINGS.put("es","spanish");
+        POSTGRES_LANG_MAPPINGS.put("pt","portuguese");
+        POSTGRES_LANG_MAPPINGS.put("sv","swedish");
+        POSTGRES_LANG_MAPPINGS.put("no","norwegian");
+        POSTGRES_LANG_MAPPINGS.put("dk","danish");
+        POSTGRES_LANG_MAPPINGS.put("nl","dutch");
+        POSTGRES_LANG_MAPPINGS.put("ru","russian");
+        POSTGRES_LANG_MAPPINGS.put("tr","turkish");
+        POSTGRES_LANG_MAPPINGS.put("hu","hungarian");
+        POSTGRES_LANG_MAPPINGS.put("fi","finnish");
+
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/da75a3e7/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_index.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_index.sql b/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_index.sql
index 114fd15..e68f348 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_index.sql
+++ b/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_index.sql
@@ -14,7 +14,7 @@
 -- limitations under the License.
 
 DROP INDEX IF EXISTS kiwi_ft_idx_@LANGUAGE@;
-CREATE INDEX kiwi_ft_idx_@LANGUAGE@ ON nodes USING gin(to_tsvector(kiwi_ft_lang('@LANGUAGE@'),svalue));
+CREATE INDEX kiwi_ft_idx_@LANGUAGE@ ON nodes USING gin(to_tsvector('@CONFIGURATION@',svalue));
 
 INSERT INTO metadata(mkey,mvalue) VALUES ('ft.idx.@LANGUAGE@','true');
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/da75a3e7/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_index_generic.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_index_generic.sql b/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_index_generic.sql
index 0719f0f..6e8870f 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_index_generic.sql
+++ b/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_index_generic.sql
@@ -16,5 +16,5 @@
 DROP INDEX IF EXISTS kiwi_ft_idx_generic;
 CREATE INDEX kiwi_ft_idx_generic ON nodes USING gin(to_tsvector('simple',svalue));
 
-INSERT INTO metadata(mkey,mvalue) VALUES ('ft.idx.generic,'true');
+INSERT INTO metadata(mkey,mvalue) VALUES ('ft.idx.generic','true');
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/da75a3e7/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_langlookup.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_langlookup.sql b/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_langlookup.sql
index 73795af..13679d8 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_langlookup.sql
+++ b/libraries/kiwi/kiwi-sparql/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_fulltext_langlookup.sql
@@ -36,7 +36,7 @@ BEGIN
     ELSE RETURN 'simple';
   END CASE;
 END
-$$ LANGUAGE plpgsql IMMUTABLE;
+$$ LANGUAGE plpgsql;
 
 INSERT INTO metadata(mkey,mvalue) VALUES ('ft.lookup','true');