| Index: trunk/WikiWord/WikiWordProperties/src/main/java/de/brightbyte/wikiword/biography/wikis/WikiConfiguration_enwiki.java |
| — | — | @@ -41,32 +41,43 @@ |
| 42 | 42 | |
| 43 | 43 | Pattern defaultSplitPattern = Pattern.compile("[,;/]\\s+|<br\\s*/?>"); |
| 44 | 44 | |
| 45 | | - propertyExtractors.add( new TemplateParameterExtractor(new ExactNameMatcher("Infobox_Artist"), |
| | 45 | + propertyExtractors.add( new TemplateParameterExtractor(new PatternNameMatcher("Infobox_[Aa]rtist|Infobox_comics_creator", 0, true), |
| 46 | 46 | new DefaultTemplateParameterPropertySpec("name", "person-name").setStripMarkup(true), |
| 47 | 47 | new DefaultTemplateParameterPropertySpec("birthname", "person-name").setStripMarkup(true), |
| 48 | 48 | new DefaultTemplateParameterPropertySpec("birthdate", "person-birth-date").setStripMarkup(true), |
| 49 | 49 | new DefaultTemplateParameterPropertySpec("birthplace", "person-birth-place").setStripMarkup(true), |
| 50 | 50 | new DefaultTemplateParameterPropertySpec("location", "person-birth-place").setStripMarkup(true), |
| 51 | 51 | new DefaultTemplateParameterPropertySpec("deathdate", "person-death-date").setStripMarkup(true), |
| | 52 | + new DefaultTemplateParameterPropertySpec("yod", "person-death-date").setStripMarkup(true), |
| 52 | 53 | new DefaultTemplateParameterPropertySpec("deathplace", "person-death-place").setStripMarkup(true), |
| | 54 | + new DefaultTemplateParameterPropertySpec("yod", "person-death-place").setStripMarkup(true), |
| 53 | 55 | new DefaultTemplateParameterPropertySpec("nationality", "person-nationality").setStripMarkup(true), |
| 54 | 56 | new DefaultTemplateParameterPropertySpec("field", "artist-group").setStripMarkup(true).setSplitPattern(defaultSplitPattern), |
| 55 | 57 | new DefaultTemplateParameterPropertySpec("movement", "artist-group").setStripMarkup(true).setSplitPattern(defaultSplitPattern), |
| 56 | 58 | new DefaultTemplateParameterPropertySpec("training", "artist-training").setStripMarkup(true), |
| 57 | | - new DefaultTemplateParameterPropertySpec("award", "artist-award").setStripMarkup(true).setSplitPattern(defaultSplitPattern) |
| | 59 | + new DefaultTemplateParameterPropertySpec("award", "artist-award").setStripMarkup(true).setSplitPattern(defaultSplitPattern), |
| | 60 | + new DefaultTemplateParameterPropertySpec("location", "person-nationality").setStripMarkup(true) |
| 58 | 61 | ) ); |
| 59 | 62 | |
| 60 | | - propertyExtractors.add( new TemplateParameterExtractor(new PatternNameMatcher("Infobox_(((Medical|Military)_)?[Pp]erson|Actor|Astronaut|Criminal|Engineer|Musical_artist|Philosopher|Pope|ReligiousBio|Scientist)", 0, true), |
| | 63 | + propertyExtractors.add( new TemplateParameterExtractor(new PatternNameMatcher("Infobox_(((Medical|Military)_)?[Pp]erson|Actor|Astronaut|Criminal|Engineer|Musical_artist|Philosopher|Pope|ReligiousBio|Scientist|.*_creator|.*_artist)", 0, true), |
| 61 | 64 | new DefaultTemplateParameterPropertySpec("name", "person-name").setStripMarkup(true), |
| 62 | 65 | new DefaultTemplateParameterPropertySpec("other_names", "person-name").setStripMarkup(true), |
| | 66 | + new DefaultTemplateParameterPropertySpec("birth_name", "person-name").setStripMarkup(true), |
| | 67 | + new DefaultTemplateParameterPropertySpec("birthname", "person-name").setStripMarkup(true), |
| 63 | 68 | new DefaultTemplateParameterPropertySpec("birth_date", "person-birth-date").setStripMarkup(true), |
| | 69 | + new DefaultTemplateParameterPropertySpec("yob", "person-birth-date").setStripMarkup(true), |
| 64 | 70 | new DefaultTemplateParameterPropertySpec("birth_place", "person-birth-place").setStripMarkup(true), |
| | 71 | + new DefaultTemplateParameterPropertySpec("birthplace", "person-birth-place").setStripMarkup(true), |
| 65 | 72 | new DefaultTemplateParameterPropertySpec("death_date", "person-death-date").setStripMarkup(true), |
| | 73 | + new DefaultTemplateParameterPropertySpec("yod", "person-death-date").setStripMarkup(true), |
| 66 | 74 | new DefaultTemplateParameterPropertySpec("death_place", "person-death-place").setStripMarkup(true), |
| | 75 | + new DefaultTemplateParameterPropertySpec("deathplace", "person-death-place").setStripMarkup(true), |
| 67 | 76 | new DefaultTemplateParameterPropertySpec("occupation", "person-occupation").setStripMarkup(true), |
| 68 | 77 | new DefaultTemplateParameterPropertySpec("known_for", "person-known-for").setStripMarkup(true), |
| | 78 | + new DefaultTemplateParameterPropertySpec("notable works", "person-known-for").setStripMarkup(true), |
| 69 | 79 | new DefaultTemplateParameterPropertySpec("nationality", "person-nationality").setStripMarkup(true), |
| 70 | 80 | new DefaultTemplateParameterPropertySpec("residence", "person-nationality").setStripMarkup(true), |
| | 81 | + new DefaultTemplateParameterPropertySpec("location", "person-nationality").setStripMarkup(true), |
| 71 | 82 | new DefaultTemplateParameterPropertySpec("citizenship", "person-nationality").setStripMarkup(true) |
| 72 | 83 | ) ); |
| 73 | 84 | |
| Index: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/WikiConfiguration_enwiki.java |
| — | — | @@ -151,7 +151,7 @@ |
| 152 | 152 | conceptTypeSensors.add( new HasTemplateSensor<ConceptType>(ConceptType.PLACE, "Geobox")); |
| 153 | 153 | |
| 154 | 154 | conceptTypeSensors.add( new HasCategoryLikeSensor<ConceptType>(ConceptType.PERSON, "^(Male|Female|People)_|_(people|men|women|births|deaths)$", 0)); |
| 155 | | - conceptTypeSensors.add( new HasTemplateLikeSensor<ConceptType>(ConceptType.PERSON, "^(Persondata|Lifetime|BD|BIRTH-DEATH-SORT)$", 0)); |
| | 155 | + conceptTypeSensors.add( new HasTemplateLikeSensor<ConceptType>(ConceptType.PERSON, "^(Persondata|Lifetime|BD|BIRTH-DEATH-SORT|Infobox.*_(person|[aA]rtist|creator|writer|musician|biography|clergy|scientist))$", 0)); |
| 156 | 156 | |
| 157 | 157 | conceptTypeSensors.add( new HasCategorySensor<ConceptType>(ConceptType.NAME, "Given_names")); |
| 158 | 158 | conceptTypeSensors.add( new HasCategorySensor<ConceptType>(ConceptType.NAME, "Surnames")); |