diff --git a/makefile b/makefile index 2cba28d..d0033e3 100644 --- a/makefile +++ b/makefile @@ -58,3 +58,6 @@ local/all.ls: .links: (cd world;../bin/findlinks */de/* */en/*) >$@ +exefix: + chmod +x bin/* run/* config/psyced.settings install.sh utility/multipatcher + diff --git a/place/babeldos.i b/place/babeldos.i index 6c538ae..723822e 100644 --- a/place/babeldos.i +++ b/place/babeldos.i @@ -10,13 +10,17 @@ #include #include +#include #define INHERIT_CONNECT start(); babel(); -#define CRESET start(); -inherit "net/connect"; +#define CREATE qInit(ME, 1000, 100); + +// too aggressive to connect babelfish on every reset!! +//efine CRESET start(); +inherit NET_PATH "connect"; #include #define emit binary_message @@ -26,10 +30,9 @@ volatile mixed *current; volatile string krank, buffer; start() { - qInit(ME, 1000, 100); unless (has_con || is_con) { is_con = 1; - call_out(#'connect, 0, "babelfish.altavista.com", 80); + call_out(#'connect, 0, "babelfish.yahoo.com", 80); } } @@ -37,21 +40,24 @@ escape(data) { return regreplace(data, "[^a-zA-Z0-9]", (: return sprintf("%%%x", $1[0]); :), 1); } -disconnect() { +disconnected() { + string k; + +//efine FMT "%~s
%s
%~s" +#define FMT "%~s%~s" + has_con = 0; + P0(("%O received %O bytes of buffer for %O\n", ME, sizeof(buffer), current)) switch (pointerp(current) ? current[0] : "") { - string k; case TRANSLATION: - if (sscanf(buffer, "%~s
%s
%~s", k)) { - krank = k; - } + if (sscanf(buffer, FMT, k)) krank = k; + else krank = "und es geschah ihr als sei es von der ferne"; #ifdef TRANSLATION2 babel(TRANSLATION2, current[1], current[2], krank, current[4]); break; case TRANSLATION2: - if (sscanf(buffer, "%~s
%s
%~s", k)) { - krank = k; - } + if (sscanf(buffer, FMT, k)) krank = k; + else krank = "und sie sah fern als sei es ein geschehen"; #endif ::msg(current[1], current[2], replace(krank, """, "\""), current[4]); default: @@ -103,8 +109,13 @@ babel(mode, source, mc, data, mapping vars) { buffer = ""; krank = 0; current = ({ mode, source, mc, data, vars }); - emit("GET /tr?lp=" + mode + "&urltext=" + escape(data) + " HTTP/1.1\r\n" - "Host: babelfish.altavista.com\r\n\r\n"); + // old API +// emit("GET /tr?lp=" + mode + "&urltext=" + escape(data) + " HTTP/1.1\r\n" +// "Host: babelfish.altavista.com\r\n\r\n"); + // new API + emit("GET /translate_txt?ei=UTF-8&doit=done&fr=bf-res&intl=1&lp="+ + mode +"&tt=urltext&trtext="+ + escape(data) +" HTTP/1.1\r\nHost: babelfish.yahoo.com\r\n\r\n"); } msg(source, mc, data, mapping vars) { diff --git a/place/de_en.c b/place/de_en.c new file mode 100644 index 0000000..6028949 --- /dev/null +++ b/place/de_en.c @@ -0,0 +1,8 @@ +#define NAME "de_en" +#define TRANSLATION "de_en" + +#ifdef ADMINISTRATORS +# define PLACE_OWNED ADMINISTRATORS +#endif + +#include "babeldos.i" diff --git a/world/net/library.i b/world/net/library.i index d04dcce..3ef9933 100644 --- a/world/net/library.i +++ b/world/net/library.i @@ -794,7 +794,12 @@ varargs mixed sendmsg(mixed target, string mc, mixed data, vamapping vars, showingLog, source, u); #endif case 0: -#ifdef DEVELOPMENT +#if 0 //def DEVELOPMENT + // we get here when doing remote messaging + // in xmpp.. and in fact, in net/jabber we + // don't *know* which scheme needs to be + // used. + // raise_error("scheme 0 is a bug\n"); // // TODO: we had this error, and maybe it's diff --git a/world/net/library/share.c b/world/net/library/share.c index a3845bb..195be99 100644 --- a/world/net/library/share.c +++ b/world/net/library/share.c @@ -24,11 +24,11 @@ volatile mapping share = ([ #ifdef JABBER_PATH # ifndef _flag_disable_module_presence "jabber2avail": ([ - 0 : AVAILABILITY_HERE, "chat" : AVAILABILITY_TALKATIVE, - "dnd" : AVAILABILITY_BUSY, - "away" : AVAILABILITY_DO_NOT_DISTURB, - "xa" : AVAILABILITY_AWAY + 0 : AVAILABILITY_HERE, + "dnd" : AVAILABILITY_BUSY, // dnd? + "away" : AVAILABILITY_DO_NOT_DISTURB, // nearby? + "xa" : AVAILABILITY_AWAY // "not available" ]), // map to http://www.jabber.org/jeps/jep-0107.html although that // is more like good ole mud feelings