1 files changed, 12 insertions, 11 deletions

diff --git a/development/pim/dbpaper/tables.tex b/development/pim/dbpaper/tables.tex
index ac28a47..64ae02d 100644
--- a/development/pim/dbpaper/tables.tex
+++ b/development/pim/dbpaper/tables.tex
@@ -41,49 +41,49 @@ Datebook: \\
 
 \begin{verbatim}
 CREATE TABLE DATEBOOK (
   UID     int NOT NULL,
   ID      int AUTOINCREMENT,
   Item    text,
   Value   text,
   PRIMARY KEY(UID,ID)
 };
 \end{verbatim} 
 
 
 \noindent
 Recurrence:\\
 \begin{tabular}[ht]{|l|l|l|l|l|l|l|l|}
 \hline
 \underline{UID} & \underline{TID} & RType & RWeekDays & RPosition & RFreq & RHasEndDate &REndDate  \\
 \hline
  & & & & & & &\\
 \hline
 \end{tabular}
 \begin{verbatim}
 CREATE TABLE RECURRENCE (
   UID          int NOT NULL UNIQUE,
-          TID   int NOT NULL
+  TID     int NOT NULL
   RType        int,
   RWeekDays    int,
   RPosition    int,
   RFreq        int,
   RHasEndDate bool,
   REndDate     DATETIME,
   PRIMARY KEY (UID)
 );
 \end{verbatim}
 
 \noindent
 Addressbook: \\
 \begin{tabular}[ht]{|l|l|l|l|}
 \hline
 \underline{UID} & \underline{ID} & Item & Value\\
 \hline
  & & & \\
 \hline
 \end{tabular}
 
 \begin{verbatim}
 CREATE TABLE ADDRESSBOOK (
   UID     int NOT NULL,
   ID      int AUTOINCREMENT,
@@ -107,158 +107,159 @@ Postal:\\
 CREATE TABLE POSTAL (
   UID     int NOT NULL ,
   TID      int NOT NULL,
   Type    int NOT NULL UNIQUE,  -- maybe text, then more are possible
   Street  text,
   City    text,
   State   text,
   Zip     text,  -- who knows if theres no country with letters in the zip code
   Country,
   PRIMARY KEY (UID, Type)
 );
 \end{verbatim}
  
 
 \noindent
 Personal data: \\
 \begin{tabular}[ht]{|l|l|l|l|}
 \hline
 \underline{UID} & \underline{ID} & Ident & Value \\
 \hline
  & & & \\
 \hline
 \end{tabular}
 \begin{verbatim}
-CREATE TABLE PERSONAL_DATA_CONTACT (
-  UID    int NOT NULL UNIQUE,
-  ID     int AUTOINCREMENT,
-  Ident  text,
-  Value  text,
+CREATE TABLE PERSONAL_DATA (
+  UID       int NOT NULL UNIQUE,
+  ID        int AUTOINCREMENT,
+  Ident     text,
+  Priority  int,
+  Value     text,
   PRIMARY KEY(UID,ID)
 );      
 \end{verbatim}
 
 \noindent
 TableID: \\
 \begin{tabular}[ht]{|l|l|l|l|}
 \hline
 \underline{UID} & Name & DefaultRep & Version\\
 \hline
  & & &\\
 \hline
 \end{tabular}
 \begin{verbatim}
 CREATE TABLE TABLEID (
   UID         int NOT NULL UNIQUE,
   Name        text,
   DefaultRep  text, -- list of which which columns from apps table are supposed to be queried for default,
   Version     int NOT NULL 
   PRIMARY KEY (UID)
 );
 \end{verbatim}
 
 
 
 \noindent
 CrossRef: \\
 \begin{tabular}[ht]{|l|l|l|l|l|l|}
 \hline
 \underline{TID1} & \underline{UID1} & \underline{Item1} & \underline{TID2} & \underline{UID2} & \underline{Item2} \\
 \hline
  & & & & &\\
 \hline
 \end{tabular}
 \begin{verbatim}
 CREATE TABLE CROSSREF (
   TID1       int NOT NULL,
   UID1       int NOT NULL,
-  Item1      int NOT NULL,
-  TID2       int MOT NULL,
+  ID1        int NOT NULL,
+  TID2       int NOT NULL,
   UID2       int NOT NULL,
-  Item2      int NOT NULL,
+  ID2        int NOT NULL,
   PRIMARY KEY() 
 );
 \end{verbatim}
 
 
 \noindent
 Category: \\
 \begin{tabular}[ht]{|l|l|l|l|l|l|}
 \hline
 \underline{UID} & Parent & Name  & ApplicationName & ForeGroundColor & BackGroundColor\\
 \hline
  & & & & &\\
 \hline
 \end{tabular}
 \begin{verbatim}
 CREATE TABLE CATEGORY (
   UID   int NOT NULL UNIQUE,
   Name  text,
   ApplicationName text,
-          ForeGroundColor text,<-- maybe hex?
+  ForeGroundColor text, <-- maybe hex?
   BackGroundColor text,
   PRIMARY KEY(UID)
 );
 \end{verbatim}
 
 \noindent
 Files: \\
 \begin{tabular}[ht]{|l|l|l|l|}
 \hline
 \underline{UID}  & MimeType & URL \\
 \hline
  & &\\
 \hline
 \end{tabular}
 \begin{verbatim}
 CREATE TABLE FILES (
   UID       int NOT NULL UNIQUE,
   MimeType      text,   -- mimetype
   URL       text, 
   PRIMARY KEY (UID)
 );
 \end{verbatim}
 
 \noindent
 Applications: \\
 \begin{tabular}[ht]{|l|l|l|}
 \hline
 \underline{UID} & MimeType & URL \\
 \hline
  & & \\
 \hline
 \end{tabular}
 \begin{verbatim}
 CREATE TABLE APPLICATION (
   UID       int NOT NULL UNIQUE,
   MimeType      text,   -- mimetype
   URL       text, 
   PRIMARY KEY (UID)
 );
 \end{verbatim}
 
 \noindent
-        Location: \\    
+Location: \\            
 \begin{tabular}[ht]{|l|l|}
 \hline
 \underline{UID} & Name  \\
 \hline
  &  \\
 \hline
 \end{tabular}
 \begin{verbatim}
 CREATE TABLE LOCATION (
   UID   int NOT NULL UNIQUE,
   Name  text,
   PRIMARY KEY (UID)
 );
 \end{verbatim} 
 
 
 \noindent
 Alarm: \\
 \begin{tabular}[ht]{|l|l|l|l|l|l|l|l|}
 \hline
 \underline{TID} & \underline{UID} & Sound & Day & Month & Year & Time \\
 \hline
  & & & & & & \\
 \hline