From 1838a0792e5d4e79584ab6c212d465a99a5a4cad Mon Sep 17 00:00:00 2001 From: Jules Date: Tue, 21 Jan 2014 13:41:00 -0500 Subject: add columns: name, remote_addr --- cgi-bin/save | 11 ++++++----- cgi-bin/view | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'cgi-bin') diff --git a/cgi-bin/save b/cgi-bin/save index f6b0498..4c87493 100755 --- a/cgi-bin/save +++ b/cgi-bin/save @@ -53,7 +53,7 @@ def strip_querystring(url): p = re.compile('^[^\?]*') return p.findall(url)[0] -def store_shader_in_db(script, shader_id=False, image_url="",username=""): +def store_shader_in_db(script, shader_id=False, image_url="",username="",name=""): conn = MySQLdb.connect(host= "127.0.0.1", user="asdfus", @@ -66,8 +66,8 @@ def store_shader_in_db(script, shader_id=False, image_url="",username=""): shader_id = conn.insert_id() conn.commit() - x.execute("""INSERT INTO shaders (script, image_url, username, time, shader_id) values (%s,%s,%s,%s,%s)""" , - (script, image_url, username, NOW, shader_id) + x.execute("""INSERT INTO shaders (script, image_url, username, name, remote_addr, time, shader_id) values (%s,%s,%s,%s,%s,%s,%s)""" , + (script, image_url, username, name, REMOTE_IP, NOW, shader_id) ); last_id = conn.insert_id() conn.commit() @@ -84,7 +84,7 @@ def main(): cgitb.enable() limit_test = check_limits(API_NAME, MAX_INTERVAL, REQUEST_LIMIT, REMOTE_IP, NOW) if limit_test: return error("You have exceeded the maximum number of requests, try again in %s seconds" % limit_test); - #form should contain script, shader_id, username, image_url + #form should contain script, shader_id, username, name, image_url form = cgi.FieldStorage(keep_blank_values=1) if 'script' not in form or not form['script']: error( 'script not found') @@ -99,7 +99,8 @@ def main(): shader_version_id = store_shader_in_db( form['script'].value, form['shader_id'].value, image_url, - form['username'].value); + form['username'].value, + form['name'].value); if not shader_version_id: error('DB Error') else: diff --git a/cgi-bin/view b/cgi-bin/view index 2e9a540..f7435f3 100755 --- a/cgi-bin/view +++ b/cgi-bin/view @@ -24,7 +24,7 @@ sub response{ my $res = $json->pretty->encode(shift); my $callback = shift; if (defined $callback){ - print $callback + "(" + $res + ")"; + print $callback . "(" . $res . ")"; } else { print $res; -- cgit v1.2.3-70-g09d2 From fef2b0538981ec5fcb6c8b91f1bfceac24a9e43e Mon Sep 17 00:00:00 2001 From: Jules Date: Sun, 26 Jan 2014 04:39:12 -0500 Subject: updates to cgis --- cgi-bin/thumbnail_upload | 4 ++-- cgi-bin/view | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cgi-bin') diff --git a/cgi-bin/thumbnail_upload b/cgi-bin/thumbnail_upload index 8ee9866..ab12c66 100644 --- a/cgi-bin/thumbnail_upload +++ b/cgi-bin/thumbnail_upload @@ -145,7 +145,7 @@ sub upload_to_AmazonS3{ sub error{ my $message = shift; - my $resp = { success => "false", "error" => $message }; + my $resp = { success => JSON::false, "error" => $message }; print JSON->new->encode($resp); exit 1; } @@ -174,7 +174,7 @@ sub main{ error( "problem adding value to db"); } my $resp = { - success => "true", + success => JSON::true, url => $thumbnail_url, filesize => $filesize }; diff --git a/cgi-bin/view b/cgi-bin/view index f7435f3..d818519 100755 --- a/cgi-bin/view +++ b/cgi-bin/view @@ -6,7 +6,7 @@ use feature qw/switch/; use CGI; my $IN = new CGI; -print $IN->header(); +print $IN->header(-type => 'application/json'); our $json = JSON->new->allow_nonref; my $sql_username = "asdfus"; -- cgit v1.2.3-70-g09d2 From 2a4e1b7c615a5b0a9e5819e6703992fe34a9a74c Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 31 Jan 2014 23:02:24 -0500 Subject: save width and height in cgi --- cgi-bin/save | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'cgi-bin') diff --git a/cgi-bin/save b/cgi-bin/save index 4c87493..bff7233 100755 --- a/cgi-bin/save +++ b/cgi-bin/save @@ -53,7 +53,7 @@ def strip_querystring(url): p = re.compile('^[^\?]*') return p.findall(url)[0] -def store_shader_in_db(script, shader_id=False, image_url="",username="",name=""): +def store_shader_in_db(script, shader_id=False, image_url="",username="",name="",width="0",height="0"): conn = MySQLdb.connect(host= "127.0.0.1", user="asdfus", @@ -66,7 +66,7 @@ def store_shader_in_db(script, shader_id=False, image_url="",username="",name="" shader_id = conn.insert_id() conn.commit() - x.execute("""INSERT INTO shaders (script, image_url, username, name, remote_addr, time, shader_id) values (%s,%s,%s,%s,%s,%s,%s)""" , + x.execute("""INSERT INTO shaders (script, image_url, username, name, remote_addr, time, shader_id, width, height) values (%s,%s,%s,%s,%s,%s,%s,%s,%s)""" , (script, image_url, username, name, REMOTE_IP, NOW, shader_id) ); last_id = conn.insert_id() @@ -97,10 +97,13 @@ def main(): error("Cannot save this shader:%s" % test_failure) shader_version_id = store_shader_in_db( - form['script'].value, form['shader_id'].value, + form['script'].value, + form['shader_id'].value, image_url, form['username'].value, - form['name'].value); + form['name'].value, + form['width'].value, + form['height'].value); if not shader_version_id: error('DB Error') else: -- cgit v1.2.3-70-g09d2 From a947354668ca5f773d4586d36275abf09ae27631 Mon Sep 17 00:00:00 2001 From: Jules Date: Sat, 1 Feb 2014 12:46:37 -0500 Subject: fix wh in save script --- cgi-bin/save | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cgi-bin') diff --git a/cgi-bin/save b/cgi-bin/save index bff7233..2bfb8c2 100755 --- a/cgi-bin/save +++ b/cgi-bin/save @@ -67,7 +67,7 @@ def store_shader_in_db(script, shader_id=False, image_url="",username="",name="" conn.commit() x.execute("""INSERT INTO shaders (script, image_url, username, name, remote_addr, time, shader_id, width, height) values (%s,%s,%s,%s,%s,%s,%s,%s,%s)""" , - (script, image_url, username, name, REMOTE_IP, NOW, shader_id) + (script, image_url, username, name, REMOTE_IP, NOW, shader_id, width, height) ); last_id = conn.insert_id() conn.commit() -- cgit v1.2.3-70-g09d2