diff --git a/src/editor/simple/Makefile b/src/editor/simple/Makefile
index 8deac8b2a..be40c0944 100644
--- a/src/editor/simple/Makefile
+++ b/src/editor/simple/Makefile
@@ -1,3 +1,7 @@
save: save.hs
ghc --make save.hs
+
+install::
+ @make save
+ rsync -avz P *.html *.css *.js ../../runtime/javascript/minibar/support.js *.cgi *.manifest save www.grammaticalframework.org:/usr/local/www/GF/demos/gfse
diff --git a/src/editor/simple/TODO b/src/editor/simple/TODO
index b9a684518..1d876e9d9 100644
--- a/src/editor/simple/TODO
+++ b/src/editor/simple/TODO
@@ -26,3 +26,6 @@
- Bug! After adding a 2nd def of a fun with a different type and then deleting
the old fun, the corresponding lin will have the wrong lhs.
+
+- Bug! The startcat menu shows the first category by default, but the startcat
+ flag is actually not set until a selection is made from the menu.
\ No newline at end of file
diff --git a/src/editor/simple/index.html b/src/editor/simple/index.html
index ef3843379..dcca4d7b7 100644
--- a/src/editor/simple/index.html
+++ b/src/editor/simple/index.html
@@ -31,10 +31,10 @@ This page does not work without JavaScript.
HTML
- Last modified: Wed Feb 16 15:10:52 CET 2011
+ Last modified: Thu Feb 17 17:45:54 CET 2011
About
-
+
diff --git a/src/editor/simple/upload.cgi b/src/editor/simple/upload.cgi
index fbc5a0be1..439ead53e 100644
--- a/src/editor/simple/upload.cgi
+++ b/src/editor/simple/upload.cgi
@@ -11,10 +11,10 @@ export LC_CTYPE="UTF-8"
style_url="editor.css"
make_dir() {
- dir="$(mktemp -d ../tmp/gfse.XXXXXXXX)"
+ dir="$(mktemp -d "$tmp/gfse.XXXXXXXX")"
# chmod a+rxw "$dir"
chmod a+rx "$dir"
- ln "$dir/../../grammars/grammars.cgi" "$dir"
+ ln "$grammars/grammars.cgi" "$dir"
}
@@ -49,12 +49,21 @@ check_grammar() {
endall
}
+if [ -z "$tmp" ] || [ -z "$grammars" ] ||
+ ! [ -d "$tmp" ] || ! [ -d "$grammars" ] ; then
+ pagestart "Error"
+ echo "upload.cgi is not properly configured"
+
+ # cgiconfig.sh must define tmp and grammars.
+ # cgiconfig.sh should minibar and gfshell to allow grammars to be tested.
+ endall
+else
case "$REQUEST_METHOD" in
POST)
case "$PATH_INFO" in
/tmp/gfse.*)
style_url="../../$style_url"
- dir="../tmp/${PATH_INFO##*/}"
+ dir="$tmp/${PATH_INFO##*/}"
check_grammar
;;
*)
@@ -75,3 +84,4 @@ case "$REQUEST_METHOD" in
endall
esac
esac
+fi