From e814da9234a24bbd78f8cf36fa872ddbcc490020 Mon Sep 17 00:00:00 2001
From: Harbour <Harbour@Sfinx.Od.UA>
Date: Tue, 29 Apr 2008 12:47:31 +0300
Subject: [PATCH] Remove unique constraint in note url

---
 Makefile         |  1 +
 docs/ru/TODO     |  3 +++
 faraon/x11_ui.C  |  2 +-
 faraon/x11_ui.fl | 10 +++++-----
 scripts/db.sql   |  3 +--
 scripts/rc.sfinx |  8 ++++----
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 1d728ad..dae7dc2 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@ todo:
 		@cat STATUS
 		@echo
 install:
+		@strip -s sfinx/sfinx faraon/faraon
 		cp -f sfinx/sfinx $(INSTALL_PREFIX)/bin
 		cp -f faraon/faraon $(INSTALL_PREFIX)/bin
 		cp -f scripts/sfinx_compress.sh $(INSTALL_PREFIX)/bin
diff --git a/docs/ru/TODO b/docs/ru/TODO
index 4b4c0d1..88e6d2a 100644
--- a/docs/ru/TODO
+++ b/docs/ru/TODO
@@ -42,6 +42,9 @@
 ÏÂÝÅÅ :
 
 - ÍÏÄÕÌÉ events/contacts/tasks
+- ÎÏÒÍÁÌØÎÙÊ cut'paste ÒÕÓÓËÏÇÏ ÔÅËÓÔÁ
+- viewer ÉÌÉ ÞÉÔÁÌËÁ Ó ÚÁËÌÁÄËÁÍÉ (ÆÏÒÍÁÔ ?)
+- ÐÒÉ ÄÏÂÁ×ÌÅÎÉÉ ÅÌÅÍÅÎÔÁ ÉÎÏÇÄÁ ÈÏÞÅÔÓÑ ÎÁ ÈÏÄÕ ÐÏÄËÏÒÒÅËÔÉÒÏ×ÁÔØ ÓÌÁÊÓÙ
 - ÐÅÒÅÓÍÏÔÒÅÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÇÌÏÂÁÌØÎÙÈ ÐÅÒÅÍÅÎÎÙÈ
 - ÕÐÒÏÓÔÉÔØ/ÐÏÄÕÍÁÔØ ÎÁÄ ÐÒÏÔÏËÏÌÏÍ (XMLRPC/BEEP ?/ÐÏÎÑÔÎÁÑ ÔÅËÓÔÏ×ÁÑ ÏÔÌÁÄËÁ
 	ÐÅÒÅÄÁ×ÁÅÍÙÈ ËÏÍÁÎÄ / etc.) : sfinx.send(XXXX, data, arg, ...);
