Commit Graph

230 Commits

Author SHA1 Message Date
hallgren
b8c1a09896 The name of the fastcgi executable has changed back to pgf-service 2011-01-09 15:32:17 +00:00
krasimir
cdebaef7ef The GF editor now lets the user to upload his/her own grammars 2010-12-28 16:26:10 +00:00
hallgren
da4f5cf607 gf-server.cabal: changes to stop cabal from demanding hsql even when content-server is not going to be built 2010-12-23 17:02:13 +00:00
hallgren
0a52aaf81d PGF web service: make the generated index.html for pgf-http a bit more informative 2010-12-22 15:06:02 +00:00
hallgren
18338b0ee4 gf-server.cabal: update description of fastcgi flag 2010-12-22 15:05:10 +00:00
hallgren
a5b661700b gf-server.cabal: make hsql-mysql optional like fastcgi
content-service depends on hsql-mysql, which depends on a C library, so like
fastcgi, only compile it if you ask for it explicitly with -ffastcgi.
2010-12-22 14:59:49 +00:00
hallgren
5dd58dfca6 gf-server.cabal: Change the default for the flag fastcgi to False
If you want the fastcgi server, use cabal install -ffastcgi.

This is to avoid problems when you only want to compile pgf-http and the
fastcgi library fails to install, which it usually does, since it depends on
a C library which is not installed automatically with cabal.
2010-12-22 14:49:17 +00:00
hallgren
681c5d25dd PGF web service: Use Content-Type text/javascript from JSON output
The Content-Type used to be text/json, but this caused warning messages in
some web browers.
2010-12-22 14:47:35 +00:00
krasimir
9ae3a7b30d tweak gf-server.cabal 2010-12-22 12:32:13 +00:00
hallgren
c9d9db121a pgf-http now uses $datadir/www instead of ./www as the document root
Along with the changes to Setup.hs it should now be enough to do

	cabal install
	pgf-http
	open http://localhost:41296/

to run the PGF service locally and play with some example grammars in minibar.
2010-12-17 16:35:59 +00:00
hallgren
31c09c8846 RunHTTP.hs: remove hardcoded document root
The document root is now part of the arguments passed to runHTTP.
2010-12-17 16:33:54 +00:00
hallgren
72148feeb9 Install minibar and some example grammars along with pgf-http
Together with the changes to pgf-http, this should make it much easier to run
the PGF service and minibar locally.
2010-12-17 16:29:22 +00:00
hallgren
5fd4efd960 Split pgf-server into pgf-fcgi and pgf-http.
The dependency on the fastcgi package made pgf-server difficult to compile, so
it is now split into

  - pgf-fgci (main module in pgf-fcgi.hs), which is built only if fastcgi is
    already installed or if you turn on the fastcgi flag (e.g. by doing
    'cabal install -f fastcgi').

  - pgf-http (main module in pgf-http.hs) which is always built (and hopefully
    has no problematic dependencies.) 

The modules FastCGIUtils and PGFService no longer depend on fastcgi.
2010-11-26 14:30:51 +00:00
hallgren
9532a34a2a pgf-server: more useful JSON output from lineraizeAll
Example:

Request: http://www.grammaticalframework.org:41296/grammars/Quiz.pgf?command=linearizeAll&tree=Run+YouPl

Response: [{"to":"QuizEng","texts":["you run"]},
           {"to":"QuizSwe","texts":["ni l??per","ni springer"]}]

Compared to the old command linearize:

Request: http://www.grammaticalframework.org:41296/grammars/Quiz.pgf?command=linearize&tree=Run+YouPl'

Response: [{"to":"QuizEng","text":"you run"},
           {"to":"QuizSwe","text":"ni l??per"}]
2010-11-25 18:30:30 +00:00
aarne
62cfeef03e linearizeAll in PGFService 2010-11-24 21:17:29 +00:00
hallgren
d0efcc035c Make PGFService.hs compile again
+ PGFService.hs: add Nothing arguments in calls to PGF.parse_ and
  PGF.getPArseOutput
+ gf-server.cabal: mark content-server as not buildable, since required source
  files are missing.
2010-11-09 15:08:37 +00:00
krasimir
042790fdf6 the PGF service now can do both random and exhaustive generation. these functions now return both the generated tree and its linearization 2010-10-13 12:32:49 +00:00
krasimir
95733f0b1b the exhaustive/random generator now knows how to handle computable functions in the types 2010-10-11 17:18:28 +00:00
krasimir
be9ad26aea refactor the API for random generation again. Now PGF contains probabilities in the abstract syntax 2010-10-02 13:03:57 +00:00
krasimir
72f505d7df update PGFService to work after the extensions in the random generation API 2010-09-30 07:35:54 +00:00
hallgren
5e1f2c069f pgf-server HTTP mode: omit charset from ContentType for static files
When pfg-server servers a static file in HTTP mode, it is output as is, so
specifying charset="iso-8859-1" could be wrong. 

