corrade-lsl-templates – Diff between revs 19 and 20

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 19 Rev 20
Line 476... Line 476...
476 jump_state = "remove"; 476 jump_state = "remove";
477 state url; 477 state url;
478 } 478 }
Line 479... Line 479...
479 479
-   480 data = llDumpList2String(command, " ");
-   481 if((integer)data == 0)
480 data = llDumpList2String(command, " "); 482 data = "";
481 jump_state = "get"; 483 jump_state = "get";
482 state url; 484 state url;
483 } 485 }
484 on_rez(integer num) { 486 on_rez(integer num) {
Line 495... Line 497...
495 497
496 state get { 498 state get {
497 state_entry() { 499 state_entry() {
498 // DEBUG 500 // DEBUG
-   501 llOwnerSay("[Joke] Retrieving from database.");
-   502 if(data == "") {
-   503 llInstantMessage(
-   504 wasKeyValueGet(
-   505 "corrade",
-   506 configuration
-   507 ),
-   508 wasKeyValueEncode(
-   509 [
-   510 "command", "database",
-   511 "group", wasURLEscape(
-   512 wasKeyValueGet(
-   513 "group",
-   514 configuration
-   515 )
-   516 ),
-   517 "password", wasURLEscape(
-   518 wasKeyValueGet(
-   519 "password",
-   520 configuration
-   521 )
-   522 ),
-   523 "SQL", wasURLEscape("SELECT * FROM \"" +
-   524 wasKeyValueGet("joke table", configuration) +
-   525 "\" WHERE name=:group LIMIT 1 OFFSET :id"),
-   526 "data", wasURLEscape(
-   527 wasListToCSV(
-   528 [
-   529 "group",
-   530 wasURLEscape(
-   531 wasKeyValueGet(
-   532 "group",
-   533 configuration
-   534 )
-   535 ),
-   536 "id",
-   537 (string)(
-   538 (integer)llFrand(
-   539 joke_counter
-   540 ) + 1
-   541 )
-   542 ]
-   543 )
-   544 ),
-   545 "callback", wasURLEscape(URL)
-   546 ]
-   547 )
-   548 );
-   549 llSetTimerEvent(60);
-   550 return;
499 llOwnerSay("[Joke] Retrieving from database."); 551 }
500 llInstantMessage( 552 llInstantMessage(
501 wasKeyValueGet( 553 wasKeyValueGet(
502 "corrade", 554 "corrade",
503 configuration 555 configuration
Line 517... Line 569...
517 configuration 569 configuration
518 ) 570 )
519 ), 571 ),
520 "SQL", wasURLEscape("SELECT * FROM \"" + 572 "SQL", wasURLEscape("SELECT * FROM \"" +
521 wasKeyValueGet("joke table", configuration) + 573 wasKeyValueGet("joke table", configuration) +
522 "\" WHERE name=:group LIMIT 1 OFFSET :id"), 574 "\" WHERE name=:group AND id=:id"),
523 "data", wasURLEscape( 575 "data", wasURLEscape(
524 wasListToCSV( 576 wasListToCSV(
525 [ 577 [
526 "group", 578 "group",
527 wasURLEscape( 579 wasURLEscape(
Line 529... Line 581...
529 "group", 581 "group",
530 configuration 582 configuration
531 ) 583 )
532 ), 584 ),
533 "id", 585 "id",
534 (string)( -  
535 (integer)llFrand( -  
536 joke_counter -  
537 ) + 1 -  
538 ) 586 data
539 ] 587 ]
540 ) 588 )
541 ), 589 ),
542 "callback", wasURLEscape(URL) 590 "callback", wasURLEscape(URL)
543 ] 591 ]
Line 638... Line 686...
638 configuration 686 configuration
639 ) 687 )
640 ), 688 ),
641 "SQL", wasURLEscape("INSERT INTO \"" + 689 "SQL", wasURLEscape("INSERT INTO \"" +
642 wasKeyValueGet("joke table", configuration) + 690 wasKeyValueGet("joke table", configuration) +
643 "\" (name, data, firstname, lastname) VALUES (:name, :data, :firstname, :lastname)"), 691 "\" (name, data, firstname, lastname, id) VALUES (:name, :data, :firstname, :lastname, :id)"),
644 "data", wasURLEscape( 692 "data", wasURLEscape(
645 wasListToCSV( 693 wasListToCSV(
646 [ 694 [
647 "name", 695 "name",
648 wasURLEscape( 696 wasURLEscape(
Line 654... Line 702...
654 "data", 702 "data",
655 wasURLEscape(data), 703 wasURLEscape(data),
656 "firstname", 704 "firstname",
657 wasURLEscape(firstname), 705 wasURLEscape(firstname),
658 "lastname", 706 "lastname",
659 wasURLEscape(lastname) 707 wasURLEscape(lastname),
-   708 "id",
-   709 (string)(joke_counter + 1)
660 ] 710 ]
661 ) 711 )
662 ), 712 ),
663 "callback", wasURLEscape(URL) 713 "callback", wasURLEscape(URL)
664 ] 714 ]
Line 678... Line 728...
678 ) 728 )
679 ); 729 );
680 state listen_group; 730 state listen_group;
681 } 731 }
682 ++joke_counter; 732 ++joke_counter;
683 data = "Joke has been stored."; 733 data = "Joke " + (string)joke_counter + " has been stored.";
684 state tell; 734 state tell;
685 } 735 }
686 timer() { 736 timer() {
687 llReleaseURL(URL); 737 llReleaseURL(URL);
688 state listen_group; 738 state listen_group;
Line 738... Line 788...
738 "group", 788 "group",
739 configuration 789 configuration
740 ) 790 )
741 ), 791 ),
742 "id", 792 "id",
743 wasURLEscape(data) 793 data
744 ] 794 ]
745 ) 795 )
746 ), 796 ),
747 "callback", wasURLEscape(URL) 797 "callback", wasURLEscape(URL)
748 ] 798 ]