From ce45f2e05c4622f1d03545478e9942602dc60f19 Mon Sep 17 00:00:00 2001
From: Francis Bond <bond@ieee.org>
Date: Fri, 3 Sep 2010 13:27:40 +0800
Subject: [PATCH] Changed setup.sh to not reset $DTHOME

Changed logon_do and lisp to
  actually use the values of limit and edges
  allow a seperate value for tedges (transfer edges)
---
 bin/logon_do               | 10 +++++++---
 lisp/settings/default.lisp | 14 ++++++++------
 setup.sh                   |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/bin/logon_do b/bin/logon_do
index 4085b94..30b0736 100755
--- a/bin/logon_do
+++ b/bin/logon_do
@@ -40,7 +40,7 @@ make_lisp () {
 }
 
 usage () {
-	echo "usage: logon_do [-a|--ascii <a.txt>] [-b|--bitext <b.txt>] [-c|--count] [-d|--debug] [-e|--edges <n>] [-l|--limit <n>] [-s|--settings <s.lisp>] -g|--grammar <jaen|enen> -t|--task <smrs|tmrs|pmrs|gmrs|vmrs|omrs|imrs> [<profile-top>]"
+	echo "usage: logon_do [-a|--ascii <a.txt>] [-b|--bitext <b.txt>] [-c|--count] [-d|--debug] [-e|--edges <n>] [-t|--tedges <n>] [-l|--limit <n>] [-s|--settings <s.lisp>] -g|--grammar <jaen|enen> -t|--task <smrs|tmrs|pmrs|gmrs|vmrs|omrs|imrs> [<profile-top>]"
 }
 
 TREEBANK=${TREEBANK:=$HOME/treebank}
@@ -67,6 +67,10 @@ while [ $# -gt 0 -a "${1#-}" != "$1" ]; do
 		-e|--edges)
 			edges=$2
 			shift 2
+                ;;
+		-t|--tedges)
+			tedges=$2
+			shift 2
 		;;
     	-g|--grammar)
 			grammar=$2
@@ -91,12 +95,12 @@ while [ $# -gt 0 -a "${1#-}" != "$1" ]; do
 done
 
 # vars that we allow the user to define
-vars="profile_top count edges limit fmt"
+vars="profile_top count edges tedges limit fmt"
 
 # lisp loaded before initializing user-defined vars
 blisp="$DTHOME/lisp/startup.lisp $settings"
 # lisp loaded after initializing user-defined vars
-alisp="$DTHOME/lisp/$grammar/$task.lisp $DTHOME/lisp/common/$task.lisp $DTHOME/lisp/shutdown.lisp"
+alisp="$DTHOME/lisp/setvars.lisp $DTHOME/lisp/$grammar/$task.lisp $DTHOME/lisp/common/$task.lisp $DTHOME/lisp/shutdown.lisp"
 
 # make sure there is an argument left that points to an absolute path
 if [ -z "$1" ]; then
diff --git a/lisp/settings/default.lisp b/lisp/settings/default.lisp
index f1f3491..f9cba2b 100644
--- a/lisp/settings/default.lisp
+++ b/lisp/settings/default.lisp
@@ -1,9 +1,11 @@
 (setf fmt "bitext")
 (setf limit 3)
 (setf count 1)
-(setf tsdb::*tsdb-maximal-number-of-analyses* limit)
-(setf tsdb::*tsdb-maximal-number-of-results* limit)
-(set (intern "*MAXIMUM-NUMBER-OF-EDGES*" :lkb) 100000)
-(set (intern "*UNPACK-EDGE-ALLOWANCE*" :lkb) 100000)
-(set (intern "*TSDB-MAXIMAL-NUMBER-OF-EDGES*" :tsdb) 100000)
-(setf mt::*transfer-edge-limit* 5000)
+(setf edges 100000)
+(setf tedges 5000)
+;; (setf tsdb::*tsdb-maximal-number-of-analyses* limit)
+;; (setf tsdb::*tsdb-maximal-number-of-results* limit)
+;; (set (intern "*MAXIMUM-NUMBER-OF-EDGES*" :lkb) 100000)
+;; (set (intern "*UNPACK-EDGE-ALLOWANCE*" :lkb) 100000)
+;; (set (intern "*TSDB-MAXIMAL-NUMBER-OF-EDGES*" :tsdb) 100000)
+;; (setf mt::*transfer-edge-limit* 5000)
diff --git a/setup.sh b/setup.sh
index 54843cb..bd603eb 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DTHOME=`dirname $0`
+#DTHOME=`dirname $0`
 export DTHOME
 export PATH=$DTHOME/bin:$PATH