Note: the a charset can be specified with a meta tag in HTML files,
e.g. for files in UTF-8:

<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
2010-09-24 12:34:38 +00:00
hallgren
af8645a2f3 pgf-server HTTP mode: support the Accept-Language header
It is needed for the userLanguage field in the grammar info from pgf-server
2010-09-10 11:20:49 +00:00
hallgren
cff7dfcf7b pgf-server HTTP mode: workaround for bugs in the httpd-shed package that prevented the fridge and translate web apps from working
queryToArguments "?&input=bla+bla"
           returns [("&input","bla+bla")]
 but should return [("input","bla bla")]
2010-09-03 13:12:08 +00:00
hallgren
c5f0b31dbe pgf-server HTTP mode feature: return the contents of index.html when the URL refers to a directory 2010-09-02 14:10:07 +00:00
hallgren
c234222cd9 Bug fix: add missing error handler for statically served files in pgf-server HTTP mode 2010-09-02 13:54:16 +00:00
hallgren
ea67281820 Standalone HTTP version of pgf-server
pgf-server can now act as a standalone HTTP server. To activate this mode,
start it with

	pfg-server http

to use the default port number (41296), or give an explicit port number, e.g.,

	pgf-server http 8080

The HTTP server serves PGF files in the same way as the old FastCGI interface.
In addition, it also serves static files. The document root for static files
is the www subdirectory of the current directory where pgf-server is started.

In spite of these addition, backwards compatibility is maintaned. The old
FastCGI interface continues to work as before. (It is activated when
pgf-server is started without arguments.)
2010-09-01 14:08:52 +00:00
krasimir
9aa7c88c5a native representation for HOAS in PMCFG and incremental type checking of the parse forest 2010-08-09 10:10:08 +00:00
krasimir
b20821dfc3 more advanced complete function in the PGFService 2010-08-24 15:58:22 +00:00
krasimir
39e83436e2 bugfix in the PGF browser 2010-07-31 16:04:15 +00:00
krasimir
57ec23e630 the PGF service now generates samples of the syntax in the browsing information 2010-07-31 15:54:03 +00:00
krasimir
b8214aff83 fix: FastCGIUtils.outputHTML should do UTF8 encoding 2010-07-31 13:56:55 +00:00
krasimir
fefd78222a fix: PGFService should type-check the trees that comes from the user 2010-07-31 10:45:59 +00:00
krasimir
b57dda5d94 detailed information for the type errors from PGFService 2010-07-13 15:33:54 +00:00
krasimir
d0ce81a02c update the shell scripts and some other configuration files for GWT 2.0.4 2010-07-08 12:03:36 +00:00
krasimir
4539830212 add src/ui folder for both Android and GWT UIs 2010-07-08 10:06:26 +00:00
krasimir
1cb3cfb4c2 change the package name of the GWT Apps to org.grammaticalframework.ui.gwt 2010-07-08 09:55:09 +00:00
krasimir
161403e7d3 upgrade to GWT 2.0.4 2010-07-08 09:32:17 +00:00
krasimir
0dbe60b7bf FridgeApp and TranslateApp now show the type errors 2010-07-08 07:57:36 +00:00
krasimir
1a7210dc18 fix PGFService after the change in the parser API 2010-07-07 14:46:24 +00:00
aarne
b66d93f44f disambiguation in Phrasebook: show Eng instead of AST if DisambL is missing; show all alternative disambiguations for each alternative translation 2010-05-28 03:40:35 +00:00
krasimir
8742ebee38 for backward compatibility we have the old parse function again. the old functionality is exposed by parse_ 2010-04-30 20:18:26 +00:00
krasimir
a3e1d43318 fix PGFService after the change in the API 2010-04-30 15:09:21 +00:00
hallgren
ee9acfc772 Update version numbers for build-depends in gf-server.cabal 2010-04-22 14:22:55 +00:00
krasimir
f806a7890d now the PGF service communicates with Graphviz using UTF8 for the input and binary for the output 2010-04-22 14:01:08 +00:00
krasimir
a4894be101 the pgf service now compiles with the latest CGI package 2010-04-22 12:37:36 +00:00
hallgren
4c757f4683 Changes to lighttpd.conf to allow grammars.cgi to work 2010-04-20 14:46:36 +00:00
aarne
1040f2a10d in PGFService disambiguation, show tree if there's no disamb grammar 2010-04-04 20:45:50 +00:00
aarne
66cca22f38 simplified the treatment of politeness in Phrasebook 2010-03-30 18:48:59 +00:00
aarne
0e91a4d84d disambiguation in Phrasebook grammars, PGF server, and the GUI 2010-03-30 15:39:11 +00:00
aarne
1c088506b3 catching initial bind symbol in PGFServer 2010-03-28 20:32:03 +00:00