You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axkit-dev@xml.apache.org by ma...@apache.org on 2004/05/20 20:35:08 UTC
cvs commit: xml-axkit axconfig.c
mach 2004/05/20 11:35:08
Modified: . Tag: axkit-pipeline-2 axconfig.c
Log:
AxPipelineController directive
Revision Changes Path
No revision
No revision
1.18.4.1 +19 -1 xml-axkit/axconfig.c
Index: axconfig.c
===================================================================
RCS file: /home/cvs/xml-axkit/axconfig.c,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- axconfig.c 7 Jul 2003 22:29:50 -0000 1.18
+++ axconfig.c 20 May 2004 18:35:08 -0000 1.18.4.1
@@ -104,6 +104,7 @@
new->config_reader_module = 0;
new->contentprovider_module = 0;
new->styleprovider_module = 0;
+ new->pipeline_controller_module = 0;
new->default_style = 0;
new->default_media = 0;
new->cache_module = 0;
@@ -394,6 +395,13 @@
new->styleprovider_module = ap_pstrdup(p, parent_dir->styleprovider_module);
}
+ if( subdir->pipeline_controller_module) {
+ new->pipeline_controller_module = ap_pstrdup(p, subdir->pipeline_controller_module);
+ }
+ else if( parent_dir->pipeline_controller_module) {
+ new->pipeline_controller_module = ap_pstrdup(p , parent_dir->pipeline_controller_module);
+ }
+
if (subdir->default_style) {
new->default_style = ap_pstrdup(p, subdir->default_style);
}
@@ -1246,6 +1254,11 @@
(void *)XtOffsetOf(axkit_dir_config, styleprovider_module),
OR_ALL, TAKE1,
"alternative module to use for reading the stylesheet" },
+
+ { "AxPipelineController", ax_set_module_slot,
+ (void *)XtOffsetOf(axkit_dir_config, pipeline_controller_module),
+ OR_ALL, TAKE1,
+ "alternative module to use for controlling the pipeline" },
{ "AxStyle", ap_set_string_slot,
(void *)XtOffsetOf(axkit_dir_config, default_style),
@@ -1416,6 +1429,11 @@
hv_store(retval, "CacheModule",
11, (newSVpv(cfg->cache_module, 0)), 0);
}
+ if (cfg->pipeline_controller_module) {
+ hv_store(retval, "PipelineController",
+ 11, (newSVpv(cfg->pipeline_controller_module, 0)), 0);
+ }
+
if (cfg->output_charset) {
hv_store(retval, "OutputCharset",
13, (newSVpv(cfg->output_charset, 0)), 0);