Update docs, db scheme

diff --git a/db_structure.xml b/db_structure.xml
index 19cdccef8a4d340e2d593f0a070e85e6b2ea4c14..c24c2c669acd0a7dac4ade3fcc405ca901f11d00 100644 (file)
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <database>
 
-   <name>*dbname*</name>
+ <name>*dbname*</name>
  <create>true</create>
  <overwrite>false</overwrite>
 
@@ -9,7 +9,7 @@
 
  <table>
 
-   <name>*dbprefix*appconfig</name>
+  <name>*dbprefix*appconfig</name>
 
   <declaration>
 
@@ -43,7 +43,7 @@
 
  <table>
 
-   <name>*dbprefix*foldersize</name>
+  <name>*dbprefix*foldersize</name>
 
   <declaration>
 
@@ -52,7 +52,7 @@
     <type>text</type>
     <default></default>
     <notnull>true</notnull>
-    <length>128</length>
+    <length>512</length>
    </field>
 
    <field>
@@ -64,8 +64,7 @@
    </field>
 
    <index>
-    <name>foldersize_pKey</name>
-    <primary>true</primary>
+    <name>path_index</name>
     <field>
      <name>path</name>
      <sorting>ascending</sorting>
@@ -78,7 +77,7 @@
 
  <table>
 
-   <name>*dbprefix*group_user</name>
+  <name>*dbprefix*group_user</name>
 
   <declaration>
 
@@ -104,7 +103,7 @@
 
  <table>
 
-   <name>*dbprefix*groups</name>
+  <name>*dbprefix*groups</name>
 
   <declaration>
 
@@ -131,143 +130,90 @@
 
  <table>
 
-   <name>*dbprefix*locks</name>
+  <name>*dbprefix*locks</name>
 
   <declaration>
 
    <field>
-    <name>token</name>
-    <type>text</type>
-    <default></default>
+    <name>id</name>
+    <type>integer</type>
+    <default>0</default>
     <notnull>true</notnull>
-    <length>255</length>
+    <autoincrement>1</autoincrement>
+    <unsigned>true</unsigned>
+    <length>4</length>
    </field>
 
    <field>
-    <name>path</name>
+    <name>userid</name>
     <type>text</type>
     <default></default>
-    <notnull>true</notnull>
+    <notnull>false</notnull>
     <length>200</length>
    </field>
 
    <field>
-    <name>created</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <length>4</length>
+    <name>owner</name>
+    <type>text</type>
+    <default></default>
+    <notnull>false</notnull>
+    <length>100</length>
    </field>
 
    <field>
-    <name>modified</name>
+    <name>timeout</name>
     <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
+    <default></default>
+    <notnull>false</notnull>
+    <unsigned>true</unsigned>
     <length>4</length>
    </field>
 
    <field>
-    <name>expires</name>
+    <name>created</name>
     <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
+    <default></default>
+    <notnull>false</notnull>
     <length>4</length>
    </field>
 
    <field>
-    <name>owner</name>
+    <name>token</name>
     <type>text</type>
     <default></default>
     <notnull>false</notnull>
-    <length>200</length>
+    <length>100</length>
    </field>
 
    <field>
-    <name>recursive</name>
+    <name>scope</name>
     <type>integer</type>
-    <default>0</default>
+    <default></default>
     <notnull>false</notnull>
-    <length>4</length>
+    <length>1</length>
    </field>
 
    <field>
-    <name>writelock</name>
+    <name>depth</name>
     <type>integer</type>
-    <default>0</default>
+    <default></default>
     <notnull>false</notnull>
-    <length>4</length>
+    <length>1</length>
    </field>
 
    <field>
-    <name>exclusivelock</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <length>4</length>
+    <name>uri</name>
+    <type>clob</type>
+    <notnull>false</notnull>
    </field>
 
-   <index>
-    <name>locks_path</name>
-    <field>
-     <name>path</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-
-   <index>
-    <name>locks_path_2</name>
-    <field>
-     <name>path</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-
-   <index>
-    <name>locks_path_3</name>
-    <field>
-     <name>path</name>
-     <sorting>ascending</sorting>
-    </field>
-    <field>
-     <name>token</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-
-   <index>
-    <name>locks_expires</name>
-    <field>
-     <name>expires</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-
-   <index>
-    <name>locks_pKey</name>
-    <primary>true</primary>
-    <field>
-     <name>token</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-
-   <index>
-    <name>locks_token</name>
-    <unique>true</unique>
-    <field>
-     <name>token</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-
   </declaration>
 
  </table>
 
  <table>
 
-   <name>*dbprefix*log</name>
+  <name>*dbprefix*log</name>
 
   <declaration>
 
