Merge branch 'devel' of maxime-alves/wikipp-pad into master

.gitignore

@@ -1 +1,6 @@
-build
+wikipp.log
+config.local.js
+build/*
+*.swp
+*.o
+*.so

sql/mysql.sql

@@ -22,10 +22,11 @@ create table pages (
 	lang varchar(16) not null,
 	slug varchar(128) not null,
 	title varchar(256) not null,
-	content text not null,
+	content text null,
 	sidebar text not null,
 	users_only integer not null,
-	constraint unique (lang,slug)
+	constraint unique (lang,slug),
+	pad_url varchar(256) null
 ) Engine = InnoDB;
 
 create table history (
@@ -34,9 +35,10 @@ create table history (
 	created datetime not null,
 	author varchar(32) not null,
 	title varchar(256) not null,
-	content text not null,
+	content text null,
 	sidebar text not null,
 	constraint unique(id,version),
+	pad_url varchar(256) null,
 	foreign key(id) references pages(id),
 	primary key(id,version)
 ) Engine = InnoDB;

sql/patches/mysql/01-pad_url.sql

@@ -0,0 +1,9 @@
+alter table pages
+add column pad_url varchar(256) null;
+alter table pages
+modify column content text null;
+
+alter table history
+add column pad_url varchar(256) null;
+alter table history
+modify column content text null;

src/page.cpp

@@ -16,12 +16,14 @@ page_form::page_form(apps::wiki *_w):
 {
 	title.message(_("Title"));
 	content.message(_("Content"));
+	pad_url.message(_("Pad URL"));
 	sidebar.message(_("Sidebar"));
 	save.value(_("Save"));
 	save_cont.value(_("Save and Continue"));
 	preview.value(_("Preview"));
 	fields.add(title);
 	fields.add(content);
+	fields.add(pad_url);
 	fields.add(sidebar);
 	buttons.add(save);
 	buttons.add(save_cont);
@@ -32,7 +34,6 @@ page_form::page_form(apps::wiki *_w):
 	users_only.help(_("Disable editing by visitors"));
 	users_only.error_message(_("Please Login"));
 	title.non_empty();
-	content.non_empty();
 	content.rows(25);
 	content.cols(60);
 	sidebar.rows(10);
@@ -113,20 +114,20 @@ void page::diff(std::string slug,std::string sv1,std::string sv2)
 	c.v2=v2;
 	c.edit_v1=edit_version_url(v1);
 	c.edit_v2=edit_version_url(v2);
-	r=sql<<	"SELECT version,history.title,history.content,history.sidebar,pages.title FROM pages "
+	r=sql<<	"SELECT version,history.title,history.content,history.pad_url,history.sidebar,pages.title FROM pages "
 		"JOIN history ON pages.id=history.id "
 		"WHERE lang=? AND slug=? AND version IN (?,?) " << locale_name << slug << v1 << v2;
 	
-	std::string t1,c1,s1,t2,c2,s2;
+	std::string t1,c1,p1,s1,t2,c2,p2,s2;
 	int count=0;
 	while(r.next()) {
 		int ver;
 		r>>ver;
 		if(ver==v1) {
-			r>>t1>>c1>>s1>>c.title;
+			r>>t1>>c1>>p2>>s1>>c.title;
 		}
 		else {
-			r>>t2>>c2>>s2;
+			r>>t2>>c2>>p2>>s2;
 		}
 		count++;
 	}
@@ -150,13 +151,19 @@ void page::diff(std::string slug,std::string sv1,std::string sv2)
 		std::vector<std::string> Y=split(c2);
 		diff::diff(X,Y,c.content_diff_content);
 	}
+	if(p1!=p2) {
+		c.pad_url_diff=true;
+		std::vector<std::string> X=split(p1);
+		std::vector<std::string> Y=split(p2);
+		diff::diff(X,Y,c.pad_url_diff_content);
+	}
 	if(s1!=s2) {
 		c.sidebar_diff=true;
 		std::vector<std::string> X=split(s1);
 		std::vector<std::string> Y=split(s2);
 		diff::diff(X,Y,c.sidebar_diff_content);
 	}
-	if(t1==t2 && c1==c2 && s1==s2) 
+	if(t1==t2 && c1==c2 && p1==p2 && s1==s2)
 		c.no_diff=true;
 	master::ini(c);
 	render("diff",c);
@@ -218,8 +225,8 @@ void page::display(std::string slug)
 {
 	this->slug=slug;
 	std::string key="article_"+locale_name+":"+slug;
-	if(cache().fetch_page(key))
-		return;
+    // if(cache().fetch_page(key))
+    //  return;
 	content::page c;
 
 	cppdb::session sql(conn);
@@ -282,14 +289,15 @@ bool page::load(content::page_form &form)
 {
 	cppdb::session sql(conn);
 	cppdb::result r;
-	r=sql<<	"SELECT title,content,sidebar,users_only "
+	r=sql<<	"SELECT title,content,pad_url,sidebar,users_only "
 		"FROM pages WHERE lang=? AND slug=?" << locale_name << slug << cppdb::row;
 	if(!r.empty()) {
-		std::string title,content,sidebar;
+		std::string title,content,pad_url,sidebar;
 		int users_only;
-		r >> title >> content >> sidebar >> users_only;
+		r >> title >> content >> pad_url >> sidebar >> users_only;
 		form.title.value(title);
 		form.content.value(content);
+		form.pad_url.value(pad_url);
 		form.sidebar.value(sidebar);
 		form.users_only.value(users_only);
 		return true;
@@ -310,31 +318,33 @@ void page::save(int id,content::page_form &form,cppdb::session &sql)
 	std::tm t = booster::ptime::local_time(booster::ptime::now());
 	wi.users.auth();
 	if(id!=-1) {
-		sql<<	"UPDATE pages SET content=?,title=?,sidebar=?,users_only=? "
+		sql<<	"UPDATE pages SET content=?,title=?,pad_url=?,sidebar=?,users_only=? "
 			"WHERE lang=? AND slug=?"
-				<< form.content.value() << form.title.value() 
+				<< form.content.value() << form.title.value() << form.pad_url.value()
 				<< form.sidebar.value() << form.users_only.value() 
 				<< locale_name << slug << cppdb::exec;
 	}
 	else {
 		cppdb::statement s;
-		s=sql<<	"INSERT INTO pages(lang,slug,title,content,sidebar,users_only) "
-			"VALUES(?,?,?,?,?,?)"
+		s=sql<<	"INSERT INTO pages(lang,slug,title,content,pad_url,sidebar,users_only) "
+			"VALUES(?,?,?,?,?,?,?)"
 			<< locale_name << slug
 			<< form.title.value()
 			<< form.content.value()
+			<< form.pad_url.value()
 			<< form.sidebar.value()
 			<< form.users_only.value();
 		s.exec();
 		id=s.sequence_last("pages_id_seq");
 	}
-	sql<<	"INSERT INTO history(id,version,created,title,content,sidebar,author) "
+	sql<<	"INSERT INTO history(id,version,created,title,content,pad_url,sidebar,author) "
 		"SELECT ?,"
 		"	(SELECT COALESCE(MAX(version),0)+1 FROM history WHERE id=?),"
-		"	?,?,?,?,?"
+		"	?,?,?,?,?,?"
 			<< id << id << t 
 			<< form.title.value()
 			<< form.content.value()
+			<< form.pad_url.value()
 			<< form.sidebar.value()
 			<< wi.users.username 
 			<< cppdb::exec;
@@ -373,6 +383,7 @@ bool page::edit_on_post(content::edit_page &c)
 		if(c.form.preview.value()) {
 			c.title=c.form.title.value();
 			c.content=c.form.content.value();
+			c.pad_url=c.form.pad_url.value();
 			c.sidebar=c.form.sidebar.value();
 		}
 	}
@@ -384,17 +395,18 @@ bool page::load_history(int ver,content::page_form &form)
 {
 	cppdb::session sql(conn);
 	cppdb::result r;
-	r=sql<<	"SELECT history.title,history.content,history.sidebar,pages.users_only "
+	r=sql<<	"SELECT history.title,history.content,history.pad_url,history.sidebar,pages.users_only "
 		"FROM pages "
 		"JOIN history ON pages.id=history.id "
 		"WHERE pages.lang=? AND pages.slug=? AND history.version=?"
 		<<locale_name<<slug<<ver<<cppdb::row;
 	if(!r.empty()) {
-		std::string title,content,sidebar;
+		std::string title,content,pad_url,sidebar;
 		int uonly;
-		r >> title >> content >> sidebar >> uonly;
+		r >> title >> content >> pad_url >> sidebar >> uonly;
 		form.title.value(title);
 		form.content.value(content);
+		form.pad_url.value(pad_url);
 		form.sidebar.value(sidebar);
 		form.users_only.value(uonly);
 		return true;
@@ -409,7 +421,7 @@ void page::display_ver(std::string slug,std::string sid)
 	int id=atoi(sid.c_str());
 	cppdb::result r;
 	cppdb::session sql(conn);
-	r=sql<<	"SELECT history.title,history.content,history.sidebar,history.created "
+	r=sql<<	"SELECT history.title,history.content,history.pad_url,history.sidebar,history.created "
 		"FROM pages "
 		"JOIN history ON pages.id=history.id "
 		"WHERE pages.lang=? AND pages.slug=? AND history.version=?"

src/page_content.h

@@ -11,6 +11,7 @@ struct page_form : public cppcms::form {
 	apps::wiki *w;
 	cppcms::widgets::text title;
 	cppcms::widgets::textarea content;
+	cppcms::widgets::text pad_url;
 	cppcms::widgets::textarea sidebar;
 	cppcms::widgets::submit save;
 	cppcms::widgets::submit save_cont;
@@ -24,7 +25,7 @@ struct page_form : public cppcms::form {
 
 struct page : public master {
 	std::string title,content;
-	std::string sidebar;
+	std::string pad_url,sidebar;
 	std::string edit_link;
 	std::string history_link;
 };
@@ -62,11 +63,12 @@ struct diff: public master {
 	std::string edit_v1,edit_v2;
 	int v1,v2;
 	diff_t content_diff_content;
+	diff_t pad_url_diff_content;
 	diff_t sidebar_diff_content;
 	std::string title,title_1,title_2;
-	bool title_diff,content_diff,sidebar_diff,no_versions,no_diff;
+	bool title_diff,content_diff,pad_url_diff,sidebar_diff,no_versions,no_diff;
 	diff() : 
-		title_diff(false),content_diff(false),
+		title_diff(false),content_diff(false),pad_url_diff(false),
 		sidebar_diff(false),no_versions(false),
 		no_diff(false)
 	{

templates/page.tmpl

@@ -111,6 +111,10 @@
 		<h2><% gt "Content" %>:</h2>
 		<% include show_diff(content_diff_content) %>
 	<% end %>
+	<% if pad_url_diff %>
+		<h2><% gt "Pad URL" %>:</h2>
+		<% include show_diff(pad_url_diff_content) %>
+	<% end %>
 	<% if sidebar_diff %>
 		<h2><% gt "Sidebar" %>:</h2>
 		<% include show_diff(sidebar_diff_content) %>