Merge branch 'master' of ssh://vo20.nl/git/uva

.gitignore

@@ -10,3 +10,5 @@
 *.gz
 compilerbouw/
 robotica/
+*.out
+*.bz2

telematica/ass2/Makefile

@@ -7,7 +7,7 @@
 all: highlight compile
 
 clean:
-	rm -vf *.out *.aux *.toc translate.tex report.pdf
+	rm -vf *.out *.aux *.toc *.bz2 translate.tex report.pdf
 
 compile:
 	pdflatex report
@@ -19,3 +19,6 @@ highlight: translate.tex
 translate.tex: translate
 	pygmentize -O style=colorful -l php -o $@ $^
 
+tarball:
+	tar -cvjf translate.tar.bz2 translate report.pdf
+

telematica/ass2/report.tex

 \documentclass[10pt,a4paper]{article}
-\usepackage{float, url}
+\usepackage{float, hyperref}
 
 % Load code highlighter color scheme
 \input{colors}
@@ -14,24 +14,24 @@
 \section{Assignment} % {{{
 \label{sec:Assignment}
 
-The assignment is to create a command-line client that uses the Google Translate
-Webservice API to translate data entered by the user. The source and target
-language must be entered in the command line, and there must be an option
-'--help' available.
+The assignment is to create a command-line interface that uses the Google
+Translate Webservice API to translate data entered by the user. The source and
+target language must be entered in the command line, and there should be an option
+\texttt{--help} available.
 
 % }}}
 
 \section{Protocol} % {{{
 \label{sec:Protocol}
 
-The Google Translate API cal be called with a HTTP GET request. To be able to
-use the API, we need an ``API key'', which we have received from Google. The
-request parameters should at least contain the API key, the target language and
-one or more texts that are to be translated. If no source language is specified
-in the parameters, the server will try to detect and return the source language
-from the entered text values. Since our program requires the source language to
-be specified, we will not use this functionality. The request URL thus
-always has the following format:
+The Google Translate API can be called with an HTTP GET request. To be able to
+use the API, we need an ``API key'', which we have obtained from the Google API
+Console website. The request parameters should at least contain the API key, the
+target language and one or more texts that are to be translated. If no source
+language is specified in the parameters, the server will try to detect and
+return the source language from the entered text values. Since our program
+requires the source language to be specified, we will not use this
+functionality. The request URL thus always has the following format:
 
 \begin{verbatim}
 https://www.googleapis.com/language/translate/v2?key={KEY}
@@ -75,9 +75,9 @@ program should be called.
 The program reads input from the user from \texttt{stdin}. When a newline
 character is entered, the function \texttt{translate} is called with the entered
 text. This function uses the built in PHP function \texttt{file\_get\_contents}
-(\url{www.php.net/file\_get\_contents}) to call the Google Translate API using
+(\url{http://nl3.php.net/file_get_contents}) to call the Google Translate API using
 the URL mentioned in section \ref{sec:Protocol}. This function returns
-\texttt{FALSE} on failure, which is handled by the program. To suppress any
+\texttt{false} on failure, which is handled by the program. To suppress any
 warnings that are generated by a ``bad request''-error, we use \texttt{@} in
 front of the function call. We can safely do this because we handle any
 failures manually. The two most probable reasons for a ``bad request'' to occur,
@@ -86,7 +86,7 @@ source/target language. Since both are critical for the program's ability to
 function correctly, we have chosen to end the program after a bad request. If
 the request is succesful, we use the built in PHP function \texttt{json\_decode}
 to parse the response. The converts the JSON object into an associative array,
-form which we can easily extract the translation:
+from which we can easily extract the translation:
 
 \begin{verbatim}
 return $response["data"]["translations"][0]["translatedText"];