From a96e90a4ae0f05092f9009467d5afcde6f2962f6 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Mon, 19 Sep 2011 14:37:30 +0000
Subject: QueryFin improved

---
 examples/query/small/QuerySwe.gf | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'examples/query/small/QuerySwe.gf')

diff --git a/examples/query/small/QuerySwe.gf b/examples/query/small/QuerySwe.gf
index 17f89352c..1dde65a3a 100644
--- a/examples/query/small/QuerySwe.gf
+++ b/examples/query/small/QuerySwe.gf
@@ -117,21 +117,11 @@ oper
 -- lexicon
 
 lincat
-  Country = {np : NP ; a : A} ;
   JobTitle = CN ;
 lin
-  NCountry c = c.np ;
-  PCountry c = mkAP c.a ;
+  Located i = mkAP (mkA2 (mkA "belägen" "beläget") in_Prep) i ;
 
-  Located i =
-      mkAP (mkA2 (mkA "belägen" "beläget") in_Prep) i ;
---    | mkAP (mkA2 (mkA "situated") in_Prep) i ;
-
-  Employed i =
-      mkAP (mkA2 (mkA "anställd") by8agent_Prep) i
---    | mkAP (mkA2 (mkA "paid") by8agent_Prep) i
---    | mkAP (mkA2 (mkA "aktiv") at_Prep) i
-    | mkAP (mkA2 (mkA "professionellt aktiv") at_Prep) i ;
+  Employed i = mkAP (mkA2 (mkA "anställd") by8agent_Prep) i ;
 
   Work i =
       mkVP (mkV2 (mkV "jobba") at_Prep) i
@@ -178,8 +168,4 @@ lin
   Person3 = mkName "'Person3" ;
   Person4 = mkName "'Person4" ;
 
-oper
-  mkCountry : Str -> Str -> {np : NP ; a : A} =
-    \n,a -> {np = mkNP (mkPN n neutrum) ; a = mkA a} ;
-
 }
-- 
cgit v1.2.3