[Refdb-devel] CVS: refdb/src backendn-notex.c,1.3,1.4

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

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

Modified Files:
	backendn-notex.c 
Log Message:
use new print_elstart_x() argument list; output according to new xnote.dtd

Index: backendn-notex.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backendn-notex.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -U2 -r1.3 -r1.4
--- backendn-notex.c	4 Nov 2003 23:27:23 -0000	1.3
+++ backendn-notex.c	21 Dec 2003 23:05:55 -0000	1.4
@@ -154,7 +154,9 @@
     citem = NULL;
   }
+  
+  get_refdb_note_date(ptr_rendinfo->dbires, date_buffer, 1);
 
   if (*id) {
-    if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "xnote", "id", id, "key", citem, "user", ptr_rendinfo->username, 0, &xindent) == NULL) {
+    if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "xnote", "id", id, "key", citem, "user", ptr_rendinfo->username, "date", date_buffer, 0, &xindent) == NULL) {
       return NULL;
     }
@@ -185,36 +187,8 @@
 
   /*----------------------------------------------------------------*/
-  /* date */
-  if (get_refdb_note_date(ptr_rendinfo->dbires, date_buffer, 1) != NULL) {
-    if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "date", NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
-      return NULL;
-    }
-
-    if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), date_buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) {
-      LOG_PRINT(LOG_WARNING, outomem.text);
-      return NULL;
-    }
-    else {
-      *(ptr_rendinfo->ptr_ref) = new_ref;
-    }
-
-    if (print_elend_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "date", &xindent) == NULL) {
-      return NULL;
-    }
-  }
-
-  if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) {
-    LOG_PRINT(LOG_WARNING, outomem.text);
-    return NULL;
-  }
-  else {
-    *(ptr_rendinfo->ptr_ref) = new_ref;
-  }
-
-  /*----------------------------------------------------------------*/
-  /* the note proper */
-  item = get_refdb_note_note_copy(ptr_rendinfo->dbires);
+  /* the content of the note */
+  item = get_refdb_note_content_copy(ptr_rendinfo->dbires);
   if (item != NULL) {
-    if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "note", NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
+    if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "content", "type", get_refdb_note_content_type(ptr_rendinfo->dbires), "xml:lang", get_refdb_note_content_xmllang(ptr_rendinfo->dbires), NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
       free(item);
       return NULL;
@@ -232,5 +206,5 @@
     free(item);
 
-    if (print_elend_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "note", &xindent) == NULL) {
+    if (print_elend_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "content", &xindent) == NULL) {
       return NULL;
     }
@@ -269,20 +243,20 @@
       if (i == 3) { /* periodical */
 	if (!mode) { /* full name */
-	  if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "link", "type", "journalfull", "target", citem, NULL, NULL, 1, &xindent) == NULL) {
+	  if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "link", "type", "journalfull", "target", citem, NULL, NULL, NULL, NULL, 1, &xindent) == NULL) {
 	    return NULL;
 	  }
 	}
 	else if (mode == 1) { /* abbrev */
-	  if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "link", "type", "journalabbrev", "target", citem, NULL, NULL, 1, &xindent) == NULL) {
+	  if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "link", "type", "journalabbrev", "target", citem, NULL, NULL, NULL, NULL, 1, &xindent) == NULL) {
 	    return NULL;
 	  }
 	}
 	else if (mode == 2) { /* custabbrev 1 */
-	  if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "link", "type", "journalcustabbrev1", "target", citem, NULL, NULL, 1, &xindent) == NULL) {
+	  if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "link", "type", "journalcustabbrev1", "target", citem, NULL, NULL, NULL, NULL, 1, &xindent) == NULL) {
 	    return NULL;
 	  }
 	}
 	else if (mode == 3) { /* custabbrev 2 */
-	  if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "link", "type", "journalcustabbrev2", "target", citem, NULL, NULL, 1, &xindent) == NULL) {
+	  if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "link", "type", "journalcustabbrev2", "target", citem, NULL, NULL, NULL, NULL, 1, &xindent) == NULL) {
 	    return NULL;
 	  }
@@ -290,5 +264,5 @@
       }
       else {
-	if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "link", "type", linktype[i], "target", citem, NULL, NULL, 1, &xindent) == NULL) {
+	if (print_elstart_x(ptr_rendinfo->ptr_ref, ptr_rendinfo->ptr_ref_len, "link", "type", linktype[i], "target", citem, NULL, NULL, NULL, NULL, 1, &xindent) == NULL) {
 	  return NULL;
 	}