@@ -324,7 +270,7 @@
 
  <table>
 
-   <name>*dbprefix*preferences</name>
+  <name>*dbprefix*preferences</name>
 
   <declaration>
 
@@ -366,64 +312,47 @@
 
  <table>
 
-   <name>*dbprefix*properties</name>
+  <name>*dbprefix*properties</name>
 
   <declaration>
 
    <field>
-    <name>path</name>
+    <name>userid</name>
     <type>text</type>
     <default></default>
     <notnull>true</notnull>
-    <length>255</length>
+    <length>200</length>
    </field>
 
    <field>
-    <name>name</name>
+    <name>propertypath</name>
     <type>text</type>
     <default></default>
     <notnull>true</notnull>
-    <length>120</length>
+    <length>255</length>
    </field>
 
    <field>
-    <name>ns</name>
+    <name>propertyname</name>
     <type>text</type>
-    <default>DAV:</default>
+    <default></default>
     <notnull>true</notnull>
-    <length>120</length>
+    <length>255</length>
    </field>
 
    <field>
-    <name>value</name>
+    <name>propertyvalue</name>
     <type>clob</type>
-    <notnull>false</notnull>
+    <notnull>true</notnull>
    </field>
 
-   <index>
-    <name>properties_pKey</name>
-    <primary>true</primary>
-    <field>
-     <name>path</name>
-     <sorting>ascending</sorting>
-    </field>
-    <field>
-     <name>name</name>
-     <sorting>ascending</sorting>
-    </field>
-    <field>
-     <name>ns</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-
   </declaration>
 
  </table>
 
  <table>
 
-   <name>*dbprefix*users</name>
+  <name>*dbprefix*users</name>
 
   <declaration>
 

diff --git a/docs/createtranslation.pl b/docs/createtranslation.pl
deleted file mode 100644 (file)
index 12ba22a..0000000
--- a/docs/createtranslation.pl
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use Locale::PO;
-use Data::Dumper;
-
-opendir( DIR, '.' );
-my @files = readdir( DIR );
-closedir( DIR );
-
-foreach my $i ( @files ){
-       next unless $i =~ m/^(.*)\.po$/;
-       my $lang = $1;
-       my $hash = Locale::PO->load_file_ashash( $i );
-
-       # Create array
-       my @strings = ();
-       foreach my $key ( keys( %{$hash} )){
-               next if $key eq '""';
-               next if $hash->{$key}->msgstr() eq '""';
-               push( @strings, $hash->{$key}->msgid()." => ".$hash->{$key}->msgstr());
-       }
-
-       # Write PHP file
-       open( OUT, ">$lang.php" );
-       print OUT "<?php \$TRANSLATIONS = array(\n";
-       print OUT join( ",\n", @strings );
-       print OUT "\n);\n";
-       close( OUT );
-}
\ No newline at end of file

diff --git a/docs/getstrings.pl b/docs/getstrings.pl
deleted file mode 100644 (file)
index 0325438..0000000
--- a/docs/getstrings.pl
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/perl
-use strict;
-
-if( -e 'messages.pot' ){
-       `xgettext --files-from=xgettextfiles --join-existing --output=messages.pot --keyword=t`
-}
-else{
-       `xgettext --files-from=xgettextfiles --output=messages.pot --keyword=t`
-}
-
-opendir( DIR, '.' );
-my @files = readdir( DIR );
-closedir( DIR );
-
-foreach my $i ( @files ){
-       next unless $i =~ m/^(.*)\.po$/;
-       `xgettext --files-from=xgettextfiles --join-existing --output=$i --keyword=t`
-}

diff --git a/docs/owncloud.sql b/docs/owncloud.sql
index bef528596fb5d7d0ddd87c26f24a5528cda25676..8037e4a25d1be2da178dfa550daaac6650ace484 100644 (file)
--- a/docs/owncloud.sql
+++ b/docs/owncloud.sql
@@ -1,28 +1,23 @@
 -- phpMyAdmin SQL Dump
--- version 3.3.7deb5
+-- version 3.4.3.1deb1
 -- http://www.phpmyadmin.net
 --
 -- Host: localhost
--- Erstellungszeit: 16. April 2011 um 10:40
--- Server Version: 5.1.49
--- PHP-Version: 5.3.3-7+squeeze1
+-- Generation Time: Jul 22, 2011 at 10:38 PM
+-- Server version: 5.1.58
+-- PHP Version: 5.3.6-13
 
 SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+SET time_zone = "+00:00";
 
 --
