refdb-devel — List for RefDB developers

[Refdb-devel] CVS: refdb/src backend.h,1.19,1.20

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32593/src

Modified Files:
	backend.h 
Log Message:
renamed get_refdb_note_note_copy() to get_refdb_note_content_copy(); new functions get_refdb_note_content_type() and get_refdb_note_content_xmllang()

Index: backend.h
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -U2 -r1.19 -r1.20
--- backend.h	4 Nov 2003 23:26:00 -0000	1.19
+++ backend.h	21 Dec 2003 23:03:39 -0000	1.20
@@ -95,5 +95,7 @@
 const char* get_refdb_note_key(dbi_result dbires);
 char* get_refdb_note_title_copy(dbi_result dbires);
-char* get_refdb_note_note_copy(dbi_result dbires);
+char* get_refdb_note_content_copy(dbi_result dbires);
+const char* get_refdb_note_content_type(dbi_result dbires);
+const char* get_refdb_note_content_xmllang(dbi_result dbires);
 dbi_result request_notes_by_ref(dbi_conn conn, unsigned long long n_id, int mode, const char* user);
 int free_request_notes_by_ref(dbi_conn conn);

[Refdb-devel] CVS: refdb/src backend.c,1.17,1.18

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32367/src

Modified Files:
	backend.c 
Log Message:
renamed get_refdb_note_note_copy() to get_refdb_note_content_copy(); new functions get_refdb_note_content_type() and get_refdb_note_content_xmllang(); fixed time output; select additional fields from t_note

Index: backend.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -U2 -r1.17 -r1.18
--- backend.c	25 Oct 2003 23:46:37 -0000	1.17
+++ backend.c	21 Dec 2003 23:02:38 -0000	1.18
@@ -117,8 +117,8 @@
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  get_refdb_note_note_copy(): retrieves the note element from a note query
+  get_refdb_note_content_copy(): retrieves the content element from a note query
 
-  char* get_refdb_note_note_copy returns a pointer to a string containing the 
-                     note_note element. The string is allocated and
+  char* get_refdb_note_content_copy returns a pointer to a string containing the 
+                     note_content element. The string is allocated and
 		     must be freed by the caller
 
@@ -127,6 +127,52 @@
 
   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-char* get_refdb_note_note_copy(dbi_result dbires) {
-  return my_dbi_result_get_string_copy(dbires, "note_note");
+char* get_refdb_note_content_copy(dbi_result dbires) {
+  return my_dbi_result_get_string_copy(dbires, "note_content");
+}
+
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  get_refdb_note_content_type(): retrieves the content_type element
+                                 from a note query
+
+  char* get_refdb_content_type returns a pointer to a string containing the 
+                     content_type element
+
+  dbi_result dbires database query result, pointing to the current
+                    dataset
+
+  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+const char* get_refdb_note_content_type(dbi_result dbires) {
+  const char* result;
+
+  result = dbi_result_get_string(dbires, "note_content_type");
+  if (dbi_conn_error_flag(dbi_result_get_conn(dbires))) {
+    return NULL;
+  }
+  else {
+    return result;
+  }
+}
+
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  get_refdb_note_content_xmllang(): retrieves the content_xmllang element
+                                 from a note query
+
+  char* get_refdb_content_xmllang returns a pointer to a string containing the 
+                     content_xmllang element
+
+  dbi_result dbires database query result, pointing to the current
+                    dataset
+
+  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+const char* get_refdb_note_content_xmllang(dbi_result dbires) {
+  const char* result;
+
+  result = dbi_result_get_string(dbires, "note_content_xmllang");
+  if (dbi_conn_error_flag(dbi_result_get_conn(dbires))) {
+    return NULL;
+  }
+  else {
+    return result;
+  }
 }
 
@@ -155,5 +201,5 @@
       }
       else {
-	strftime(date, 256, "<year>%Y</year><month>%m</month><day>%d</day>", localtime(&the_time));
+	strftime(date, 256, "%Y-%m-%d", localtime(&the_time));
       }
     }
