Sorting of languages different from EO

ziorufus · ziorufus · commit 0c4b0d7c2eb7 · 2013-07-04T11:43:08.000+02:00
diff --git a/core/src/main/scala/org/dbpedia/extraction/config/dataparser/DateTimeParserConfig.scala b/core/src/main/scala/org/dbpedia/extraction/config/dataparser/DateTimeParserConfig.scala
@@ -39,10 +39,10 @@ object DateTimeParserConfig
         "el" -> Map("ΠΧ"-> -1, "Π\\.Χ\\."-> -1, "Π\\.Χ"-> -1 , "ΜΧ"-> 1 , "Μ\\.Χ\\."-> 1, "Μ\\.Χ"-> 1),
         "eo" -> Map("a.K." -> -1, "p.K." -> -1),
         "es" -> Map("AC"-> -1, "A\\.C\\."-> -1, "DC"-> 1, "D\\.C\\."-> 1, "AD"-> 1, "A\\.D\\."-> 1, "AEC"-> 1, "A\\.E\\.C\\."-> 1 , "EC"-> 1, "E\\.C\\."-> 1),
+        "fr" -> Map("av\\. J\\.-C\\."-> -1, "ap\\. J\\.-C\\." -> 1),
         "it" -> Map("AC"-> -1, "A\\.C\\."-> -1, "DC"-> 1, "D\\.C\\."-> 1, "AD"-> 1, "A\\.D\\."-> 1, "PEV"-> -1, "P\\.E\\.V\\."-> -1, "EV"-> 1, "E\\.V\\." -> 1),
         "nl" -> Map("v\\.Chr\\." -> -1, "n\\.C\\."-> 1, "v\\.C\\." -> -1, "n\\.Chr\\."-> 1, "voor Chr\\." -> -1, "na Chr\\."-> 1), 
-        "pt" -> Map("AC"-> -1, "A\\.C\\."-> -1, "DC"-> 1, "D\\.C\\."-> 1, "AD"-> 1, "A\\.D\\."-> 1, "AEC"-> 1, "A\\.E\\.C\\."-> 1 , "EC"-> 1, "E\\.C\\."-> 1),
-        "fr" -> Map("av\\. J\\.-C\\."-> -1, "ap\\. J\\.-C\\." -> 1)
+        "pt" -> Map("AC"-> -1, "A\\.C\\."-> -1, "DC"-> 1, "D\\.C\\."-> 1, "AD"-> 1, "A\\.D\\."-> 1, "AEC"-> 1, "A\\.E\\.C\\."-> 1 , "EC"-> 1, "E\\.C\\."-> 1)
     )
 
     //suffixes for 1st, 2nd etc. (maybe add this to infobox extractor RankRegex val)
@@ -51,10 +51,10 @@ object DateTimeParserConfig
         "el" -> "η|ης",
         "eo" -> "-a|-an",
         "es" -> "°|\\.°|°\\.",
+        "fr" -> "er|nd|ème",
         "it" -> "°|\\.°|°\\.",
         "nl" -> "ste|de|e",
-        "pt" -> "°|\\.°|°\\.",
-        "fr" -> "er|nd|ème"
+        "pt" -> "°|\\.°|°\\."
     )
 
     //specifies for a template name (lower-cased) the property keys of year, month and day
@@ -131,6 +131,11 @@ object DateTimeParserConfig
             "adina"                -> Map ("year" -> "1", "month"-> "2", "day" -> "3"),
             "adin parentesigabea"  -> Map ("year" -> "1", "month"-> "2", "day" -> "3")
         ),
+        "fr" -> Map(
+            "date"      -> Map ("year" -> "3", "month"-> "2", "day" -> "1"),
+            "date de naissance"      -> Map ("year" -> "3", "month"-> "2", "day" -> "1"),
+            "date de décès"      -> Map ("year" -> "3", "month"-> "2", "day" -> "1")
+        ),
         "id" -> Map(
             "Mula tanggal dan usia"         -> Map ("year" -> "1", "month"-> "2", "day" -> "3"),
             "Tanggal lahir dan umur"        -> Map ("year" -> "1", "month"-> "2", "day" -> "3"),
@@ -216,11 +221,6 @@ object DateTimeParserConfig
             "Дата народження"     -> Map ("year" -> "3", "month"-> "2", "day" -> "1"),
             "Народився"           -> Map ("year" -> "3", "month"-> "2", "day" -> "1"),
             "Дата смерті"         -> Map ("year" -> "3", "month"-> "2", "day" -> "1")
-        ),
-        "fr" -> Map(
-            "date"      -> Map ("year" -> "3", "month"-> "2", "day" -> "1"),
-            "date de naissance"      -> Map ("year" -> "3", "month"-> "2", "day" -> "1"),
-            "date de décès"      -> Map ("year" -> "3", "month"-> "2", "day" -> "1")
         )
     )
 
diff --git a/core/src/main/scala/org/dbpedia/extraction/config/dataparser/ParserUtilsConfig.scala b/core/src/main/scala/org/dbpedia/extraction/config/dataparser/ParserUtilsConfig.scala
@@ -54,7 +54,21 @@ object ParserUtilsConfig
             "biliardo" -> 15,
             "triliono" -> 18
         ),
-        
+        "es" -> Map(
+            "mil" -> 3,
+            "millón" -> 6,
+            "millardo" -> 9,
+            "billón" -> 12,
+            "trillón" -> 18,
+            "cuatrillón" -> 24
+        ),
+        "fr" -> Map(
+            "mille" -> 3,
+            "million" -> 6,
+            "milliard" -> 9,
+            "billion" -> 12,
+            "trillion" -> 18
+        ),
         "nl" -> Map(
             "honderd" -> 2,
             "duizend" -> 3,
@@ -85,21 +99,6 @@ object ParserUtilsConfig
             "biliony" -> 12,
             "bilionów" -> 12,
             "bln" -> 12
-        ),
-        "es" -> Map(
-            "mil" -> 3,
-            "millón" -> 6,
-            "millardo" -> 9,
-            "billón" -> 12,
-            "trillón" -> 18,
-            "cuatrillón" -> 24
-        ),
-        "fr" -> Map(
-            "mille" -> 3,
-            "million" -> 6,
-            "milliard" -> 9,
-            "billion" -> 12,
-            "trillion" -> 18
         )
     )
     
