From 3ada1fcc1dc933ae92e93f1ed4ca25bf4d742d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 2 Sep 2013 17:15:29 +0200
Subject: [PATCH] introduce documents_revisions table, whitespace changes

---
 appinfo/database.xml | 71 +++++++++++++++++++++++++++++++++++++++++---
 appinfo/version      |  2 +-
 lib/op.php           |  2 +-
 3 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/appinfo/database.xml b/appinfo/database.xml
index af4baa4c..c410082e 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -7,6 +7,7 @@
 	<table>
 		<name>*dbprefix*documents_session</name>
 		<declaration>
+			
 			<field>
 				<name>es_id</name>
 				<type>text</type>
@@ -35,7 +36,7 @@
 				<notnull>false</notnull>
 				<length>512</length>
 				<comments>Relative to storage e.g. /welcome.odt</comments>
-			</field>			
+			</field>
 			<field>
 				<name>owner</name>
 				<type>text</type>
@@ -53,12 +54,14 @@
 					<sorting>ascending</sorting>
 				</field>
 			</index>
+			
 		</declaration>
 	</table>
 	
 	<table>
 		<name>*dbprefix*documents_member</name>
 		<declaration>
+			
 			<field>
 				<name>member_id</name>
 				<type>integer</type>
@@ -105,12 +108,14 @@
 				<unsigned>true</unsigned>
 				<length>1</length>
 			</field>
+			
 		</declaration>
 	</table>
 		
 	<table>
 		<name>*dbprefix*documents_op</name>
 		<declaration>
+			
 			<field>
 				<name>seq</name>
 				<type>integer</type>
@@ -142,6 +147,7 @@
 				<notnull>false</notnull>
 				<comments>json-string</comments>
 			</field>
+			
 			<index>
 				<name>seq_pKey</name>
 				<primary>true</primary>
@@ -162,11 +168,13 @@
 					<sorting>ascending</sorting>
 				</field>
 			</index>
+			
 		</declaration>
 	</table>
 	<table>
 		<name>*dbprefix*documents_invite</name>
 		<declaration>
+			
 			<field>
 				<name>es_id</name>
 				<type>text</type>
@@ -198,7 +206,62 @@
 			
 		</declaration>
 	</table>
+	<table>
+		<name>*dbprefix*documents_revisions</name>
+		<declaration>
+			
+			<field>
+				<name>es_id</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+				<comments>Related editing session id</comments>
+			</field>
+			<field>
+				<name>seq_head</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+				<comments>Sequence head number</comments>
+			</field>
+			<field>
+				<name>member_id</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+				<comments>the member that saved the revision</comments>
+			</field>
+			<field>
+				<name>file_id</name>
+				<type>text</type>
+				<default></default>
+				<notnull>false</notnull>
+				<length>512</length>
+				<comments>Relative to storage e.g. /welcome.odt</comments>
+			</field>
+			<field>
+				<name>save_hash</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<comments>used to lookup revision in documents folder of member, eg '{hash}.odt'</comments>
+			</field>
+			
+			<index>
+				<name>documents_rev_eis_idx</name>
+				<unique>true</unique>
+				<field>
+					<name>es_id</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>seq_head</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+			
+		</declaration>
+	</table>
 	
-	
-	
-</database>
\ No newline at end of file
+</database>
diff --git a/appinfo/version b/appinfo/version
index c52db980..167b000b 100755
--- a/appinfo/version
+++ b/appinfo/version
@@ -1 +1 @@
-0.5.3
\ No newline at end of file
+0.5.4
\ No newline at end of file
diff --git a/lib/op.php b/lib/op.php
index df19f63f..0867eb73 100644
--- a/lib/op.php
+++ b/lib/op.php
@@ -45,7 +45,7 @@ class Op {
 			SELECT `seq`
 			FROM `*PREFIX*documents_op`
 			WHERE `es_id`=?
-			ORDER BY `seq`			DESC
+			ORDER BY `seq` DESC
 			', 1);
 		$result = $query->execute(array(
 				$esId