@@ -212,5 +258,5 @@
     if (mode & REFERENCE) {
       sprintf(sql_chunk,
-	      "SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_note FROM t_note,t_xnote, t_user, t_refdb WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xnote.xref_id=t_refdb.refdb_id AND t_xnote.xnote_type=\'REFERENCE\'",
+	      "SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_content, t_note.note_content_type, t_note.note_content_xmllang FROM t_note,t_xnote, t_user, t_refdb WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xnote.xref_id=t_refdb.refdb_id AND t_xnote.xnote_type=\'REFERENCE\'",
 	      user,
 	      (unsigned long long)n_id);
@@ -222,5 +268,5 @@
     if (mode & KEYWORD) {
       sprintf(sql_chunk,
-	      "SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_note FROM t_note,t_xnote, t_user, t_refdb, t_xkeyword, t_keyword WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xkeyword.keyword_id=t_keyword.keyword_id AND t_xkeyword.xref_id=t_refdb.refdb_id AND t_xnote.xref_id=t_keyword.keyword_id AND t_xnote.xnote_type=\'KEYWORD\'",
+	      "SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_content, t_note.note_content_type, t_note.note_content_xmllang FROM t_note,t_xnote, t_user, t_refdb, t_xkeyword, t_keyword WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xkeyword.keyword_id=t_keyword.keyword_id AND t_xkeyword.xref_id=t_refdb.refdb_id AND t_xnote.xref_id=t_keyword.keyword_id AND t_xnote.xnote_type=\'KEYWORD\'",
 	      user,
 	      (unsigned long long)n_id);
@@ -235,5 +281,5 @@
     if (mode & AUTHOR) {
       sprintf(sql_chunk,
-	      "SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_note FROM t_note,t_xnote, t_user, t_refdb, t_xauthor, t_author WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xauthor.author_id=t_author.author_id AND t_xauthor.refdb_id=t_refdb.refdb_id AND t_xnote.xref_id=t_author.author_id AND t_xnote.xnote_type=\'AUTHOR\'",
+	      "SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_content, t_note.note_content_type, t_note.note_content_xmllang FROM t_note,t_xnote, t_user, t_refdb, t_xauthor, t_author WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xauthor.author_id=t_author.author_id AND t_xauthor.refdb_id=t_refdb.refdb_id AND t_xnote.xref_id=t_author.author_id AND t_xnote.xnote_type=\'AUTHOR\'",
 	      user,
 	      (unsigned long long)n_id);
@@ -248,5 +294,5 @@
     if (mode & PERIODICAL) {
       sprintf(sql_chunk,
-	      "SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_note FROM t_note,t_xnote, t_user, t_refdb, t_periodical WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_refdb.refdb_periodical_id=t_periodical.periodical_id AND t_xnote.xref_id=t_periodical.periodical_id AND t_xnote.xnote_type=\'PERIODICAL\'",
+	      "SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_content, t_note.note_content_type, t_note.note_content_xmllang FROM t_note,t_xnote, t_user, t_refdb, t_periodical WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_refdb.refdb_periodical_id=t_periodical.periodical_id AND t_xnote.xref_id=t_periodical.periodical_id AND t_xnote.xnote_type=\'PERIODICAL\'",
 	      user,
 	      (unsigned long long)n_id);
@@ -267,5 +313,7 @@
                                     note_key VARCHAR(255), \
                                     note_title VARCHAR(255), \
-                                    note_note BLOB, \
+                                    note_content BLOB, \
+                                    note_content_type VARCHAR(255), \
+                                    note_content_xmllang VARCHAR(255), \
                                     note_user_id INT, \
                                     note_date DATE)");
@@ -277,5 +325,7 @@
                                     note_key VARCHAR(255) UNIQUE, \
                                     note_title VARCHAR(255), \
-                                    note_note TEXT, \
+                                    note_content TEXT, \
+                                    note_content_type VARCHAR(255), \
+                                    note_content_xmllang VARCHAR(255), \
                                     note_user_id BIGINT, \
                                     note_date DATE)");
@@ -287,7 +337,9 @@
                                     note_key TEXT, \
                                     note_title TEXT, \
+                                    note_content_type TEXT, \
+                                    note_content_xmllang TEXT, \
                                     note_user_id INTEGER, \
                                     note_date DATE, \
-                                    note_note TEXT)");
+                                    note_content TEXT)");
     }
     else {
@@ -313,5 +365,5 @@
     if (mode & REFERENCE) {
       sprintf(sql_chunk,
-	      "INSERT INTO t_noteunion (note_id, note_key, note_title, note_user_id, note_date, note_note) SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_note FROM t_note,t_xnote, t_user, t_refdb WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xnote.xref_id=t_refdb.refdb_id AND t_xnote.xnote_type=\'REFERENCE\'",
+	      "INSERT INTO t_noteunion (note_id, note_key, note_title, note_user_id, note_date, note_content, t_note.note_content_type, t_note.note_content_xmllang) SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_content, t_note.note_content_type, t_note.note_content_xmllang FROM t_note,t_xnote, t_user, t_refdb WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xnote.xref_id=t_refdb.refdb_id AND t_xnote.xnote_type=\'REFERENCE\'",
 	      user,
 	      (unsigned long long)n_id);
@@ -330,5 +382,5 @@
     if (mode & KEYWORD) {
       sprintf(sql_chunk,
-	      "INSERT INTO t_noteunion (note_id, note_key, note_title, note_user_id, note_date, note_note) SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_note FROM t_note,t_xnote, t_user, t_refdb, t_xkeyword, t_keyword WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xkeyword.keyword_id=t_keyword.keyword_id AND t_xkeyword.xref_id=t_refdb.refdb_id AND t_xnote.xref_id=t_keyword.keyword_id AND t_xnote.xnote_type=\'KEYWORD\'",
+	      "INSERT INTO t_noteunion (note_id, note_key, note_title, note_user_id, note_date, note_content, t_note.note_content_type, t_note.note_content_xmllang) SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_content FROM t_note,t_xnote, t_user, t_refdb, t_xkeyword, t_keyword WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xkeyword.keyword_id=t_keyword.keyword_id AND t_xkeyword.xref_id=t_refdb.refdb_id AND t_xnote.xref_id=t_keyword.keyword_id AND t_xnote.xnote_type=\'KEYWORD\'",
 	      user,
 	      (unsigned long long)n_id);
@@ -347,5 +399,5 @@
     if (mode & AUTHOR) {
       sprintf(sql_chunk,
-	      "INSERT INTO t_noteunion (note_id, note_key, note_title, note_user_id, note_date, note_note) SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_note FROM t_note,t_xnote, t_user, t_refdb, t_xauthor, t_author WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xauthor.author_id=t_author.author_id AND t_xauthor.refdb_id=t_refdb.refdb_id AND t_xnote.xref_id=t_author.author_id AND t_xnote.xnote_type=\'AUTHOR\'",
+	      "INSERT INTO t_noteunion (note_id, note_key, note_title, note_user_id, note_date, note_content, t_note.note_content_type, t_note.note_content_xmllang) SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_content, t_note.note_content_type, t_note.note_content_xmllang FROM t_note,t_xnote, t_user, t_refdb, t_xauthor, t_author WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_xauthor.author_id=t_author.author_id AND t_xauthor.refdb_id=t_refdb.refdb_id AND t_xnote.xref_id=t_author.author_id AND t_xnote.xnote_type=\'AUTHOR\'",
 	      user,
 	      (unsigned long long)n_id);
@@ -364,5 +416,5 @@
     if (mode & PERIODICAL) {
       sprintf(sql_chunk,
-	      "INSERT INTO t_noteunion (note_id, note_key, note_title, note_user_id, note_date, note_note) SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_note FROM t_note,t_xnote, t_user, t_refdb, t_periodical WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_refdb.refdb_periodical_id=t_periodical.periodical_id AND t_xnote.xref_id=t_periodical.periodical_id AND t_xnote.xnote_type=\'PERIODICAL\'",
+	      "INSERT INTO t_noteunion (note_id, note_key, note_title, note_user_id, note_date, note_content, t_note.note_content_type, t_note.note_content_xmllang) SELECT DISTINCT t_note.note_id, t_note.note_key, t_note.note_title, t_note.note_user_id, t_note.note_date, t_note.note_content, t_note.note_content_type, t_note.note_content_xmllang FROM t_note,t_xnote, t_user, t_refdb, t_periodical WHERE t_note.note_user_id=t_user.user_id AND t_user.user_name=\'%s\' AND t_refdb.refdb_id="ULLSPEC" AND t_note.note_id=t_xnote.note_id AND t_refdb.refdb_periodical_id=t_periodical.periodical_id AND t_xnote.xref_id=t_periodical.periodical_id AND t_xnote.xnote_type=\'PERIODICAL\'",
 	      user,
 	      (unsigned long long)n_id);
@@ -380,5 +432,5 @@
 
     /* now retrieve the datasets again */
-    sprintf(sql_command, "SELECT DISTINCT note_id, note_key, note_title, note_user_id, note_date, note_note FROM t_noteunion");
+    sprintf(sql_command, "SELECT DISTINCT note_id, note_key, note_title, note_user_id, note_date, note_content, t_note.note_content_type, t_note.note_content_xmllang FROM t_noteunion");
 
   }

[Refdb-devel] CVS: refdb/src backend-risx.c,1.20,1.21

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31668/src

Modified Files:
	backend-risx.c 
Log Message:
new print_elstart_x argument list

Index: backend-risx.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-risx.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -U2 -r1.20 -r1.21
--- backend-risx.c	18 Oct 2003 23:39:57 -0000	1.20
+++ backend-risx.c	21 Dec 2003 22:59:34 -0000	1.21
@@ -180,5 +180,5 @@
   item1 = get_refdb_citekey(ptr_rendinfo->dbires);
 
-  if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "entry", "type", item, "id", id, "citekey", item1, 0, &xindent) == NULL) {
+  if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "entry", "type", item, "id", id, "citekey", item1, NULL, NULL, 0, &xindent) == NULL) {
     return NULL;
   }
@@ -203,5 +203,5 @@
       || !strcmp(type, "CASE")
       || !strcmp(type, "GEN")) {
-    if (print_elstart_x(&buffer, &buffer_len, "part", NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
+    if (print_elstart_x(&buffer, &buffer_len, "part", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
       free(buffer);
       return NULL;
@@ -247,5 +247,5 @@
   *buffer = '\0';
 
-  if (print_elstart_x(&buffer, &buffer_len, "publication", NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
+  if (print_elstart_x(&buffer, &buffer_len, "publication", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
     free(buffer);
     return NULL;
@@ -370,5 +370,5 @@
   *buffer = '\0';
 
-  if (print_elstart_x(&buffer, &buffer_len, "set", NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
+  if (print_elstart_x(&buffer, &buffer_len, "set", NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, &xindent) == NULL) {
     free(buffer);
     return NULL;
@@ -420,5 +420,5 @@
     *buffer = '\0';
 
-    if (print_elstart_x(&buffer, &buffer_len, "libinfo", "user", item1, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
+    if (print_elstart_x(&buffer, &buffer_len, "libinfo", "user", item1, NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
       free(buffer);
       clean_request(dbires);
@@ -469,5 +469,5 @@
   *buffer = '\0';
 
-  if (print_elstart_x(&buffer, &buffer_len, "contents", NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
+  if (print_elstart_x(&buffer, &buffer_len, "contents", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
     free(buffer);
     return NULL;
@@ -577,5 +577,5 @@
   /* fetch part authors */
   while (get_author_parts(dbires, ptr_ainfo)) {
-    if (print_elstart_x(ptr_buffer, ptr_buffer_len, "author", "role", ptr_ainfo->role, NULL, NULL, NULL, NULL, 0, ptr_indent) == NULL) {
+    if (print_elstart_x(ptr_buffer, ptr_buffer_len, "author", "role", ptr_ainfo->role, NULL, NULL, NULL, NULL, NULL, NULL, 0, ptr_indent) == NULL) {
       clean_request(dbires);
       free_authorinfo(ptr_ainfo);
@@ -748,5 +748,5 @@
   *buffer1 = '\0';
 
-  if (print_elstart_x(&buffer1, &buffer1_len, "pubinfo", NULL, NULL, NULL, NULL, NULL, NULL, 0, ptr_indent) == NULL) {
+  if (print_elstart_x(&buffer1, &buffer1_len, "pubinfo", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, ptr_indent) == NULL) {
     free(buffer1);
     return NULL;
@@ -1000,5 +1000,5 @@
 
   if (type == 1) {
-    if (print_elstart_x(&buffer1, &buffer1_len, "pubdate", "type", "primary", NULL, NULL, NULL, NULL, 0, ptr_indent) == NULL) {
+    if (print_elstart_x(&buffer1, &buffer1_len, "pubdate", "type", "primary", NULL, NULL, NULL, NULL, NULL, NULL, 0, ptr_indent) == NULL) {
       free(buffer1);
       return NULL;
@@ -1007,5 +1007,5 @@
   }
   else {
-    if (print_elstart_x(&buffer1, &buffer1_len, "pubdate", "type", "secondary", NULL, NULL, NULL, NULL, 0, ptr_indent) == NULL) {
+    if (print_elstart_x(&buffer1, &buffer1_len, "pubdate", "type", "secondary", NULL, NULL, NULL, NULL, NULL, NULL, 0, ptr_indent) == NULL) {
       free(buffer1);
       return NULL;
@@ -1048,5 +1048,5 @@
   if (nhave_year || nhave_other) {
     nhave_data++;
-    if (print_elstart_x(&buffer1, &buffer1_len, "date", NULL, NULL, NULL, NULL, NULL, NULL, 0, ptr_indent) == NULL) {
+    if (print_elstart_x(&buffer1, &buffer1_len, "date", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, ptr_indent) == NULL) {
       free(buffer1);
       return NULL;

[Refdb-devel] CVS: refdb/scripts refdbxml.in,1.8,1.9

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv31492/scripts

Modified Files:
	refdbxml.in 
Log Message:
added --xinclude switch to xsltproc calls

Index: refdbxml.in
===================================================================
RCS file: /cvsroot/refdb/refdb/scripts/refdbxml.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -U2 -r1.8 -r1.9
--- refdbxml.in	4 Nov 2003 23:25:07 -0000	1.8
+++ refdbxml.in	21 Dec 2003 22:58:22 -0000	1.9
@@ -37,5 +37,5 @@
 	xt       ) java -cp "$classpath" com.jclark.xsl.sax.Driver $1 $jfosheet > $2;;
 	saxon    ) java -cp "$classpath" com.icl.saxon.StyleSheet -o $2 $1 $jfosheet;;
-	xsltproc ) xsltproc --catalogs $fosheet $1 > $2;;
+	xsltproc ) xsltproc --catalogs --xinclude $fosheet $1 > $2;;
     esac
 }
@@ -47,5 +47,5 @@
 	xt       ) java -cp "$classpath" com.jclark.xsl.sax.Driver $1 $jhtmlsheet > $2;;
 	saxon    ) java -cp "$classpath" com.icl.saxon.StyleSheet -o $2 $1 $jhtmlsheet;;
-	xsltproc ) xsltproc --catalogs $htmlsheet $1 > $2;;
+	xsltproc ) xsltproc --catalogs --xinclude $htmlsheet $1 > $2;;
     esac
 }
@@ -57,5 +57,5 @@
 	xt       ) java -cp "$classpath" com.jclark.xsl.sax.Driver $1 $jxhtmlsheet > $2;;
 	saxon    ) java -cp "$classpath" com.icl.saxon.StyleSheet -o $2 $1 $jxhtmlsheet;;
-	xsltproc ) xsltproc --catalogs $xhtmlsheet $1 > $2;;
+	xsltproc ) xsltproc --catalogs --xinclude $xhtmlsheet $1 > $2;;
     esac
 }

[Refdb-devel] CVS: refdb/dtd xnote.dtd,1.1,1.2

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/dtd
In directory sc8-pr-cvs1:/tmp/cvs-serv31289/dtd

Modified Files:
	xnote.dtd 
Log Message:
bumped up version number; changed note element to content; demoted date to an attribute of xnote; added type and xml:lang attributes to content

Index: xnote.dtd
===================================================================
RCS file: /cvsroot/refdb/refdb/dtd/xnote.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -U2 -r1.1 -r1.2
--- xnote.dtd	29 Oct 2003 22:03:56 -0000	1.1
+++ xnote.dtd	21 Dec 2003 22:57:22 -0000	1.2
@@ -4,5 +4,5 @@
 
 <!-- Invoke with the following declaration -->
-<!-- <!DOCTYPE xnoteset PUBLIC "-//Markus Hoenicka//DTD Xnote V1.0//EN" "http://refdb.sourceforge.net/dtd/xnote-1.0/xnote.dtd"> -->
+<!-- <!DOCTYPE xnoteset PUBLIC "-//Markus Hoenicka//DTD Xnote V1.1//EN" "http://refdb.sourceforge.net/dtd/xnote-1.1/xnote.dtd"> -->
 
 <!-- the top-level element, containing one or more extended notes -->
@@ -10,23 +10,19 @@
 
 <!-- this element describes one extended note -->
-<!ELEMENT xnote (title?, date?, note, keyword*, link*)>
+<!-- todo: demote date to an attribute and use YYYY-MM-DD notation? -->
+<!ELEMENT xnote (title?, content, keyword*, link*)>
 <!ATTLIST xnote id NMTOKEN #IMPLIED
                 citekey NMTOKEN #IMPLIED
-                user NMTOKEN #IMPLIED>
+                user NMTOKEN #IMPLIED
+                date NMTOKEN #IMPLIED>
 
 <!-- the optional title of a note -->
 <!ELEMENT title (#PCDATA)>
 
-<!-- the optional date of a note -->
-<!ELEMENT date (year?, month?, day?)>
+<!-- the contents of the note -->
+<!ELEMENT content ANY>
 
-<!ELEMENT year (#PCDATA)>
-
-<!ELEMENT month (#PCDATA)>
-
-<!ELEMENT day (#PCDATA)>
-
-<!-- the note proper -->
-<!ELEMENT note (#PCDATA)>
+<!ATTLIST content type CDATA #IMPLIED
+                  xml:lang CDATA #IMPLIED>
 
 <!-- keyword for indexing purposes -->

Re: [Refdb-devel] Anonymous CVS checkout

[Bruce D'A. <bd...@fa...>]

On Dec 18, 2003, at 4:56 PM, Markus Hoenicka wrote:

> Depends on your current permissions. I'd do something like:
>
> sudo chmod u=rw,g-rwx,o-rwx .cvspass

I still get the permission error.  Any other ideas?

Bruce

Re: [Refdb-devel] Anonymous CVS checkout

[Markus H. <mar...@mh...>]

Bruce D'Arcus writes:
 > > Maybe you should take this warning literally and check the permissions
 > > of .cvspass. I believe it must be read+writable for yourself, but
 > > have no read or write permissions for group or others:
 > 
 > And the command I use?  Is this ok?
 > 
 > 	sudo chmod u+x .cvspass
 > 

Depends on your current permissions. I'd do something like:

sudo chmod u=rw,g-rwx,o-rwx .cvspass

regards,
Markus

-- 
Markus Hoenicka
mar...@ca...
(Spam-protected email: replace the quadrupeds with "mhoenicka")
http://www.mhoenicka.de

Re: [Refdb-devel] Anonymous CVS checkout

[Bruce D'A. <bd...@fa...>]

On Dec 16, 2003, at 5:12 PM, Markus Hoenicka wrote:

>> cvs login: cannot open /Users/darcusb/.cvspass: Permission denied
>> cvs [login aborted]: could not open /Users/darcusb/.cvspass: 
>> Permission
>> denied
>>
>
> Maybe you should take this warning literally and check the permissions
> of .cvspass. I believe it must be read+writable for yourself, but
> have no read or write permissions for group or others:

And the command I use?  Is this ok?

	sudo chmod u+x .cvspass

Bruce

Re: [Refdb-devel] refdb-checkins list?

[Markus H. <mar...@mh...>]

Hi Mike,

Markus Hoenicka writes:
 > I've created a list "refdb-cvs" which should be available in 6-24
 > hours according to SF. I'll let you know when the list is available to
 > receive the cvs checkin traffic.
 > 

The list appears to be available now.

Markus

-- 
Markus Hoenicka
mar...@ca...
(Spam-protected email: replace the quadrupeds with "mhoenicka")
http://www.mhoenicka.de

Re: [Refdb-devel] refdb-checkins list?

[Markus H. <mar...@mh...>]

Hi Mike,

Michael Smith writes:
 > You just need to create a new project mailing list to go along with the
 > refdb-devel and refdb-users lists. The name doesn't matter --
 > "refdb-checkins" or "refdb-cvs" or whatever. And it should probably be
 > configured so that the name is pre-pended to the Subject header for all
 > messages (i.e., as refdb-devel and refdb-users are now).
 > 

I've created a list "refdb-cvs" which should be available in 6-24
hours according to SF. I'll let you know when the list is available to
receive the cvs checkin traffic.

regards,
Markus

-- 
Markus Hoenicka
mar...@ca...
(Spam-protected email: replace the quadrupeds with "mhoenicka")
http://www.mhoenicka.de

Re: [Refdb-devel] Updated Emacs package, syntax highlighting, new name

[Bruce D'A. <bd...@fa...>]

On Dec 16, 2003, at 8:36 PM, Michael Smith wrote:

> So when I type a backslash in mail messages -- I actually edit as
> temporary files vim, it shows up in vim as a Yen symbol. But if I then
> open that temp file in Emacs (or some other text editor), before I send
> it, it'l still show up as a real backslash. So I guess the problem is
> with what mutt does with those messages before I send it them.

Curious question:  why vim?  Also, do you ever use vip-mode in emacs?

Bruce

[Refdb-devel] Percent signs in queries (Bug #861419)

[Michael S. <sm...@xm...>]

Markus Hoenicka <mar...@mh...> writes:

[...]

> Finally, if I use sqlite as a backend (as I did in my preliminary test
> yesterday), all queries for partial strings require a '%'. E.g. to
> find the author entry 'Walsh,N.', you'll either have to type the full
> string or use 'Walsh%'. However, the percent sign is interpreted
> by a format call before it is sent to refdbc, and Emacs complains
> about not getting enough arguments. Can you work around this issue?

I opened up bug #861419 for this

  http://sourceforge.net/tracker/index.php?func=detail&aid=861419&group_id=26091&atid=385991

And fixed it in v1.3. Please update your sandbox and let me know if it
works as expected now. I'm only testing with the Postgres backend, and
that supports full regex syntax instead of the SQL percent-sign stuff
(as far as I can know), so I can't test myself whether queries with
percent-signs work as expected. But I pretty sure that now that percent
signs should be getting passed through to refdbc verbatim, without Emacs
choking on them or munging them.

  --Mike

Re: [Refdb-devel] CVS: elisp refdb-mode.el,1.3,1.4

[Michael S. <sm...@xm...>]

I got the checkin notification system set up on the CVS side, and
configured it temporarily to send notifications to this list until the
new checkins list is up.

  --Mike

Michael Smith <xm...@us...> writes:

> Update of /cvsroot/refdb/elisp
> In directory sc8-pr-cvs1:/tmp/cvs-serv22094
> 
> Modified Files:
> 	refdb-mode.el 
> Log Message:
> Change for RFE #861367, "consolidate variables containing refdbc"
> 
>   http://sourceforge.net/tracker/index.php?func=detail&aid=861367&group_id=26091&atid=385994
> 
> Problem:
>   The customization buffer of refdb-menu contains a variety of entries
>   containing the name/path of the refdbc executable. Changing the
>   refdb-refdbc-program variable will change the others only after a
>   restart or after reloading .emacs. This is inconvenient if you want
>   to switch e.g. to a debug version of the executable.  I'd suggest to
>   modify the code so that in all places refdb-refdbc-program is used,
>   and use the other variables which so far depend on this to carry
>   only additional arguments.
> 
> Cause:
>   Bad design; custom variables referencing other custom variables
>   don't get updated when the values of the referenced custom variables
>   change.
> 
> Fix:
>   All user commands now include a direct call refdb-refdbc-program
>   (instead of a call to a custom variable that references
>   refdb-refdbc-program.
> 
> Affects:
>   All commands that call the refdbc program. If you change the value
>   of refdb-refdbc-program during a session, the new value will be used
>   in all commands that call refdbc (i.e., you don't have to restart
>   your Emacs for the changes to take effect). As a consequence of
>   this, the following custom variables have been removed:
> 
>     refdb-refdbc-program-and-options
>     refdb-addref-command
>     refdb-getref-command
>     refdb-listdb-command
> 
> Other:
>   Made some minor formatting changes to make code look better in
>   outline view.
> 
> 
> Index: refdb-mode.el
> ===================================================================
> RCS file: /cvsroot/refdb/elisp/refdb-mode.el,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -U2 -r1.3 -r1.4
> --- refdb-mode.el	17 Dec 2003 10:36:31 -0000	1.3
> +++ refdb-mode.el	17 Dec 2003 11:32:56 -0000	1.4
> @@ -117,7 +117,7 @@
>  ;; -------------------------------------------------------------------
>  ;;
> -;; --------------------
> -;;  :: Menu contents ::
> -;; --------------------
> +;; ------------------------------
> +;;;      :: Menu contents ::
> +;; ------------------------------
>  ;; By default, the RefDB menu provides the following submenus:
>  ;;
> @@ -305,39 +305,4 @@
>    :group 'refdb)
>  
> -(defcustom refdb-refdbc-program-and-options
> -  (format "%s %s"
> -	  refdb-refdbc-program
> -	  refdb-refdbc-options
> -	  )
> -  "RefDB command along with global options."
> -  :type 'string
> -  :group 'refdb)
> -
> -(defcustom refdb-addref-command
> -  (format "%s -C addref"
> -	  refdb-refdbc-program-and-options
> -	  )
> -  "Command for adding references to RefDB."
> -  :type 'string
> -  :group 'refdb)
> -
> -(defcustom refdb-getref-command
> -  (format "%s -C getref"
> -	  refdb-refdbc-program-and-options
> -	  )
> -  "Command for getting references from RefDB."
> -  :type 'string
> -  :group 'refdb)
> -
> -(defcustom refdb-listdb-command
> -  (format "%s -C listdb"
> -	  refdb-refdbc-program-and-options
> -	  )
> -  "Command for getting database list from RefDB."
> -  :type 'string
> -  :group 'refdb)
> -
> -;; need to have this here to ensure that menu item will be in Tools
> -;; menu even if RefDB hasn't been loaded yet.
>  (defcustom refdb-menu-suppress-toggle-flag nil
>    "*Non-nil means suppress 'RefDB Mode' menu item.
> @@ -365,5 +330,5 @@
>  
>  ;; *******************************************************************
> -;; end of user-customizable options, part 1
> +;;; end of user-customizable options, part 1
>  ;; *******************************************************************
>  
> @@ -372,6 +337,7 @@
>    (setq refdb-selectdb-submenu-contents nil)
>    (message
> -   "Building list of databases using '%s %s' ..."
> -   refdb-listdb-command
> +   "Building list of databases using '%s %s -C listdb %s' ..."
> +   refdb-refdbc-program
> +   refdb-refdbc-options
>     refdb-listdb-sql-regexp
>     )
> @@ -380,10 +346,12 @@
>       (with-current-buffer
>  	 standard-output
> -       (call-process shell-file-name nil '(t nil) nil shell-command-switch
> -		     (format "%s %s"
> -			     refdb-listdb-command
> -			     refdb-listdb-sql-regexp
> -			     )
> -		     )
> +       (call-process
> +	shell-file-name nil '(t nil) nil shell-command-switch
> +	(format "%s %s -C listdb %s"
> +		refdb-refdbc-program
> +		refdb-refdbc-options
> +		refdb-listdb-sql-regexp
> +		)
> +	)
>         )
>       )
> @@ -559,6 +527,7 @@
>  	     (point) (mark)
>  	     (format
> -	      "%s %s -d %s -t %s"
> -	      refdb-addref-command
> +	      "%s %s -C addref %s -d %s -t %s"
> +	      refdb-refdbc-program
> +	      refdb-refdbc-options
>  	      refdb-addref-options
>  	      refdb-database
> @@ -567,6 +536,7 @@
>  	     "*refdb-output*" nil "*refdb-messages*")
>  	     (message
> -	      "Displaying output for '%s %s -d %s -t %s'"
> -	      refdb-addref-command
> +	      "Displaying output for '%s %s -C addref %s -d %s -t %s'"
> +	      refdb-refdbc-program
> +	      refdb-refdbc-options
>  	      refdb-addref-options
>  	      refdb-database
> @@ -604,10 +574,13 @@
>  	(shell-command
>  	 (format
> -	  "%s -d %s -t %s :%s:=%s"
> -	  refdb-getref-command
> +	  "%s %s -C getref %s -d %s -t %s :%s:=%s"
> +	  refdb-refdbc-program
> +	  refdb-refdbc-options
> +	  refdb-getref-options
>  	  refdb-database
>  	  refdb-output-type
>  	  field
> -	  value)
> +	  value
> +	  )
>  	 "*refdb-output*" "*refdb-messages*")
>  	
> @@ -621,6 +594,8 @@
>      )
>    (message
> -   "Displaying output for %s -d %s -t %s :%s:=%s"
> -   refdb-getref-command
> +   "Displaying output for '%s %s -C getref %s -d %s -t %s :%s:=%s'"
> +   refdb-refdbc-program
> +   refdb-refdbc-options
> +   refdb-getref-options
>     refdb-database
>     refdb-output-type
> @@ -714,9 +689,12 @@
>  	(shell-command
>  	 (format
> -	  "%s -d %s -t %s %s"
> -	  refdb-getref-command
> +	  "%s %s -C getref %s -d %s -t %s %s"
> +	  refdb-refdbc-program
> +	  refdb-refdbc-options
> +	  refdb-getref-options
>  	  refdb-database
>  	  refdb-output-type
> -	  searchstring)
> +	  searchstring
> +	  )
>  	 "*refdb-output*" nil)
>  	
> @@ -730,6 +708,8 @@
>      )
>    (message
> -   "Displaying output for %s -d %s -t %s %s"
> -   refdb-getref-command
> +   "Displaying output for '%s %s -C getref %s -d %s -t %s %s"
> +   refdb-refdbc-program
> +   refdb-refdbc-options
> +   refdb-getref-options
>     refdb-database
>     refdb-output-type
> @@ -941,5 +921,5 @@
>    )
>  ;; *******************************************************************
> -;; end of user-customizable options, part 2
> +;;; end of user-customizable options, part 2
>  ;; *******************************************************************

[Refdb-devel] CVS: elisp refdb-mode.el,1.3,1.4

[Michael S. <xm...@us...>]

Update of /cvsroot/refdb/elisp
In directory sc8-pr-cvs1:/tmp/cvs-serv22094

Modified Files:
	refdb-mode.el 
Log Message:
Change for RFE #861367, "consolidate variables containing refdbc"

  http://sourceforge.net/tracker/index.php?func=detail&aid=861367&group_id=26091&atid=385994

Problem:
  The customization buffer of refdb-menu contains a variety of entries
  containing the name/path of the refdbc executable. Changing the
  refdb-refdbc-program variable will change the others only after a
  restart or after reloading .emacs. This is inconvenient if you want
  to switch e.g. to a debug version of the executable.  I'd suggest to
  modify the code so that in all places refdb-refdbc-program is used,
  and use the other variables which so far depend on this to carry
  only additional arguments.

Cause:
  Bad design; custom variables referencing other custom variables
  don't get updated when the values of the referenced custom variables
  change.

Fix:
  All user commands now include a direct call refdb-refdbc-program
  (instead of a call to a custom variable that references
  refdb-refdbc-program.

Affects:
  All commands that call the refdbc program. If you change the value
  of refdb-refdbc-program during a session, the new value will be used
  in all commands that call refdbc (i.e., you don't have to restart
  your Emacs for the changes to take effect). As a consequence of
  this, the following custom variables have been removed:

    refdb-refdbc-program-and-options
    refdb-addref-command
    refdb-getref-command
    refdb-listdb-command

Other:
  Made some minor formatting changes to make code look better in
  outline view.


Index: refdb-mode.el
===================================================================
RCS file: /cvsroot/refdb/elisp/refdb-mode.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -U2 -r1.3 -r1.4
--- refdb-mode.el	17 Dec 2003 10:36:31 -0000	1.3
+++ refdb-mode.el	17 Dec 2003 11:32:56 -0000	1.4
@@ -117,7 +117,7 @@
 ;; -------------------------------------------------------------------
 ;;
-;; --------------------
-;;  :: Menu contents ::
-;; --------------------
+;; ------------------------------
+;;;      :: Menu contents ::
+;; ------------------------------
 ;; By default, the RefDB menu provides the following submenus:
 ;;
@@ -305,39 +305,4 @@
   :group 'refdb)
 
-(defcustom refdb-refdbc-program-and-options
-  (format "%s %s"
-	  refdb-refdbc-program
-	  refdb-refdbc-options
-	  )
-  "RefDB command along with global options."
-  :type 'string
-  :group 'refdb)
-
-(defcustom refdb-addref-command
-  (format "%s -C addref"
-	  refdb-refdbc-program-and-options
-	  )
-  "Command for adding references to RefDB."
-  :type 'string
-  :group 'refdb)
-
-(defcustom refdb-getref-command
-  (format "%s -C getref"
-	  refdb-refdbc-program-and-options
-	  )
-  "Command for getting references from RefDB."
-  :type 'string
-  :group 'refdb)
-
-(defcustom refdb-listdb-command
-  (format "%s -C listdb"
-	  refdb-refdbc-program-and-options
-	  )
-  "Command for getting database list from RefDB."
-  :type 'string
-  :group 'refdb)
-
-;; need to have this here to ensure that menu item will be in Tools
-;; menu even if RefDB hasn't been loaded yet.
 (defcustom refdb-menu-suppress-toggle-flag nil
   "*Non-nil means suppress 'RefDB Mode' menu item.
@@ -365,5 +330,5 @@
 
 ;; *******************************************************************
-;; end of user-customizable options, part 1
+;;; end of user-customizable options, part 1
 ;; *******************************************************************
 
@@ -372,6 +337,7 @@
   (setq refdb-selectdb-submenu-contents nil)
   (message
-   "Building list of databases using '%s %s' ..."
-   refdb-listdb-command
+   "Building list of databases using '%s %s -C listdb %s' ..."
+   refdb-refdbc-program
+   refdb-refdbc-options
    refdb-listdb-sql-regexp
    )
@@ -380,10 +346,12 @@
      (with-current-buffer
 	 standard-output
-       (call-process shell-file-name nil '(t nil) nil shell-command-switch
-		     (format "%s %s"
-			     refdb-listdb-command
-			     refdb-listdb-sql-regexp
-			     )
-		     )
+       (call-process
+	shell-file-name nil '(t nil) nil shell-command-switch
+	(format "%s %s -C listdb %s"
+		refdb-refdbc-program
+		refdb-refdbc-options
+		refdb-listdb-sql-regexp
+		)
+	)
        )
      )
@@ -559,6 +527,7 @@
 	     (point) (mark)
 	     (format
-	      "%s %s -d %s -t %s"
-	      refdb-addref-command
+	      "%s %s -C addref %s -d %s -t %s"
+	      refdb-refdbc-program
+	      refdb-refdbc-options
 	      refdb-addref-options
 	      refdb-database
@@ -567,6 +536,7 @@
 	     "*refdb-output*" nil "*refdb-messages*")
 	     (message
-	      "Displaying output for '%s %s -d %s -t %s'"
-	      refdb-addref-command
+	      "Displaying output for '%s %s -C addref %s -d %s -t %s'"
+	      refdb-refdbc-program
+	      refdb-refdbc-options
 	      refdb-addref-options
 	      refdb-database
@@ -604,10 +574,13 @@
 	(shell-command
 	 (format
-	  "%s -d %s -t %s :%s:=%s"
-	  refdb-getref-command
+	  "%s %s -C getref %s -d %s -t %s :%s:=%s"
+	  refdb-refdbc-program
+	  refdb-refdbc-options
+	  refdb-getref-options
 	  refdb-database
 	  refdb-output-type
 	  field
-	  value)
+	  value
+	  )
 	 "*refdb-output*" "*refdb-messages*")
 	
@@ -621,6 +594,8 @@
     )
   (message
-   "Displaying output for %s -d %s -t %s :%s:=%s"
-   refdb-getref-command
+   "Displaying output for '%s %s -C getref %s -d %s -t %s :%s:=%s'"
+   refdb-refdbc-program
+   refdb-refdbc-options
+   refdb-getref-options
    refdb-database
    refdb-output-type
@@ -714,9 +689,12 @@
 	(shell-command
 	 (format
-	  "%s -d %s -t %s %s"
-	  refdb-getref-command
+	  "%s %s -C getref %s -d %s -t %s %s"
+	  refdb-refdbc-program
+	  refdb-refdbc-options
+	  refdb-getref-options
 	  refdb-database
 	  refdb-output-type
-	  searchstring)
+	  searchstring
+	  )
 	 "*refdb-output*" nil)
 	
@@ -730,6 +708,8 @@
     )
   (message
-   "Displaying output for %s -d %s -t %s %s"
-   refdb-getref-command
+   "Displaying output for '%s %s -C getref %s -d %s -t %s %s"
+   refdb-refdbc-program
+   refdb-refdbc-options
+   refdb-getref-options
    refdb-database
    refdb-output-type
@@ -941,5 +921,5 @@
   )
 ;; *******************************************************************
-;; end of user-customizable options, part 2
+;;; end of user-customizable options, part 2
 ;; *******************************************************************
 

[Refdb-devel] CVS: elisp refdb-mode.el,1.2,1.3

[Michael S. <xm...@us...>]

Update of /cvsroot/refdb/elisp
In directory sc8-pr-cvs1:/tmp/cvs-serv13993

Modified Files:
	refdb-mode.el 
Log Message:
Fix for Bug #861419, "handle percent sign in queries".

  http://sourceforge.net/tracker/index.php?func=detail&aid=861419&group_id=26091&atid=385991

Problem:
  If you try to use a string that contains a percent sign, e.g.,
  "Walsh%", in a getref query, Emacs emits a "not enough arguments for
  format call" error, and the query fails.

Cause:
  Message functions with nested format functions, like this:

    (message (format CONTROL-STRING OBJECTS))

  In that case, when objects for that nested format call had percent
  signs in them, the message function choked on them.

Fix:
  Un-nested content that was in the format function, like this:

    (message CONTROL-STRING OBJECTS)

  Because the message function has built-in support for expanding
  control-strings just as the format function does, the format call
  was actually unnecessary.

  Also, added a new function, `refdb-message-getting-refs', for
  displaying the "Getting datasets for FIELD VALUE" message. All the
  refdb-getref-by-* functions now call this (instead of having
  their own hard-coded message calls).

Affects:
  All getref queries, whether from command-line or menu.


Index: refdb-mode.el
===================================================================
RCS file: /cvsroot/refdb/elisp/refdb-mode.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -U2 -r1.2 -r1.3
--- refdb-mode.el	16 Dec 2003 04:48:07 -0000	1.2
+++ refdb-mode.el	17 Dec 2003 10:36:31 -0000	1.3
@@ -586,4 +586,14 @@
   )
 
+(defun refdb-message-getting-refs (field value)
+  "Emit appropriate status message for FIELD and VALUE.
+This function is called by the various refdb-getref-by commands."
+  (message
+   "Getting datasets for %s %s ..."
+   field
+   value
+   )
+  )
+
 (defun refdb-getref-by-field (field value)
   "Display all RefDB datasets that match the specified FIELD and VALUE.
@@ -611,11 +621,10 @@
     )
   (message
-   (format
-    "Displaying output for %s -d %s -t %s :%s:=%s"
-    refdb-getref-command
-    refdb-database
-    refdb-output-type
-    field
-    value)
+   "Displaying output for %s -d %s -t %s :%s:=%s"
+   refdb-getref-command
+   refdb-database
+   refdb-output-type
+   field
+   value
    )
   (pop-to-buffer "*refdb-output*")
@@ -665,5 +674,5 @@
   "Display all RefDB datasets matching AUTHOR."
   (interactive (list (read-string (format "Author: "))))
-  (message (format "Getting datasets for author %s ..." author))
+  (refdb-message-getting-refs 'author author)
   (refdb-getref-by-field "AU" author)
   )
@@ -672,5 +681,5 @@
   "Display all RefDB datasets matching TITLE."
   (interactive (list (read-string (format "Title: "))))
-  (message (format "Getting datasets for title %s ..." title))
+  (refdb-message-getting-refs 'title title)
   (refdb-getref-by-field "TI" title)
   )
@@ -679,5 +688,5 @@
   "Display all RefDB datasets matching KEYWORD."
   (interactive (list (read-string (format "Keyword: "))))
-  (message (format "Getting datasets for keyword %s ..." keyword))
+  (refdb-message-getting-refs 'keyword keyword)
   (refdb-getref-by-field "KW" keyword)
   )
@@ -686,5 +695,5 @@
   "Display all RefDB datasets matching ID."
   (interactive (list (read-string (format "ID: "))))
-  (message (format "Getting datasets for ID %s ..." ID))
+  (refdb-message-getting-refs 'id id)
   (refdb-getref-by-field "ID" id)
   )
@@ -693,5 +702,5 @@
   "Display all RefDB datasets matching CITEKEY."
   (interactive (list (read-string (format "Citation Key: "))))
-  (message (format "Getting datasets for citation key %s ..." citekey))
+  (refdb-message-getting-refs 'citekey citekey)
   (refdb-getref-by-field "CK" citekey)
   )
@@ -700,5 +709,5 @@
   "Display all RefDB datasets matching SEARCHSTRING."
   (interactive "sSearch string: ")
-  (message (format "Getting datasets for search string %s ..." searchstring))
+  (refdb-message-getting-refs 'searchstring searchstring)
   (if (not (eq (length refdb-database) 0))
       (progn
@@ -721,10 +730,9 @@
     )
   (message
-   (format
-    "Displaying output for %s -d %s -t %s %s"
-    refdb-getref-command
-    refdb-database
-    refdb-output-type
-    searchstring)
+   "Displaying output for %s -d %s -t %s %s"
+   refdb-getref-command
+   refdb-database
+   refdb-output-type
+   searchstring
    )
   )

Re: [Refdb-devel] Updated Emacs package, syntax highlighting, new name

[Michael S. <sm...@xm...>]

Hi Markus,

You wrote:

[...]

> Finally, if I use sqlite as a backend (as I did in my preliminary test
> yesterday), all queries for partial strings require a '%'. E.g. to
> find the author entry 'Walsh,N.', you'll either have to type the full
> string or use 'Walsh%'. However, the percent sign is interpreted
> by a format call before it is sent to refdbc, and Emacs complains
> about not getting enough arguments. Can you work around this issue?

A workaround to try for now is just to specify two percent signs instead
of one -- i.e., "%%" instead of "%". The double-percent-sign is the way
of escaping it in Emacs so that the format and message functions don't
try to expand it.

  --Mike

Re: [Refdb-devel] refdb-checkins list?

[Michael S. <sm...@xm...>]

Hi Markus,

You wrote:

[...p

> I've actually been using such a mailing list for the libdbi
> project. I find it quite convenient.
> 
>  > It's just a way for people to know when they need to update their
>  > sandbox setups if they have them, or even just for anybody who's
>  > interested in keeping up with code changes that are being made -- bug
>  > fixes made, new features added, whatever.
>  > 
>  > Anyway, If you think it'd be worthwhile to have, I can do the setup for
>  > it on the CVS side. But I'd need for you to create the list.
>  > 
> 
> Fine. Just let me know what I'll have to do on my side.

You just need to create a new project mailing list to go along with the
refdb-devel and refdb-users lists. The name doesn't matter --
"refdb-checkins" or "refdb-cvs" or whatever. And it should probably be
configured so that the name is pre-pended to the Subject header for all
messages (i.e., as refdb-devel and refdb-users are now).

  --Mike

Re: [Refdb-devel] Updated Emacs package, syntax highlighting, new name

[Michael S. <sm...@xm...>]

Hi Markus,

You wrote:

> Hi Mike,
> 
> Michael Smith writes:
>  > > BTW I've tested 1.5 on the weekend real quick. It was entirely broke
>  > > for me but I didn't have the time to investigate this yet. I'll be
>  > > back with fixes or at least a complete problem description asap.
>  > 
>  > OK -- thanks. Note that when I changed the name to "refdb-mode", I
>  > changed every single variable name as well. So if you still have any
>  > related config variables in your .emacs that you haven't updated to the
>  > new names yet, that may be part of the problem.
>  > 
> 
> I think I've figured it out. First of all, if I cut+paste the elisp
> source from your mails, the backslash ends up as a funny Japanese
> character. Updating from CVS fixes this problem.

I see -- I should have thought about that. The reason for that I have my
mail program, mutt, set up for Japanese, and in Japanese encodings, the
backlash character and Yen symbol are the same character. 

So when I type a backslash in mail messages -- I actually edit as
temporary files vim, it shows up in vim as a Yen symbol. But if I then
open that temp file in Emacs (or some other text editor), before I send
it, it'l still show up as a real backslash. So I guess the problem is
with what mutt does with those messages before I send it them.

I think this is probably also the cause for some of the problems that
Bruce has reported.

Anyway, next time I need to send any code by e-mail, I'll tar it or
compress it first so that mutt doesn't monkey with it.

> Next, there is a small typo ("ID"vs "id") that apparently screws up
> the ID queries, see the appended patch.

Thanks

> Finally, if I use sqlite as a backend (as I did in my preliminary test
> yesterday), all queries for partial strings require a '%'. E.g. to
> find the author entry 'Walsh,N.', you'll either have to type the full
> string or use 'Walsh%'. However, the percent sign is interpreted
> by a format call before it is sent to refdbc, and Emacs complains
> about not getting enough arguments. Can you work around this issue?

Yes, I'm sure I can. I'll get it figured out asap and update the source
in CVS today.

  --Mike

[Refdb-devel] Please test with latest CVS source (v1.2)

[Markus H. <mar...@mh...>]

Hi Mike,

ID queries work ok now, but there's still the issue with the SQL
regexp character '%' which screws up a format call at some
point. Otherwise queries work ok, and I can add references just fine.


regards,
Markus

Michael Smith writes:
 > Anyway, if you try with the CVS source and it's still broke for you,
 > definitely please let me know.
 > 


-- 
Markus Hoenicka
mar...@ca...
(Spam-protected email: replace the quadrupeds with "mhoenicka")
http://www.mhoenicka.de

Re: [Refdb-devel] Anonymous CVS checkout

[Markus H. <mar...@mh...>]

Bruce D'Arcus writes:
 > cvs login: cannot open /Users/darcusb/.cvspass: Permission denied
 > cvs [login aborted]: could not open /Users/darcusb/.cvspass: Permission 
 > denied
 > 

Maybe you should take this warning literally and check the permissions
of .cvspass. I believe it must be read+writable for yourself, but
have no read or write permissions for group or others:

-rw-------   1 markus  markus       163 Apr  3  2003 .cvspass

regards,
Markus

-- 
Markus Hoenicka
mar...@ca...
(Spam-protected email: replace the quadrupeds with "mhoenicka")
http://www.mhoenicka.de

[Refdb-devel] refdb-checkins list?

[Markus H. <mar...@mh...>]

Hi Mike,

Michael Smith writes:
 > Markus,
 > 
 > Do you think it'd be useful to have a mailing list for sending out
 > automated notifications of CVS checkins?
 > 
 > If you want to see an example, take a look at the one I've got set up
 > for the DocBook project -
 > 
 >   http://sourceforge.net/mailarchive/forum.php?forum_id=2281
 > 
 > The way it works is, any time code is committed to the repository, CVS
 > sends out a notification to the mailing list, containing a diff and the
 > checking description.
 > 

I've actually been using such a mailing list for the libdbi
project. I find it quite convenient.

 > It's just a way for people to know when they need to update their
 > sandbox setups if they have them, or even just for anybody who's
 > interested in keeping up with code changes that are being made -- bug
 > fixes made, new features added, whatever.
 > 
 > Anyway, If you think it'd be worthwhile to have, I can do the setup for
 > it on the CVS side. But I'd need for you to create the list.
 > 

Fine. Just let me know what I'll have to do on my side.

regards,
Markus


-- 
Markus Hoenicka
mar...@ca...
(Spam-protected email: replace the quadrupeds with "mhoenicka")
http://www.mhoenicka.de

[Refdb-devel] minor refdbd.h.in bug

[Markus H. <mar...@mh...>]

Michael Smith writes:
 > Markus,
 > 
 > Ran into a minor snag when trying to build from the latest CVS source.
 > Patch (such as it is) below.
 > 

Thanks Mike, I've applied the patch.

regards,
Markus


-- 
Markus Hoenicka
mar...@ca...
(Spam-protected email: replace the quadrupeds with "mhoenicka")
http://www.mhoenicka.de

Re: [Refdb-devel] Updated Emacs package, syntax highlighting, new name

[Markus H. <mar...@mh...>]

Hi Mike,

Michael Smith writes:
 > > BTW I've tested 1.5 on the weekend real quick. It was entirely broke
 > > for me but I didn't have the time to investigate this yet. I'll be
 > > back with fixes or at least a complete problem description asap.
 > 
 > OK -- thanks. Note that when I changed the name to "refdb-mode", I
 > changed every single variable name as well. So if you still have any
 > related config variables in your .emacs that you haven't updated to the
 > new names yet, that may be part of the problem.
 > 

I think I've figured it out. First of all, if I cut+paste the elisp
source from your mails, the backslash ends up as a funny Japanese
character. Updating from CVS fixes this problem.

Next, there is a small typo ("ID"vs "id") that apparently screws up
the ID queries, see the appended patch.

Finally, if I use sqlite as a backend (as I did in my preliminary test
yesterday), all queries for partial strings require a '%'. E.g. to
find the author entry 'Walsh,N.', you'll either have to type the full
string or use 'Walsh%'. However, the percent sign is interpreted
by a format call before it is sent to refdbc, and Emacs complains
about not getting enough arguments. Can you work around this issue?

regards,
Markus

Re: [Refdb-devel] Anonymous CVS checkout

[Bruce D'A. <bd...@fa...>]

On Dec 16, 2003, at 1:18 AM, Michael Smith wrote:

> Are you able to check out code from Sourceforge via anonymous CVS?
>
> You should be able to get all the RefDB source by doing this to login:
>
>   cvs -d:pserver:ano...@cv...:/cvsroot/refdb login
>
> (just hit Enter at the password prompt)

I can do this in theory, but this is what happens in practice:

cvs login: cannot open /Users/darcusb/.cvspass: Permission denied
cvs [login aborted]: could not open /Users/darcusb/.cvspass: Permission 
denied

I don't understand the intricacies of CVS, though this machine is setup 
with a repository so that I can sync work on my laptop with it.  Maybe 
that causes the problem?

Bruce

[Refdb-devel] refdb-checkins list?

[Michael S. <sm...@xm...>]

Markus,

Do you think it'd be useful to have a mailing list for sending out
automated notifications of CVS checkins?

If you want to see an example, take a look at the one I've got set up
for the DocBook project -

  http://sourceforge.net/mailarchive/forum.php?forum_id=2281

The way it works is, any time code is committed to the repository, CVS
sends out a notification to the mailing list, containing a diff and the
checking description.

It's just a way for people to know when they need to update their
sandbox setups if they have them, or even just for anybody who's
interested in keeping up with code changes that are being made -- bug
fixes made, new features added, whatever.

Anyway, If you think it'd be worthwhile to have, I can do the setup for
it on the CVS side. But I'd need for you to create the list.

  --Mike