diff --git a/faraon/x11_ui.C b/faraon/x11_ui.C
index 9740f10..077809c 100644
--- a/faraon/x11_ui.C
+++ b/faraon/x11_ui.C
@@ -3647,7 +3647,7 @@ void x11_ui::init() {
     search_w->end();
   } // Fl_Double_Window* search_w
   { about_w = new Fl_Double_Window(374, 154);
-    { Fl_Button* o = new Fl_Button(72, 122, 226, 20, gettext("Ok"));
+    { Fl_Button* o = new Fl_Button(76, 122, 226, 20, gettext("Ok"));
       o->box(FL_PLASTIC_ROUND_UP_BOX);
       o->labeltype(FL_ENGRAVED_LABEL);
       o->callback((Fl_Callback*)cb_Ok3);
diff --git a/faraon/x11_ui.fl b/faraon/x11_ui.fl
index 1e16676..fc6897a 100644
--- a/faraon/x11_ui.fl
+++ b/faraon/x11_ui.fl
@@ -362,7 +362,7 @@ Function {x11_ui::init()} {open return_type void
   Fl_Window main_w {
     label Faraon
     callback {if (fl_choice("Really quit ?", "No", "Yes", 0L))
-	F::shutdown(0);} open
+	F::shutdown(0);}
     xywh {61 126 945 365} type Double hide resizable
   } {
     Fl_Menu_Bar {} {open
@@ -1567,7 +1567,7 @@ delete_note_w->show();*/}
     }
   }
   Fl_Window search_w {
-    label {Search & Browse} open
+    label {Search & Browse}
     xywh {281 378 749 389} type Double color 31 hide modal
   } {
     Fl_Button {} {
@@ -1630,18 +1630,18 @@ browse_w->show();}
       xywh {539 96 163 25} box PLASTIC_ROUND_UP_BOX labeltype ENGRAVED_LABEL
     }
     Fl_Check_Button search_in_notes_b {
-      label {Search in Notes} selected
+      label {Search in Notes}
       xywh {204 96 146 23} box PLASTIC_UP_BOX down_box DOWN_BOX selection_color 15 labeltype ENGRAVED_LABEL align 16
       code0 {o->value(1);}
     }
   }
-  Fl_Window about_w {
+  Fl_Window about_w {selected
     xywh {357 229 374 154} type Double hide
   } {
     Fl_Button {} {
       label Ok
       callback {about_w->hide();}
-      xywh {72 122 226 20} box PLASTIC_ROUND_UP_BOX labeltype ENGRAVED_LABEL
+      xywh {76 122 226 20} box PLASTIC_ROUND_UP_BOX labeltype ENGRAVED_LABEL
     }
     Fl_Box {} {
       image {../docs/sfinx.jpg} xywh {10 9 130 101}
diff --git a/scripts/db.sql b/scripts/db.sql
index d0a68b2..2133789 100644
--- a/scripts/db.sql
+++ b/scripts/db.sql
@@ -210,8 +210,7 @@ create table notes (
   secured SMALLINT default 0,
 
   constraint pknotes PRIMARY KEY (id),
-  UNIQUE (mtag_slice_id, mtag_type, mtag_id, name),
-  UNIQUE (url)
+  UNIQUE (mtag_slice_id, mtag_type, mtag_id, name)
 );
 
 create index notes_etime on notes(etime);
diff --git a/scripts/rc.sfinx b/scripts/rc.sfinx
index 265543a..4ab26b8 100755
--- a/scripts/rc.sfinx
+++ b/scripts/rc.sfinx
@@ -4,11 +4,11 @@
 DBDIR=/usr/local/share/sfinx
 export FIREBIRD=$DBDIR/libs
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$FIREBIRD"
-LOGLEVEL="--loglevel debug"
+#LOGLEVEL="--loglevel debug"
 #CHANGEUSER="-u sfinx"
 
 if [ "$1" = "stop" ]; then
-  echo "Stopping sfinx ..."
+  echo "Stopping Sfinx ..."
   killall -2 sfinx > /dev/null 2>&1
   killall -2 sfinx > /dev/null 2>&1
   sleep 1
@@ -16,7 +16,7 @@ if [ "$1" = "stop" ]; then
   sleep 1
   killall -9 sfinx > /dev/null 2>&1
 elif [ "$1" = "restart" ]; then
-  echo "Restarting sfinx ..."
+  echo "Restarting Sfinx: DB in $DBDIR"
   killall -2 sfinx > /dev/null 2>&1
   killall -2 sfinx > /dev/null 2>&1
   sleep 1
@@ -25,6 +25,6 @@ elif [ "$1" = "restart" ]; then
   killall -9 sfinx > /dev/null 2>&1
   sfinx $CHANGEUSER $LOGLEVEL -d /usr/local/share/sfinx >> /var/log/sfinx.log 2>&1 &
 else # assume $1 = start:
-  echo "Starting sfinx: DB in $DBDIR"
+  echo "Starting Sfinx: DB in $DBDIR"
   sfinx $CHANGEUSER $LOGLEVEL -d $DBDIR >> /var/log/sfinx.log 2>&1 &
 fi
-- 
2.11.4.GIT