[Hejes-devel] [912] Kulegy: wordform.py, def: changed "Uralkodohaz" to "Dynasty"

[hejes-devel at nytud.hu]

Revision: 912
Author:   ludanyizs
Date:     2013-08-26 13:24:19 +0200 (Mon, 26 Aug 2013)
Log Message:
-----------
Kulegy: wordform.py, def: changed "Uralkodohaz" to "Dynasty"

Modified Paths:
--------------
    trunk/web2py/applications/helyesiras_webdev/modules/Wordform.py
    trunk/web2py/applications/helyesiras_webdev/modules/egybekulon2_def.py

Modified: trunk/web2py/applications/helyesiras_webdev/modules/Wordform.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/Wordform.py	2013-08-26 11:21:41 UTC (rev 911)
+++ trunk/web2py/applications/helyesiras_webdev/modules/Wordform.py	2013-08-26 11:24:19 UTC (rev 912)
@@ -890,11 +890,11 @@
         """
         return self.NatGeo == 1
         
-    def isUralkodohaz(self):
+    def isDynasty(self):
 	""" Lexical information: uralkodohaz neve
         Returns True, False or None (when unknown)
         """
-        return self.Uralkodohaz
+        return self.Dynasty
 
 def forPrefix(mydb, q) :
     """ Load id-wordform pairs found for the given wordform prefix.
@@ -1141,7 +1141,7 @@
         l.MorphXivus = row[87] # i-kepzos alak (foldrajzi nevek)
         l.GeoPart = row[88] # telepules resze, pl. Ujpest, Varosliget
         l.NatGeo = row[89] # termeszetfoldrajzi nev
-        l.Uralkodohaz = row[90] # uralkodohaz neve
+        l.Dynasty = row[90] # uralkodohaz neve
 
     return l
 

Modified: trunk/web2py/applications/helyesiras_webdev/modules/egybekulon2_def.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/egybekulon2_def.py	2013-08-26 11:21:41 UTC (rev 911)
+++ trunk/web2py/applications/helyesiras_webdev/modules/egybekulon2_def.py	2013-08-26 11:24:19 UTC (rev 912)
@@ -20,7 +20,7 @@
 'sem': ['Color1', 'Color3', 'CompoundPrefix2', 'FamilyName', 'PersFirst', 'Group', 'NumeralIndef',
  'Material1', 'Material2', 'ProperName', 'ProperGeo', 'Folk', 'Container', 'Animal', 'Occupation', 'HatarozosMelleknev', 'FoneviJelzosSzerkAlaptag',
  'Emphasis', 'EgyebFoneviJelzo', 'Occupation', 'Ecclesiastic', 'ProperGeo', 'Abbr', 'KozszoiBetuszo', 'KozszoiBetuszoKivetel',
-  'Major', 'isGeoSettlement', 'TulnevBetuszo', 'Uralkodohaz'],
+  'Major', 'isGeoSettlement', 'TulnevBetuszo', 'Dynasty'],
 # semantic features, see WordInfo.hasLexProp()
 'match': '!REGEXP!',
 # regexp over concatenated list of morphs' tags