fixed the generator to work on both Linux and Mac

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@774 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Feb 22, 2010 · 353a2c2 · 353a2c2
1 parent aa96345
commit 353a2c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/shared/generators/reroot2top b/shared/generators/reroot2top
@@ -15,7 +15,11 @@ elif [ ! -r $1 ]; then
 	exit 1
 else
 	rm -f $2
-	xpath $1 `cat ${SLPS}/topics/presentation/metrics/listtops.xpath` 1> $2.tmp 2> /dev/null
+	if [ `uname` = 'Linux' ] ; then
+		xpath -e `cat ${SLPS}/topics/presentation/metrics/listtops.xpath` $1 1> $2.tmp 2> /dev/null
+	else
+		xpath $1 `cat ${SLPS}/topics/presentation/metrics/listtops.xpath` 1> $2.tmp 2> /dev/null
+	fi
 	python ${SLPS}/shared/python/reroot2nts.py $2.tmp $2
 	rm -f $2.tmp
 fi
diff --git a/topics/presentation/metrics/listtops.xpath b/topics/presentation/metrics/listtops.xpath
@@ -1 +1 @@
-/*/*/nonterminal[not(text()=/*/*/*//nonterminal/text()) and not(text()=../preceding-sibling::*/nonterminal/text())]
+/*/*/nonterminal[not(text()=/*/*/*//nonterminal/text())][not(text()=../preceding-sibling::*/nonterminal/text())]