github.com/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty synced 2024-12-21 02:05:51 +01:00
Code Releases Wiki Activity

various fixes of the blog demo.

Browse Source
This commit is contained in:
agentzh (章亦春) 2010-04-12 18:57:03 +08:00
parent dd1d50c2fe
commit 29d0653849
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/js/openresty.js
View File

@ -263,7 +263,7 @@ $ClientP.post = function (url) {
// if (!formId) throw "No form specified.";
if (this.session) args._session = this.session;
if (!this.session && !args._user)
if (!this.session && !args._user && this.user)
args._user = this.user;
args._last_response = this.genId();
@ -353,7 +353,7 @@ $ClientP.get = function (url, args) {
//if (!this.user) throw "No user specified for OpenResty.";
if (this.session) args._session = this.session;
if (!this.session && !args._user)
if (!this.session && !args._user && this.user)
args._user = this.user;
//args.password = this.password || '';

5
demo/Blog/js/blog.js
View File

@ -1,6 +1,6 @@
var account = 'agentzh';
//var host = 'http://10.32.24.13:1984';
var host = 'http://localhost:1984';
//var host = 'http://10.32.24.16:8080';
var host = 'http://localhost:8080';
//var host = 'http://api.eeeeworks.org';
//var host = 'http://api.openresty.org';
//var host = 'http://10.62.136.86';
@ -42,6 +42,7 @@ function debug (msg) {
$("#copyright").append(msg + "<br/>");
}
$.fn.postprocess = function (className, options) {
return this.find("a[@href*='#']").each( function () {
//debug("HERE!");

2
demo/Blog/misc/mysql/init-db.sql
View File

@ -2,7 +2,7 @@
drop table if exists posts;
create table posts (
id serial,
title varchar(128) not null,
title text not null,
content text not null,
author varchar(64) not null,
created timestamp(0) default now() not null,

2
demo/Blog/template/sidebar.tt
View File

@ -73,7 +73,7 @@
<a href="site-binary.tar.gz">Compiled form (.tar.gz)</a>
</li>
<li class="module-list-item">
<a target="_blank" href="http://github.com/agentzh/openresty/tree/8463c31834e1d007da26b8b6549e4d06b5963b70/demo/[% blog_owner == 'agentzh' ? "Blog" : "Blog2" %]/">
<a target="_blank" href="http://github.com/agentzh/ngx_openresty/tree/master/demo/[% blog_owner == 'agentzh' ? "Blog" : "Blog2" %]/">
Source code (Git)
</a>
</li>

13
util/import-model.pl
View File

@ -6,7 +6,7 @@ use warnings;
use Getopt::Long;
use lib 'lib';
use Params::Util qw( _HASH );
#use JSON::XS ();
use JSON::XS ();
use JSON::Syck;
#use WWW::OpenResty::Simple;
use Data::Dumper;
@ -62,7 +62,7 @@ if ($help) { print usage() }
$user or die "No --user given.\n";
$model or die "No --model given.\n";
# my $json_xs = JSON::XS->new->utf8->allow_nonref;
my $json_xs = JSON::XS->new->utf8->allow_nonref;
my $database = 'test';
@ -83,12 +83,13 @@ local $| = 1;
my ($sth);
my @cols;
while (<>) {
#select(undef, undef, undef, 0.1);
#warn "count: ", scalar(@elems), "\n";
next if $. <= $skip;
# my $row = $json_xs->decode($_);
my $row = JSON::Syck::Load($_);
my $row = $json_xs->decode($_);
#my $row = JSON::Syck::Load($_);
if (!defined $row->{id}) {
@ -100,7 +101,7 @@ while (<>) {
}
if (!defined $sth) {
my @cols = sort keys %$row;
@cols = reverse sort keys %$row;
my $cols = join ',', @cols;
my @holders = map { '?' } @cols;
my $holders = join ',', @holders;
@ -108,7 +109,7 @@ while (<>) {
}
my @vals;
for my $col (sort keys %$row) {
for my $col (@cols) {
push @vals, $row->{$col};
}