Changeset 784

Timestamp:

2005-01-30 13:07:50 (4 years ago)

Author:

conrad

Message:

backport cmml reparsing to not send <stream> (ticket: 41)

Files:

• mod_annodex-ap13/trunk/Makefile (modified) (1 diff)
• mod_annodex-ap13/trunk/mod_annodex.c (modified) (4 diffs)

mod_annodex-ap13/trunk/Makefile

@@ -11 +11 @@
-#DEF=-Dmy_define=my_value
-#INC=-Imy/include/dir
-
+ cmml
-#LIB=-Lmy/lib/dir -lc -lmylib
-
+ cmml
-
-#   the default target

mod_annodex-ap13/trunk/mod_annodex.c

@@ -51 +51 @@
-#include <annodex/anx_core.h>
-#include <annodex/annodex.h>
+#include <cmml.h>
-
-/* define __PROTOTYPE to enable mode= parameter */
@@ -540 +541 @@
-#endif
-
+#ifdef UNUSED
-static int
-ma_send (request_rec * r, char * filename)
@@ -563 +565 @@
-
-  ap_pfclose (r->pool, f);
+
+  return 0;
+}
+#endif
+
+static int
+read_cmml_stream (CMML * cmml, const CMML_Stream * stream, void * user_data)
+{
+  request_rec * r = (request_rec *)user_data;
+  CMML_Preamble * preamble;
+  static char buf[1024];
+  int n;
+
+  preamble = cmml_get_preamble (cmml);
+  n = cmml_preamble_snprint (buf, 1024, preamble);
+  if (n > 0) {
+    ap_rwrite (buf, n, r);
+  }
+
+  return 0;
+}
+
+static int
+read_cmml_head (CMML * cmml, const CMML_Head * head, void * user_data)
+{
+  request_rec * r = (request_rec *)user_data;
+  static char buf[MAX_CLIP_LEN];
+  int n;
+
+  n = cmml_head_pretty_snprint (buf, MAX_CLIP_LEN, (CMML_Head *)head);
+  if (n > 0) {
+    ap_rwrite (buf, n, r);
+  }
+
+  return 0;
+}
+
+static int
+read_cmml_clip (CMML * cmml, const CMML_Clip * clip, void * user_data)
+{ 
+  request_rec * r = (request_rec *)user_data;
+  static char buf[MAX_CLIP_LEN];
+  int n;
+
+  n = cmml_clip_pretty_snprint (buf, MAX_CLIP_LEN, (CMML_Clip *)clip);
+  if (n > 0) {
+    ap_rwrite (buf, n, r);
+  }
+
+  return 0;
+}
+
+static int
+ma_send_cmml (request_rec * r, char * filename)
+{
+  CMML * doc;
+  size_t nread = 0;
+  long n;
+  static char * cmml_tail = "</cmml>\n";
+
+  doc = cmml_open (filename);
+  cmml_set_read_callbacks (doc, read_cmml_stream, read_cmml_head,
+                           read_cmml_clip, r);
+
+  while ((n = cmml_read (doc, 1024)) > 0) nread += n;
+
+  if (n < 0) {
+    /* ERROR */
+  }
+
+  n = strlen (cmml_tail);
+  if (n > 0) {
+    ap_rwrite (cmml_tail, n, r);
+  }
+
+  cmml_destroy (doc);
-
-  return 0;
@@ -706 +784 @@
-             output_type == MOD_ANNODEX_TYPE_CMML) {
-    /* push out cmml */
-
+_cmml
-#ifdef __PROTOTYPE
-  } else if (input_type == MOD_ANNODEX_TYPE_ANX &&