From 7ec017983e46750784f14b153fe011398ee03acd Mon Sep 17 00:00:00 2001
From: jpohlmeyer <jpohlmeyer@techfak.uni-bielefeld.de>
Date: Fri, 12 Apr 2019 09:49:34 +0200
Subject: [PATCH] Delete getName grammar from whereIsThis config and add
 variations to location grammar

---
 psConfig/tasks/whereIsThis/whereIsThis.conf  | 7 -------
 psGrammar/tasks/whereIsThis/getLocation.jsgf | 6 +++++-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/psConfig/tasks/whereIsThis/whereIsThis.conf b/psConfig/tasks/whereIsThis/whereIsThis.conf
index 722f69a4..b85f25b9 100644
--- a/psConfig/tasks/whereIsThis/whereIsThis.conf
+++ b/psConfig/tasks/whereIsThis/whereIsThis.conf
@@ -6,13 +6,6 @@ timeout=8;
 openDeviceDirectly=yes;
 alsadevice=sysdefault;
 
-[pocketsphinxinstance]
-name=getName;
-jsgf=../../../psGrammar/tasks/receptionist/getName.jsgf;
-rsbscope=/speechrec/psa/receptionist/getname;
-bestpath=no;
-autoload=yes;
-
 [pocketsphinxinstance]
 name=getLocation;
 jsgf=../../../psGrammar/tasks/whereIsThis/getLocation.jsgf;
diff --git a/psGrammar/tasks/whereIsThis/getLocation.jsgf b/psGrammar/tasks/whereIsThis/getLocation.jsgf
index c6273772..96309b1c 100644
--- a/psGrammar/tasks/whereIsThis/getLocation.jsgf
+++ b/psGrammar/tasks/whereIsThis/getLocation.jsgf
@@ -2,12 +2,16 @@
 grammar getLocation;
 public <locationstring> = [<prefix>] <location> [<robot>];
 
-<prefix> = (<whereis> | <wherecan>);
+<prefix> = (<whereis> | <wherecan> | <canyouguide> | <canyouhelp>);
 
 <whereis> = (where is [the]);
 
 <wherecan> = (where can i find [the]);
 
+<canyouguide> = (can you guide me to [the]);
+
+<canyouhelp> = (can you help me find [the]);
+
 <location> = ( (sofa) | (comfy chair) | (shelf) );
 
 <robot> = (tobi) | (robot) | (biron) | (pepper);
-- 
GitLab