--- Datenbank: `owncloud`
+-- Database: `owncloud`
 --
 
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `appconfig`
+-- Table structure for table `appconfig`
 --
 
 CREATE TABLE IF NOT EXISTS `appconfig` (
@@ -31,15 +26,22 @@ CREATE TABLE IF NOT EXISTS `appconfig` (
   `configvalue` varchar(255) COLLATE utf8_unicode_ci NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
+-- --------------------------------------------------------
+
 --
--- Daten für Tabelle `appconfig`
+-- Table structure for table `foldersize`
 --
 
+CREATE TABLE IF NOT EXISTS `foldersize` (
+  `path` varchar(512) COLLATE utf8_unicode_ci NOT NULL,
+  `size` int(11) NOT NULL,
+  KEY `PATH_INDEX` (`path`(333))
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `groups`
+-- Table structure for table `groups`
 --
 
 CREATE TABLE IF NOT EXISTS `groups` (
@@ -47,17 +49,10 @@ CREATE TABLE IF NOT EXISTS `groups` (
   PRIMARY KEY (`gid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
---
--- Daten für Tabelle `groups`
---
-
-INSERT INTO `groups` (`gid`) VALUES
-('admin');
-
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `group_user`
+-- Table structure for table `group_user`
 --
 
 CREATE TABLE IF NOT EXISTS `group_user` (
@@ -65,43 +60,29 @@ CREATE TABLE IF NOT EXISTS `group_user` (
   `uid` varchar(64) COLLATE utf8_unicode_ci NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
---
--- Daten für Tabelle `group_user`
---
-
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `locks`
+-- Table structure for table `locks`
 --
 
 CREATE TABLE IF NOT EXISTS `locks` (
-  `token` varchar(255) NOT NULL DEFAULT '',
-  `path` varchar(200) NOT NULL DEFAULT '',
-  `created` int(11) NOT NULL DEFAULT '0',
-  `modified` int(11) NOT NULL DEFAULT '0',
-  `expires` int(11) NOT NULL DEFAULT '0',
-  `owner` varchar(200) DEFAULT NULL,
-  `recursive` int(11) DEFAULT '0',
-  `writelock` int(11) DEFAULT '0',
-  `exclusivelock` int(11) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`token`),
-  UNIQUE KEY `token` (`token`),
-  KEY `path` (`path`),
-  KEY `path_2` (`path`),
-  KEY `path_3` (`path`,`token`),
-  KEY `expires` (`expires`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Daten für Tabelle `locks`
---
-
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `userid` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `owner` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `timeout` int(10) unsigned DEFAULT NULL,
+  `created` int(11) DEFAULT NULL,
+  `token` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `scope` tinyint(4) DEFAULT NULL,
+  `depth` tinyint(4) DEFAULT NULL,
+  `uri` text COLLATE utf8_unicode_ci,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `log`
+-- Table structure for table `log`
 --
 
 CREATE TABLE IF NOT EXISTS `log` (
@@ -112,17 +93,12 @@ CREATE TABLE IF NOT EXISTS `log` (
   `action` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `info` text COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-
---
--- Daten für Tabelle `log`
---
-
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=3437 ;
 
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `preferences`
+-- Table structure for table `preferences`
 --
 
 CREATE TABLE IF NOT EXISTS `preferences` (
@@ -132,35 +108,23 @@ CREATE TABLE IF NOT EXISTS `preferences` (
   `configvalue` varchar(255) COLLATE utf8_unicode_ci NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
---
--- Daten für Tabelle `preferences`
---
-
-
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `properties`
+-- Table structure for table `properties`
 --
 
 CREATE TABLE IF NOT EXISTS `properties` (
-  `path` varchar(255) NOT NULL DEFAULT '',
-  `name` varchar(120) NOT NULL DEFAULT '',
-  `ns` varchar(120) NOT NULL DEFAULT 'DAV:',
-  `value` text,
-  PRIMARY KEY (`path`,`name`,`ns`),
-  KEY `path` (`path`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Daten für Tabelle `properties`
---
-
+  `userid` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
+  `propertypath` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `propertyname` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `propertyvalue` text COLLATE utf8_unicode_ci NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `users`
+-- Table structure for table `users`
 --
 
 CREATE TABLE IF NOT EXISTS `users` (
@@ -168,17 +132,3 @@ CREATE TABLE IF NOT EXISTS `users` (
   `password` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`uid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
---
--- Daten für Tabelle `users`
---
-
---
--- Table structure for table `foldersize`
---
-
-CREATE TABLE IF NOT EXISTS `foldersize` (
-  `path` varchar(512) NOT NULL,
-  `size` int(11) NOT NULL,
-  PRIMARY KEY (`path`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file