corrade-lsl-templates – Diff between revs 41 and 42

Subversion Repositories:

?pathlinks?

Rev 41 – Details – Blame – Last modification – View Log

 ///////////////////////////////////////////////////////////////////////////
-//  Copyright (C) Wizardry and Steamworks 2016 - License: CC BY 2.0      //
+//  Copyright (C) Wizardry and Steamworks 2016 - License: GNU GPLv3      //
 ///////////////////////////////////////////////////////////////////////////
 //
 // A wiki module that can memorize strings and recall them by path.
 //
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////
-//  Copyright (C) Wizardry and Steamworks 2014 - License: CC BY 2.0      //
+//  Copyright (C) Wizardry and Steamworks 2014 - License: GNU GPLv3      //
 ///////////////////////////////////////////////////////////////////////////
 integer wasIsAlNum(string a) {
     if(a == "") return FALSE;
     integer x = llBase64ToInteger("AAAA" +
     if(i != -1) return llList2String(a, 2*i+1);
     return "";
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2013 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 string wasKeyValueEncode(list data) {
     list k = llList2ListStrided(data, 0, -1, 2);
     list v = llList2ListStrided(llDeleteSubList(data, 0, 0), 0, -1, 2);
     } while(llGetListLength(k) != 0);
     return llDumpList2String(data, "&");
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 // escapes a string in conformance with RFC1738
 string wasURLEscape(string i) {
     string o = "";
     } while(i != "");
     return o;
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 list wasCSVToList(string csv) {
     list l = [];
     list s = [];
     // postcondition: length(s) = 0
     return l + m;
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 string wasListToCSV(list l) {
     list v = [];
     do {
     } while(l != []);
     return llDumpList2String(v, ",");
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 // unescapes a string in conformance with RFC1738
 string wasURLUnescape(string i) {
     return llUnescapeURL(
     );
+}
 // configuration data
-string configuration = "";
-// callback URL
-string URL = "";
+string configuration = "";
 // store message over state.
 string path = "";
 string data = "";
 string action = "";
     link_message(integer sender, integer num, string message, key id) {
         if(id != "configuration") return;
         llOwnerSay("[Wiki] Got configuration...");
         configuration = message;
         action = "create";
-        state url;
+        state trampoline;
+    }
     timer() {
         llOwnerSay("[Wiki] Requesting configuration...");
         llMessageLinked(LINK_THIS, 0, "configuration", NULL_KEY);
+    }
     state_exit() {
         llSetTimerEvent(0);
+    }
+}
-state url {
+state trampoline {
-    state_entry() {
-        // DEBUG
-        llOwnerSay("[Wiki] Requesting URL...");
-        llRequestURL();
-    }
-    http_request(key id, string method, string body) {
-        if(method != URL_REQUEST_GRANTED) return;
-        URL = body;
-        // DEBUG
-        llOwnerSay("[Wiki] Got URL.");
     state_entry() {
         if(action == "create") {
             statement = wasURLEscape("CREATE TABLE IF NOT EXISTS \"" +
                 wasKeyValueGet("wiki table", configuration) +
                 "\" (path text unique collate nocase, data text)");
         // We only care about notifications now.
         if(id != "notification")
             return;
         // This script only processes group notifications.
+        if(wasKeyValueGet("type", message) != "group" ||
+            (wasKeyValueGet("type", message) == "group" &&
+            wasURLUnescape(wasKeyValueGet("group", message)) !=
-        if(wasKeyValueGet("type", message) != "group")
+            wasKeyValueGet("group", configuration)))
             return;
         // Get the sent message.
         command = llDeleteSubList(command, 0, 0);
         // Dump the rest of the message.
-        data = llDumpList2String(command, " ");
+        data = llDumpList2String(command, " ");
         // Get an URL.
-        state url;
+        state trampoline;
+    }
     on_rez(integer num) {
         llResetScript();
                         configuration
+                    )
                 ),
                 "SQL", statement,
                 "data", parameters,
-                "callback", wasURLEscape(URL)
+                "callback", wasURLEscape(
+                    wasKeyValueGet(
+                        "URL",
+                        configuration
+                    )
+                )
+            ]
         );
         // GC - none of these are needed anymore.
         statement = "";
         parameters = "";
+        // Message length check.
         if(llStringLength(message) > 1023) {
             data = "Message length exceeded 1023 characters.";
             state tell;
+        }
         // DEBUG
         llOwnerSay("[Wiki] Executing action: " + action);
         llInstantMessage(
             wasKeyValueGet(
                 "corrade",
         );
         // GC
         message = "";
         llSetTimerEvent(60);
+    }
-    http_request(key id, string method, string body) {
+    link_message(integer sender, integer num, string body, key id) {
-        llHTTPResponse(id, 200, "OK");
+        // Only process callbacks for the database command.
-        llReleaseURL(URL);
-        if(wasKeyValueGet("command", body) != "database" ||
+        if(id != "callback" || wasKeyValueGet("command", body) != "database")
+            return;
-            wasKeyValueGet("success", body) != "True") {
+        if(wasKeyValueGet("success", body) != "True") {
             // DEBUG
             llOwnerSay("[Wiki] Unable query database: " +
                 wasURLUnescape(
                     wasKeyValueGet("error", body)
+                )
             );
             state listen_group;
+        }
-        // Process actions.
         // Process actions.
         if(action == "set") {
             if(data == "") {
                 data = "Deleted from " + path;
                 state tell;
         // DEBUG
         llOwnerSay("[Wiki] Jump table corrupted, please contact creator...");
         state listen_group;
+    }
     timer() {
-        llReleaseURL(URL);
         state listen_group;
+    }
     on_rez(integer num) {
         llResetScript();
+    }